@tinqerjs/pg-promise-adapter 0.0.22 → 0.0.24

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.
@@ -1 +1 @@
1
- {"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../src/generators/join.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EACV,aAAa,EAUd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,UAAU,EAAgC,MAAM,aAAa,CAAC;AAwP5E;;GAEG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,GAAG,MAAM,CA4ElF"}
1
+ {"version":3,"file":"join.d.ts","sourceRoot":"","sources":["../../src/generators/join.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EACV,aAAa,EAUd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,UAAU,EAAgC,MAAM,aAAa,CAAC;AAwP5E;;GAEG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,GAAG,MAAM,CAmFlF"}
@@ -218,12 +218,20 @@ export function generateJoin(operation, context) {
218
218
  })();
219
219
  if (operation.inner.operationType === "from") {
220
220
  const fromOp = operation.inner;
221
- const tableName = fromOp.table;
222
- joinClause = `${joinKeyword} "${tableName}" AS "${innerAlias}"`;
221
+ if (fromOp.subquery) {
222
+ const innerSql = generateSql(fromOp.subquery, context.params);
223
+ joinClause = `${joinKeyword} (${innerSql}) AS "${innerAlias}"`;
224
+ }
225
+ else {
226
+ const tableName = fromOp.schema
227
+ ? `"${fromOp.schema}"."${fromOp.table}"`
228
+ : `"${fromOp.table}"`;
229
+ joinClause = `${joinKeyword} ${tableName} AS "${innerAlias}"`;
230
+ }
223
231
  }
224
232
  else {
225
233
  // Complex inner query - need subquery
226
- const innerSql = generateSql(operation.inner, {});
234
+ const innerSql = generateSql(operation.inner, context.params);
227
235
  joinClause = `${joinKeyword} (${innerSql}) AS "${innerAlias}"`;
228
236
  }
229
237
  if (joinKeyword === "CROSS JOIN") {
@@ -1 +1 @@
1
- {"version":3,"file":"join.js","sourceRoot":"","sources":["../../src/generators/join.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"join.js","sourceRoot":"","sources":["../../src/generators/join.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tinqerjs/pg-promise-adapter",
3
- "version": "0.0.22",
3
+ "version": "0.0.24",
4
4
  "description": "pg-promise SQL generator for Tinqer query builder",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
@@ -19,7 +19,7 @@
19
19
  },
20
20
  "dependencies": {},
21
21
  "peerDependencies": {
22
- "@tinqerjs/tinqer": "^0.0.22"
22
+ "@tinqerjs/tinqer": "^0.0.24"
23
23
  },
24
24
  "devDependencies": {
25
25
  "@types/chai": "5.2.2",