drizzle-orm 0.23.5 → 0.23.6-33cb0ce
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.
- package/README.md +1 -1
- package/mysql-core/columns/decimal.d.ts +2 -2
- package/mysql-core/columns/decimal.d.ts.map +1 -1
- package/mysql-core/columns/enum.d.ts +3 -3
- package/mysql-core/columns/enum.d.ts.map +1 -1
- package/mysql-core/columns/enum.js.map +1 -1
- package/mysql-core/db.js +1 -1
- package/mysql-core/db.js.map +1 -1
- package/mysql-core/query-builders/select.js +2 -2
- package/mysql-core/query-builders/select.js.map +1 -1
- package/package.json +3 -2
- package/pg-core/columns/enum.d.ts +2 -2
- package/pg-core/columns/enum.d.ts.map +1 -1
- package/pg-core/columns/enum.js.map +1 -1
- package/pg-core/db.js +1 -1
- package/pg-core/db.js.map +1 -1
- package/pg-core/query-builders/select.js +2 -2
- package/pg-core/query-builders/select.js.map +1 -1
- package/sql/expressions/conditions.js +1 -1
- package/sql/expressions/conditions.js.map +1 -1
- package/sqlite-core/columns/integer.d.ts +2 -2
- package/sqlite-core/columns/integer.d.ts.map +1 -1
- package/sqlite-core/columns/integer.js.map +1 -1
- package/sqlite-core/db.js +1 -1
- package/sqlite-core/db.js.map +1 -1
- package/sqlite-core/query-builders/select.js +2 -2
- package/sqlite-core/query-builders/select.js.map +1 -1
- package/subquery.d.ts.map +1 -1
- package/subquery.js +3 -3
- package/subquery.js.map +1 -1
package/README.md
CHANGED
|
@@ -69,7 +69,7 @@ export const users = pgTable('users', {
|
|
|
69
69
|
id: serial('id').primaryKey(),
|
|
70
70
|
fullName: text('full_name').notNull(),
|
|
71
71
|
phone: varchar('phone', { length: 20 }).notNull(),
|
|
72
|
-
role: text
|
|
72
|
+
role: text('role', { enum: ['user', 'admin'] }).default('user').notNull(),
|
|
73
73
|
cityId: integer('city_id').references(() => cities.id),
|
|
74
74
|
createdAt: timestamp('created_at').defaultNow().notNull(),
|
|
75
75
|
updatedAt: timestamp('updated_at').defaultNow().notNull(),
|
|
@@ -11,8 +11,8 @@ export interface MySqlDecimalHKT extends ColumnHKTBase {
|
|
|
11
11
|
}
|
|
12
12
|
export type MySqlDecimalBuilderInitial<TName extends string> = MySqlDecimalBuilder<{
|
|
13
13
|
name: TName;
|
|
14
|
-
data:
|
|
15
|
-
driverParam:
|
|
14
|
+
data: string;
|
|
15
|
+
driverParam: string;
|
|
16
16
|
notNull: false;
|
|
17
17
|
hasDefault: false;
|
|
18
18
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decimal.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/columns/decimal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,oBAAoB,EAAoB,MAAM,kBAAkB,CAAC;AAExG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,mCAAmC,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAE7F,MAAM,WAAW,sBAAuB,SAAQ,oBAAoB;IACnE,KAAK,EAAE,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAC5E,UAAU,EAAE,eAAe,CAAC;CAC5B;AAED,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACrD,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;CAC9D;AAED,MAAM,MAAM,0BAA0B,CAAC,KAAK,SAAS,MAAM,IAAI,mBAAmB,CAAC;IAClF,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"decimal.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/columns/decimal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,oBAAoB,EAAoB,MAAM,kBAAkB,CAAC;AAExG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,mCAAmC,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAE7F,MAAM,WAAW,sBAAuB,SAAQ,oBAAoB;IACnE,KAAK,EAAE,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAC5E,UAAU,EAAE,eAAe,CAAC;CAC5B;AAED,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACrD,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;CAC9D;AAED,MAAM,MAAM,0BAA0B,CAAC,KAAK,SAAS,MAAM,IAAI,mBAAmB,CAAC;IAClF,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,KAAK,CAAC;IACf,UAAU,EAAE,KAAK,CAAC;CAClB,CAAC,CAAC;AAEH,qBAAa,mBAAmB,CAAC,CAAC,SAAS,uBAAuB,CACjE,SAAQ,mCAAmC,CAAC,sBAAsB,EAAE,CAAC,EAAE,kBAAkB,CAAC;gBAE9E,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;CAY/D;AAED,qBAAa,YAAY,CAAC,CAAC,SAAS,gBAAgB,CACnD,SAAQ,4BAA4B,CAAC,eAAe,EAAE,CAAC,EAAE,kBAAkB,CAAC;IAE5E,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAyB;IAC/D,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAqB;IAEvD,UAAU,IAAI,MAAM;CASpB;AAED,MAAM,WAAW,kBAAkB;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CACf;AAED,wBAAgB,OAAO,CAAC,KAAK,SAAS,MAAM,EAC3C,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,kBAAuB,GAC7B,0BAA0B,CAAC,KAAK,CAAC,CAEnC"}
|
|
@@ -23,10 +23,10 @@ export declare class MySqlEnumColumnBuilder<T extends ColumnBuilderBaseConfig> e
|
|
|
23
23
|
constructor(name: T['name'], values: string[]);
|
|
24
24
|
}
|
|
25
25
|
export declare class MySqlEnumColumn<T extends ColumnBaseConfig> extends MySqlColumn<MySqlEnumColumnHKT, T, {
|
|
26
|
-
values: string[];
|
|
26
|
+
values: readonly string[];
|
|
27
27
|
}> {
|
|
28
|
-
readonly values: string[];
|
|
28
|
+
readonly values: readonly string[];
|
|
29
29
|
getSQLType(): string;
|
|
30
30
|
}
|
|
31
|
-
export declare function mysqlEnum<TName extends string, U extends string, T extends Readonly<[U, ...U[]]>>(name: TName, values: Writable<T>): MySqlEnumColumnBuilderInitial<TName, Writable<T>>;
|
|
31
|
+
export declare function mysqlEnum<TName extends string, U extends string, T extends Readonly<[U, ...U[]]>>(name: TName, values: T | Writable<T>): MySqlEnumColumnBuilderInitial<TName, Writable<T>>;
|
|
32
32
|
//# sourceMappingURL=enum.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/columns/enum.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,oBAAoB,EAAoB,MAAM,kBAAkB,CAAC;AAExG,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE3D,MAAM,WAAW,yBAA0B,SAAQ,oBAAoB;IACtE,KAAK,EAAE,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAC/E,UAAU,EAAE,kBAAkB,CAAC;CAC/B;AAED,MAAM,WAAW,kBAAmB,SAAQ,aAAa;IACxD,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;CACjE;AAED,MAAM,MAAM,6BAA6B,CAAC,KAAK,SAAS,MAAM,EAAE,KAAK,SAAS,MAAM,EAAE,IAAI,sBAAsB,CAAC;IAChH,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,KAAK,CAAC;IACZ,OAAO,EAAE,KAAK,CAAC;IACf,UAAU,EAAE,KAAK,CAAC;CAClB,CAAC,CAAC;AAEH,qBAAa,sBAAsB,CAAC,CAAC,SAAS,uBAAuB,CACpE,SAAQ,kBAAkB,CAAC,yBAAyB,EAAE,CAAC,EAAE;IAAE,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;gBAElE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE;CAc7C;AAED,qBAAa,eAAe,CAAC,CAAC,SAAS,gBAAgB,CACtD,SAAQ,WAAW,CAAC,kBAAkB,EAAE,CAAC,EAAE;IAAE,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/columns/enum.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,oBAAoB,EAAoB,MAAM,kBAAkB,CAAC;AAExG,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE3D,MAAM,WAAW,yBAA0B,SAAQ,oBAAoB;IACtE,KAAK,EAAE,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAC/E,UAAU,EAAE,kBAAkB,CAAC;CAC/B;AAED,MAAM,WAAW,kBAAmB,SAAQ,aAAa;IACxD,KAAK,EAAE,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;CACjE;AAED,MAAM,MAAM,6BAA6B,CAAC,KAAK,SAAS,MAAM,EAAE,KAAK,SAAS,MAAM,EAAE,IAAI,sBAAsB,CAAC;IAChH,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,KAAK,CAAC;IACZ,OAAO,EAAE,KAAK,CAAC;IACf,UAAU,EAAE,KAAK,CAAC;CAClB,CAAC,CAAC;AAEH,qBAAa,sBAAsB,CAAC,CAAC,SAAS,uBAAuB,CACpE,SAAQ,kBAAkB,CAAC,yBAAyB,EAAE,CAAC,EAAE;IAAE,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;gBAElE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE;CAc7C;AAED,qBAAa,eAAe,CAAC,CAAC,SAAS,gBAAgB,CACtD,SAAQ,WAAW,CAAC,kBAAkB,EAAE,CAAC,EAAE;IAAE,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;IAEzE,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAsB;IAExD,UAAU,IAAI,MAAM;CAGpB;AAED,wBAAgB,SAAS,CAAC,KAAK,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EAChG,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GACrB,6BAA6B,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/enum.ts"],"names":[],"mappings":";;;AAIA,qCAA2D;AAoB3D,MAAa,sBACZ,SAAQ,2BAAsE;IAE9E,YAAY,IAAe,EAAE,MAAgB;QAC5C,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;IAC7B,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,eAAe,CACzB,KAAK,EACL,IAAI,CAAC,MAAM,CACX,CAAC;IACH,CAAC;CACD;AAjBD,wDAiBC;AAED,MAAa,eACZ,SAAQ,
|
|
1
|
+
{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/enum.ts"],"names":[],"mappings":";;;AAIA,qCAA2D;AAoB3D,MAAa,sBACZ,SAAQ,2BAAsE;IAE9E,YAAY,IAAe,EAAE,MAAgB;QAC5C,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;IAC7B,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,eAAe,CACzB,KAAK,EACL,IAAI,CAAC,MAAM,CACX,CAAC;IACH,CAAC;CACD;AAjBD,wDAiBC;AAED,MAAa,eACZ,SAAQ,oBAAiE;IAD1E;;QAGU,WAAM,GAAsB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAKzD,CAAC;IAHA,UAAU;QACT,OAAO,QAAQ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IACtE,CAAC;CACD;AARD,0CAQC;AAMD,SAAgB,SAAS,CAAC,IAAY,EAAE,MAAgB;IACvD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,KAAK,CAAC,gCAAgC,IAAI,eAAe,CAAC,CAAC;IAE1F,OAAO,IAAI,sBAAsB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACjD,CAAC;AAJD,8BAIC"}
|
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.getSelectedFields(), alias, true), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: '
|
|
21
|
+
return new Proxy(new subquery_1.WithSubquery(qb.getSQL(), qb.getSelectedFields(), alias, true), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'error' }));
|
|
22
22
|
},
|
|
23
23
|
};
|
|
24
24
|
}
|
package/mysql-core/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/mysql-core/db.ts"],"names":[],"mappings":";;;AAGA,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,iBAAiB,EAAoB,EAAE,KAAK,EAAE,IAAI,CAAC,EACpF,IAAI,gCAAqB,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/mysql-core/db.ts"],"names":[],"mappings":";;;AAGA,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,iBAAiB,EAAoB,EAAE,KAAK,EAAE,IAAI,CAAC,EACpF,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,MAAuB;YACtC,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,MAAuB;QAC7B,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"}
|
|
@@ -104,7 +104,7 @@ class MySqlSelectQueryBuilder extends query_builder_1.QueryBuilder {
|
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
106
|
if (typeof on === 'function') {
|
|
107
|
-
on = on(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: '
|
|
107
|
+
on = on(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'sql', sqlBehavior: 'sql' })));
|
|
108
108
|
}
|
|
109
109
|
this.config.joins.push({ on, table, joinType, alias: tableName });
|
|
110
110
|
if (typeof tableName === 'string') {
|
|
@@ -183,7 +183,7 @@ class MySqlSelectQueryBuilder extends query_builder_1.QueryBuilder {
|
|
|
183
183
|
return rest;
|
|
184
184
|
}
|
|
185
185
|
as(alias) {
|
|
186
|
-
return new Proxy(new subquery_1.Subquery(this.getSQL(), this.config.fields, alias), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: '
|
|
186
|
+
return new Proxy(new subquery_1.Subquery(this.getSQL(), this.config.fields, alias), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'error' }));
|
|
187
187
|
}
|
|
188
188
|
}
|
|
189
189
|
exports.MySqlSelectQueryBuilder = MySqlSelectQueryBuilder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "drizzle-orm",
|
|
3
|
-
"version": "0.23.
|
|
3
|
+
"version": "0.23.6-33cb0ce",
|
|
4
4
|
"description": "Drizzle ORM package for SQL databases",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "tsc && resolve-tspaths && cp ../README.md package.json dist/",
|
|
@@ -126,6 +126,7 @@
|
|
|
126
126
|
"sql.js": "^1.8.0",
|
|
127
127
|
"sqlite3": "^5.1.2",
|
|
128
128
|
"vite-tsconfig-paths": "^4.0.7",
|
|
129
|
-
"vitest": "^0.29.8"
|
|
129
|
+
"vitest": "^0.29.8",
|
|
130
|
+
"zod": "^3.20.2"
|
|
130
131
|
}
|
|
131
132
|
}
|
|
@@ -21,7 +21,7 @@ export type PgEnumColumnBuilderInitial<TName extends string, TValues extends str
|
|
|
21
21
|
export interface PgEnum<TValues extends [string, ...string[]]> {
|
|
22
22
|
<TName extends string>(name: TName): PgEnumColumnBuilderInitial<TName, TValues>;
|
|
23
23
|
readonly enumName: string;
|
|
24
|
-
readonly enumValues:
|
|
24
|
+
readonly enumValues: TValues;
|
|
25
25
|
}
|
|
26
26
|
export declare function isPgEnum(obj: unknown): obj is PgEnum<[string, ...string[]]>;
|
|
27
27
|
export declare class PgEnumColumnBuilder<T extends ColumnBuilderBaseConfig> extends PgColumnBuilder<PgEnumColumnBuilderHKT, T, {
|
|
@@ -36,5 +36,5 @@ export declare class PgEnumColumn<T extends ColumnBaseConfig> extends PgColumn<P
|
|
|
36
36
|
}>, config: PgEnumColumnBuilder<T>['config']);
|
|
37
37
|
getSQLType(): string;
|
|
38
38
|
}
|
|
39
|
-
export declare function pgEnum<U extends string, T extends Readonly<[U, ...U[]]>>(enumName: string, values: Writable<T>): PgEnum<Writable<T>>;
|
|
39
|
+
export declare function pgEnum<U extends string, T extends Readonly<[U, ...U[]]>>(enumName: string, values: T | Writable<T>): PgEnum<Writable<T>>;
|
|
40
40
|
//# sourceMappingURL=enum.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../../src/pg-core/columns/enum.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,oBAAoB,EAAoB,MAAM,kBAAkB,CAAC;AACxG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAErD,MAAM,WAAW,sBAAuB,SAAQ,oBAAoB;IACnE,KAAK,EAAE,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAC5E,UAAU,EAAE,eAAe,CAAC;CAC5B;AAED,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACrD,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;CAC9D;AAED,MAAM,MAAM,0BAA0B,CAAC,KAAK,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EAAE,IAAI,mBAAmB,CAAC;IAC5G,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,KAAK,CAAC;IACf,UAAU,EAAE,KAAK,CAAC;CAClB,CAAC,CAAC;AAGH,MAAM,WAAW,MAAM,CAAC,OAAO,SAAS,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;IAC5D,CAAC,KAAK,SAAS,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,0BAA0B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAEhF,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"enum.d.ts","sourceRoot":"","sources":["../../../src/pg-core/columns/enum.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,oBAAoB,EAAoB,MAAM,kBAAkB,CAAC;AACxG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAErD,MAAM,WAAW,sBAAuB,SAAQ,oBAAoB;IACnE,KAAK,EAAE,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC;IAC5E,UAAU,EAAE,eAAe,CAAC;CAC5B;AAED,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACrD,KAAK,EAAE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC;CAC9D;AAED,MAAM,MAAM,0BAA0B,CAAC,KAAK,SAAS,MAAM,EAAE,OAAO,SAAS,MAAM,EAAE,IAAI,mBAAmB,CAAC;IAC5G,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,KAAK,CAAC;IACf,UAAU,EAAE,KAAK,CAAC;CAClB,CAAC,CAAC;AAGH,MAAM,WAAW,MAAM,CAAC,OAAO,SAAS,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;IAC5D,CAAC,KAAK,SAAS,MAAM,EAAE,IAAI,EAAE,KAAK,GAAG,0BAA0B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAEhF,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAG7B;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAE3E;AAED,qBAAa,mBAAmB,CAAC,CAAC,SAAS,uBAAuB,CACjE,SAAQ,eAAe,CAAC,sBAAsB,EAAE,CAAC,EAAE;IAAE,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,CAAA;CAAE,CAAC;gBAErE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC;CAWnD;AAED,qBAAa,YAAY,CAAC,CAAC,SAAS,gBAAgB,CAAE,SAAQ,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC;IACzF,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;gBAG1B,KAAK,EAAE,UAAU,CAAC;QAAE,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,CAAA;KAAE,CAAC,EAC3C,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAMzC,UAAU,IAAI,MAAM;CAGpB;AAGD,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EACvE,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GACrB,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAYrB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../src/pg-core/columns/enum.ts"],"names":[],"mappings":";;;AAIA,qCAAqD;AAoBrD,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAUvC,SAAgB,QAAQ,CAAC,GAAY;IACpC,OAAO,CAAC,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,UAAU,IAAI,WAAW,IAAI,GAAG,CAAC;AACjE,CAAC;AAFD,4BAEC;AAED,MAAa,mBACZ,SAAQ,wBAAyE;IAEjF,YAAY,IAAY,EAAE,YAAyB;QAClD,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;IACzC,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAAuC;QAEvC,OAAO,IAAI,YAAY,CAAkC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9E,CAAC;CACD;AAdD,kDAcC;AAED,MAAa,YAAyC,SAAQ,iBAA4B;IAGzF,YACC,KAA2C,EAC3C,MAAwC;QAExC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC;IACjC,CAAC;IAED,UAAU;QACT,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC3B,CAAC;CACD;AAdD,oCAcC;AAED,+CAA+C;AAC/C,SAAgB,MAAM,CACrB,QAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"enum.js","sourceRoot":"","sources":["../../../src/pg-core/columns/enum.ts"],"names":[],"mappings":";;;AAIA,qCAAqD;AAoBrD,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;AAUvC,SAAgB,QAAQ,CAAC,GAAY;IACpC,OAAO,CAAC,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,UAAU,IAAI,WAAW,IAAI,GAAG,CAAC;AACjE,CAAC;AAFD,4BAEC;AAED,MAAa,mBACZ,SAAQ,wBAAyE;IAEjF,YAAY,IAAY,EAAE,YAAyB;QAClD,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;IACzC,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAAuC;QAEvC,OAAO,IAAI,YAAY,CAAkC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9E,CAAC;CACD;AAdD,kDAcC;AAED,MAAa,YAAyC,SAAQ,iBAA4B;IAGzF,YACC,KAA2C,EAC3C,MAAwC;QAExC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC;IACjC,CAAC;IAED,UAAU;QACT,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC3B,CAAC;CACD;AAdD,oCAcC;AAED,+CAA+C;AAC/C,SAAgB,MAAM,CACrB,QAAgB,EAChB,MAAuB;IAEvB,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CACjC,CAAuB,IAAW,EAAkD,EAAE,CACrF,IAAI,mBAAmB,CAAC,IAAI,EAAE,YAAY,CAAC,EAC5C;QACC,QAAQ;QACR,UAAU,EAAE,MAAM;QAClB,CAAC,WAAW,CAAC,EAAE,IAAI;KACV,CACV,CAAC;IAEF,OAAO,YAAY,CAAC;AACrB,CAAC;AAfD,wBAeC"}
|
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.getSelectedFields(), alias, true), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: '
|
|
22
|
+
return new Proxy(new subquery_1.WithSubquery(qb.getSQL(), qb.getSelectedFields(), alias, true), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', 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;AAKrH,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,iBAAiB,EAAoB,EAAE,KAAK,EAAE,IAAI,CAAC,EACpF,IAAI,gCAAqB,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/pg-core/db.ts"],"names":[],"mappings":";;;AAEA,6DAAqH;AAKrH,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,iBAAiB,EAAoB,EAAE,KAAK,EAAE,IAAI,CAAC,EACpF,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,MAAuB;YACtC,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,MAAuB;QAC7B,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"}
|
|
@@ -105,7 +105,7 @@ class PgSelectQueryBuilder extends query_builder_1.QueryBuilder {
|
|
|
105
105
|
}
|
|
106
106
|
}
|
|
107
107
|
if (typeof on === 'function') {
|
|
108
|
-
on = on(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: '
|
|
108
|
+
on = on(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'sql', sqlBehavior: 'sql' })));
|
|
109
109
|
}
|
|
110
110
|
this.config.joins.push({ on, table, joinType, alias: tableName });
|
|
111
111
|
if (typeof tableName === 'string') {
|
|
@@ -184,7 +184,7 @@ class PgSelectQueryBuilder extends query_builder_1.QueryBuilder {
|
|
|
184
184
|
return rest;
|
|
185
185
|
}
|
|
186
186
|
as(alias) {
|
|
187
|
-
return new Proxy(new subquery_1.Subquery(this.getSQL(), this.config.fields, alias), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: '
|
|
187
|
+
return new Proxy(new subquery_1.Subquery(this.getSQL(), this.config.fields, alias), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'error' }));
|
|
188
188
|
}
|
|
189
189
|
}
|
|
190
190
|
exports.PgSelectQueryBuilder = PgSelectQueryBuilder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/pg-core/query-builders/select.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/pg-core/query-builders/select.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,7 +84,7 @@ function inArray(column, values) {
|
|
|
84
84
|
if (values.length === 0) {
|
|
85
85
|
throw new Error('inArray requires at least one value');
|
|
86
86
|
}
|
|
87
|
-
return (0, index_1.sql) `${column} in
|
|
87
|
+
return (0, index_1.sql) `${column} in ${values.map((v) => bindIfParam(v, column))}`;
|
|
88
88
|
}
|
|
89
89
|
return (0, index_1.sql) `${column} in ${bindIfParam(values, column)}`;
|
|
90
90
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conditions.js","sourceRoot":"","sources":["../../../src/sql/expressions/conditions.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"conditions.js","sourceRoot":"","sources":["../../../src/sql/expressions/conditions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { ColumnBaseConfig, ColumnHKTBase } from '../../column';
|
|
2
2
|
import type { ColumnBuilderBaseConfig, ColumnBuilderHKTBase, ColumnBuilderKind, MakeColumnConfig, UpdateCBConfig } from '../../column-builder';
|
|
3
3
|
import type { OnConflict } from '../utils';
|
|
4
|
-
import type { Assume } from '../../utils';
|
|
4
|
+
import type { Assume, Equal, Or } from '../../utils';
|
|
5
5
|
import type { AnySQLiteTable } from '../table';
|
|
6
6
|
import { SQLiteColumn, SQLiteColumnBuilder } from './common';
|
|
7
7
|
export interface PrimaryKeyConfig {
|
|
@@ -84,6 +84,6 @@ export declare class SQLiteTimestamp<T extends ColumnBaseConfig> extends SQLiteB
|
|
|
84
84
|
export interface IntegerConfig<TMode extends 'number' | 'timestamp' | 'timestamp_ms' = 'number' | 'timestamp' | 'timestamp_ms'> {
|
|
85
85
|
mode: TMode;
|
|
86
86
|
}
|
|
87
|
-
export declare function integer<TName extends string, TMode extends IntegerConfig['mode']
|
|
87
|
+
export declare function integer<TName extends string, TMode extends IntegerConfig['mode']>(name: TName, config?: IntegerConfig<TMode>): Or<Equal<TMode, 'timestamp'>, Equal<TMode, 'timestamp_ms'>> extends true ? SQLiteTimestampBuilderInitial<TName> : SQLiteIntegerBuilderInitial<TName>;
|
|
88
88
|
export declare const int: typeof integer;
|
|
89
89
|
//# sourceMappingURL=integer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integer.d.ts","sourceRoot":"","sources":["../../../src/sqlite-core/columns/integer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAChE,OAAO,KAAK,EACX,uBAAuB,EACvB,oBAAoB,EACpB,iBAAiB,EACjB,gBAAgB,EAChB,cAAc,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"integer.d.ts","sourceRoot":"","sources":["../../../src/sqlite-core/columns/integer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integer.js","sourceRoot":"","sources":["../../../src/sqlite-core/columns/integer.ts"],"names":[],"mappings":";;;AAQA,+BAA4B;AAI5B,qCAA6D;AAO7D,MAAsB,wBAIpB,SAAQ,4BAAyE;IAClF,YAAY,IAAe;QAC1B,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG,KAAK,CAAC;IACnC,CAAC;IAEQ,UAAU,CAClB,MAAyB;QAEzB,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,EAAE;YAC1B,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;SACjC;QACD,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;QAC9B,OAAO,KAAK,CAAC,UAAU,EAAoC,CAAC;IAC7D,CAAC;CAMD;AAxBD,4DAwBC;AAED,MAAsB,iBAIpB,SAAQ,qBAAkE;IAJ5E;;QAKU,kBAAa,GAAY,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;IAK7D,CAAC;IAHA,UAAU;QACT,OAAO,SAAS,CAAC;IAClB,CAAC;CACD;AAVD,8CAUC;AAmBD,MAAa,oBACZ,SAAQ,wBAAoD;IAE5D,KAAK,CACJ,KAA2C;QAE3C,OAAO,IAAI,aAAa,CAAkC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/E,CAAC;CACD;AARD,oDAQC;AAED,MAAa,aAA0C,SAAQ,iBAAsC;CAAG;AAAxG,sCAAwG;AAmBxG,MAAa,sBACZ,SAAQ,wBAA8F;IAEtG,YAAY,IAAe,EAAE,IAAkC;QAC9D,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACH,UAAU;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,IAAA,SAAG,EAAA,4DAA4D,CAAC,CAAC;IACtF,CAAC;IAED,KAAK,CACJ,KAA2C;QAE3C,OAAO,IAAI,eAAe,CACzB,KAAK,EACL,IAAI,CAAC,MAAM,CACX,CAAC;IACH,CAAC;CACD;AAzBD,wDAyBC;AAED,MAAa,eACZ,SAAQ,iBAAgF;IADzF;;QAGU,SAAI,GAAiC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAgBhE,CAAC;IAdS,kBAAkB,CAAC,KAAa;QACxC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE;YACrC,OAAO,IAAI,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;SAC9B;QACD,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IAEQ,gBAAgB,CAAC,KAAW;QACpC,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE;YACrC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;SAC/B;QACD,OAAO,IAAI,CAAC;IACb,CAAC;CACD;AAnBD,0CAmBC;
|
|
1
|
+
{"version":3,"file":"integer.js","sourceRoot":"","sources":["../../../src/sqlite-core/columns/integer.ts"],"names":[],"mappings":";;;AAQA,+BAA4B;AAI5B,qCAA6D;AAO7D,MAAsB,wBAIpB,SAAQ,4BAAyE;IAClF,YAAY,IAAe;QAC1B,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG,KAAK,CAAC;IACnC,CAAC;IAEQ,UAAU,CAClB,MAAyB;QAEzB,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,EAAE;YAC1B,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;SACjC;QACD,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;QAC9B,OAAO,KAAK,CAAC,UAAU,EAAoC,CAAC;IAC7D,CAAC;CAMD;AAxBD,4DAwBC;AAED,MAAsB,iBAIpB,SAAQ,qBAAkE;IAJ5E;;QAKU,kBAAa,GAAY,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;IAK7D,CAAC;IAHA,UAAU;QACT,OAAO,SAAS,CAAC;IAClB,CAAC;CACD;AAVD,8CAUC;AAmBD,MAAa,oBACZ,SAAQ,wBAAoD;IAE5D,KAAK,CACJ,KAA2C;QAE3C,OAAO,IAAI,aAAa,CAAkC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/E,CAAC;CACD;AARD,oDAQC;AAED,MAAa,aAA0C,SAAQ,iBAAsC;CAAG;AAAxG,sCAAwG;AAmBxG,MAAa,sBACZ,SAAQ,wBAA8F;IAEtG,YAAY,IAAe,EAAE,IAAkC;QAC9D,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACH,UAAU;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,IAAA,SAAG,EAAA,4DAA4D,CAAC,CAAC;IACtF,CAAC;IAED,KAAK,CACJ,KAA2C;QAE3C,OAAO,IAAI,eAAe,CACzB,KAAK,EACL,IAAI,CAAC,MAAM,CACX,CAAC;IACH,CAAC;CACD;AAzBD,wDAyBC;AAED,MAAa,eACZ,SAAQ,iBAAgF;IADzF;;QAGU,SAAI,GAAiC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAgBhE,CAAC;IAdS,kBAAkB,CAAC,KAAa;QACxC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE;YACrC,OAAO,IAAI,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;SAC9B;QACD,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;IAEQ,gBAAgB,CAAC,KAAW;QACpC,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;QAC7B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE;YACrC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;SAC/B;QACD,OAAO,IAAI,CAAC;IACb,CAAC;CACD;AAnBD,0CAmBC;AAaD,SAAgB,OAAO,CAAC,IAAY,EAAE,MAAsB;IAC3D,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,WAAW,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,cAAc,EAAE;QACpE,OAAO,IAAI,sBAAsB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;KACrD;IACD,OAAO,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC;AALD,0BAKC;AAEY,QAAA,GAAG,GAAG,OAAO,CAAC"}
|
package/sqlite-core/db.js
CHANGED
|
@@ -18,7 +18,7 @@ class BaseSQLiteDatabase {
|
|
|
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.getSelectedFields(), alias, true), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: '
|
|
21
|
+
return new Proxy(new subquery_1.WithSubquery(qb.getSQL(), qb.getSelectedFields(), alias, true), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'error' }));
|
|
22
22
|
},
|
|
23
23
|
};
|
|
24
24
|
}
|
package/sqlite-core/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/sqlite-core/db.ts"],"names":[],"mappings":";;;AAIA,iEAOsC;AAGtC,yCAAiE;AAIjE,MAAa,kBAAkB;IAC9B;IACC,gBAAgB;IACP,OAA4E;IACrF,gBAAgB;IACP,OAA+C;QAF/C,YAAO,GAAP,OAAO,CAAqE;QAE5E,YAAO,GAAP,OAAO,CAAwC;IACtD,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,iBAAiB,EAAoB,EAAE,KAAK,EAAE,IAAI,CAAC,EACpF,IAAI,gCAAqB,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/sqlite-core/db.ts"],"names":[],"mappings":";;;AAIA,iEAOsC;AAGtC,yCAAiE;AAIjE,MAAa,kBAAkB;IAC9B;IACC,gBAAgB;IACP,OAA4E;IACrF,gBAAgB;IACP,OAA+C;QAF/C,YAAO,GAAP,OAAO,CAAqE;QAE5E,YAAO,GAAP,OAAO,CAAwC;IACtD,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,iBAAiB,EAAoB,EAAE,KAAK,EAAE,IAAI,CAAC,EACpF,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;QAMlB,SAAS,MAAM,CAAC,MAAuB;YACtC,OAAO,IAAI,oCAAmB,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC1F,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,CAAC;IACnB,CAAC;IAMD,MAAM,CAAC,MAAuB;QAC7B,OAAO,IAAI,oCAAmB,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACjF,CAAC;IAED,MAAM,CAAgC,KAAa;QAClD,OAAO,IAAI,oCAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,CAAgC,IAAY;QACjD,OAAO,IAAI,oCAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,CAAgC,IAAY;QACjD,OAAO,IAAI,6BAAY,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;IAED,GAAG,CAAC,KAAiB;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,GAAG,CAA0B,KAAiB;QAC7C,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,GAAG,CAA0B,KAAiB;QAC7C,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAA8B,KAAiB;QACpD,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5C,CAAC;CACD;AA1ED,gDA0EC"}
|
|
@@ -102,7 +102,7 @@ class SQLiteSelectQueryBuilder extends query_builder_1.QueryBuilder {
|
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
104
|
if (typeof on === 'function') {
|
|
105
|
-
on = on(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: '
|
|
105
|
+
on = on(new Proxy(this.config.fields, new subquery_1.SelectionProxyHandler({ sqlAliasedBehavior: 'sql', sqlBehavior: 'sql' })));
|
|
106
106
|
}
|
|
107
107
|
this.config.joins.push({ on, table, joinType, alias: tableName });
|
|
108
108
|
if (typeof tableName === 'string') {
|
|
@@ -177,7 +177,7 @@ class SQLiteSelectQueryBuilder extends query_builder_1.QueryBuilder {
|
|
|
177
177
|
return rest;
|
|
178
178
|
}
|
|
179
179
|
as(alias) {
|
|
180
|
-
return new Proxy(new subquery_1.Subquery(this.getSQL(), this.config.fields, alias), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: '
|
|
180
|
+
return new Proxy(new subquery_1.Subquery(this.getSQL(), this.config.fields, alias), new subquery_1.SelectionProxyHandler({ alias, sqlAliasedBehavior: 'alias', sqlBehavior: 'error' }));
|
|
181
181
|
}
|
|
182
182
|
}
|
|
183
183
|
exports.SQLiteSelectQueryBuilder = SQLiteSelectQueryBuilder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/sqlite-core/query-builders/select.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../src/sqlite-core/query-builders/select.ts"],"names":[],"mappings":"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"}
|
package/subquery.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subquery.d.ts","sourceRoot":"","sources":["../src/subquery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAkB,MAAM,QAAQ,CAAC;AAE9C,eAAO,MAAM,cAAc,eAA2B,CAAC;AAEvD,qBAAa,QAAQ,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,EAAE,eAAe,GAAG,OAAO;IACtE,CAAC,EAAE;QACV,KAAK,EAAE,UAAU,CAAC;QAClB,cAAc,EAAE,eAAe,CAAC;QAChC,KAAK,EAAE,MAAM,CAAC;KACd,CAAC;gBAUU,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,OAAe;CAQzG;AAED,qBAAa,YAAY,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,EAAE,UAAU,GAAG,OAAO,CAAE,SAAQ,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;CAAG;AAEvH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,QAAQ,GAAG,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,IAAI,CAC9F,YAAW,YAAY,CAAC,QAAQ,GAAG,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC;IAE3E,OAAO,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"subquery.d.ts","sourceRoot":"","sources":["../src/subquery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAkB,MAAM,QAAQ,CAAC;AAE9C,eAAO,MAAM,cAAc,eAA2B,CAAC;AAEvD,qBAAa,QAAQ,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,EAAE,eAAe,GAAG,OAAO;IACtE,CAAC,EAAE;QACV,KAAK,EAAE,UAAU,CAAC;QAClB,cAAc,EAAE,eAAe,CAAC;QAChC,KAAK,EAAE,MAAM,CAAC;KACd,CAAC;gBAUU,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,OAAe;CAQzG;AAED,qBAAa,YAAY,CAAC,MAAM,SAAS,MAAM,GAAG,MAAM,EAAE,UAAU,GAAG,OAAO,CAAE,SAAQ,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;CAAG;AAEvH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,QAAQ,GAAG,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,IAAI,CAC9F,YAAW,YAAY,CAAC,QAAQ,GAAG,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC;IAE3E,OAAO,CAAC,MAAM,CAqBZ;gBAEU,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IAItD,GAAG,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,GAAG;CAiD3D"}
|
package/subquery.js
CHANGED
|
@@ -35,8 +35,8 @@ class SelectionProxyHandler {
|
|
|
35
35
|
: subquery;
|
|
36
36
|
const value = columns[prop];
|
|
37
37
|
if (value instanceof sql_1.SQL.Aliased) {
|
|
38
|
-
|
|
39
|
-
|
|
38
|
+
// Never return the underlying SQL expression for a field previously selected in a subquery
|
|
39
|
+
if (this.config.sqlAliasedBehavior === 'sql' && !value.isSelectionField) {
|
|
40
40
|
return value.sql;
|
|
41
41
|
}
|
|
42
42
|
const newValue = value.clone();
|
|
@@ -47,7 +47,7 @@ class SelectionProxyHandler {
|
|
|
47
47
|
if (this.config.sqlBehavior === 'sql') {
|
|
48
48
|
return value;
|
|
49
49
|
}
|
|
50
|
-
throw new Error(`You tried to reference "${prop}" field from a subquery, which is a raw SQL field, but it doesn't have an alias. Please add an alias to the field using ".as('alias')" method.`);
|
|
50
|
+
throw new Error(`You tried to reference "${prop}" field from a subquery, which is a raw SQL field, but it doesn't have an alias declared. Please add an alias to the field using ".as('alias')" method.`);
|
|
51
51
|
}
|
|
52
52
|
if (value instanceof column_1.Column) {
|
|
53
53
|
if (this.config.alias) {
|
package/subquery.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subquery.js","sourceRoot":"","sources":["../src/subquery.ts"],"names":[],"mappings":";;;AAAA,mCAA0E;AAE1E,qCAAkC;AAElC,+BAA4B;AAE5B,iCAA8C;AAEjC,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAEvD,MAAa,QAAQ;IAepB,YAAY,GAAQ,EAAE,SAA2C,EAAE,KAAa,EAAE,SAAkB,KAAK;QACxG,IAAI,CAAC,sBAAc,CAAC,GAAG;YACtB,GAAG;YACH,SAAS;YACT,KAAK;YACL,MAAM;SACN,CAAC;IACH,CAAC;CACD;AAvBD,4BAuBC;AAED,MAAa,YAAmE,SAAQ,QAA4B;CAAG;AAAvH,oCAAuH;AAEvH,MAAa,qBAAqB;
|
|
1
|
+
{"version":3,"file":"subquery.js","sourceRoot":"","sources":["../src/subquery.ts"],"names":[],"mappings":";;;AAAA,mCAA0E;AAE1E,qCAAkC;AAElC,+BAA4B;AAE5B,iCAA8C;AAEjC,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAEvD,MAAa,QAAQ;IAepB,YAAY,GAAQ,EAAE,SAA2C,EAAE,KAAa,EAAE,SAAkB,KAAK;QACxG,IAAI,CAAC,sBAAc,CAAC,GAAG;YACtB,GAAG;YACH,SAAS;YACT,KAAK;YACL,MAAM;SACN,CAAC;IACH,CAAC;CACD;AAvBD,4BAuBC;AAED,MAAa,YAAmE,SAAQ,QAA4B;CAAG;AAAvH,oCAAuH;AAEvH,MAAa,qBAAqB;IA0BjC,YAAY,MAA0C;QACrD,IAAI,CAAC,MAAM,qBAAQ,MAAM,CAAE,CAAC;IAC7B,CAAC;IAED,GAAG,CAAC,QAAW,EAAE,IAAqB,EAAE,QAAa;QACpD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAC7B,OAAO,QAAQ,CAAC,IAA6B,CAAC,CAAC;SAC/C;QAED,MAAM,OAAO,GAAG,QAAQ,YAAY,QAAQ;YAC3C,CAAC,CAAC,QAAQ,CAAC,sBAAc,CAAC,CAAC,SAAS;YACpC,CAAC,CAAC,QAAQ,YAAY,WAAI;gBAC1B,CAAC,CAAC,QAAQ,CAAC,qBAAc,CAAC,CAAC,cAAc;gBACzC,CAAC,CAAC,QAAQ,CAAC;QACZ,MAAM,KAAK,GAAY,OAAO,CAAC,IAA4B,CAAC,CAAC;QAE7D,IAAI,KAAK,YAAY,SAAG,CAAC,OAAO,EAAE;YACjC,2FAA2F;YAC3F,IAAI,IAAI,CAAC,MAAM,CAAC,kBAAkB,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE;gBACxE,OAAO,KAAK,CAAC,GAAG,CAAC;aACjB;YAED,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;YAC/B,QAAQ,CAAC,gBAAgB,GAAG,IAAI,CAAC;YACjC,OAAO,QAAQ,CAAC;SAChB;QAED,IAAI,KAAK,YAAY,SAAG,EAAE;YACzB,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,KAAK,KAAK,EAAE;gBACtC,OAAO,KAAK,CAAC;aACb;YAED,MAAM,IAAI,KAAK,CACd,2BAA2B,IAAI,yJAAyJ,CACxL,CAAC;SACF;QAED,IAAI,KAAK,YAAY,eAAM,EAAE;YAC5B,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACtB,OAAO,IAAI,KAAK,CACf,KAAK,EACL,IAAI,+BAAuB,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,8BAAsB,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAClG,CAAC;aACF;YACD,OAAO,KAAK,CAAC;SACb;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;YAChD,OAAO,KAAK,CAAC;SACb;QAED,OAAO,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACjE,CAAC;CACD;AA/ED,sDA+EC"}
|