:Merge remote-tracking branch 'origin/master' into transform-properties

mmkal · Mar 2, 2020 · acaca20 · acaca20
2 parents ecaab17 + 6d97b00
commit acaca20
Show file tree

Hide file tree

Showing 10 changed files with 114 additions and 114 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,10 +1,14 @@
 version: '3'
 services:
   postgres:
-    image: postgres
+    image: postgres:12
     restart: always
     ports:
     - "5433:5432"
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: postgres
     volumes:
       - postgres:/var/lib/postgresql/data
 volumes:

diff --git a/package.json b/package.json
@@ -54,15 +54,15 @@
   "devDependencies": {
     "@types/jest": "^24.0.18",
     "@types/node": "^12.6.8",
-    "@types/slonik": "^21.4.0",
+    "@types/slonik": "^22.1.0",
     "check-clean": "^0.1.0",
     "coveralls": "^3.0.5",
     "jest": "^24.9.0",
     "lerna": "^3.16.1",
     "nodemon": "^2.0.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^1.18.2",
-    "slonik": "^21.4.2",
+    "slonik": "^22.4.3",
     "ts-expect": "^1.1.0",
     "ts-jest": "^24.1.0",
     "ts-node": "^8.3.0",

diff --git a/packages/demo/src/generated/db/_pg_types.ts b/packages/demo/src/generated/db/_pg_types.ts
@@ -3,7 +3,6 @@
 // this file is generated by a tool; don't change it manually.
 
 export const _pg_types = {
-  abstime: 'abstime',
   aclitem: 'aclitem',
   any: 'any',
   anyarray: 'anyarray',
@@ -43,6 +42,7 @@ export const _pg_types = {
   interval: 'interval',
   json: 'json',
   jsonb: 'jsonb',
+  jsonpath: 'jsonpath',
   language_handler: 'language_handler',
   line: 'line',
   lseg: 'lseg',
@@ -59,6 +59,7 @@ export const _pg_types = {
   pg_ddl_command: 'pg_ddl_command',
   pg_dependencies: 'pg_dependencies',
   pg_lsn: 'pg_lsn',
+  pg_mcv_list: 'pg_mcv_list',
   pg_ndistinct: 'pg_ndistinct',
   pg_node_tree: 'pg_node_tree',
   point: 'point',
@@ -75,17 +76,15 @@ export const _pg_types = {
   regprocedure: 'regprocedure',
   regrole: 'regrole',
   regtype: 'regtype',
-  reltime: 'reltime',
-  smgr: 'smgr',
   sql_identifier: 'sql_identifier',
+  table_am_handler: 'table_am_handler',
   text: 'text',
   tid: 'tid',
   time: 'time',
   time_stamp: 'time_stamp',
   timestamp: 'timestamp',
   timestamptz: 'timestamptz',
   timetz: 'timetz',
-  tinterval: 'tinterval',
   trigger: 'trigger',
   tsm_handler: 'tsm_handler',
   tsquery: 'tsquery',
@@ -101,7 +100,6 @@ export const _pg_types = {
   xid: 'xid',
   xml: 'xml',
   yes_or_no: 'yes_or_no',
-  _abstime: '_abstime',
   _aclitem: '_aclitem',
   _bit: '_bit',
   _bool: '_bool',
@@ -128,6 +126,7 @@ export const _pg_types = {
   _interval: '_interval',
   _json: '_json',
   _jsonb: '_jsonb',
+  _jsonpath: '_jsonpath',
   _line: '_line',
   _lseg: '_lseg',
   _macaddr: '_macaddr',
@@ -154,14 +153,12 @@ export const _pg_types = {
   _regprocedure: '_regprocedure',
   _regrole: '_regrole',
   _regtype: '_regtype',
-  _reltime: '_reltime',
   _text: '_text',
   _tid: '_tid',
   _time: '_time',
   _timestamp: '_timestamp',
   _timestamptz: '_timestamptz',
   _timetz: '_timetz',
-  _tinterval: '_tinterval',
   _tsquery: '_tsquery',
   _tsrange: '_tsrange',
   _tstzrange: '_tstzrange',

diff --git a/packages/migrator/package.json b/packages/migrator/package.json
@@ -30,6 +30,6 @@
     "@types/umzug": "^2.2.2"
   },
   "peerDependencies": {
-    "slonik": ">= 21.0.0 < 22"
+    "slonik": ">= 21.0.0 < 23"
   }
 }
diff --git a/packages/typegen/package.json b/packages/typegen/package.json
@@ -19,6 +19,6 @@
   },
   "license": "ISC",
   "peerDependencies": {
-    "slonik": ">= 21.0.0 < 22"
+    "slonik": ">= 21.0.0 < 23"
   }
 }
diff --git a/packages/typegen/test/cli.test.ts b/packages/typegen/test/cli.test.ts
@@ -34,12 +34,12 @@ describe('cli reset', () => {
   beforeEach(jest.clearAllMocks)
 
   it(`recursively creates directory when one doesn't exist`, () => {
-    main(['test/generated/foo/bar/baz/this/path/does/not/exist'])
+    main(['test/generated/foo/bar/baz/fake/path'])
     expect(fs.mocks).toMatchInlineSnapshot(`
             Object {
               "mkdirSync": [
               [
-                "test/generated/foo/bar/baz/this/path/does/not/exist",
+                "test/generated/foo/bar/baz/fake/path",
                 {
                   "recursive": true
                 }
@@ -49,7 +49,7 @@ describe('cli reset', () => {
               "unlinkSync": [],
               "writeFileSync": [
               [
-                "test/generated/foo/bar/baz/this/path/does/not/exist/index.ts",
+                "test/generated/foo/bar/baz/fake/path/index.ts",
                 "export const knownTypes = {}\\n",
                 "utf8"
               ]

diff --git a/packages/typegen/test/generated/main/_pg_types.ts b/packages/typegen/test/generated/main/_pg_types.ts
@@ -3,7 +3,6 @@
 // this file is generated by a tool; don't change it manually.
 
 export const _pg_types = {
-  abstime: 'abstime',
   aclitem: 'aclitem',
   any: 'any',
   anyarray: 'anyarray',
@@ -43,6 +42,7 @@ export const _pg_types = {
   interval: 'interval',
   json: 'json',
   jsonb: 'jsonb',
+  jsonpath: 'jsonpath',
   language_handler: 'language_handler',
   line: 'line',
   lseg: 'lseg',
@@ -59,6 +59,7 @@ export const _pg_types = {
   pg_ddl_command: 'pg_ddl_command',
   pg_dependencies: 'pg_dependencies',
   pg_lsn: 'pg_lsn',
+  pg_mcv_list: 'pg_mcv_list',
   pg_ndistinct: 'pg_ndistinct',
   pg_node_tree: 'pg_node_tree',
   point: 'point',
@@ -75,17 +76,15 @@ export const _pg_types = {
   regprocedure: 'regprocedure',
   regrole: 'regrole',
   regtype: 'regtype',
-  reltime: 'reltime',
-  smgr: 'smgr',
   sql_identifier: 'sql_identifier',
+  table_am_handler: 'table_am_handler',
   text: 'text',
   tid: 'tid',
   time: 'time',
   time_stamp: 'time_stamp',
   timestamp: 'timestamp',
   timestamptz: 'timestamptz',
   timetz: 'timetz',
-  tinterval: 'tinterval',
   trigger: 'trigger',
   tsm_handler: 'tsm_handler',
   tsquery: 'tsquery',
@@ -101,7 +100,6 @@ export const _pg_types = {
   xid: 'xid',
   xml: 'xml',
   yes_or_no: 'yes_or_no',
-  _abstime: '_abstime',
   _aclitem: '_aclitem',
   _bit: '_bit',
   _bool: '_bool',
@@ -128,6 +126,7 @@ export const _pg_types = {
   _interval: '_interval',
   _json: '_json',
   _jsonb: '_jsonb',
+  _jsonpath: '_jsonpath',
   _line: '_line',
   _lseg: '_lseg',
   _macaddr: '_macaddr',
@@ -154,14 +153,12 @@ export const _pg_types = {
   _regprocedure: '_regprocedure',
   _regrole: '_regrole',
   _regtype: '_regtype',
-  _reltime: '_reltime',
   _text: '_text',
   _tid: '_tid',
   _time: '_time',
   _timestamp: '_timestamp',
   _timestamptz: '_timestamptz',
   _timetz: '_timetz',
-  _tinterval: '_tinterval',
   _tsquery: '_tsquery',
   _tsrange: '_tsrange',
   _tstzrange: '_tstzrange',

diff --git a/packages/typegen/test/generated/with-custom-date/_pg_types.ts b/packages/typegen/test/generated/with-custom-date/_pg_types.ts
@@ -3,7 +3,6 @@
 // this file is generated by a tool; don't change it manually.
 
 export const _pg_types = {
-  abstime: 'abstime',
   aclitem: 'aclitem',
   any: 'any',
   anyarray: 'anyarray',
@@ -43,6 +42,7 @@ export const _pg_types = {
   interval: 'interval',
   json: 'json',
   jsonb: 'jsonb',
+  jsonpath: 'jsonpath',
   language_handler: 'language_handler',
   line: 'line',
   lseg: 'lseg',
@@ -59,6 +59,7 @@ export const _pg_types = {
   pg_ddl_command: 'pg_ddl_command',
   pg_dependencies: 'pg_dependencies',
   pg_lsn: 'pg_lsn',
+  pg_mcv_list: 'pg_mcv_list',
   pg_ndistinct: 'pg_ndistinct',
   pg_node_tree: 'pg_node_tree',
   point: 'point',
@@ -75,17 +76,15 @@ export const _pg_types = {
   regprocedure: 'regprocedure',
   regrole: 'regrole',
   regtype: 'regtype',
-  reltime: 'reltime',
-  smgr: 'smgr',
   sql_identifier: 'sql_identifier',
+  table_am_handler: 'table_am_handler',
   text: 'text',
   tid: 'tid',
   time: 'time',
   time_stamp: 'time_stamp',
   timestamp: 'timestamp',
   timestamptz: 'timestamptz',
   timetz: 'timetz',
-  tinterval: 'tinterval',
   trigger: 'trigger',
   tsm_handler: 'tsm_handler',
   tsquery: 'tsquery',
@@ -101,7 +100,6 @@ export const _pg_types = {
   xid: 'xid',
   xml: 'xml',
   yes_or_no: 'yes_or_no',
-  _abstime: '_abstime',
   _aclitem: '_aclitem',
   _bit: '_bit',
   _bool: '_bool',
@@ -128,6 +126,7 @@ export const _pg_types = {
   _interval: '_interval',
   _json: '_json',
   _jsonb: '_jsonb',
+  _jsonpath: '_jsonpath',
   _line: '_line',
   _lseg: '_lseg',
   _macaddr: '_macaddr',
@@ -154,14 +153,12 @@ export const _pg_types = {
   _regprocedure: '_regprocedure',
   _regrole: '_regrole',
   _regtype: '_regtype',
-  _reltime: '_reltime',
   _text: '_text',
   _tid: '_tid',
   _time: '_time',
   _timestamp: '_timestamp',
   _timestamptz: '_timestamptz',
   _timetz: '_timetz',
-  _tinterval: '_tinterval',
   _tsquery: '_tsquery',
   _tsrange: '_tsrange',
   _tstzrange: '_tstzrange',

diff --git a/packages/typegen/test/generated/with-date/_pg_types.ts b/packages/typegen/test/generated/with-date/_pg_types.ts
@@ -3,7 +3,6 @@
 // this file is generated by a tool; don't change it manually.
 
 export const _pg_types = {
-  abstime: 'abstime',
   aclitem: 'aclitem',
   any: 'any',
   anyarray: 'anyarray',
@@ -43,6 +42,7 @@ export const _pg_types = {
   interval: 'interval',
   json: 'json',
   jsonb: 'jsonb',
+  jsonpath: 'jsonpath',
   language_handler: 'language_handler',
   line: 'line',
   lseg: 'lseg',
@@ -59,6 +59,7 @@ export const _pg_types = {
   pg_ddl_command: 'pg_ddl_command',
   pg_dependencies: 'pg_dependencies',
   pg_lsn: 'pg_lsn',
+  pg_mcv_list: 'pg_mcv_list',
   pg_ndistinct: 'pg_ndistinct',
   pg_node_tree: 'pg_node_tree',
   point: 'point',
@@ -75,17 +76,15 @@ export const _pg_types = {
   regprocedure: 'regprocedure',
   regrole: 'regrole',
   regtype: 'regtype',
-  reltime: 'reltime',
-  smgr: 'smgr',
   sql_identifier: 'sql_identifier',
+  table_am_handler: 'table_am_handler',
   text: 'text',
   tid: 'tid',
   time: 'time',
   time_stamp: 'time_stamp',
   timestamp: 'timestamp',
   timestamptz: 'timestamptz',
   timetz: 'timetz',
-  tinterval: 'tinterval',
   trigger: 'trigger',
   tsm_handler: 'tsm_handler',
   tsquery: 'tsquery',
@@ -101,7 +100,6 @@ export const _pg_types = {
   xid: 'xid',
   xml: 'xml',
   yes_or_no: 'yes_or_no',
-  _abstime: '_abstime',
   _aclitem: '_aclitem',
   _bit: '_bit',
   _bool: '_bool',
@@ -128,6 +126,7 @@ export const _pg_types = {
   _interval: '_interval',
   _json: '_json',
   _jsonb: '_jsonb',
+  _jsonpath: '_jsonpath',
   _line: '_line',
   _lseg: '_lseg',
   _macaddr: '_macaddr',
@@ -154,14 +153,12 @@ export const _pg_types = {
   _regprocedure: '_regprocedure',
   _regrole: '_regrole',
   _regtype: '_regtype',
-  _reltime: '_reltime',
   _text: '_text',
   _tid: '_tid',
   _time: '_time',
   _timestamp: '_timestamp',
   _timestamptz: '_timestamptz',
   _timetz: '_timetz',
-  _tinterval: '_tinterval',
   _tsquery: '_tsquery',
   _tsrange: '_tsrange',
   _tstzrange: '_tstzrange',