drizzle-orm 0.22.0-cfe1679 → 0.22.0-d52ce91

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 (62) hide show
  1. package/mysql-core/db.js +1 -1
  2. package/mysql-core/db.js.map +1 -1
  3. package/mysql-core/dialect.d.ts +1 -1
  4. package/mysql-core/dialect.d.ts.map +1 -1
  5. package/mysql-core/dialect.js +14 -13
  6. package/mysql-core/dialect.js.map +1 -1
  7. package/mysql-core/query-builders/select.d.ts +8 -8
  8. package/mysql-core/query-builders/select.d.ts.map +1 -1
  9. package/mysql-core/query-builders/select.js +41 -26
  10. package/mysql-core/query-builders/select.js.map +1 -1
  11. package/mysql-core/query-builders/select.types.d.ts +12 -11
  12. package/mysql-core/query-builders/select.types.d.ts.map +1 -1
  13. package/mysql-core/session.d.ts.map +1 -1
  14. package/mysql-core/session.js +0 -1
  15. package/mysql-core/session.js.map +1 -1
  16. package/operations.js +0 -7
  17. package/operations.js.map +1 -1
  18. package/package.json +1 -1
  19. package/pg-core/db.js +1 -1
  20. package/pg-core/db.js.map +1 -1
  21. package/pg-core/dialect.d.ts +1 -1
  22. package/pg-core/dialect.d.ts.map +1 -1
  23. package/pg-core/dialect.js +12 -12
  24. package/pg-core/dialect.js.map +1 -1
  25. package/pg-core/query-builders/select.d.ts +8 -8
  26. package/pg-core/query-builders/select.d.ts.map +1 -1
  27. package/pg-core/query-builders/select.js +41 -26
  28. package/pg-core/query-builders/select.js.map +1 -1
  29. package/pg-core/query-builders/select.types.d.ts +12 -11
  30. package/pg-core/query-builders/select.types.d.ts.map +1 -1
  31. package/planetscale-serverless/session.d.ts.map +1 -1
  32. package/planetscale-serverless/session.js +0 -1
  33. package/planetscale-serverless/session.js.map +1 -1
  34. package/sql/expressions/conditions.d.ts +2 -3
  35. package/sql/expressions/conditions.d.ts.map +1 -1
  36. package/sql/expressions/conditions.js +36 -36
  37. package/sql/expressions/conditions.js.map +1 -1
  38. package/sqlite-core/db.js +1 -1
  39. package/sqlite-core/db.js.map +1 -1
  40. package/sqlite-core/dialect.d.ts +1 -1
  41. package/sqlite-core/dialect.d.ts.map +1 -1
  42. package/sqlite-core/dialect.js +12 -12
  43. package/sqlite-core/dialect.js.map +1 -1
  44. package/sqlite-core/query-builders/select.d.ts +6 -6
  45. package/sqlite-core/query-builders/select.d.ts.map +1 -1
  46. package/sqlite-core/query-builders/select.js +41 -26
  47. package/sqlite-core/query-builders/select.js.map +1 -1
  48. package/sqlite-core/query-builders/select.types.d.ts +12 -11
  49. package/sqlite-core/query-builders/select.types.d.ts.map +1 -1
  50. package/subquery.d.ts.map +1 -1
  51. package/subquery.js +2 -1
  52. package/subquery.js.map +1 -1
  53. package/utils.d.ts +0 -1
  54. package/utils.d.ts.map +1 -1
  55. package/knex/index.d.ts +0 -12
  56. package/knex/index.d.ts.map +0 -1
  57. package/knex/index.js +0 -3
  58. package/knex/index.js.map +0 -1
  59. package/kysely/index.d.ts +0 -20
  60. package/kysely/index.d.ts.map +0 -1
  61. package/kysely/index.js +0 -3
  62. package/kysely/index.js.map +0 -1
package/mysql-core/db.js CHANGED
@@ -18,7 +18,7 @@ class MySqlDatabase {
18
18
  if (typeof qb === 'function') {
19
19
  qb = qb(query_builders_1.queryBuilder);
20
20
  }
21
- return new Proxy(new subquery_1.WithSubquery(qb.getSQL(), qb.getSelection(), alias, true), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'error' }));
21
+ return new Proxy(new subquery_1.WithSubquery(qb.getSQL(), qb.getSelection(), alias, true), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'subquery_selection', sqlBehavior: 'error' }));
22
22
  },
23
23
  };
24
24
  }
@@ -1 +1 @@
1
- {"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/mysql-core/db.ts"],"names":[],"mappings":";;;AAEA,yCAAiE;AAGjE,qDAM0B;AAM1B,MAAa,aAAa;IACzB;IACC,gBAAgB;IACP,OAAqB;IAC9B,gBAAgB;IACP,OAAiB;QAFjB,YAAO,GAAP,OAAO,CAAc;QAErB,YAAO,GAAP,OAAO,CAAU;IACxB,CAAC;IAEJ,KAAK,CAAwB,KAAa;QACzC,OAAO;YACN,EAAE,CACD,EAAuF;gBAEvF,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;oBAC7B,EAAE,GAAG,EAAE,CAAC,6BAAY,CAAC,CAAC;iBACtB;gBAED,OAAO,IAAI,KAAK,CACf,IAAI,uBAAY,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,YAAY,EAAkB,EAAE,KAAK,EAAE,IAAI,CAAC,EAC7E,IAAI,gCAAqB,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CACtC,CAAC;YACpD,CAAC;SACD,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,OAAuB;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC;QAIlB,SAAS,MAAM,CAAC,MAAqB;YACpC,OAAO,IAAI,mCAAkB,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACzF,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,CAAC;IACnB,CAAC;IAID,MAAM,CAAC,MAAqB;QAC3B,OAAO,IAAI,mCAAkB,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAChF,CAAC;IAED,MAAM,CAA+B,KAAa;QACjD,OAAO,IAAI,mCAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAA+B,KAAa;QACjD,OAAO,IAAI,mCAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAA+B,KAAa;QACjD,OAAO,IAAI,4BAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO,CACN,KAAiB;QAEjB,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7C,CAAC;CACD;AA5DD,sCA4DC"}
1
+ {"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/mysql-core/db.ts"],"names":[],"mappings":";;;AAEA,yCAAiE;AAGjE,qDAM0B;AAM1B,MAAa,aAAa;IACzB;IACC,gBAAgB;IACP,OAAqB;IAC9B,gBAAgB;IACP,OAAiB;QAFjB,YAAO,GAAP,OAAO,CAAc;QAErB,YAAO,GAAP,OAAO,CAAU;IACxB,CAAC;IAEJ,KAAK,CAAwB,KAAa;QACzC,OAAO;YACN,EAAE,CACD,EAAuF;gBAEvF,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;oBAC7B,EAAE,GAAG,EAAE,CAAC,6BAAY,CAAC,CAAC;iBACtB;gBAED,OAAO,IAAI,KAAK,CACf,IAAI,uBAAY,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,YAAY,EAAkB,EAAE,KAAK,EAAE,IAAI,CAAC,EAC7E,IAAI,gCAAqB,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CACnD,CAAC;YACpD,CAAC;SACD,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,OAAuB;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC;QAIlB,SAAS,MAAM,CAAC,MAAqB;YACpC,OAAO,IAAI,mCAAkB,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACzF,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,CAAC;IACnB,CAAC;IAID,MAAM,CAAC,MAAqB;QAC3B,OAAO,IAAI,mCAAkB,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAChF,CAAC;IAED,MAAM,CAA+B,KAAa;QACjD,OAAO,IAAI,mCAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAA+B,KAAa;QACjD,OAAO,IAAI,mCAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAA+B,KAAa;QACjD,OAAO,IAAI,4BAAW,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO,CACN,KAAiB;QAEjB,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7C,CAAC;CACD;AA5DD,sCA4DC"}
@@ -28,7 +28,7 @@ export declare class MySqlDialect {
28
28
  * If `isSingleTable` is true, then columns won't be prefixed with table name
29
29
  */
30
30
  private buildSelection;
31
- buildSelectQuery({ withList, fieldsList: fields, where, having, table, joins, orderBy, groupBy, limit, offset, lockingClause }: MySqlSelectConfig): SQL;
31
+ buildSelectQuery({ withList, fieldsList, where, having, table, joins, orderBy, groupBy, limit, offset, lockingClause }: MySqlSelectConfig): SQL;
32
32
  buildInsertQuery({ table, values, onConflict, returning }: MySqlInsertConfig): SQL;
33
33
  sqlToQuery(sql: SQL): Query;
34
34
  }
