prostgles-server 4.1.135 → 4.1.138

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/TableConfig/getFutureTableSchema.d.ts.map +1 -1
  2. package/dist/TableConfig/getFutureTableSchema.js +5 -2
  3. package/dist/TableConfig/getFutureTableSchema.js.map +1 -1
  4. package/lib/TableConfig/getFutureTableSchema.ts +5 -3
  5. package/package.json +1 -1
  6. package/tests/isomorphic_queries.ts +2 -2
  7. package/tests/server/package-lock.json +1 -1
package/dist/TableConfig/getFutureTableSchema.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getFutureTableSchema.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getFutureTableSchema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAElC,OAAO,EAAE,iBAAiB,EAAmB,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,aAAa,EAAqB,MAAM,kCAAkC,CAAC;AAEnG,KAAK,IAAI,GAAG;IACV,EAAE,EAAE,EAAE,CAAC;IACP,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,oBAAoB,kDAA8D,IAAI;iBACpF,aAAa,EAAE;UACtB,iBAAiB,EAAE;EA6C1B,CAAA"}
1
+ {"version":3,"file":"getFutureTableSchema.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/getFutureTableSchema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAElC,OAAO,EAAE,iBAAiB,EAAmB,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,aAAa,EAAqB,MAAM,kCAAkC,CAAC;AAEnG,KAAK,IAAI,GAAG;IACV,EAAE,EAAE,EAAE,CAAC;IACP,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC;CAClC,CAAC;AAEF,eAAO,MAAM,oBAAoB,kDAA8D,IAAI;iBACpF,aAAa,EAAE;UACtB,iBAAiB,EAAE;EA+C1B,CAAA"}
package/dist/TableConfig/getFutureTableSchema.js CHANGED
@@ -30,11 +30,14 @@ const getFutureTableSchema = async ({ columnDefs, tableName, constraintDefs = []
30
30
  constraints = await (0, getConstraintDefinitionQueries_1.getColConstraints)({ db: t, table: tableName });
31
31
  cols = await (0, getColumnDefinitionQuery_1.getTableColumns)({ db: t, table: tableName });
32
32
  /** Rollback */
33
- return Promise.reject(ROLLBACK);
33
+ return Promise.reject(new Error(ROLLBACK));
34
34
  });
35
35
  }
