litedbmodel 0.19.5 → 0.19.7
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 +2 -1
- package/dist/Column.d.ts +14 -10
- package/dist/Column.d.ts.map +1 -1
- package/dist/Column.js +32 -10
- package/dist/Column.js.map +1 -1
- package/dist/DBConditions.d.ts +4 -3
- package/dist/DBConditions.d.ts.map +1 -1
- package/dist/DBConditions.js +9 -8
- package/dist/DBConditions.js.map +1 -1
- package/dist/DBModel.d.ts +7 -1
- package/dist/DBModel.d.ts.map +1 -1
- package/dist/DBModel.js +53 -10
- package/dist/DBModel.js.map +1 -1
- package/dist/DBValues.d.ts +106 -1
- package/dist/DBValues.d.ts.map +1 -1
- package/dist/DBValues.js +145 -2
- package/dist/DBValues.js.map +1 -1
- package/dist/decorators.d.ts +29 -0
- package/dist/decorators.d.ts.map +1 -1
- package/dist/decorators.js +69 -2
- package/dist/decorators.js.map +1 -1
- package/dist/drivers/MysqlHelper.d.ts +14 -0
- package/dist/drivers/MysqlHelper.d.ts.map +1 -1
- package/dist/drivers/MysqlHelper.js +24 -0
- package/dist/drivers/MysqlHelper.js.map +1 -1
- package/dist/drivers/PostgresHelper.d.ts +14 -0
- package/dist/drivers/PostgresHelper.d.ts.map +1 -1
- package/dist/drivers/PostgresHelper.js +24 -0
- package/dist/drivers/PostgresHelper.js.map +1 -1
- package/dist/drivers/SqliteHelper.d.ts +15 -0
- package/dist/drivers/SqliteHelper.d.ts.map +1 -1
- package/dist/drivers/SqliteHelper.js +25 -0
- package/dist/drivers/SqliteHelper.js.map +1 -1
- package/dist/drivers/index.d.ts +27 -0
- package/dist/drivers/index.d.ts.map +1 -1
- package/dist/drivers/index.js +68 -0
- package/dist/drivers/index.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +10 -2
- package/dist/index.js.map +1 -1
- package/docs/api/README.md +1 -1
- package/docs/api/classes/Conditions.md +8 -8
- package/docs/api/classes/DBHandler.md +1 -1
- package/docs/api/classes/DBModel.md +84 -84
- package/docs/api/classes/LimitExceededError.md +1 -1
- package/docs/api/classes/Middleware.md +1 -1
- package/docs/api/classes/Values.md +6 -6
- package/docs/api/classes/WriteInReadOnlyContextError.md +1 -1
- package/docs/api/classes/WriteOutsideTransactionError.md +1 -1
- package/docs/api/functions/belongsTo.md +2 -2
- package/docs/api/functions/closeAllPools.md +1 -1
- package/docs/api/functions/createPostgresDriver.md +1 -1
- package/docs/api/functions/createSqliteDriver.md +1 -1
- package/docs/api/functions/dbCast.md +30 -0
- package/docs/api/functions/dbCastIn.md +26 -0
- package/docs/api/functions/dbDynamic.md +2 -2
- package/docs/api/functions/dbFalse.md +2 -2
- package/docs/api/functions/dbImmediate.md +2 -2
- package/docs/api/functions/dbIn.md +2 -2
- package/docs/api/functions/dbNotNull.md +2 -2
- package/docs/api/functions/dbNow.md +2 -2
- package/docs/api/functions/dbNull.md +2 -2
- package/docs/api/functions/dbRaw.md +2 -2
- package/docs/api/functions/dbTrue.md +2 -2
- package/docs/api/functions/dbUuid.md +33 -0
- package/docs/api/functions/dbUuidIn.md +32 -0
- package/docs/api/functions/getDBConfig.md +1 -1
- package/docs/api/functions/getDBHandler.md +1 -1
- package/docs/api/functions/getTransactionConnection.md +2 -2
- package/docs/api/functions/getTransactionContext.md +2 -2
- package/docs/api/functions/hasMany.md +2 -2
- package/docs/api/functions/hasOne.md +2 -2
- package/docs/api/functions/initDBHandler.md +1 -1
- package/docs/api/functions/model.md +4 -4
- package/docs/api/functions/parentRef.md +2 -2
- package/docs/api/globals.md +23 -17
- package/docs/api/interfaces/Column.md +40 -39
- package/docs/api/interfaces/ColumnOptions.md +4 -4
- package/docs/api/interfaces/DBConfig.md +1 -1
- package/docs/api/interfaces/DBConfigOptions.md +1 -1
- package/docs/api/interfaces/DeleteOptions.md +1 -1
- package/docs/api/interfaces/InsertOptions.md +1 -1
- package/docs/api/interfaces/LimitConfig.md +1 -1
- package/docs/api/interfaces/ModelOptions.md +1 -1
- package/docs/api/interfaces/PkeyResult.md +1 -1
- package/docs/api/interfaces/SelectOptions.md +1 -1
- package/docs/api/interfaces/TransactionOptions.md +1 -1
- package/docs/api/interfaces/UpdateManyOptions.md +1 -1
- package/docs/api/interfaces/UpdateOptions.md +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -198,7 +198,7 @@ Types are inferred from TypeScript property types:
|
|
|
198
198
|
| `columnName` | `string` | Database column name (defaults to property name) |
|
|
199
199
|
| `primaryKey` | `boolean` | Mark as part of primary key (for `getPkey()`) |
|
|
200
200
|
|
|
201
|
-
### Explicit Types (for arrays/JSON)
|
|
201
|
+
### Explicit Types (for arrays/JSON/UUID)
|
|
202
202
|
|
|
203
203
|
Use explicit type decorators when auto-inference isn't sufficient:
|
|
204
204
|
|
|
@@ -207,6 +207,7 @@ Use explicit type decorators when auto-inference isn't sufficient:
|
|
|
207
207
|
@column.datetime() updated_at?: Date; // DateTime with timezone
|
|
208
208
|
@column.boolean() is_active?: boolean; // Explicit boolean
|
|
209
209
|
@column.number() amount?: number; // Explicit number
|
|
210
|
+
@column.uuid() id?: string; // UUID with auto-casting (PostgreSQL)
|
|
210
211
|
@column.stringArray() tags?: string[]; // String array
|
|
211
212
|
@column.intArray() scores?: number[]; // Integer array
|
|
212
213
|
@column.numericArray() prices?: number[]; // Numeric/decimal array
|
package/dist/Column.d.ts
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
* await User.findAll({ [`${User.id} > ?`]: 10 });
|
|
18
18
|
* ```
|
|
19
19
|
*/
|
|
20
|
-
import { DBNotNullValue } from './DBValues';
|
|
20
|
+
import { DBNotNullValue, DBCast, DBCastArray } from './DBValues';
|
|
21
21
|
/**
|
|
22
22
|
* Sort direction for ORDER BY
|
|
23
23
|
* @internal
|
|
@@ -120,38 +120,40 @@ export interface Column<ValueType = unknown, ModelType = unknown> {
|
|
|
120
120
|
readonly modelName: string;
|
|
121
121
|
/** Brand for type discrimination - enables static analysis to distinguish from regular variables */
|
|
122
122
|
readonly _brand: 'Column';
|
|
123
|
+
/** SQL type for automatic casting in conditions (e.g., 'uuid') */
|
|
124
|
+
readonly sqlCast?: string;
|
|
123
125
|
/** Phantom type for model association (compile-time only, not used at runtime) */
|
|
124
126
|
readonly __model?: ModelType;
|
|
125
127
|
/**
|
|
126
128
|
* Equal condition (column = value)
|
|
127
129
|
* @example User.id.eq(1) → { id: 1 }
|
|
128
130
|
*/
|
|
129
|
-
eq(value: ValueType): Record<string, ValueType>;
|
|
131
|
+
eq(value: ValueType): Record<string, ValueType | DBCast>;
|
|
130
132
|
/**
|
|
131
133
|
* Not equal condition (column != value)
|
|
132
134
|
* @example User.status.ne('deleted') → { 'status != ?': 'deleted' }
|
|
133
135
|
*/
|
|
134
|
-
ne(value: ValueType): Record<string, ValueType>;
|
|
136
|
+
ne(value: ValueType): Record<string, ValueType | DBCast>;
|
|
135
137
|
/**
|
|
136
138
|
* Greater than condition (column > value)
|
|
137
139
|
* @example User.age.gt(18) → { 'age > ?': 18 }
|
|
138
140
|
*/
|
|
139
|
-
gt(value: ValueType): Record<string, ValueType>;
|
|
141
|
+
gt(value: ValueType): Record<string, ValueType | DBCast>;
|
|
140
142
|
/**
|
|
141
143
|
* Greater than or equal condition (column >= value)
|
|
142
144
|
* @example User.age.gte(18) → { 'age >= ?': 18 }
|
|
143
145
|
*/
|
|
144
|
-
gte(value: ValueType): Record<string, ValueType>;
|
|
146
|
+
gte(value: ValueType): Record<string, ValueType | DBCast>;
|
|
145
147
|
/**
|
|
146
148
|
* Less than condition (column < value)
|
|
147
149
|
* @example User.age.lt(65) → { 'age < ?': 65 }
|
|
148
150
|
*/
|
|
149
|
-
lt(value: ValueType): Record<string, ValueType>;
|
|
151
|
+
lt(value: ValueType): Record<string, ValueType | DBCast>;
|
|
150
152
|
/**
|
|
151
153
|
* Less than or equal condition (column <= value)
|
|
152
154
|
* @example User.age.lte(65) → { 'age <= ?': 65 }
|
|
153
155
|
*/
|
|
154
|
-
lte(value: ValueType): Record<string, ValueType>;
|
|
156
|
+
lte(value: ValueType): Record<string, ValueType | DBCast>;
|
|
155
157
|
/**
|
|
156
158
|
* LIKE condition (column LIKE pattern)
|
|
157
159
|
* @example User.name.like('%test%') → { 'name LIKE ?': '%test%' }
|
|
@@ -177,12 +179,12 @@ export interface Column<ValueType = unknown, ModelType = unknown> {
|
|
|
177
179
|
* Note: Arrays are automatically converted to IN clause by litedbmodel
|
|
178
180
|
* @example User.status.in(['active', 'pending']) → { status: ['active', 'pending'] }
|
|
179
181
|
*/
|
|
180
|
-
in(values: ValueType[]): Record<string, ValueType[]>;
|
|
182
|
+
in(values: ValueType[]): Record<string, ValueType[] | DBCastArray>;
|
|
181
183
|
/**
|
|
182
184
|
* NOT IN condition (column NOT IN (values))
|
|
183
185
|
* @example User.status.notIn(['deleted', 'banned'])
|
|
184
186
|
*/
|
|
185
|
-
notIn(values: ValueType[]): Record<string, ValueType[]>;
|
|
187
|
+
notIn(values: ValueType[]): Record<string, ValueType[] | DBCastArray>;
|
|
186
188
|
/**
|
|
187
189
|
* IS NULL condition
|
|
188
190
|
* @example User.deleted_at.isNull() → { deleted_at: null }
|
|
@@ -237,6 +239,8 @@ export interface Column<ValueType = unknown, ModelType = unknown> {
|
|
|
237
239
|
* @param columnName - The database column name
|
|
238
240
|
* @param tableName - The database table name
|
|
239
241
|
* @param modelName - The model class name (for debugging)
|
|
242
|
+
* @param propertyName - The property name on the model (defaults to columnName)
|
|
243
|
+
* @param sqlCast - SQL type for automatic casting in conditions (e.g., 'uuid')
|
|
240
244
|
* @returns A callable Column function with condition builder methods
|
|
241
245
|
*
|
|
242
246
|
* @example
|
|
@@ -252,7 +256,7 @@ export interface Column<ValueType = unknown, ModelType = unknown> {
|
|
|
252
256
|
*
|
|
253
257
|
* @internal
|
|
254
258
|
*/
|
|
255
|
-
export declare function createColumn<ValueType, ModelType = unknown>(columnName: string, tableName: string, modelName: string, propertyName?: string): Column<ValueType, ModelType>;
|
|
259
|
+
export declare function createColumn<ValueType, ModelType = unknown>(columnName: string, tableName: string, modelName: string, propertyName?: string, sqlCast?: string): Column<ValueType, ModelType>;
|
|
256
260
|
/**
|
|
257
261
|
* Type guard to check if a value is a Column instance.
|
|
258
262
|
*
|
package/dist/Column.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Column.d.ts","sourceRoot":"","sources":["../src/Column.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAAE,cAAc,EAAa,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"Column.d.ts","sourceRoot":"","sources":["../src/Column.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAAE,cAAc,EAAa,MAAM,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAM5E;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,MAAM,CAAC;AAE3C;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI,CAAC;AAEpD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,qBAAa,WAAW,CAAC,SAAS,GAAG,OAAO;IAKxC,+BAA+B;aACf,UAAU,EAAE,MAAM;IAClC,2CAA2C;aAC3B,SAAS,EAAE,MAAM;IACjC,qBAAqB;aACL,SAAS,EAAE,aAAa;IACxC,qBAAqB;aACL,KAAK,EAAE,aAAa;IAXtC,oCAAoC;IACpC,QAAQ,CAAC,MAAM,EAAG,aAAa,CAAU;;IAGvC,+BAA+B;IACf,UAAU,EAAE,MAAM;IAClC,2CAA2C;IAC3B,SAAS,EAAE,MAAM;IACjC,qBAAqB;IACL,SAAS,EAAE,aAAa;IACxC,qBAAqB;IACL,KAAK,GAAE,aAAoB;IAG7C;;OAEG;IACH,QAAQ,IAAI,MAAM;IAQlB,6DAA6D;IAC7D,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;CAC9B;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,WAAW,CAOlE;AAED;;;;GAIG;AACH,MAAM,MAAM,aAAa,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,CAAC,CAAC;AAEtD;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG,WAAW,EAAE,CAAC;AAEpD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAO9F;AAMD;;;;;;;;;GASG;AACH,MAAM,WAAW,MAAM,CAAC,SAAS,GAAG,OAAO,EAAE,SAAS,GAAG,OAAO;IAC9D,qEAAqE;IACrE,IAAI,MAAM,CAAC;IAEX,+BAA+B;IAC/B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAE5B,wEAAwE;IACxE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAE9B,8BAA8B;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,+DAA+D;IAC/D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B,oGAAoG;IACpG,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;IAE1B,kEAAkE;IAClE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAE1B,kFAAkF;IAClF,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC;IAM7B;;;OAGG;IACH,EAAE,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,CAAC;IAEzD;;;OAGG;IACH,EAAE,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,CAAC;IAEzD;;;OAGG;IACH,EAAE,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,CAAC;IAEzD;;;OAGG;IACH,GAAG,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,CAAC;IAE1D;;;OAGG;IACH,EAAE,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,CAAC;IAEzD;;;OAGG;IACH,GAAG,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,CAAC;IAE1D;;;OAGG;IACH,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE9C;;;OAGG;IACH,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEjD;;;OAGG;IACH,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAE/C;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;IAEhF;;;;OAIG;IACH,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC,CAAC;IAEnE;;;OAGG;IACH,KAAK,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,WAAW,CAAC,CAAC;IAEtE;;;OAGG;IACH,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAE/B;;;OAGG;IACH,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAM5C;;;OAGG;IACH,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;IAE9B;;;OAGG;IACH,IAAI,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;IAE/B;;;OAGG;IACH,aAAa,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;IAExC;;;OAGG;IACH,YAAY,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;IAEvC;;;OAGG;IACH,cAAc,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;IAEzC;;;OAGG;IACH,aAAa,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC;IAMxC;;;OAGG;IACH,QAAQ,IAAI,MAAM,CAAC;CACpB;AAMD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,EACzD,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,YAAY,CAAC,EAAE,MAAM,EACrB,OAAO,CAAC,EAAE,MAAM,GACf,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAyF9B;AAMD;;;;;;;;;;;GAWG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAMxD;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI;IACzB,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,QAAQ,GAC5C,KAAK,GACL,CAAC,SAAS,IAAI,MAAM,EAAE,GACpB,KAAK,GACL,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;CACzC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAE9E;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,QAAQ,CAAC,KAAK,IAAI,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAErD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAE1D;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qBAAa,MAAM,CAAC,KAAK;IACvB,OAAO,CAAC,KAAK,CAAqC;IAElD;;OAEG;gBACS,OAAO,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE;IAMzE;;OAEG;IACH,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI;IAKnE;;OAEG;IACH,KAAK,IAAI,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE;IAI1D;;OAEG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;CACF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,qBAAa,UAAU,CAAC,KAAK;IAC3B,OAAO,CAAC,KAAK,CAAqB;IAElC;;OAEG;gBACS,OAAO,CAAC,EAAE,KAAK;IAM3B;;OAEG;IACH,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI;IAKnE;;OAEG;IACH,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,IAAI;IAShD;;OAEG;IACH,EAAE,CAAC,GAAG,UAAU,EAAE,SAAS,KAAK,EAAE,GAAG,IAAI;IAKzC;;OAEG;IACH,KAAK,IAAI,KAAK;IAId;;OAEG;IACH,IAAI,MAAM,IAAI,MAAM,CAEnB;CACF;AAMD;;;;;;;;;;;;GAYG;AACH;;;;GAIG;AACH,MAAM,MAAM,EAAE,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IACvC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,QAAQ,CAAC,GAAG,KAAK,CAAC;AAEzF;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,MAAM,GAAG,CAAC,CAAC,SAAS,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI;KACxE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAChD,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,GAC5B,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,QAAQ,CAAC,GAC7C,KAAK,GACP,KAAK;CACV,CAAC;AAMF;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,IAAI,eAAiC,CAAC;AACnD,MAAM,MAAM,QAAQ,GAAG,OAAO,IAAI,CAAC;AAEnC;;;;;GAKG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE,GACvD,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAQzB;AAMD;;;;GAIG;AACH,MAAM,MAAM,IAAI,GACZ,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,OAAO,CAAC,GACpC,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,GAC1C,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,GAC1B,SAAS,CAAC,MAAM,CAAC,CAAC;AAEtB;;;;GAIG;AACH,KAAK,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAE1E;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,MAAM,MAAM,CAAC,CAAC,IAChB,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,GACjD,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,GACvD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,GAC1B,SAAS,CAAC,MAAM,CAAC,CAAC;AAEtB;;;;GAIG;AACH,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,SAAS,KAAK,EAAE,CAAC;CACvC;AAED;;;;GAIG;AACH,MAAM,WAAW,QAAQ,CAAC,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,SAAS,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;CAC5C;AAED;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,MAAM,GAAG,QAAQ,CAAC;AAEnD;;;;GAIG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC;AAElE;;;;GAIG;AACH,MAAM,MAAM,KAAK,GAAG,SAAS,WAAW,EAAE,CAAC;AAE3C;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI,SAAS,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;AAErD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,UAAU,EAAE,SAAS,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC,CAE9E;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,IAAI,IAAI,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAE/F;AAgCD;;;;GAIG;AACH,wBAAgB,aAAa,CAC3B,UAAU,EAAE,KAAK,GAChB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAqBzB"}
|
package/dist/Column.js
CHANGED
|
@@ -120,6 +120,8 @@ function orderToString(order) {
|
|
|
120
120
|
* @param columnName - The database column name
|
|
121
121
|
* @param tableName - The database table name
|
|
122
122
|
* @param modelName - The model class name (for debugging)
|
|
123
|
+
* @param propertyName - The property name on the model (defaults to columnName)
|
|
124
|
+
* @param sqlCast - SQL type for automatic casting in conditions (e.g., 'uuid')
|
|
123
125
|
* @returns A callable Column function with condition builder methods
|
|
124
126
|
*
|
|
125
127
|
* @example
|
|
@@ -135,7 +137,7 @@ function orderToString(order) {
|
|
|
135
137
|
*
|
|
136
138
|
* @internal
|
|
137
139
|
*/
|
|
138
|
-
function createColumn(columnName, tableName, modelName, propertyName) {
|
|
140
|
+
function createColumn(columnName, tableName, modelName, propertyName, sqlCast) {
|
|
139
141
|
// The callable function itself - returns column name as string
|
|
140
142
|
const fn = function () {
|
|
141
143
|
return columnName;
|
|
@@ -168,14 +170,36 @@ function createColumn(columnName, tableName, modelName, propertyName) {
|
|
|
168
170
|
writable: false,
|
|
169
171
|
enumerable: true,
|
|
170
172
|
});
|
|
173
|
+
Object.defineProperty(fn, 'sqlCast', {
|
|
174
|
+
value: sqlCast,
|
|
175
|
+
writable: false,
|
|
176
|
+
enumerable: true,
|
|
177
|
+
});
|
|
171
178
|
// __model is a phantom type - not set at runtime, only used for TypeScript type checking
|
|
172
|
-
// Condition builder methods
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
+
// Condition builder methods - wrap with DBCast if sqlCast is specified
|
|
180
|
+
if (sqlCast) {
|
|
181
|
+
// With type casting (e.g., UUID columns)
|
|
182
|
+
fn.eq = (value) => ({ [columnName]: new DBValues_1.DBCast(value, sqlCast, '=') });
|
|
183
|
+
fn.ne = (value) => ({ [columnName]: new DBValues_1.DBCast(value, sqlCast, '!=') });
|
|
184
|
+
fn.gt = (value) => ({ [columnName]: new DBValues_1.DBCast(value, sqlCast, '>') });
|
|
185
|
+
fn.gte = (value) => ({ [columnName]: new DBValues_1.DBCast(value, sqlCast, '>=') });
|
|
186
|
+
fn.lt = (value) => ({ [columnName]: new DBValues_1.DBCast(value, sqlCast, '<') });
|
|
187
|
+
fn.lte = (value) => ({ [columnName]: new DBValues_1.DBCast(value, sqlCast, '<=') });
|
|
188
|
+
fn.in = (values) => ({ [columnName]: new DBValues_1.DBCastArray(values, sqlCast) });
|
|
189
|
+
fn.notIn = (values) => ({ [`${columnName} NOT`]: new DBValues_1.DBCastArray(values, sqlCast) });
|
|
190
|
+
}
|
|
191
|
+
else {
|
|
192
|
+
// Without type casting (default behavior)
|
|
193
|
+
fn.eq = (value) => ({ [columnName]: value });
|
|
194
|
+
fn.ne = (value) => ({ [`${columnName} != ?`]: value });
|
|
195
|
+
fn.gt = (value) => ({ [`${columnName} > ?`]: value });
|
|
196
|
+
fn.gte = (value) => ({ [`${columnName} >= ?`]: value });
|
|
197
|
+
fn.lt = (value) => ({ [`${columnName} < ?`]: value });
|
|
198
|
+
fn.lte = (value) => ({ [`${columnName} <= ?`]: value });
|
|
199
|
+
fn.in = (values) => ({ [columnName]: values });
|
|
200
|
+
fn.notIn = (values) => ({ [`${columnName} NOT IN (?)`]: values });
|
|
201
|
+
}
|
|
202
|
+
// String operations - no sqlCast needed (always string comparison)
|
|
179
203
|
fn.like = (pattern) => ({ [`${columnName} LIKE ?`]: pattern });
|
|
180
204
|
fn.notLike = (pattern) => ({
|
|
181
205
|
[`${columnName} NOT LIKE ?`]: pattern,
|
|
@@ -184,8 +208,6 @@ function createColumn(columnName, tableName, modelName, propertyName) {
|
|
|
184
208
|
fn.between = (from, to) => ({
|
|
185
209
|
[`${columnName} BETWEEN ? AND ?`]: [from, to],
|
|
186
210
|
});
|
|
187
|
-
fn.in = (values) => ({ [columnName]: values });
|
|
188
|
-
fn.notIn = (values) => ({ [`${columnName} NOT IN (?)`]: values });
|
|
189
211
|
fn.isNull = () => ({ [columnName]: null });
|
|
190
212
|
fn.isNotNull = () => ({ [columnName]: new DBValues_1.DBNotNullValue() });
|
|
191
213
|
// Order by helpers - return OrderColumn for type safety
|
package/dist/Column.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Column.js","sourceRoot":"","sources":["../src/Column.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;GAkBG;;;AA0EH,sCAOC;AAoBD,sCAOC;
|
|
1
|
+
{"version":3,"file":"Column.js","sourceRoot":"","sources":["../src/Column.ts"],"names":[],"mappings":"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"}
|
package/dist/DBConditions.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* litedbmodel - Condition Builder
|
|
3
3
|
*/
|
|
4
|
-
import { DBToken } from './DBValues';
|
|
4
|
+
import { DBToken, type SqlCastFormatter } from './DBValues';
|
|
5
5
|
/** @internal */
|
|
6
6
|
export type ConditionValue = string | number | boolean | null | Date | unknown[] | DBToken | DBConditions;
|
|
7
7
|
/** @internal */
|
|
@@ -22,13 +22,14 @@ export declare class DBConditions {
|
|
|
22
22
|
/**
|
|
23
23
|
* Compile conditions to SQL WHERE clause
|
|
24
24
|
* @param params - Parameter array to append values
|
|
25
|
+
* @param formatter - Optional SQL cast formatter (for driver-specific casting)
|
|
25
26
|
* @returns SQL WHERE clause (without 'WHERE' keyword)
|
|
26
27
|
*/
|
|
27
|
-
compile(params: unknown[]): string;
|
|
28
|
+
compile(params: unknown[], formatter?: SqlCastFormatter): string;
|
|
28
29
|
/**
|
|
29
30
|
* Compile a single condition
|
|
30
31
|
*/
|
|
31
|
-
protected compileCondition(key: string, value: ConditionValue, params: unknown[]): string;
|
|
32
|
+
protected compileCondition(key: string, value: ConditionValue, params: unknown[], formatter?: SqlCastFormatter): string;
|
|
32
33
|
/**
|
|
33
34
|
* Compile custom operator condition
|
|
34
35
|
* Key already contains ? placeholders, just push params in order
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBConditions.d.ts","sourceRoot":"","sources":["../src/DBConditions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAwB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"DBConditions.d.ts","sourceRoot":"","sources":["../src/DBConditions.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAwB,KAAK,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAMlF,gBAAgB;AAChB,MAAM,MAAM,cAAc,GACtB,MAAM,GACN,MAAM,GACN,OAAO,GACP,IAAI,GACJ,IAAI,GACJ,OAAO,EAAE,GACT,OAAO,GACP,YAAY,CAAC;AAEjB,gBAAgB;AAChB,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;AAM7D,gBAAgB;AAChB,qBAAa,YAAY;IACvB,SAAS,CAAC,UAAU,EAAE,eAAe,CAAC;IACtC,SAAS,CAAC,QAAQ,EAAE,KAAK,GAAG,IAAI,CAAC;IACjC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC;QAAE,UAAU,EAAE,YAAY,CAAC;QAAC,QAAQ,EAAE,KAAK,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;gBAElE,UAAU,GAAE,eAAoB,EAAE,QAAQ,GAAE,KAAK,GAAG,IAAY;IAM5E;;OAEG;IACH,GAAG,CACD,UAAU,EAAE,YAAY,GAAG,eAAe,EAC1C,QAAQ,GAAE,KAAK,GAAG,IAAY,GAC7B,YAAY;IAUf;;;;;OAKG;IACH,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,SAAS,CAAC,EAAE,gBAAgB,GAAG,MAAM;IA4BhE;;OAEG;IACH,SAAS,CAAC,gBAAgB,CACxB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,cAAc,EACrB,MAAM,EAAE,OAAO,EAAE,EACjB,SAAS,CAAC,EAAE,gBAAgB,GAC3B,MAAM;IAyGT;;;OAGG;IACH,SAAS,CAAC,qBAAqB,CAC7B,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,cAAc,EACrB,MAAM,EAAE,OAAO,EAAE,GAChB,MAAM;IAcT;;OAEG;IACH,OAAO,IAAI,OAAO;IAMlB;;OAEG;IACH,aAAa,IAAI,eAAe;CAGjC;AAMD,gBAAgB;AAChB,qBAAa,cAAe,SAAQ,YAAY;gBAClC,UAAU,GAAE,eAAoB;CAG7C;AAMD;;;GAGG;AACH,wBAAgB,GAAG,CAAC,UAAU,EAAE,eAAe,GAAG,YAAY,CAE7D;AAED;;;GAGG;AACH,wBAAgB,EAAE,CAAC,UAAU,EAAE,eAAe,GAAG,cAAc,CAE9D;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,YAAY,GAAG,eAAe,GACzC,YAAY,CAKd"}
|
package/dist/DBConditions.js
CHANGED
|
@@ -37,20 +37,21 @@ class DBConditions {
|
|
|
37
37
|
/**
|
|
38
38
|
* Compile conditions to SQL WHERE clause
|
|
39
39
|
* @param params - Parameter array to append values
|
|
40
|
+
* @param formatter - Optional SQL cast formatter (for driver-specific casting)
|
|
40
41
|
* @returns SQL WHERE clause (without 'WHERE' keyword)
|
|
41
42
|
*/
|
|
42
|
-
compile(params) {
|
|
43
|
+
compile(params, formatter) {
|
|
43
44
|
const parts = [];
|
|
44
45
|
// Compile main conditions
|
|
45
46
|
for (const [key, value] of Object.entries(this.conditions)) {
|
|
46
|
-
const sql = this.compileCondition(key, value, params);
|
|
47
|
+
const sql = this.compileCondition(key, value, params, formatter);
|
|
47
48
|
if (sql) {
|
|
48
49
|
parts.push(sql);
|
|
49
50
|
}
|
|
50
51
|
}
|
|
51
52
|
// Compile nested conditions
|
|
52
53
|
for (const nested of this.nested) {
|
|
53
|
-
const nestedSql = nested.conditions.compile(params);
|
|
54
|
+
const nestedSql = nested.conditions.compile(params, formatter);
|
|
54
55
|
if (nestedSql) {
|
|
55
56
|
// Don't add operator here - it will be added by the join
|
|
56
57
|
parts.push(`(${nestedSql})`);
|
|
@@ -65,13 +66,13 @@ class DBConditions {
|
|
|
65
66
|
/**
|
|
66
67
|
* Compile a single condition
|
|
67
68
|
*/
|
|
68
|
-
compileCondition(key, value, params) {
|
|
69
|
+
compileCondition(key, value, params, formatter) {
|
|
69
70
|
// Handle __or__ special key for OR conditions
|
|
70
71
|
if (key === '__or__' && Array.isArray(value)) {
|
|
71
72
|
const orParts = [];
|
|
72
73
|
for (const group of value) {
|
|
73
74
|
const groupCond = new DBConditions(group, 'AND');
|
|
74
|
-
const groupSql = groupCond.compile(params);
|
|
75
|
+
const groupSql = groupCond.compile(params, formatter);
|
|
75
76
|
if (groupSql) {
|
|
76
77
|
orParts.push(`(${groupSql})`);
|
|
77
78
|
}
|
|
@@ -111,18 +112,18 @@ class DBConditions {
|
|
|
111
112
|
}
|
|
112
113
|
// Handle DBToken instances (must be before __ key skip to handle __tuple__)
|
|
113
114
|
if (value instanceof DBValues_1.DBToken) {
|
|
114
|
-
return value.compile(params, key);
|
|
115
|
+
return value.compile(params, key, formatter);
|
|
115
116
|
}
|
|
116
117
|
// Skip other nested conditions (keys starting with __)
|
|
117
118
|
if (key.startsWith('__')) {
|
|
118
119
|
if (value instanceof DBConditions) {
|
|
119
|
-
return `(${value.compile(params)})`;
|
|
120
|
+
return `(${value.compile(params, formatter)})`;
|
|
120
121
|
}
|
|
121
122
|
return '';
|
|
122
123
|
}
|
|
123
124
|
// Handle nested DBConditions
|
|
124
125
|
if (value instanceof DBConditions) {
|
|
125
|
-
return `(${value.compile(params)})`;
|
|
126
|
+
return `(${value.compile(params, formatter)})`;
|
|
126
127
|
}
|
|
127
128
|
// Handle null
|
|
128
129
|
if (value === null) {
|
package/dist/DBConditions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBConditions.js","sourceRoot":"","sources":["../src/DBConditions.ts"],"names":[],"mappings":";AAAA;;GAEG;;;
|
|
1
|
+
{"version":3,"file":"DBConditions.js","sourceRoot":"","sources":["../src/DBConditions.ts"],"names":[],"mappings":"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"}
|
package/dist/DBModel.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* litedbmodel - Base Model Class
|
|
3
3
|
*/
|
|
4
|
-
import { DBBoolValue, DBNullValue, DBNotNullValue, DBImmediateValue, DBSubquery, DBExists } from './DBValues';
|
|
4
|
+
import { DBBoolValue, DBNullValue, DBNotNullValue, DBImmediateValue, DBSubquery, DBExists, type SqlCastFormatter } from './DBValues';
|
|
5
5
|
import { type ConditionObject } from './DBConditions';
|
|
6
6
|
import { DBHandler, type DBConfig, type DBConnection } from './DBHandler';
|
|
7
7
|
import type { SelectOptions, InsertOptions, UpdateOptions, DeleteOptions, UpdateManyOptions, TransactionOptions, LimitConfig, DBConfigOptions, PkeyResult } from './types';
|
|
@@ -194,6 +194,12 @@ export declare abstract class DBModel {
|
|
|
194
194
|
* Returns 'postgres', 'mysql', or 'sqlite'.
|
|
195
195
|
*/
|
|
196
196
|
static getDriverType(): 'postgres' | 'mysql' | 'sqlite';
|
|
197
|
+
/**
|
|
198
|
+
* Get SQL cast formatter for the current driver.
|
|
199
|
+
* Returns undefined if DBHandler is not initialized (safe for tests).
|
|
200
|
+
* @internal
|
|
201
|
+
*/
|
|
202
|
+
protected static _getSqlCastFormatter(): SqlCastFormatter | undefined;
|
|
197
203
|
/**
|
|
198
204
|
* Get a DBHandler instance for this model.
|
|
199
205
|
* Connection priority:
|
package/dist/DBModel.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DBModel.d.ts","sourceRoot":"","sources":["../src/DBModel.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DBModel.d.ts","sourceRoot":"","sources":["../src/DBModel.ts"],"names":[],"mappings":"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"}
|
package/dist/DBModel.js
CHANGED
|
@@ -9,6 +9,7 @@ exports.getTransactionConnection = getTransactionConnection;
|
|
|
9
9
|
exports.getTransactionClient = getTransactionClient;
|
|
10
10
|
const async_hooks_1 = require("async_hooks");
|
|
11
11
|
const DBValues_1 = require("./DBValues");
|
|
12
|
+
const drivers_1 = require("./drivers");
|
|
12
13
|
const DBConditions_1 = require("./DBConditions");
|
|
13
14
|
const DBHandler_1 = require("./DBHandler");
|
|
14
15
|
const types_1 = require("./types");
|
|
@@ -246,6 +247,20 @@ class DBModel {
|
|
|
246
247
|
static getDriverType() {
|
|
247
248
|
return this.getHandler().getDriverType();
|
|
248
249
|
}
|
|
250
|
+
/**
|
|
251
|
+
* Get SQL cast formatter for the current driver.
|
|
252
|
+
* Returns undefined if DBHandler is not initialized (safe for tests).
|
|
253
|
+
* @internal
|
|
254
|
+
*/
|
|
255
|
+
static _getSqlCastFormatter() {
|
|
256
|
+
try {
|
|
257
|
+
return (0, drivers_1.getSqlCastFormatter)(this.getDriverType());
|
|
258
|
+
}
|
|
259
|
+
catch {
|
|
260
|
+
// DBHandler not initialized - return undefined (no casting)
|
|
261
|
+
return undefined;
|
|
262
|
+
}
|
|
263
|
+
}
|
|
249
264
|
/**
|
|
250
265
|
* Get a DBHandler instance for this model.
|
|
251
266
|
* Connection priority:
|
|
@@ -436,7 +451,9 @@ class DBModel {
|
|
|
436
451
|
const filterCondition = (0, Column_1.condsToRecord)(this.FIND_FILTER);
|
|
437
452
|
normalizedCond.add(filterCondition);
|
|
438
453
|
}
|
|
439
|
-
|
|
454
|
+
// Get formatter for driver-specific SQL type casting (safe for tests)
|
|
455
|
+
const formatter = this._getSqlCastFormatter();
|
|
456
|
+
const whereClause = normalizedCond.compile(params, formatter);
|
|
440
457
|
// Build CTE prefix
|
|
441
458
|
let sql = '';
|
|
442
459
|
// Custom CTE takes precedence
|
|
@@ -517,7 +534,9 @@ class DBModel {
|
|
|
517
534
|
params.push(...options.joinParams);
|
|
518
535
|
}
|
|
519
536
|
const normalizedCond = (0, DBConditions_1.normalizeConditions)(conditions);
|
|
520
|
-
|
|
537
|
+
// Get formatter for driver-specific SQL type casting (safe for tests)
|
|
538
|
+
const formatter = this._getSqlCastFormatter();
|
|
539
|
+
const whereClause = normalizedCond.compile(params, formatter);
|
|
521
540
|
// Build SQL
|
|
522
541
|
let sql = '';
|
|
523
542
|
// Custom CTE
|
|
@@ -627,7 +646,9 @@ class DBModel {
|
|
|
627
646
|
const filterCondition = (0, Column_1.condsToRecord)(this.FIND_FILTER);
|
|
628
647
|
normalizedCond.add(filterCondition);
|
|
629
648
|
}
|
|
630
|
-
|
|
649
|
+
// Get formatter for driver-specific SQL type casting (safe for tests)
|
|
650
|
+
const formatter = this._getSqlCastFormatter();
|
|
651
|
+
const whereClause = normalizedCond.compile(params, formatter);
|
|
631
652
|
// Build CTE prefix if query-based
|
|
632
653
|
let sql = '';
|
|
633
654
|
if (isQueryBased && this.QUERY) {
|
|
@@ -672,25 +693,35 @@ class DBModel {
|
|
|
672
693
|
const columns = Object.keys(records[0]).filter((k) => !(records[0][k] instanceof DBValues_1.DBImmediateValue && records[0][k].value === 'DEFAULT'));
|
|
673
694
|
const params = [];
|
|
674
695
|
const valueRows = [];
|
|
696
|
+
// Get sqlCast map and formatter for type casting in INSERT
|
|
697
|
+
const sqlCastMap = (0, decorators_1.getSqlCastMap)(this);
|
|
698
|
+
const formatter = this._getSqlCastFormatter();
|
|
675
699
|
for (const record of records) {
|
|
676
700
|
const rowValues = [];
|
|
677
701
|
for (const col of columns) {
|
|
678
702
|
const val = record[col];
|
|
679
703
|
if (val instanceof DBValues_1.DBToken) {
|
|
680
|
-
rowValues.push(val.compile(params));
|
|
704
|
+
rowValues.push(val.compile(params, undefined, formatter));
|
|
681
705
|
}
|
|
682
706
|
else if (val === undefined) {
|
|
683
707
|
rowValues.push('DEFAULT');
|
|
684
708
|
}
|
|
685
709
|
else {
|
|
686
710
|
params.push(val);
|
|
687
|
-
|
|
711
|
+
// Apply SQL type cast if defined
|
|
712
|
+
const sqlCast = sqlCastMap.get(col);
|
|
713
|
+
if (sqlCast && formatter) {
|
|
714
|
+
rowValues.push(formatter('?', sqlCast));
|
|
715
|
+
}
|
|
716
|
+
else {
|
|
717
|
+
rowValues.push('?');
|
|
718
|
+
}
|
|
688
719
|
}
|
|
689
720
|
}
|
|
690
721
|
valueRows.push(`(${rowValues.join(', ')})`);
|
|
691
722
|
}
|
|
692
|
-
const driverType = this.getDriverType();
|
|
693
723
|
// Handle conflict options with database-specific syntax
|
|
724
|
+
const driverType = this.getDriverType();
|
|
694
725
|
let sql;
|
|
695
726
|
if (options.onConflict) {
|
|
696
727
|
// Convert Column symbols to strings
|
|
@@ -769,21 +800,31 @@ class DBModel {
|
|
|
769
800
|
const params = [];
|
|
770
801
|
// Apply serialization based on column metadata
|
|
771
802
|
const serializedValues = (0, decorators_1.serializeRecord)(this, values);
|
|
803
|
+
// Get sqlCast map and formatter for type casting in UPDATE
|
|
804
|
+
const sqlCastMap = (0, decorators_1.getSqlCastMap)(this);
|
|
805
|
+
const formatter = this._getSqlCastFormatter();
|
|
772
806
|
const setClauses = [];
|
|
773
807
|
for (const [col, val] of Object.entries(serializedValues)) {
|
|
774
808
|
if (val instanceof DBValues_1.DBToken) {
|
|
775
|
-
setClauses.push(`${col} = ${val.compile(params)}`);
|
|
809
|
+
setClauses.push(`${col} = ${val.compile(params, undefined, formatter)}`);
|
|
776
810
|
}
|
|
777
811
|
else {
|
|
778
812
|
params.push(val);
|
|
779
|
-
|
|
813
|
+
// Apply SQL type cast if defined
|
|
814
|
+
const sqlCast = sqlCastMap.get(col);
|
|
815
|
+
if (sqlCast && formatter) {
|
|
816
|
+
setClauses.push(`${col} = ${formatter('?', sqlCast)}`);
|
|
817
|
+
}
|
|
818
|
+
else {
|
|
819
|
+
setClauses.push(`${col} = ?`);
|
|
820
|
+
}
|
|
780
821
|
}
|
|
781
822
|
}
|
|
782
823
|
if (setClauses.length === 0) {
|
|
783
824
|
return [];
|
|
784
825
|
}
|
|
785
826
|
const normalizedCond = (0, DBConditions_1.normalizeConditions)(conditions);
|
|
786
|
-
const whereClause = normalizedCond.compile(params);
|
|
827
|
+
const whereClause = normalizedCond.compile(params, formatter);
|
|
787
828
|
if (!whereClause) {
|
|
788
829
|
throw new Error('UPDATE requires conditions');
|
|
789
830
|
}
|
|
@@ -804,7 +845,9 @@ class DBModel {
|
|
|
804
845
|
const tableName = options.tableName || this.getUpdateTableName();
|
|
805
846
|
const params = [];
|
|
806
847
|
const normalizedCond = (0, DBConditions_1.normalizeConditions)(conditions);
|
|
807
|
-
|
|
848
|
+
// Get formatter for driver-specific SQL type casting (safe for tests)
|
|
849
|
+
const formatter = this._getSqlCastFormatter();
|
|
850
|
+
const whereClause = normalizedCond.compile(params, formatter);
|
|
808
851
|
if (!whereClause) {
|
|
809
852
|
throw new Error('DELETE requires conditions');
|
|
810
853
|
}
|