Skip to content

Commit fcdf179

Browse files
soedirgosoedirgo
committed
refactor: move old stuff into /src/old
Makes it clear which parts are the new lib stuff and which are the old routes.
1 parent f357190 commit fcdf179

17 files changed

+54
-54
lines changed

‎src/api.ts renamed to ‎src/old/api.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Router } from 'express'
22
import cors = require('cors')
3-
import { addConnectionToRequest } from './lib/connectionMiddleware'
3+
import { addConnectionToRequest } from './connectionMiddleware'
44

55
const router = Router()
66
router.use(cors())

‎src/api/columns.ts renamed to ‎src/old/api/columns.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Router } from 'express'
22
import format, { ident, literal } from 'pg-format'
33
import SQL from 'sql-template-strings'
4-
import { RunQuery } from '../lib/connectionPool'
5-
import sql = require('../lib/sql')
6-
import { DEFAULT_SYSTEM_SCHEMAS } from '../lib/constants'
7-
import { Tables } from '../lib/interfaces'
8-
import logger from '../server/logger'
4+
import { RunQuery } from '../connectionPool'
5+
import sql = require('../../lib/sql')
6+
import { DEFAULT_SYSTEM_SCHEMAS } from '../../lib/constants'
7+
import { Tables } from '../interfaces'
8+
import logger from '../../server/logger'
99