36
36
  catch (e) {
37
- if (e !== ROLLBACK) {
37
+ if (e instanceof Error && e.message === ROLLBACK) {
38
+ // Ignore
39
+ }
40
+ else {
38
41
  throw e;
39
42
  }
40
43
  }
package/dist/TableConfig/getFutureTableSchema.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getFutureTableSchema.js","sourceRoot":"","sources":["../../lib/TableConfig/getFutureTableSchema.ts"],"names":[],"mappings":";;;AAAA,qDAAyC;AACzC,yDAA+C;AAE/C,MAAM,EAAC,eAAe,EAAE,cAAc,EAAC,GAAG,gBAAG,CAAC,MAAM,CAAC;AACrD,yEAAgF;AAChF,qFAAmG;AAS5F,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,GAAG,EAAE,EAAE,EAAE,EAAQ,EAGhG,EAAE;IAEH,IAAI,WAAW,GAAoB,EAAE,CAAC;IACtC,IAAI,IAAI,GAAwB,EAAE,CAAC;IACnC,MAAM,QAAQ,GAAG,UAAU,CAAC;IAC5B,IAAI;QACF,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;YACjC,OAAO,EAAE,cAAc,CAAC,YAAY;SACrC,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;YAEtC,yKAAyK;YACzK,gHAAgH;YAEhH,MAAM,QAAQ,GAAG,IAAA,wBAAM,EAAC,SAAS,CAAC,CAAC;YAEnC,MAAM,WAAW,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACzC,eAAe,QAAQ,QAAQ,CAAC,CAAC,IAAI,CAAA,CAAC,CAAC,eAAe,IAAA,wBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,OAAO,GAAG,CAC5F,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEb,MAAM,KAAK,GAAG;+BACW,QAAQ;uBAChB,QAAQ;YACnB,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;;UAExB,WAAW;OACd,CAAC;YAEF,MAAM,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAEnB,WAAW,GAAG,MAAM,IAAA,kDAAiB,EAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YACnE,IAAI,GAAG,MAAM,IAAA,0CAAe,EAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YAE1D,eAAe;YACf,OAAO,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;KAEJ;IAAC,OAAM,CAAC,EAAC;QACR,IAAG,CAAC,KAAK,QAAQ,EAAE;YACjB,MAAM,CAAC,CAAC;SACT;KACF;IAED,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;AAC/B,CAAC,CAAA;AA/CY,QAAA,oBAAoB,wBA+ChC"}
1
+ {"version":3,"file":"getFutureTableSchema.js","sourceRoot":"","sources":["../../lib/TableConfig/getFutureTableSchema.ts"],"names":[],"mappings":";;;AAAA,qDAAyC;AACzC,yDAA+C;AAE/C,MAAM,EAAC,eAAe,EAAE,cAAc,EAAC,GAAG,gBAAG,CAAC,MAAM,CAAC;AACrD,yEAAgF;AAChF,qFAAmG;AAS5F,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,GAAG,EAAE,EAAE,EAAE,EAAQ,EAGhG,EAAE;IAEH,IAAI,WAAW,GAAoB,EAAE,CAAC;IACtC,IAAI,IAAI,GAAwB,EAAE,CAAC;IACnC,MAAM,QAAQ,GAAG,UAAU,CAAC;IAC5B,IAAI;QACF,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;YACjC,OAAO,EAAE,cAAc,CAAC,YAAY;SACrC,CAAC,CAAC;QACH,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;YAEtC,yKAAyK;YACzK,gHAAgH;YAEhH,MAAM,QAAQ,GAAG,IAAA,wBAAM,EAAC,SAAS,CAAC,CAAC;YAEnC,MAAM,WAAW,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CACzC,eAAe,QAAQ,QAAQ,CAAC,CAAC,IAAI,CAAA,CAAC,CAAC,eAAe,IAAA,wBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,OAAO,GAAG,CAC5F,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEb,MAAM,KAAK,GAAG;+BACW,QAAQ;uBAChB,QAAQ;YACnB,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC;;UAExB,WAAW;OACd,CAAC;YAEF,MAAM,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAEnB,WAAW,GAAG,MAAM,IAAA,kDAAiB,EAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YACnE,IAAI,GAAG,MAAM,IAAA,0CAAe,EAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YAE1D,eAAe;YACf,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;KAEJ;IAAC,OAAM,CAAM,EAAC;QACb,IAAG,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,QAAQ,EAAE;YAC/C,SAAS;SACV;aAAM;YACL,MAAM,CAAC,CAAC;SACT;KACF;IAED,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;AAC/B,CAAC,CAAA;AAjDY,QAAA,oBAAoB,wBAiDhC"}
package/lib/TableConfig/getFutureTableSchema.ts CHANGED
@@ -49,11 +49,13 @@ export const getFutureTableSchema = async ({ columnDefs, tableName, constraintDe
49
49
  cols = await getTableColumns({ db: t, table: tableName });
50
50
 
51
51
  /** Rollback */
52
- return Promise.reject(ROLLBACK);
52
+ return Promise.reject(new Error(ROLLBACK));
53
53
  });
54
54
 
55
- } catch(e){
56
- if(e !== ROLLBACK) {
55
+ } catch(e: any){
56
+ if(e instanceof Error && e.message === ROLLBACK) {
57
+ // Ignore
58
+ } else {
57
59
  throw e;
58
60
  }
59
61
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "prostgles-server",
3
- "version": "4.1.135",
3
+ "version": "4.1.138",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/tests/isomorphic_queries.ts CHANGED
@@ -959,8 +959,8 @@ export default async function isomorphic(db: Required<DBHandlerServer> | DBHandl
959
959
  $array_agg: ["id"],
960
960
  }
961
961
  }
962
- const normalJoin = await db.tr1.find!({}, { select: { "*": 1, tr2: { $innerJoin: "tr2", filter: { t1: "a" }, select: idAggSelect } } })
963
- const reverseJoin = await db.tr2.find!({ t1: "a" }, { select: { "*": 1, tr1: { $innerJoin: "tr1", select: idAggSelect } } });
962
+ const normalJoin = await db.tr1.find!({}, { orderBy: { id: true }, select: { "*": 1, tr2: { $innerJoin: "tr2", filter: { t1: "a" }, select: idAggSelect } } })
963
+ const reverseJoin = await db.tr2.find!({ t1: "a" }, { orderBy: { id: true }, select: { "*": 1, tr1: { $innerJoin: "tr1", select: idAggSelect } } });
964
964
  assert.deepStrictEqual(normalJoin[0], {"id": 1,"t1": null,"tr2": [{ "ids": [1] }]});
965
965
  assert.deepStrictEqual(normalJoin[1], {"id": 2,"t1": null,"tr2": [{ "ids": [2] }]});
966
966
  assert.deepStrictEqual(reverseJoin[0], { "id": 1, "tr1_id": 1, "t1": "a", "t2": "b", "tr1": [{ "ids": [1] }] });
package/tests/server/package-lock.json CHANGED
@@ -21,7 +21,7 @@
21
21
  },
22
22
  "../..": {
23
23
  "name": "prostgles-server",
24
- "version": "4.1.134",
24
+ "version": "4.1.137",
25
25
  "license": "MIT",
26
26
  "dependencies": {
27
27
  "@types/express": "^4.17.13",