@@ -1 +1 @@
1
- {"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/mysql-core/dialect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,KAAK,EAAkB,MAAM,OAAO,CAAC;AACnD,OAAO,EAAQ,GAAG,EAAO,MAAM,OAAO,CAAC;AAGvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAIzC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAuB,MAAM,+BAA+B,CAAC;AAC5F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAW7C,qBAAa,YAAY;IAClB,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAmChF,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIhC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIhC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIjC,gBAAgB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAUrE,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,SAAS,GAAG,GAAG;IAkBzD,gBAAgB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAY1E;;;;;;;;;;OAUG;IACH,OAAO,CAAC,cAAc;IAoDtB,gBAAgB,CACf,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,EAC5G,iBAAiB,GAChB,GAAG;IAkHN,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAoClF,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK;CAO3B"}
1
+ {"version":3,"file":"dialect.d.ts","sourceRoot":"","sources":["../../src/mysql-core/dialect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,KAAK,EAAkB,MAAM,OAAO,CAAC;AACnD,OAAO,EAAQ,GAAG,EAAO,MAAM,OAAO,CAAC;AAGvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAIzC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAuB,MAAM,+BAA+B,CAAC;AAC5F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAY7C,qBAAa,YAAY;IAClB,OAAO,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAmChF,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAIhC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIhC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIjC,gBAAgB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAUrE,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,SAAS,GAAG,GAAG;IAkBzD,gBAAgB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAY1E;;;;;;;;;;OAUG;IACH,OAAO,CAAC,cAAc;IAoDtB,gBAAgB,CACf,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,EACpG,iBAAiB,GAChB,GAAG;IAkHN,gBAAgB,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,iBAAiB,GAAG,GAAG;IAoClF,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK;CAO3B"}
@@ -24,6 +24,7 @@ const table_1 = require("../table");
24
24
  const view_1 = require("../view");
25
25
  const common_1 = require("./columns/common");
26
26
  const table_2 = require("./table");
27
+ const view_2 = require("./view");
27
28
  // TODO find out how to use all/values. Seems like I need those functions
28
29
  // Build project
29
30
  // copy runtime tests to be sure it's working
@@ -159,22 +160,23 @@ class MySqlDialect {
159
160
  .flat(1);
160
161
  return sql_1.sql.fromList(chunks);
161
162
  }
162
- buildSelectQuery({ withList, fieldsList: fields, where, having, table, joins, orderBy, groupBy, limit, offset, lockingClause }) {
163
- fields.forEach((f) => {
164
- let tableName;
163
+ buildSelectQuery({ withList, fieldsList, where, having, table, joins, orderBy, groupBy, limit, offset, lockingClause }) {
164
+ fieldsList.forEach((f) => {
165
165
  if (f.field instanceof column_1.Column
166
166
  && (0, table_1.getTableName)(f.field.table)
167
167
  !== (table instanceof subquery_1.Subquery
168
168
  ? table[subquery_1.SubqueryConfig].alias
169
- : table instanceof view_1.View
169
+ : table instanceof view_2.MySqlViewBase
170
170
  ? table[view_1.ViewBaseConfig].name
171
- : (0, table_1.getTableName)(table))
172
- && !((tableName = (0, table_1.getTableName)(f.field.table)) in joins)) {
171
+ : table instanceof sql_1.SQL
172
+ ? undefined
173
+ : (0, table_1.getTableName)(table))
174
+ && !((table) => joins.some(({ alias }) => alias === (0, table_1.getTableName)(table)))(f.field.table)) {
175
+ const tableName = (0, table_1.getTableName)(f.field.table);
173
176
  throw new Error(`Your "${f.path.join('->')}" field references a column "${tableName}"."${f.field.name}", but the table "${tableName}" is not part of the query! Did you forget to join it?`);
174
177
  }
175
178
  });
176
- const joinKeys = Object.keys(joins);
177
- const isSingleTable = joinKeys.length === 0;
179
+ const isSingleTable = joins.length === 0;
178
180
  let withSql;
179
181
  if (withList.length) {
180
182
  const withSqlChunks = [(0, sql_1.sql) `with `];
@@ -187,25 +189,24 @@ class MySqlDialect {
187
189
  withSqlChunks.push((0, sql_1.sql) ` `);
188
190
  withSql = sql_1.sql.fromList(withSqlChunks);
189
191
  }
190
- const selection = this.buildSelection(fields, { isSingleTable });
192
+ const selection = this.buildSelection(fieldsList, { isSingleTable });
191
193
  const joinsArray = [];
192
- joinKeys.forEach((tableAlias, index) => {
194
+ joins.forEach((joinMeta, index) => {
193
195
  if (index === 0) {
194
196
  joinsArray.push((0, sql_1.sql) ` `);
195
197
  }
196
- const joinMeta = joins[tableAlias];
197
198
  const table = joinMeta.table;
198
199
  if (table instanceof table_2.MySqlTable) {
199
200
  const tableName = table[table_2.MySqlTable.Symbol.Name];
200
201
  const tableSchema = table[table_2.MySqlTable.Symbol.Schema];
201
202
  const origTableName = table[table_2.MySqlTable.Symbol.OriginalName];
202
- const alias = tableName === origTableName ? undefined : tableAlias;
203
+ const alias = tableName === origTableName ? undefined : joinMeta.alias;
203
204
  joinsArray.push((0, sql_1.sql) `${sql_1.sql.raw(joinMeta.joinType)} join ${tableSchema ? (0, sql_1.sql) `${new sql_1.Name(tableSchema)}.` : undefined}${new sql_1.Name(origTableName)} ${alias && new sql_1.Name(alias)} on ${joinMeta.on}`);
204
205
  }
205
206
  else {
206
207
  joinsArray.push((0, sql_1.sql) `${sql_1.sql.raw(joinMeta.joinType)} join ${table} on ${joinMeta.on}`);
207
208
  }
208
- if (index < joinKeys.length - 1) {
209
+ if (index < joins.length - 1) {
209
210
  joinsArray.push((0, sql_1.sql) ` `);
210
211
  }
211
212
  });
@@ -1 +1 @@
1
- {"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../src/mysql-core/dialect.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dialect.js","sourceRoot":"","sources":["../../src/mysql-core/dialect.ts"],"names":[],"mappings":"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"}
@@ -5,21 +5,21 @@ import type { SubqueryWithSelection } from '../subquery';
5
5
  import type { AnyMySqlTable } from '../table';
6
6
  import { MySqlViewBase } from '../view';
7
7
  import { QueryPromise } from '../../query-promise';
8
- import type { Query, SQL } from '../../sql';
8
+ import { type Query, SQL } from '../../sql';
9
9
  import { Subquery } from '../../subquery';
10
10
  import { type Simplify, type ValueOrArray } from '../../utils';
11
11
  import { QueryBuilder } from './query-builder';
12
12
  import type { BuildSubquerySelection, GetSelectTableName, GetSelectTableSelection, JoinFn, JoinNullability, LockConfig, LockStrength, MySqlSelectConfig, MySqlSelectHKT, MySqlSelectHKTBase, MySqlSelectQueryBuilderHKT, SelectFields, SelectMode, SelectResult } from './select.types';
13
- declare type CreateMySqlSelectFromBuilderMode<TBuilderMode extends 'db' | 'qb', TTableName extends string, TSelection, TSelectMode extends SelectMode> = TBuilderMode extends 'db' ? MySqlSelect<TTableName, TSelection, TSelectMode> : MySqlSelectQueryBuilder<MySqlSelectQueryBuilderHKT, TTableName, TSelection, TSelectMode>;
13
+ declare type CreateMySqlSelectFromBuilderMode<TBuilderMode extends 'db' | 'qb', TTableName extends string | undefined, TSelection, TSelectMode extends SelectMode> = TBuilderMode extends 'db' ? MySqlSelect<TTableName, TSelection, TSelectMode> : MySqlSelectQueryBuilder<MySqlSelectQueryBuilderHKT, TTableName, TSelection, TSelectMode>;
14
14
  export declare class MySqlSelectBuilder<TSelection extends SelectFields | undefined, TBuilderMode extends 'db' | 'qb' = 'db'> {
15
15
  private fields;
16
16
  private session;
17
17
  private dialect;
18
18
  private withList;
19
19
  constructor(fields: TSelection, session: MySqlSession | undefined, dialect: MySqlDialect, withList?: Subquery[]);
20
- from<TFrom extends AnyMySqlTable | Subquery | MySqlViewBase>(source: TFrom): CreateMySqlSelectFromBuilderMode<TBuilderMode, GetSelectTableName<TFrom>, TSelection extends undefined ? GetSelectTableSelection<TFrom> : TSelection, TSelection extends undefined ? 'single' : 'partial'>;
20
+ from<TFrom extends AnyMySqlTable | Subquery | MySqlViewBase | SQL>(source: TFrom): CreateMySqlSelectFromBuilderMode<TBuilderMode, GetSelectTableName<TFrom>, TSelection extends undefined ? GetSelectTableSelection<TFrom> : TSelection, TSelection extends undefined ? 'single' : 'partial'>;
21
21
  }
22
- export declare abstract class MySqlSelectQueryBuilder<THKT extends MySqlSelectHKTBase, TTableName extends string, TSelection, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability> = Record<TTableName, 'not-null'>> extends QueryBuilder<BuildSubquerySelection<TSelection, TNullabilityMap>> {
22
+ export declare abstract class MySqlSelectQueryBuilder<THKT extends MySqlSelectHKTBase, TTableName extends string | undefined, TSelection, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'> : {}> extends QueryBuilder<BuildSubquerySelection<TSelection, TNullabilityMap>> {
23
23
  private isPartialSelect;
24
24
  protected session: MySqlSession | undefined;
25
25
  protected dialect: MySqlDialect;
@@ -38,18 +38,18 @@ export declare abstract class MySqlSelectQueryBuilder<THKT extends MySqlSelectHK
38
38
  where(where: ((aliases: TSelection) => SQL | undefined) | SQL | undefined): this;
39
39
  having(having: ((aliases: TSelection) => SQL | undefined) | SQL | undefined): this;
40
40
  groupBy(builder: (aliases: TSelection) => ValueOrArray<AnyMySqlColumn | SQL | SQL.Aliased>): this;
41
- groupBy(...columns: (AnyMySqlColumn | SQL)[]): this;
41
+ groupBy(...columns: (AnyMySqlColumn | SQL | SQL.Aliased)[]): this;
42
42
  orderBy(builder: (aliases: TSelection) => ValueOrArray<AnyMySqlColumn | SQL | SQL.Aliased>): this;
43
- orderBy(...columns: (AnyMySqlColumn | SQL)[]): this;
43
+ orderBy(...columns: (AnyMySqlColumn | SQL | SQL.Aliased)[]): this;
44
44
  limit(limit: number): this;
45
45
  offset(offset: number): this;
46
46
  for(strength: LockStrength, config?: LockConfig): this;
47
47
  toSQL(): Simplify<Omit<Query, 'typings'>>;
48
48
  as<TAlias extends string>(alias: TAlias): SubqueryWithSelection<BuildSubquerySelection<TSelection, TNullabilityMap>, TAlias>;
49
49
  }
50
- export interface MySqlSelect<TTableName extends string, TSelection, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability> = Record<TTableName, 'not-null'>> extends MySqlSelectQueryBuilder<MySqlSelectHKT, TTableName, TSelection, TSelectMode, TNullabilityMap>, QueryPromise<SelectResult<TSelection, TSelectMode, TNullabilityMap>[]> {
50
+ export interface MySqlSelect<TTableName extends string | undefined, TSelection, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'> : {}> extends MySqlSelectQueryBuilder<MySqlSelectHKT, TTableName, TSelection, TSelectMode, TNullabilityMap>, QueryPromise<SelectResult<TSelection, TSelectMode, TNullabilityMap>[]> {
51
51
  }
52
- export declare class MySqlSelect<TTableName extends string, TSelection, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability> = Record<TTableName, 'not-null'>> extends MySqlSelectQueryBuilder<MySqlSelectHKT, TTableName, TSelection, TSelectMode, TNullabilityMap> {
52
+ export declare class MySqlSelect<TTableName extends string | undefined, TSelection, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability> = TTableName extends string ? Record<TTableName, 'not-null'> : {}> extends MySqlSelectQueryBuilder<MySqlSelectHKT, TTableName, TSelection, TSelectMode, TNullabilityMap> {
53
53
  private _prepare;
54
54
  prepare(name: string): PreparedQuery<PreparedQueryConfig & {
55
55
  execute: SelectResult<TSelection, TSelectMode, TNullabilityMap>[];
@@ -1 +1 @@
1
- {"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"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"}
@@ -15,6 +15,7 @@ exports.MySqlSelect = exports.MySqlSelectQueryBuilder = exports.MySqlSelectBuild
15
15
  const utils_1 = require("../utils");
16
16
  const view_1 = require("../view");
17
17
  const query_promise_1 = require("../../query-promise");
18
+ const sql_1 = require("../../sql");
18
19
  const subquery_1 = require("../../subquery");
19
20
  const table_1 = require("../../table");
20
21
  const utils_2 = require("../../utils");
@@ -41,6 +42,9 @@ class MySqlSelectBuilder {
41
42
  else if (source instanceof view_1.MySqlViewBase) {
42
43
  fields = source[view_2.ViewBaseConfig].selection;
43
44
  }
45
+ else if (source instanceof sql_1.SQL) {
46
+ fields = {};
47
+ }
44
48
  else {
45
49
  fields = (0, utils_1.getTableColumns)(source);
46
50
  }
@@ -64,7 +68,7 @@ class MySqlSelectQueryBuilder extends query_builder_1.QueryBuilder {
64
68
  table,
65
69
  fields,
66
70
  fieldsList,
67
- joins: {},
71
+ joins: [],
68
72
  orderBy: [],
69
73
  groupBy: [],
70
74
  };
@@ -73,41 +77,52 @@ class MySqlSelectQueryBuilder extends query_builder_1.QueryBuilder {
73
77
  ? table[subquery_1.SubqueryConfig].alias
74
78
  : table instanceof view_1.MySqlViewBase
75
79
  ? table[view_2.ViewBaseConfig].name
76
- : table[table_1.Table.Symbol.Name];
77
- this.joinsNotNullableMap = { [this.tableName]: true };
80
+ : table instanceof sql_1.SQL
81
+ ? undefined
82
+ : table[table_1.Table.Symbol.Name];
83
+ this.joinsNotNullableMap = typeof this.tableName === 'string' ? { [this.tableName]: true } : {};
78
84
  }
79
85
  createJoin(joinType) {
80
86
  return (table, on) => {
81
- const tableName = table instanceof subquery_1.Subquery ? table[subquery_1.SubqueryConfig].alias : table[table_1.Table.Symbol.Name];
82
- if (this.config.joins[tableName]) {
87
+ const baseTableName = this.tableName;
88
+ const tableName = table instanceof subquery_1.Subquery
89
+ ? table[subquery_1.SubqueryConfig].alias
90
+ : table instanceof sql_1.SQL
91
+ ? undefined
92
+ : table[table_1.Table.Symbol.Name];
93
+ if (typeof tableName === 'string' && this.config.joins.some((join) => join.alias === tableName)) {
83
94
  throw new Error(`Alias "${tableName}" is already used in this query`);
84
95
  }
85
96
  if (!this.isPartialSelect) {
86
- // If this is the first join and this is not a partial select, "move" the fields from the main table to the nested object
87
- if (Object.keys(this.joinsNotNullableMap).length === 1) {
88
- this.config.fieldsList = this.config.fieldsList.map((field) => (Object.assign(Object.assign({}, field), { path: [this.tableName, ...field.path] })));
97
+ // If this is the first join and this is not a partial select and we're not selecting from raw SQL, "move" the fields from the main table to the nested object
98
+ if (Object.keys(this.joinsNotNullableMap).length === 1 && typeof baseTableName === 'string') {
99
+ this.config.fieldsList = this.config.fieldsList.map((field) => (Object.assign(Object.assign({}, field), { path: [baseTableName, ...field.path] })));
100
+ }
101
+ if (typeof tableName === 'string' && !(table instanceof sql_1.SQL)) {
102
+ this.config.fieldsList.push(...(0, utils_3.orderSelectedFields)(table instanceof subquery_1.Subquery ? table[subquery_1.SubqueryConfig].selection : table[table_1.Table.Symbol.Columns], [tableName]));
89
103
  }
90
- this.config.fieldsList.push(...(0, utils_3.orderSelectedFields)(table instanceof subquery_1.Subquery ? table[subquery_1.SubqueryConfig].selection : table[table_1.Table.Symbol.Columns], [tableName]));
91
104
  }
92
105
  if (typeof on === 'function') {
93
106
  on = on(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'alias', sqlBehavior: 'sql' })));
94
107
  }
95
- this.config.joins[tableName] = { on, table, joinType };
96
- switch (joinType) {
97
- case 'left':
98
- this.joinsNotNullableMap[tableName] = false;
99
- break;
100
- case 'right':
101
- this.joinsNotNullableMap = Object.fromEntries(Object.entries(this.joinsNotNullableMap).map(([key]) => [key, false]));
102
- this.joinsNotNullableMap[tableName] = true;
103
- break;
104
- case 'inner':
105
- this.joinsNotNullableMap[tableName] = true;
106
- break;
107
- case 'full':
108
- this.joinsNotNullableMap = Object.fromEntries(Object.entries(this.joinsNotNullableMap).map(([key]) => [key, false]));
109
- this.joinsNotNullableMap[tableName] = false;
110
- break;
108
+ this.config.joins.push({ on, table, joinType, alias: tableName });
109
+ if (typeof tableName === 'string') {
110
+ switch (joinType) {
111
+ case 'left':
112
+ this.joinsNotNullableMap[tableName] = false;
113
+ break;
114
+ case 'right':
115
+ this.joinsNotNullableMap = Object.fromEntries(Object.entries(this.joinsNotNullableMap).map(([key]) => [key, false]));
116
+ this.joinsNotNullableMap[tableName] = true;
117
+ break;
118
+ case 'inner':
119
+ this.joinsNotNullableMap[tableName] = true;
120
+ break;
121
+ case 'full':
122
+ this.joinsNotNullableMap = Object.fromEntries(Object.entries(this.joinsNotNullableMap).map(([key]) => [key, false]));
123
+ this.joinsNotNullableMap[tableName] = false;
124
+ break;
125
+ }
111
126
  }
112
127
  return this;
113
128
  };
@@ -167,7 +182,7 @@ class MySqlSelectQueryBuilder extends query_builder_1.QueryBuilder {
167
182
  return rest;
168
183
  }
169
184
  as(alias) {
170
- return new Proxy(new subquery_1.Subquery(this.getSQL(), this.config.fields, alias), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'error' }));
185
+ return new Proxy(new subquery_1.Subquery(this.getSQL(), this.config.fields, alias), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'subquery_selection', sqlBehavior: 'error' }));
171
186
  }
172
187
  }
173
188
  exports.MySqlSelectQueryBuilder = MySqlSelectQueryBuilder;
@@ -1 +1 @@
1
- {"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAKA,8CAAqD;AACrD,4CAAkD;AAClD,mDAA+C;AAE/C,yCAA6E;AAC7E,mCAAgC;AAChC,mCAAwE;AACxE,mCAA8C;AAC9C,iCAAwC;AACxC,mDAA+C;AA2B/C,MAAa,kBAAkB;IAC9B,YACS,MAAkB,EAClB,OAAiC,EACjC,OAAqB,EACrB,WAAuB,EAAE;QAHzB,WAAM,GAAN,MAAM,CAAY;QAClB,YAAO,GAAP,OAAO,CAA0B;QACjC,YAAO,GAAP,OAAO,CAAc;QACrB,aAAQ,GAAR,QAAQ,CAAiB;IAC/B,CAAC;IAEJ,IAAI,CACH,MAAa;QAOb,MAAM,eAAe,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;QAEtC,IAAI,MAAoB,CAAC;QACzB,IAAI,IAAI,CAAC,MAAM,EAAE;YAChB,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;SACrB;aAAM,IAAI,MAAM,YAAY,mBAAQ,EAAE;YACtC,8FAA8F;YAC9F,MAAM,GAAG,MAAM,CAAC,WAAW,CAC1B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,yBAAc,CAAC,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CACjD,GAAG,EACF,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,GAAqC,CAAoC,CAAC,CAAC,CAC7F,CAAC;SACF;aAAM,IAAI,MAAM,YAAY,oBAAa,EAAE;YAC3C,MAAM,GAAG,MAAM,CAAC,qBAAc,CAAC,CAAC,SAAyB,CAAC;SAC1D;aAAM;YACN,MAAM,GAAG,IAAA,uBAAe,EAAC,MAAM,CAAC,CAAC;SACjC;QAED,MAAM,UAAU,GAAG,IAAA,2BAAmB,EAAiB,MAAM,CAAC,CAAC;QAC/D,OAAO,IAAI,WAAW,CACrB,MAAM,EACN,MAAM,EACN,UAAU,EACV,eAAe,EACf,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,QAAQ,CACN,CAAC;IACV,CAAC;CACD;AA7CD,gDA6CC;AAED,MAAsB,uBAMpB,SAAQ,4BAAiE;IAS1E,YACC,KAAiC,EACjC,MAAmC,EACnC,UAA2C,EACnC,eAAwB,EACtB,OAAiC,EACjC,OAAqB,EAC/B,QAAoB;QAEpB,KAAK,EAAE,CAAC;QALA,oBAAe,GAAf,eAAe,CAAS;QACtB,YAAO,GAAP,OAAO,CAA0B;QACjC,YAAO,GAAP,OAAO,CAAc;QAuFhC,aAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAEnC,cAAS,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAErC,cAAS,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAErC,aAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAzFlC,IAAI,CAAC,MAAM,GAAG;YACb,QAAQ;YACR,KAAK;YACL,MAAM;YACN,UAAU;YACV,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,EAAE;SACX,CAAC;QACF,IAAI,CAAC,kBAAkB,GAAG,MAA6D,CAAC;QACxF,IAAI,CAAC,SAAS,GAAG,KAAK,YAAY,mBAAQ;YACzC,CAAC,CAAC,KAAK,CAAC,yBAAc,CAAC,CAAC,KAAK;YAC7B,CAAC,CAAC,KAAK,YAAY,oBAAa;gBAChC,CAAC,CAAC,KAAK,CAAC,qBAAc,CAAC,CAAC,IAAI;gBAC5B,CAAC,CAAC,KAAK,CAAC,aAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,CAAC,mBAAmB,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC;IACvD,CAAC;IAEO,UAAU,CACjB,QAAmB;QAEnB,OAAO,CACN,KAA+B,EAC/B,EAAgE,EAC/D,EAAE;YACH,MAAM,SAAS,GAAG,KAAK,YAAY,mBAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,yBAAc,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,aAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAErG,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;gBACjC,MAAM,IAAI,KAAK,CAAC,UAAU,SAAS,iCAAiC,CAAC,CAAC;aACtE;YAED,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE;gBAC1B,yHAAyH;gBACzH,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;oBACvD,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,iCAC3D,KAAK,KACR,IAAI,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,IACpC,CAAC,CAAC;iBACJ;gBACD,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAC1B,GAAG,IAAA,2BAAmB,EACrB,KAAK,YAAY,mBAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,yBAAc,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,aAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EACzF,CAAC,SAAS,CAAC,CACX,CACD,CAAC;aACF;YAED,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;gBAC7B,EAAE,GAAG,EAAE,CACN,IAAI,KAAK,CACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,gCAAqB,CAAC,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAChE,CACf,CAAC;aACF;YAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;YAEvD,QAAQ,QAAQ,EAAE;gBACjB,KAAK,MAAM;oBACV,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;oBAC5C,MAAM;gBACP,KAAK,OAAO;oBACX,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,WAAW,CAC5C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CACrE,CAAC;oBACF,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;oBAC3C,MAAM;gBACP,KAAK,OAAO;oBACX,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;oBAC3C,MAAM;gBACP,KAAK,MAAM;oBACV,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,WAAW,CAC5C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CACrE,CAAC;oBACF,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;oBAC5C,MAAM;aACP;YAED,OAAO,IAAW,CAAC;QACpB,CAAC,CAAC;IACH,CAAC;IAUD,KAAK,CAAC,KAAmE;QACxE,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;YAChC,KAAK,GAAG,KAAK,CACZ,IAAI,KAAK,CACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,gCAAqB,CAAC,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAC9D,CACf,CAAC;SACF;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QAC1B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,MAAM,CAAC,MAAoE;QAC1E,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE;YACjC,MAAM,GAAG,MAAM,CACd,IAAI,KAAK,CACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,gCAAqB,CAAC,EAAE,kBAAkB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAC9D,CACf,CAAC;SACF;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QAC5B,OAAO,IAAI,CAAC;IACb,CAAC;IAID,OAAO,CACN,GAAG,OAEwB;QAE3B,IAAI,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE;YACrC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CACzB,IAAI,KAAK,CACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,gCAAqB,CAAC,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAChE,CACf,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;SACnE;aAAM;YACN,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,OAAmC,CAAC;SAC1D;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAID,OAAO,CACN,GAAG,OAEwB;QAE3B,IAAI,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,UAAU,EAAE;YACrC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CACzB,IAAI,KAAK,CACR,IAAI,CAAC,MAAM,CAAC,MAAM,EAClB,IAAI,gCAAqB,CAAC,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAChE,CACf,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;SACnE;aAAM;YACN,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,OAAmC,CAAC;SAC1D;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK,CAAC,KAAa;QAClB,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QAC1B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,MAAM,CAAC,MAAc;QACpB,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QAC5B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,GAAG,CAAC,QAAsB,EAAE,SAAqB,EAAE;QAClD,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;QACjD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,gBAAgB;IAChB,MAAM;QACL,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnD,CAAC;IAED,KAAK;QACJ,MAAM,KAAuB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAA7D,EAAE,OAAO,OAAoD,EAA/C,IAAI,cAAlB,WAAoB,CAAyC,CAAC;QACpE,OAAO,IAAI,CAAC;IACb,CAAC;IAED,EAAE,CACD,KAAa;QAEb,OAAO,IAAI,KAAK,CACf,IAAI,mBAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EACtD,IAAI,gCAAqB,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CACD,CAAC;IACzF,CAAC;CACD;AAzND,0DAyNC;AAYD,MAAa,WAKX,SAAQ,uBAA6F;IALvG;;QA6BC,YAAO,GAA2C,CAAC,iBAAiB,EAAE,EAAE;YACvE,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACnD,CAAC,CAAC;IACH,CAAC;IA1BQ,QAAQ,CAAC,IAAa;QAK7B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,oFAAoF,CAAC,CAAC;SACtG;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAErC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACxE,KAAK,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAAC;QACrD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,OAAO,CAAC,IAAY;QAKnB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;CAKD;AAhCD,kCAgCC;AAED,IAAA,mBAAW,EAAC,WAAW,EAAE,CAAC,4BAAY,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"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"}
@@ -12,7 +12,8 @@ export declare type JoinType = 'inner' | 'left' | 'right' | 'full';
12
12
  export declare type SelectMode = 'partial' | 'single' | 'multiple';
13
13
  export interface JoinsValue {
14
14
  on: SQL | undefined;
15
- table: AnyMySqlTable | Subquery;
15
+ table: AnyMySqlTable | Subquery | SQL;
16
+ alias: string | undefined;
16
17
  joinType: JoinType;
17
18
  }
18
19
  export declare type JoinNullability = 'nullable' | 'not-null';
@@ -45,11 +46,11 @@ export declare type AddAliasToSelection<TSelection, TAlias extends string> = Equ
45
46
  export declare type BuildSubquerySelection<TSelection, TNullability extends Record<string, JoinNullability>> = TSelection extends never ? any : Simplify<{
46
47
  [Key in keyof TSelection]: TSelection[Key] extends SQL ? DrizzleTypeError<'You cannot reference this field without assigning it an alias first - use `.as(<alias>)`'> : TSelection[Key] extends SQL.Aliased ? TSelection[Key] : TSelection[Key] extends AnyMySqlColumn ? ApplyNullabilityToColumn<TSelection[Key], TNullability[GetColumnConfig<TSelection[Key], 'tableName'>]> : TSelection[Key] extends Record<string, AnyMySqlColumn | SQL | SQL.Aliased> ? BuildSubquerySelection<TSelection[Key], TNullability> : never;
47
48
  }>;
48
- export declare type AppendToResult<TTableName extends string, TResult, TJoinedName extends string, TSelectedFields extends SelectFields, TOldSelectMode extends SelectMode> = TOldSelectMode extends 'partial' ? TResult : TOldSelectMode extends 'single' ? Record<TTableName, TResult> & Record<TJoinedName, TSelectedFields> : TResult & Record<TJoinedName, TSelectedFields>;
49
+ export declare type AppendToResult<TTableName extends string | undefined, TResult, TJoinedName extends string | undefined, TSelectedFields extends SelectFields, TOldSelectMode extends SelectMode> = TOldSelectMode extends 'partial' ? TResult : TOldSelectMode extends 'single' ? (TTableName extends string ? Record<TTableName, TResult> : TResult) & (TJoinedName extends string ? Record<TJoinedName, TSelectedFields> : TSelectedFields) : TResult & (TJoinedName extends string ? Record<TJoinedName, TSelectedFields> : TSelectedFields);
49
50
  declare type SetJoinsNullability<TNullabilityMap extends Record<string, JoinNullability>, TValue extends JoinNullability> = {
50
51
  [Key in keyof TNullabilityMap]: TValue;
51
52
  };
52
- export declare type AppendToNullabilityMap<TJoinsNotNull extends Record<string, JoinNullability>, TJoinedName extends string, TJoinType extends JoinType> = 'left' extends TJoinType ? TJoinsNotNull & {
53
+ export declare type AppendToNullabilityMap<TJoinsNotNull extends Record<string, JoinNullability>, TJoinedName extends string | undefined, TJoinType extends JoinType> = TJoinedName extends string ? 'left' extends TJoinType ? TJoinsNotNull & {
53
54
  [name in TJoinedName]: 'nullable';
54
55
  } : 'right' extends TJoinType ? SetJoinsNullability<TJoinsNotNull, 'nullable'> & {
55
56
  [name in TJoinedName]: 'not-null';
@@ -57,17 +58,17 @@ export declare type AppendToNullabilityMap<TJoinsNotNull extends Record<string,
57
58
  [name in TJoinedName]: 'not-null';
58
59
  } : 'full' extends TJoinType ? SetJoinsNullability<TJoinsNotNull, 'nullable'> & {
59
60
  [name in TJoinedName]: 'nullable';
60
- } : never;
61
+ } : never : TJoinsNotNull;
61
62
  export interface MySqlSelectConfig {
62
63
  withList: Subquery[];
63
64
  fields: SelectFields;
64
65
  fieldsList: SelectFieldsOrdered;
65
66
  where?: SQL;
66
67
  having?: SQL;
67
- table: AnyMySqlTable | Subquery | MySqlViewBase;
68
+ table: AnyMySqlTable | Subquery | MySqlViewBase | SQL;
68
69
  limit?: number | Placeholder;
69
70
  offset?: number | Placeholder;
70
- joins: Record<string, JoinsValue>;
71
+ joins: JoinsValue[];
71
72
  orderBy: (AnyMySqlColumn | SQL | SQL.Aliased)[];
72
73
  groupBy: (AnyMySqlColumn | SQL | SQL.Aliased)[];
73
74
  lockingClause?: {
@@ -75,9 +76,9 @@ export interface MySqlSelectConfig {
75
76
  config: LockConfig;
76
77
  };
77
78
  }
78
- export declare type JoinFn<THKT extends MySqlSelectHKTBase, TTableName extends string, TSelectMode extends SelectMode, TJoinType extends JoinType, TSelection, TNullabilityMap extends Record<string, JoinNullability>> = <TJoinedTable extends AnyMySqlTable | Subquery, TJoinedName extends GetSelectTableName<TJoinedTable> = GetSelectTableName<TJoinedTable>>(table: TJoinedTable, on: SQL | undefined) => MySqlSelectKind<THKT, TTableName, AppendToResult<TTableName, TSelection, TJoinedName, TJoinedTable extends AnyMySqlTable ? GetTableConfig<TJoinedTable, 'columns'> : TJoinedName extends Subquery ? Assume<GetSubquerySelection<TJoinedName>, SelectFields> : never, TSelectMode>, TSelectMode extends 'partial' ? TSelectMode : 'multiple', AppendToNullabilityMap<TNullabilityMap, TJoinedName, TJoinType>>;
79
- export declare type GetSelectTableName<TTable extends AnyMySqlTable | Subquery | MySqlViewBase> = TTable extends AnyMySqlTable ? GetTableConfig<TTable, 'name'> : TTable extends Subquery<infer TAlias> ? TAlias : TTable extends MySqlViewBase<infer TAlias> ? TAlias : never;
80
- export declare type GetSelectTableSelection<TTable extends AnyMySqlTable | Subquery | MySqlViewBase> = TTable extends AnyMySqlTable ? GetTableConfig<TTable, 'columns'> : TTable extends Subquery<string, infer TSelection> ? TSelection : TTable extends MySqlViewWithSelection<any, any, infer TSelection> ? TSelection : never;
79
+ export declare type JoinFn<THKT extends MySqlSelectHKTBase, TTableName extends string | undefined, TSelectMode extends SelectMode, TJoinType extends JoinType, TSelection, TNullabilityMap extends Record<string, JoinNullability>> = <TJoinedTable extends AnyMySqlTable | Subquery | SQL, TJoinedName extends GetSelectTableName<TJoinedTable> = GetSelectTableName<TJoinedTable>>(table: TJoinedTable, on: ((aliases: TSelection) => SQL | undefined) | SQL | undefined) => MySqlSelectKind<THKT, TTableName, AppendToResult<TTableName, TSelection, TJoinedName, TJoinedTable extends AnyMySqlTable ? GetTableConfig<TJoinedTable, 'columns'> : TJoinedName extends Subquery ? Assume<GetSubquerySelection<TJoinedName>, SelectFields> : never, TSelectMode>, TSelectMode extends 'partial' ? TSelectMode : 'multiple', AppendToNullabilityMap<TNullabilityMap, TJoinedName, TJoinType>>;
80
+ export declare type GetSelectTableName<TTable extends AnyMySqlTable | Subquery | MySqlViewBase | SQL> = TTable extends AnyMySqlTable ? GetTableConfig<TTable, 'name'> : TTable extends Subquery<infer TAlias> ? TAlias : TTable extends MySqlViewBase<infer TAlias> ? TAlias : TTable extends SQL ? undefined : never;
81
+ export declare type GetSelectTableSelection<TTable extends AnyMySqlTable | Subquery | MySqlViewBase | SQL> = TTable extends AnyMySqlTable ? GetTableConfig<TTable, 'columns'> : TTable extends Subquery<string, infer TSelection> ? TSelection : TTable extends MySqlViewWithSelection<any, any, infer TSelection> ? TSelection : TTable extends SQL ? {} : never;
81
82
  export declare type SelectFieldsFlat = SelectFieldsFlatBase<AnyMySqlColumn>;
82
83
  export declare type SelectFields = SelectFieldsBase<AnyMySqlColumn, AnyMySqlTable>;
83
84
  export declare type SelectFieldsOrdered = SelectFieldsOrderedBase<AnyMySqlColumn>;
@@ -97,13 +98,13 @@ export declare type LockConfig = {
97
98
  skipLocked?: undefined;
98
99
  };
99
100
  export interface MySqlSelectHKTBase {
100
- tableName: string;
101
+ tableName: string | undefined;
101
102
  selection: unknown;
102
103
  selectMode: SelectMode;
103
104
  nullabilityMap: unknown;
104
105
  $type: unknown;
105
106
  }
106
- export declare type MySqlSelectKind<T extends MySqlSelectHKTBase, TTableName extends string, TSelection, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability>> = (T & {
107
+ export declare type MySqlSelectKind<T extends MySqlSelectHKTBase, TTableName extends string | undefined, TSelection, TSelectMode extends SelectMode, TNullabilityMap extends Record<string, JoinNullability>> = (T & {
107
108
  tableName: TTableName;
108
109
  selection: TSelection;
109
110
  selectMode: TSelectMode;
@@ -1 +1 @@
1
- {"version":3,"file":"select.types.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"select.types.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAChF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACtF,OAAO,KAAK,EACX,aAAa,EACb,cAAc,EACd,qBAAqB,EACrB,WAAW,EACX,iBAAiB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC/E,OAAO,KAAK,EACX,YAAY,IAAI,gBAAgB,EAChC,gBAAgB,IAAI,oBAAoB,EACxC,mBAAmB,IAAI,uBAAuB,EAC9C,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAErE,oBAAY,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAE3D,oBAAY,UAAU,GAAG,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;AAE3D,MAAM,WAAW,UAAU;IAC1B,EAAE,EAAE,GAAG,GAAG,SAAS,CAAC;IACpB,KAAK,EAAE,aAAa,GAAG,QAAQ,GAAG,GAAG,CAAC;IACtC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,QAAQ,EAAE,QAAQ,CAAC;CACnB;AAED,oBAAY,eAAe,GAAG,UAAU,GAAG,UAAU,CAAC;AAEtD,oBAAY,gBAAgB,CAAC,CAAC,EAAE,YAAY,SAAS,eAAe,IAAI,YAAY,SAAS,UAAU,GAAG,CAAC,GAAG,IAAI,GAC/G,YAAY,SAAS,MAAM,GAAG,IAAI,GAClC,CAAC,CAAC;AAEL,oBAAY,wBAAwB,CAAC,OAAO,SAAS,cAAc,EAAE,YAAY,SAAS,eAAe,IACxG,YAAY,SAAS,UAAU,GAAG,OAAO,GACtC,OAAO,SAAS,WAAW,CAAC,MAAM,OAAO,CAAC,GAAG,WAAW,CACxD,eAAe,CAAC,OAAO,EAAE;IACxB,OAAO,EAAE,YAAY,SAAS,UAAU,GAAG,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;CACtE,CAAC,CACF,GACA,KAAK,CAAC;AAEV,oBAAY,sBAAsB,CAAC,OAAO,EAAE,eAAe,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,IAAI,QAAQ,CAC9G;KACE,UAAU,IAAI,MAAM,OAAO,GAAG,MAAM,eAAe,GAAG,MAAM,GAAG,gBAAgB,CAC/E,OAAO,CAAC,UAAU,CAAC,EACnB,eAAe,CAAC,UAAU,CAAC,CAC3B;CACD,CACD,CAAC;AAEF,oBAAY,YAAY,CACvB,OAAO,EACP,WAAW,SAAS,UAAU,EAC9B,eAAe,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,IACpD,WAAW,SAAS,SAAS,GAAG,mBAAmB,CAAC,OAAO,EAAE,eAAe,CAAC,GAC9E,WAAW,SAAS,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAC1D,sBAAsB,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,CAAC;AAExE,aAAK,OAAO,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC,SAAS,KAAK,GAAG,KAAK,GAAG,IAAI,CAAC;AAEvH,aAAK,GAAG,CAAC,CAAC,SAAS,OAAO,IAAI,CAAC,SAAS,IAAI,GAAG,KAAK,GAAG,IAAI,CAAC;AAE5D,aAAK,mBAAmB,CAAC,OAAO,EAAE,YAAY,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,IAAI,YAAY,SACrG,YAAY,GAAG;KACb,GAAG,IAAI,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,MAAM,MAAM,GACtD,MAAM,SAAS,aAAa,GAAG,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,MAAM,YAAY,GAAG,gBAAgB,CAC1G,kBAAkB,CAAC,cAAc,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,EACrD,YAAY,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAC5C,GACA,KAAK,GACN,MAAM,SAAS,cAAc,GAC5B,eAAe,CAAC,MAAM,EAAE,WAAW,CAAC,SAAS,MAAM,UAAU,SAAS,MAAM,YAAY,GACvF,gBAAgB,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,GACtE,KAAK,GACN,MAAM,SAAS,GAAG,GAAG,GAAG,CAAC,OAAO,GAAG,iBAAiB,CAAC,MAAM,CAAC,GAC5D,MAAM,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjC,MAAM,CAAC,MAAM,MAAM,CAAC,SACrB,cAAc,CAAC;QAAE,SAAS,EAAE,MAAM,UAAU,SAAS,MAAM,CAAA;KAAE,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,GAChF,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,SAAS,IAAI,GACpC,gBAAgB,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC,GACvE,mBAAmB,CAAC,MAAM,EAAE,YAAY,CAAC,GAC1C,KAAK,GACN,KAAK,GACL,KAAK;CACR,GACC,KAAK,CAAC;AAET,oBAAY,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAE7D,oBAAY,eAAe,CAAC,MAAM,SAAS,aAAa,EAAE,MAAM,SAAS,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,SACxG,MAAM,OAAO,SAAS,WAAW,GAAG,qBAAqB,CACxD,iBAAiB,CAAC,OAAO,EAAE;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,QAAQ,CAAC,sBAAsB,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;CACtE,CAAC,CACF,GACC,KAAK,CAAC;AAET,oBAAY,sBAAsB,CACjC,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,EACnE,MAAM,SAAS,MAAM,IAClB,QAAQ,CACX;KACE,GAAG,IAAI,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,SAAS,cAAc,GAAG,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GACzG,QAAQ,CAAC,GAAG,CAAC;CAChB,CACD,CAAC;AAEF,oBAAY,mBAAmB,CAAC,UAAU,EAAE,MAAM,SAAS,MAAM,IAAI,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,SAAS,IAAI,GAAG,GAAG,GAC3G,QAAQ,CACT;KACE,GAAG,IAAI,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,cAAc,GAAG,qBAAqB,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAC/G,UAAU,CAAC,GAAG,CAAC,SAAS,GAAG,GAAG,GAAG,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,GAC3D,UAAU,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,GACzE,sBAAsB,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAChD,KAAK;CACR,CACD,CAAC;AAEH,oBAAY,sBAAsB,CACjC,UAAU,EACV,YAAY,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,IACjD,UAAU,SAAS,KAAK,GAAG,GAAG,GAAG,QAAQ,CAC5C;KACE,GAAG,IAAI,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,GAAG,GACnD,gBAAgB,CAAC,0FAA0F,CAAC,GAC5G,UAAU,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,GACrD,UAAU,CAAC,GAAG,CAAC,SAAS,cAAc,GACrC,wBAAwB,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GACvG,UAAU,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,GACzE,sBAAsB,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,YAAY,CAAC,GACtD,KAAK;CACR,CACD,CAAC;AAEF,oBAAY,cAAc,CACzB,UAAU,SAAS,MAAM,GAAG,SAAS,EACrC,OAAO,EACP,WAAW,SAAS,MAAM,GAAG,SAAS,EACtC,eAAe,SAAS,YAAY,EACpC,cAAc,SAAS,UAAU,IAC9B,cAAc,SAAS,SAAS,GAAG,OAAO,GAC3C,cAAc,SAAS,QAAQ,GAC7B,CAAC,UAAU,SAAS,MAAM,GAAG,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,GACnE,CAAC,WAAW,SAAS,MAAM,GAAG,MAAM,CAAC,WAAW,EAAE,eAAe,CAAC,GAAG,eAAe,CAAC,GACvF,OAAO,GAAG,CAAC,WAAW,SAAS,MAAM,GAAG,MAAM,CAAC,WAAW,EAAE,eAAe,CAAC,GAAG,eAAe,CAAC,CAAC;AAEnG,aAAK,mBAAmB,CAAC,eAAe,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EAAE,MAAM,SAAS,eAAe,IAAI;KAClH,GAAG,IAAI,MAAM,eAAe,GAAG,MAAM;CACtC,CAAC;AAEF,oBAAY,sBAAsB,CACjC,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACrD,WAAW,SAAS,MAAM,GAAG,SAAS,EACtC,SAAS,SAAS,QAAQ,IACvB,WAAW,SAAS,MAAM,GAAG,MAAM,SAAS,SAAS,GAAG,aAAa,GAAG;KAAG,IAAI,IAAI,WAAW,GAAG,UAAU;CAAE,GAC9G,OAAO,SAAS,SAAS,GAAG,mBAAmB,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG;KAAG,IAAI,IAAI,WAAW,GAAG,UAAU;CAAE,GAClH,OAAO,SAAS,SAAS,GAAG,aAAa,GAAG;KAAG,IAAI,IAAI,WAAW,GAAG,UAAU;CAAE,GACjF,MAAM,SAAS,SAAS,GAAG,mBAAmB,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG;KAAG,IAAI,IAAI,WAAW,GAAG,UAAU;CAAE,GACjH,KAAK,GACL,aAAa,CAAC;AAEjB,MAAM,WAAW,iBAAiB;IACjC,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,MAAM,EAAE,YAAY,CAAC;IACrB,UAAU,EAAE,mBAAmB,CAAC;IAChC,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,aAAa,GAAG,QAAQ,GAAG,aAAa,GAAG,GAAG,CAAC;IACtD,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC9B,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,OAAO,EAAE,CAAC,cAAc,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;IAChD,OAAO,EAAE,CAAC,cAAc,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;IAChD,aAAa,CAAC,EAAE;QACf,QAAQ,EAAE,YAAY,CAAC;QACvB,MAAM,EAAE,UAAU,CAAC;KACnB,CAAC;CACF;AAED,oBAAY,MAAM,CACjB,IAAI,SAAS,kBAAkB,EAC/B,UAAU,SAAS,MAAM,GAAG,SAAS,EACrC,WAAW,SAAS,UAAU,EAC9B,SAAS,SAAS,QAAQ,EAC1B,UAAU,EACV,eAAe,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,IACpD,CACH,YAAY,SAAS,aAAa,GAAG,QAAQ,GAAG,GAAG,EACnD,WAAW,SAAS,kBAAkB,CAAC,YAAY,CAAC,GAAG,kBAAkB,CAAC,YAAY,CAAC,EACtF,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,UAAU,KAAK,GAAG,GAAG,SAAS,CAAC,GAAG,GAAG,GAAG,SAAS,KAAK,eAAe,CAC1G,IAAI,EACJ,UAAU,EACV,cAAc,CACb,UAAU,EACV,UAAU,EACV,WAAW,EACX,YAAY,SAAS,aAAa,GAAG,cAAc,CAAC,YAAY,EAAE,SAAS,CAAC,GACzE,WAAW,SAAS,QAAQ,GAAG,MAAM,CAAC,oBAAoB,CAAC,WAAW,CAAC,EAAE,YAAY,CAAC,GACtF,KAAK,EACR,WAAW,CACX,EACD,WAAW,SAAS,SAAS,GAAG,WAAW,GAAG,UAAU,EACxD,sBAAsB,CAAC,eAAe,EAAE,WAAW,EAAE,SAAS,CAAC,CAC/D,CAAC;AAEF,oBAAY,kBAAkB,CAAC,MAAM,SAAS,aAAa,GAAG,QAAQ,GAAG,aAAa,GAAG,GAAG,IAAI,MAAM,SACrG,aAAa,GAAG,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,GAC5C,MAAM,SAAS,QAAQ,CAAC,MAAM,MAAM,CAAC,GAAG,MAAM,GAC9C,MAAM,SAAS,aAAa,CAAC,MAAM,MAAM,CAAC,GAAG,MAAM,GACnD,MAAM,SAAS,GAAG,GAAG,SAAS,GAC9B,KAAK,CAAC;AAET,oBAAY,uBAAuB,CAAC,MAAM,SAAS,aAAa,GAAG,QAAQ,GAAG,aAAa,GAAG,GAAG,IAAI,MAAM,SAC1G,aAAa,GAAG,cAAc,CAAC,MAAM,EAAE,SAAS,CAAC,GAC/C,MAAM,SAAS,QAAQ,CAAC,MAAM,EAAE,MAAM,UAAU,CAAC,GAAG,UAAU,GAC9D,MAAM,SAAS,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC,GAAG,UAAU,GAC9E,MAAM,SAAS,GAAG,GAAG,EAAE,GACvB,KAAK,CAAC;AAET,oBAAY,gBAAgB,GAAG,oBAAoB,CAAC,cAAc,CAAC,CAAC;AAEpE,oBAAY,YAAY,GAAG,gBAAgB,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;AAE3E,oBAAY,mBAAmB,GAAG,uBAAuB,CAAC,cAAc,CAAC,CAAC;AAE1E,oBAAY,iBAAiB,CAAC,CAAC,IAAI,CAAC,SAAS,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,GACnE,CAAC,SAAS,aAAa,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,GACzE,CAAC,SAAS,cAAc,GAAG,aAAa,CAAC,CAAC,CAAC,GAC3C,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GACjD,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,GACrD,KAAK,CAAC;AAET,oBAAY,kBAAkB,CAAC,eAAe,IAAI,QAAQ,CACzD;KACE,GAAG,IAAI,MAAM,eAAe,GAAG,MAAM,GAAG,iBAAiB,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;CAChF,CACD,CAAC;AAEF,oBAAY,YAAY,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE9C,oBAAY,UAAU,GAAG;IACxB,MAAM,EAAE,IAAI,CAAC;IACb,UAAU,CAAC,EAAE,SAAS,CAAC;CACvB,GAAG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,UAAU,EAAE,IAAI,CAAC;CACjB,GAAG;IACH,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,UAAU,CAAC,EAAE,SAAS,CAAC;CACvB,CAAC;AAEF,MAAM,WAAW,kBAAkB;IAClC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;IACvB,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC;CACf;AAED,oBAAY,eAAe,CAC1B,CAAC,SAAS,kBAAkB,EAC5B,UAAU,SAAS,MAAM,GAAG,SAAS,EACrC,UAAU,EACV,WAAW,SAAS,UAAU,EAC9B,eAAe,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,IACpD,CAAC,CAAC,GAAG;IACR,SAAS,EAAE,UAAU,CAAC;IACtB,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,EAAE,WAAW,CAAC;IACxB,cAAc,EAAE,eAAe,CAAC;CAChC,CAAC,CAAC,OAAO,CAAC,CAAC;AAEZ,MAAM,WAAW,0BAA2B,SAAQ,kBAAkB;IACrE,KAAK,EAAE,uBAAuB,CAC7B,IAAI,EACJ,IAAI,CAAC,WAAW,CAAC,EACjB,IAAI,CAAC,WAAW,CAAC,EACjB,IAAI,CAAC,YAAY,CAAC,EAClB,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAC/D,CAAC;CACF;AAED,MAAM,WAAW,cAAe,SAAQ,kBAAkB;IACzD,KAAK,EAAE,WAAW,CACjB,IAAI,CAAC,WAAW,CAAC,EACjB,IAAI,CAAC,WAAW,CAAC,EACjB,IAAI,CAAC,YAAY,CAAC,EAClB,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAC/D,CAAC;CACF"}
@@ -1 +1 @@
1
- {"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/mysql-core/session.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CACvB;AAED,oBAAY,eAAe,CAAC,KAAK,SAAS,cAAc,EAAE,IAAI,IAAI,CAAC,KAAK,GAAG;IAC1E,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;CACnB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEX,MAAM,WAAW,mBAAmB;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;CAChB;AAED,8BAAsB,aAAa,CAAC,CAAC,SAAS,mBAAmB;IAIhE,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;CAOpF;AAED,8BAAsB,YAAY;IACrB,SAAS,CAAC,OAAO,EAAE,YAAY;gBAArB,OAAO,EAAE,YAAY;IAE3C,QAAQ,CAAC,YAAY,CAAC,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACxE,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,mBAAmB,GAAG,SAAS,EACvC,IAAI,EAAE,MAAM,GAAG,SAAS,GACtB,aAAa,CAAC,CAAC,CAAC;IAEnB,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC;IAQlC,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;CAe1C"}
1
+ {"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/mysql-core/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CACvB;AAED,oBAAY,eAAe,CAAC,KAAK,SAAS,cAAc,EAAE,IAAI,IAAI,CAAC,KAAK,GAAG;IAC1E,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC;CACnB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEX,MAAM,WAAW,mBAAmB;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;CAChB;AAED,8BAAsB,aAAa,CAAC,CAAC,SAAS,mBAAmB;IAIhE,QAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;CAOpF;AAED,8BAAsB,YAAY;IACrB,SAAS,CAAC,OAAO,EAAE,YAAY;gBAArB,OAAO,EAAE,YAAY;IAE3C,QAAQ,CAAC,YAAY,CAAC,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,EACxE,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,mBAAmB,GAAG,SAAS,EACvC,IAAI,EAAE,MAAM,GAAG,SAAS,GACtB,aAAa,CAAC,CAAC,CAAC;IAEnB,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC;IAQlC,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;CAe1C"}
@@ -1,7 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.MySqlSession = exports.PreparedQuery = void 0;
4
- require("mysql2/promise");
5
4
  class PreparedQuery {
6
5
  }
7
6
  exports.PreparedQuery = PreparedQuery;
@@ -1 +1 @@
1
- {"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/mysql-core/session.ts"],"names":[],"mappings":";;;AAAA,0BAAuF;AAqBvF,MAAsB,aAAa;CAWlC;AAXD,sCAWC;AAED,MAAsB,YAAY;IACjC,YAAsB,OAAqB;QAArB,YAAO,GAAP,OAAO,CAAc;IAAG,CAAC;IAQ/C,OAAO,CAAI,KAAU;QACpB,OAAO,IAAI,CAAC,YAAY,CACvB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAC9B,SAAS,EACT,SAAS,CACT,CAAC,OAAO,EAAE,CAAC;IACb,CAAC;IAED,GAAG,CAAc,KAAU;QAC1B,OAAO,IAAI,CAAC,YAAY,CACvB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAC9B,SAAS,EACT,SAAS,CACT,CAAC,GAAG,EAAE,CAAC;IACT,CAAC;CASD;AAhCD,oCAgCC"}
1
+ {"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/mysql-core/session.ts"],"names":[],"mappings":";;;AAoBA,MAAsB,aAAa;CAWlC;AAXD,sCAWC;AAED,MAAsB,YAAY;IACjC,YAAsB,OAAqB;QAArB,YAAO,GAAP,OAAO,CAAc;IAAG,CAAC;IAQ/C,OAAO,CAAI,KAAU;QACpB,OAAO,IAAI,CAAC,YAAY,CACvB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAC9B,SAAS,EACT,SAAS,CACT,CAAC,OAAO,EAAE,CAAC;IACb,CAAC;IAED,GAAG,CAAc,KAAU;QAC1B,OAAO,IAAI,CAAC,YAAY,CACvB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,EAC9B,SAAS,EACT,SAAS,CACT,CAAC,GAAG,EAAE,CAAC;IACT,CAAC;CASD;AAhCD,oCAgCC"}
package/operations.js CHANGED
@@ -2,11 +2,4 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  require("./subquery");
4
4
  require("./utils");
5
- // export function normalizeSQLCallback<TReturn, TTable extends Table, TColumn extends AnyColumn, TSelection>(
6
- // builder: (fields: TSelection) => TReturn,
7
- // fields: SelectFields<TColumn, TTable>,
8
- // ): TReturn {
9
- // const aliases = new Proxy(fields, new SelectionProxyHandler()) as TSelection;
10
- // return builder(aliases);
11
- // }
12
5
  //# sourceMappingURL=operations.js.map
package/operations.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"operations.js","sourceRoot":"","sources":["../src/operations.ts"],"names":[],"mappings":";;AAEA,sBAAmD;AAEnD,mBAAmC;AA4BnC,8GAA8G;AAC9G,6CAA6C;AAC7C,0CAA0C;AAC1C,eAAe;AACf,iFAAiF;AACjF,4BAA4B;AAC5B,IAAI"}
1
+ {"version":3,"file":"operations.js","sourceRoot":"","sources":["../src/operations.ts"],"names":[],"mappings":";;AAEA,sBAAmD;AAEnD,mBAAmC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "drizzle-orm",
3
- "version": "0.22.0-cfe1679",
3
+ "version": "0.22.0-d52ce91",
4
4
  "description": "Drizzle ORM package for SQL databases",
5
5
  "scripts": {
6
6
  "build": "tsc && resolve-tspaths && cp ../README.md package.json dist/",
package/pg-core/db.js CHANGED
@@ -19,7 +19,7 @@ class PgDatabase {
19
19
  if (typeof qb === 'function') {
20
20
  qb = qb(query_builders_1.queryBuilder);
21
21
  }
22
- return new Proxy(new subquery_1.WithSubquery(qb.getSQL(), qb.getSelection(), alias, true), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'error' }));
22
+ return new Proxy(new subquery_1.WithSubquery(qb.getSQL(), qb.getSelection(), alias, true), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'subquery_selection', sqlBehavior: 'error' }));
23
23
  },
24
24
  };
25
25
  }
package/pg-core/db.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/pg-core/db.ts"],"names":[],"mappings":";;;AAEA,6DAAqH;AAIrH,yCAAiE;AACjE,0FAAuF;AAKvF,MAAa,UAAU;IACtB;IACC,gBAAgB;IACP,OAAkB;IAC3B,gBAAgB;IACP,OAAiB;QAFjB,YAAO,GAAP,OAAO,CAAW;QAElB,YAAO,GAAP,OAAO,CAAU;IACxB,CAAC;IAEJ,KAAK,CAAwB,KAAa;QACzC,OAAO;YACN,EAAE,CACD,EAAuF;gBAEvF,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;oBAC7B,EAAE,GAAG,EAAE,CAAC,6BAAY,CAAC,CAAC;iBACtB;gBAED,OAAO,IAAI,KAAK,CACf,IAAI,uBAAY,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,YAAY,EAAkB,EAAE,KAAK,EAAE,IAAI,CAAC,EAC7E,IAAI,gCAAqB,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CACtC,CAAC;YACpD,CAAC;SACD,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,OAAuB;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC;QAIlB,SAAS,MAAM,CAAC,MAAqB;YACpC,OAAO,IAAI,gCAAe,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtF,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,CAAC;IACnB,CAAC;IAID,MAAM,CAAC,MAAqB;QAC3B,OAAO,IAAI,gCAAe,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,CAA4B,KAAa;QAC9C,OAAO,IAAI,gCAAe,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,CAA4B,KAAa;QAC9C,OAAO,IAAI,gCAAe,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,CAA4B,KAAa;QAC9C,OAAO,IAAI,yBAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC;IAED,uBAAuB,CAAmC,IAAW;QACpE,OAAO,IAAI,qDAAyB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,CACN,KAAiB;QAEjB,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7C,CAAC;CACD;AAhED,gCAgEC"}
1
+ {"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/pg-core/db.ts"],"names":[],"mappings":";;;AAEA,6DAAqH;AAIrH,yCAAiE;AACjE,0FAAuF;AAKvF,MAAa,UAAU;IACtB;IACC,gBAAgB;IACP,OAAkB;IAC3B,gBAAgB;IACP,OAAiB;QAFjB,YAAO,GAAP,OAAO,CAAW;QAElB,YAAO,GAAP,OAAO,CAAU;IACxB,CAAC;IAEJ,KAAK,CAAwB,KAAa;QACzC,OAAO;YACN,EAAE,CACD,EAAuF;gBAEvF,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;oBAC7B,EAAE,GAAG,EAAE,CAAC,6BAAY,CAAC,CAAC;iBACtB;gBAED,OAAO,IAAI,KAAK,CACf,IAAI,uBAAY,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,YAAY,EAAkB,EAAE,KAAK,EAAE,IAAI,CAAC,EAC7E,IAAI,gCAAqB,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CACnD,CAAC;YACpD,CAAC;SACD,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,OAAuB;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC;QAIlB,SAAS,MAAM,CAAC,MAAqB;YACpC,OAAO,IAAI,gCAAe,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtF,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,CAAC;IACnB,CAAC;IAID,MAAM,CAAC,MAAqB;QAC3B,OAAO,IAAI,gCAAe,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,CAA4B,KAAa;QAC9C,OAAO,IAAI,gCAAe,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,CAA4B,KAAa;QAC9C,OAAO,IAAI,gCAAe,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,MAAM,CAA4B,KAAa;QAC9C,OAAO,IAAI,yBAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC;IAED,uBAAuB,CAAmC,IAAW;QACpE,OAAO,IAAI,qDAAyB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,CACN,KAAiB;QAEjB,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7C,CAAC;CACD;AAhED,gCAgEC"}