1010
/**
1111
* @param {boolean} [include_system_schemas=false] - Return system schemas as well as user schemas

‎src/api/config.ts renamed to ‎src/old/api/config.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Router } from 'express'
22

3-
import { RunQuery } from '../lib/connectionPool'
4-
import sql = require('../lib/sql')
5-
import logger from '../server/logger'
3+
import { RunQuery } from '../connectionPool'
4+
import sql = require('../../lib/sql')
5+
import logger from '../../server/logger'
66
const { configSql, versionSql } = sql
77

88
const router = Router()

‎src/api/extensions.ts renamed to ‎src/old/api/extensions.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Router } from 'express'
22
import format from 'pg-format'
33
import SQL from 'sql-template-strings'
4-
import sqlTemplates = require('../lib/sql')
4+
import sqlTemplates = require('../../lib/sql')
55
const { extensionsSql } = sqlTemplates
6-
import { RunQuery } from '../lib/connectionPool'
7-
import logger from '../server/logger'
6+
import { RunQuery } from '../connectionPool'
7+
import logger from '../../server/logger'
88

99
const router = Router()
1010

‎src/api/functions.ts renamed to ‎src/old/api/functions.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Router } from 'express'
22

3-
import sql = require('../lib/sql')
3+
import sql = require('../../lib/sql')
44
const { functionsSql } = sql
5-
import { RunQuery } from '../lib/connectionPool'
6-
import { DEFAULT_SYSTEM_SCHEMAS } from '../lib/constants'
7-
import { Functions } from '../lib/interfaces'
8-
import logger from '../server/logger'
5+
import { RunQuery } from '../connectionPool'
6+
import { DEFAULT_SYSTEM_SCHEMAS } from '../../lib/constants'
7+
import { Functions } from '../interfaces'
8+
import logger from '../../server/logger'
99

1010
/**
1111
* @param {boolean} [include_system_schemas=false] - Return system schemas as well as user schemas

‎src/api/policies.ts renamed to ‎src/old/api/policies.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Router } from 'express'
22
import format from 'pg-format'
3-
import { toTransaction } from '../lib/helpers'
4-
import { RunQuery } from '../lib/connectionPool'
5-
import { DEFAULT_SYSTEM_SCHEMAS } from '../lib/constants'
6-
import { Tables } from '../lib/interfaces'
7-
import sqlTemplates = require('../lib/sql')
8-
import logger from '../server/logger'
3+
import { toTransaction } from '../../lib/helpers'
4+
import { RunQuery } from '../connectionPool'
5+
import { DEFAULT_SYSTEM_SCHEMAS } from '../../lib/constants'
6+
import { Tables } from '../interfaces'
7+
import sqlTemplates = require('../../lib/sql')
8+
import logger from '../../server/logger'
99

1010
/**
1111
* @param {string} [include_system_schemas=false] - Return system schemas as well as user schemas

‎src/api/publications.ts renamed to ‎src/old/api/publications.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Router } from 'express'
22
import { ident, literal } from 'pg-format'
3-
import sql = require('../lib/sql')
4-
import { RunQuery } from '../lib/connectionPool'
5-
import logger from '../server/logger'
3+
import sql = require('../../lib/sql')
4+
import { RunQuery } from '../connectionPool'
5+
import logger from '../../server/logger'
66

77
const { publicationsSql } = sql
88
const router = Router()

‎src/api/query.ts renamed to ‎src/old/api/query.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Router } from 'express'
22

3-
import { RunQuery } from '../lib/connectionPool'
4-
import logger from '../server/logger'
3+
import { RunQuery } from '../connectionPool'
4+
import logger from '../../server/logger'
55

66
const router = Router()
77
router.post('/', async (req, res) => {

‎src/api/roles.ts renamed to ‎src/old/api/roles.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import { Router } from 'express'
22

33
import format from 'pg-format'
44
import SQL from 'sql-template-strings'
5-
import sqlTemplates = require('../lib/sql')
5+
import sqlTemplates = require('../../lib/sql')
66
const { grantsSql, rolesSql } = sqlTemplates
7-
import { coalesceRowsToArray } from '../lib/helpers'
8-
import { RunQuery } from '../lib/connectionPool'
9-
import { DEFAULT_ROLES, DEFAULT_SYSTEM_SCHEMAS } from '../lib/constants'
10-
import { Roles } from '../lib/interfaces'
11-
import logger from '../server/logger'
7+
import { coalesceRowsToArray } from '../../lib/helpers'
8+
import { RunQuery } from '../connectionPool'
9+
import { DEFAULT_ROLES, DEFAULT_SYSTEM_SCHEMAS } from '../../lib/constants'
10+
import { Roles } from '../interfaces'
11+
import logger from '../../server/logger'
1212

1313
/**
1414
* @param {boolean} [include_system_schemas=false] - Return system schemas as well as user schemas

‎src/api/schemas.ts renamed to ‎src/old/api/schemas.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import SQL from 'sql-template-strings'
2-
import sqlTemplates = require('../lib/sql')
3-
import { RunQuery } from '../lib/connectionPool'
4-
import { DEFAULT_SYSTEM_SCHEMAS } from '../lib/constants'
5-
import { Schemas as Interfaces } from '../lib/interfaces'
6-
import logger from '../server/logger'
2+
import sqlTemplates = require('../../lib/sql')
3+
import { RunQuery } from '../connectionPool'
4+
import { DEFAULT_SYSTEM_SCHEMAS } from '../../lib/constants'
5+
import { Schemas as Interfaces } from '../interfaces'
6+
import logger from '../../server/logger'
77

88
const { schemasSql: allSchemasSql } = sqlTemplates
99
const defaultSchemasList = DEFAULT_SYSTEM_SCHEMAS.map((x) => `'${x}'`).join(', ')

‎src/api/tables.ts renamed to ‎src/old/api/tables.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Router } from 'express'
22
import format, { ident } from 'pg-format'
3-
import { coalesceRowsToArray, toTransaction } from '../lib/helpers'
4-
import { RunQuery } from '../lib/connectionPool'
5-
import { DEFAULT_SYSTEM_SCHEMAS } from '../lib/constants'
6-
import { Tables } from '../lib/interfaces'
7-
import logger from '../server/logger'
8-
import sqlTemplates = require('../lib/sql')
3+
import { coalesceRowsToArray, toTransaction } from '../../lib/helpers'
4+
import { RunQuery } from '../connectionPool'
5+
import { DEFAULT_SYSTEM_SCHEMAS } from '../../lib/constants'
6+
import { Tables } from '../interfaces'
7+
import logger from '../../server/logger'
8+
import sqlTemplates = require('../../lib/sql')
99

1010
/**
1111
* @param {string} [include_system_schemas=false] - Return system schemas as well as user schemas

‎src/api/types.ts renamed to ‎src/old/api/types.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Router } from 'express'
22

3-
import sql = require('../lib/sql')
3+
import sql = require('../../lib/sql')
44
const { typesSql } = sql
5-
import { RunQuery } from '../lib/connectionPool'
6-
import { DEFAULT_SYSTEM_SCHEMAS } from '../lib/constants'
7-
import { Types } from '../lib/interfaces'
8-
import logger from '../server/logger'
5+
import { RunQuery } from '../connectionPool'
6+
import { DEFAULT_SYSTEM_SCHEMAS } from '../../lib/constants'
7+
import { Types } from '../interfaces'
8+
import logger from '../../server/logger'
99

1010
/**
1111
* @param {boolean} [include_system_schemas=false] - Return system schemas as well as user schemas

‎src/lib/connectionMiddleware.ts renamed to ‎src/old/connectionMiddleware.ts

File renamed without changes.

‎src/lib/connectionPool.ts renamed to ‎src/old/connectionPool.ts

File renamed without changes.

‎src/lib/interfaces.ts renamed to ‎src/old/interfaces.ts

File renamed without changes.

‎src/routes/schemas.ts renamed to ‎src/old/routes/schemas.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Router } from 'express'
22
import format from 'pg-format'
33
import SQL from 'sql-template-strings'
4-
import sqlTemplates = require('../lib/sql')
5-
import { RunQuery } from '../lib/connectionPool'
6-
import { Schemas } from '../lib/interfaces'
4+
import sqlTemplates = require('../../lib/sql')
5+
import { RunQuery } from '../connectionPool'
6+
import { Schemas } from '../interfaces'
77

88
import { list, byId, byName } from '../api/schemas'
99

‎src/server/app.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import express from 'express'
22
import { PG_META_PORT } from './constants'
3-
import routes from './routes'
3+
import routes from '../old/api'
44
import pkg from '../../package.json'
55
import logger from './logger'
66

0 commit comments

Comments
 (0)