drizzle-orm 1.0.0-beta.1-fd8bfcc → 1.0.0-beta.1-17c242e

package/mysql-core/columns/time.d.ts

@@ -14,6 +14,7 @@ export declare class MySqlTime<T extends ColumnBaseConfig<'string time'>> extend
     static readonly [entityKind]: string;
     readonly fsp: number | undefined;
     getSQLType(): string;
+    mapFromDriverValue(value: Date | string): string;
 }
 export type TimeConfig = {
     fsp?: 0 | 1 | 2 | 3 | 4 | 5 | 6;

package/mysql-core/columns/time.js

@@ -19,6 +19,10 @@ class MySqlTime extends MySqlColumn {
     const precision = this.fsp === void 0 ? "" : `(${this.fsp})`;
     return `time${precision}`;
   }
+  mapFromDriverValue(value) {
+    if (typeof value === "string") return value;
+    return value.toTimeString().split(" ").shift();
+  }
 }
 function time(a, b) {
   const { name, config } = getColumnNameAndConfig(a, b);

package/mysql-core/columns/time.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/mysql-core/columns/time.ts"],"sourcesContent":["import type { ColumnBaseConfig } from '~/column.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport { getColumnNameAndConfig } from '~/utils.ts';\nimport { MySqlColumn, MySqlColumnBuilder } from './common.ts';\n\nexport class MySqlTimeBuilder extends MySqlColumnBuilder<\n\t{\n\t\tname: string;\n\t\tdataType: 'string time';\n\t\tdata: string;\n\t\tdriverParam: string | number;\n\t},\n\tTimeConfig\n> {\n\tstatic override readonly [entityKind]: string = 'MySqlTimeBuilder';\n\n\tconstructor(\n\t\tname: string,\n\t\tconfig: TimeConfig | undefined,\n\t) {\n\t\tsuper(name, 'string time', 'MySqlTime');\n\t\tthis.config.fsp = config?.fsp;\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlTime(table, this.config as any);\n\t}\n}\n\nexport class MySqlTime<\n\tT extends ColumnBaseConfig<'string time'>,\n> extends MySqlColumn<T, TimeConfig> {\n\tstatic override readonly [entityKind]: string = 'MySqlTime';\n\n\treadonly fsp: number | undefined = this.config.fsp;\n\n\tgetSQLType(): string {\n\t\tconst precision = this.fsp === undefined ? '' : `(${this.fsp})`;\n\t\treturn `time${precision}`;\n\t}\n}\n\nexport type TimeConfig = {\n\tfsp?: 0 | 1 | 2 | 3 | 4 | 5 | 6;\n};\n\nexport function time(\n\tconfig?: TimeConfig,\n): MySqlTimeBuilder;\nexport function time(\n\tname: string,\n\tconfig?: TimeConfig,\n): MySqlTimeBuilder;\nexport function time(a?: string | TimeConfig, b?: TimeConfig) {\n\tconst { name, config } = getColumnNameAndConfig<TimeConfig>(a, b);\n\treturn new MySqlTimeBuilder(name, config);\n}\n"],"mappings":"AACA,SAAS,kBAAkB;AAE3B,SAAS,8BAA8B;AACvC,SAAS,aAAa,0BAA0B;AAEzC,MAAM,yBAAyB,mBAQpC;AAAA,EACD,QAA0B,UAAU,IAAY;AAAA,EAEhD,YACC,MACA,QACC;AACD,UAAM,MAAM,eAAe,WAAW;AACtC,SAAK,OAAO,MAAM,QAAQ;AAAA,EAC3B;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI,UAAU,OAAO,KAAK,MAAa;AAAA,EAC/C;AACD;AAEO,MAAM,kBAEH,YAA2B;AAAA,EACpC,QAA0B,UAAU,IAAY;AAAA,EAEvC,MAA0B,KAAK,OAAO;AAAA,EAE/C,aAAqB;AACpB,UAAM,YAAY,KAAK,QAAQ,SAAY,KAAK,IAAI,KAAK,GAAG;AAC5D,WAAO,OAAO,SAAS;AAAA,EACxB;AACD;AAaO,SAAS,KAAK,GAAyB,GAAgB;AAC7D,QAAM,EAAE,MAAM,OAAO,IAAI,uBAAmC,GAAG,CAAC;AAChE,SAAO,IAAI,iBAAiB,MAAM,MAAM;AACzC;","names":[]}
+{"version":3,"sources":["../../../src/mysql-core/columns/time.ts"],"sourcesContent":["import type { ColumnBaseConfig } from '~/column.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport { getColumnNameAndConfig } from '~/utils.ts';\nimport { MySqlColumn, MySqlColumnBuilder } from './common.ts';\n\nexport class MySqlTimeBuilder extends MySqlColumnBuilder<\n\t{\n\t\tname: string;\n\t\tdataType: 'string time';\n\t\tdata: string;\n\t\tdriverParam: string | number;\n\t},\n\tTimeConfig\n> {\n\tstatic override readonly [entityKind]: string = 'MySqlTimeBuilder';\n\n\tconstructor(\n\t\tname: string,\n\t\tconfig: TimeConfig | undefined,\n\t) {\n\t\tsuper(name, 'string time', 'MySqlTime');\n\t\tthis.config.fsp = config?.fsp;\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlTime(table, this.config as any);\n\t}\n}\n\nexport class MySqlTime<\n\tT extends ColumnBaseConfig<'string time'>,\n> extends MySqlColumn<T, TimeConfig> {\n\tstatic override readonly [entityKind]: string = 'MySqlTime';\n\n\treadonly fsp: number | undefined = this.config.fsp;\n\n\tgetSQLType(): string {\n\t\tconst precision = this.fsp === undefined ? '' : `(${this.fsp})`;\n\t\treturn `time${precision}`;\n\t}\n\n\toverride mapFromDriverValue(value: Date | string): string {\n\t\tif (typeof value === 'string') return value;\n\n\t\treturn value.toTimeString().split(' ').shift()!;\n\t}\n}\n\nexport type TimeConfig = {\n\tfsp?: 0 | 1 | 2 | 3 | 4 | 5 | 6;\n};\n\nexport function time(\n\tconfig?: TimeConfig,\n): MySqlTimeBuilder;\nexport function time(\n\tname: string,\n\tconfig?: TimeConfig,\n): MySqlTimeBuilder;\nexport function time(a?: string | TimeConfig, b?: TimeConfig) {\n\tconst { name, config } = getColumnNameAndConfig<TimeConfig>(a, b);\n\treturn new MySqlTimeBuilder(name, config);\n}\n"],"mappings":"AACA,SAAS,kBAAkB;AAE3B,SAAS,8BAA8B;AACvC,SAAS,aAAa,0BAA0B;AAEzC,MAAM,yBAAyB,mBAQpC;AAAA,EACD,QAA0B,UAAU,IAAY;AAAA,EAEhD,YACC,MACA,QACC;AACD,UAAM,MAAM,eAAe,WAAW;AACtC,SAAK,OAAO,MAAM,QAAQ;AAAA,EAC3B;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI,UAAU,OAAO,KAAK,MAAa;AAAA,EAC/C;AACD;AAEO,MAAM,kBAEH,YAA2B;AAAA,EACpC,QAA0B,UAAU,IAAY;AAAA,EAEvC,MAA0B,KAAK,OAAO;AAAA,EAE/C,aAAqB;AACpB,UAAM,YAAY,KAAK,QAAQ,SAAY,KAAK,IAAI,KAAK,GAAG;AAC5D,WAAO,OAAO,SAAS;AAAA,EACxB;AAAA,EAES,mBAAmB,OAA8B;AACzD,QAAI,OAAO,UAAU,SAAU,QAAO;AAEtC,WAAO,MAAM,aAAa,EAAE,MAAM,GAAG,EAAE,MAAM;AAAA,EAC9C;AACD;AAaO,SAAS,KAAK,GAAyB,GAAgB;AAC7D,QAAM,EAAE,MAAM,OAAO,IAAI,uBAAmC,GAAG,CAAC;AAChE,SAAO,IAAI,iBAAiB,MAAM,MAAM;AACzC;","names":[]}

package/mysql-core/columns/timestamp.cjs

@@ -50,7 +50,8 @@ class MySqlTimestamp extends import_date_common.MySqlDateBaseColumn {
     return `timestamp${precision}`;
   }
   mapFromDriverValue(value) {
-    return /* @__PURE__ */ new Date(value + "+0000");
+    if (typeof value === "string") return /* @__PURE__ */ new Date(value + "+0000");
+    return value;
   }
   mapToDriverValue(value) {
     return value.toISOString().slice(0, -1).replace("T", " ");
@@ -77,6 +78,12 @@ class MySqlTimestampString extends import_date_common.MySqlDateBaseColumn {
     const precision = this.fsp === void 0 ? "" : `(${this.fsp})`;
     return `timestamp${precision}`;
   }
+  mapFromDriverValue(value) {
+    if (typeof value === "string") return value;
+    const shortened = value.toISOString().slice(0, -1).replace("T", " ");
+    if (shortened.endsWith(".000")) return shortened.slice(0, -4);
+    return shortened;
+  }
 }
 function timestamp(a, b = {}) {
   const { name, config } = (0, import_utils.getColumnNameAndConfig)(a, b);

package/mysql-core/columns/timestamp.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/mysql-core/columns/timestamp.ts"],"sourcesContent":["import type { ColumnBaseConfig } from '~/column.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport { type Equal, getColumnNameAndConfig } from '~/utils.ts';\nimport { MySqlDateBaseColumn, MySqlDateColumnBaseBuilder } from './date.common.ts';\n\nexport class MySqlTimestampBuilder extends MySqlDateColumnBaseBuilder<{\n\tname: string;\n\tdataType: 'object date';\n\tdata: Date;\n\tdriverParam: string | number;\n}, MySqlTimestampConfig> {\n\tstatic override readonly [entityKind]: string = 'MySqlTimestampBuilder';\n\n\tconstructor(name: string, config: MySqlTimestampConfig | undefined) {\n\t\tsuper(name, 'object date', 'MySqlTimestamp');\n\t\tthis.config.fsp = config?.fsp;\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlTimestamp(\n\t\t\ttable,\n\t\t\tthis.config as any,\n\t\t);\n\t}\n}\n\nexport class MySqlTimestamp<T extends ColumnBaseConfig<'object date'>>\n\textends MySqlDateBaseColumn<T, MySqlTimestampConfig>\n{\n\tstatic override readonly [entityKind]: string = 'MySqlTimestamp';\n\n\treadonly fsp: number | undefined = this.config.fsp;\n\n\tgetSQLType(): string {\n\t\tconst precision = this.fsp === undefined ? '' : `(${this.fsp})`;\n\t\treturn `timestamp${precision}`;\n\t}\n\n\toverride mapFromDriverValue(value: string): Date {\n\t\treturn new Date(value + '+0000');\n\t}\n\n\toverride mapToDriverValue(value: Date): string {\n\t\treturn value.toISOString().slice(0, -1).replace('T', ' ');\n\t}\n}\n\nexport class MySqlTimestampStringBuilder extends MySqlDateColumnBaseBuilder<{\n\tname: string;\n\tdataType: 'string timestamp';\n\tdata: string;\n\tdriverParam: string | number;\n}, MySqlTimestampConfig> {\n\tstatic override readonly [entityKind]: string = 'MySqlTimestampStringBuilder';\n\n\tconstructor(name: string, config: MySqlTimestampConfig | undefined) {\n\t\tsuper(name, 'string timestamp', 'MySqlTimestampString');\n\t\tthis.config.fsp = config?.fsp;\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlTimestampString(\n\t\t\ttable,\n\t\t\tthis.config as any,\n\t\t);\n\t}\n}\n\nexport class MySqlTimestampString<T extends ColumnBaseConfig<'string timestamp'>>\n\textends MySqlDateBaseColumn<T, MySqlTimestampConfig>\n{\n\tstatic override readonly [entityKind]: string = 'MySqlTimestampString';\n\n\treadonly fsp: number | undefined = this.config.fsp;\n\n\tgetSQLType(): string {\n\t\tconst precision = this.fsp === undefined ? '' : `(${this.fsp})`;\n\t\treturn `timestamp${precision}`;\n\t}\n}\n\nexport type TimestampFsp = 0 | 1 | 2 | 3 | 4 | 5 | 6;\n\nexport interface MySqlTimestampConfig<TMode extends 'string' | 'date' = 'string' | 'date'> {\n\tmode?: TMode;\n\tfsp?: TimestampFsp;\n}\n\nexport function timestamp<TMode extends MySqlTimestampConfig['mode'] & {}>(\n\tconfig?: MySqlTimestampConfig<TMode>,\n): Equal<TMode, 'string'> extends true ? MySqlTimestampStringBuilder\n\t: MySqlTimestampBuilder;\nexport function timestamp<TMode extends MySqlTimestampConfig['mode'] & {}>(\n\tname: string,\n\tconfig?: MySqlTimestampConfig<TMode>,\n): Equal<TMode, 'string'> extends true ? MySqlTimestampStringBuilder\n\t: MySqlTimestampBuilder;\nexport function timestamp(a?: string | MySqlTimestampConfig, b: MySqlTimestampConfig = {}) {\n\tconst { name, config } = getColumnNameAndConfig<MySqlTimestampConfig | undefined>(a, b);\n\tif (config?.mode === 'string') {\n\t\treturn new MySqlTimestampStringBuilder(name, config);\n\t}\n\treturn new MySqlTimestampBuilder(name, config);\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,oBAA2B;AAE3B,mBAAmD;AACnD,yBAAgE;AAEzD,MAAM,8BAA8B,8CAKlB;AAAA,EACxB,QAA0B,wBAAU,IAAY;AAAA,EAEhD,YAAY,MAAc,QAA0C;AACnE,UAAM,MAAM,eAAe,gBAAgB;AAC3C,SAAK,OAAO,MAAM,QAAQ;AAAA,EAC3B;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI;AAAA,MACV;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AACD;AAEO,MAAM,uBACJ,uCACT;AAAA,EACC,QAA0B,wBAAU,IAAY;AAAA,EAEvC,MAA0B,KAAK,OAAO;AAAA,EAE/C,aAAqB;AACpB,UAAM,YAAY,KAAK,QAAQ,SAAY,KAAK,IAAI,KAAK,GAAG;AAC5D,WAAO,YAAY,SAAS;AAAA,EAC7B;AAAA,EAES,mBAAmB,OAAqB;AAChD,WAAO,oBAAI,KAAK,QAAQ,OAAO;AAAA,EAChC;AAAA,EAES,iBAAiB,OAAqB;AAC9C,WAAO,MAAM,YAAY,EAAE,MAAM,GAAG,EAAE,EAAE,QAAQ,KAAK,GAAG;AAAA,EACzD;AACD;AAEO,MAAM,oCAAoC,8CAKxB;AAAA,EACxB,QAA0B,wBAAU,IAAY;AAAA,EAEhD,YAAY,MAAc,QAA0C;AACnE,UAAM,MAAM,oBAAoB,sBAAsB;AACtD,SAAK,OAAO,MAAM,QAAQ;AAAA,EAC3B;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI;AAAA,MACV;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AACD;AAEO,MAAM,6BACJ,uCACT;AAAA,EACC,QAA0B,wBAAU,IAAY;AAAA,EAEvC,MAA0B,KAAK,OAAO;AAAA,EAE/C,aAAqB;AACpB,UAAM,YAAY,KAAK,QAAQ,SAAY,KAAK,IAAI,KAAK,GAAG;AAC5D,WAAO,YAAY,SAAS;AAAA,EAC7B;AACD;AAkBO,SAAS,UAAU,GAAmC,IAA0B,CAAC,GAAG;AAC1F,QAAM,EAAE,MAAM,OAAO,QAAI,qCAAyD,GAAG,CAAC;AACtF,MAAI,QAAQ,SAAS,UAAU;AAC9B,WAAO,IAAI,4BAA4B,MAAM,MAAM;AAAA,EACpD;AACA,SAAO,IAAI,sBAAsB,MAAM,MAAM;AAC9C;","names":[]}
+{"version":3,"sources":["../../../src/mysql-core/columns/timestamp.ts"],"sourcesContent":["import type { ColumnBaseConfig } from '~/column.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport { type Equal, getColumnNameAndConfig } from '~/utils.ts';\nimport { MySqlDateBaseColumn, MySqlDateColumnBaseBuilder } from './date.common.ts';\n\nexport class MySqlTimestampBuilder extends MySqlDateColumnBaseBuilder<{\n\tname: string;\n\tdataType: 'object date';\n\tdata: Date;\n\tdriverParam: string | number;\n}, MySqlTimestampConfig> {\n\tstatic override readonly [entityKind]: string = 'MySqlTimestampBuilder';\n\n\tconstructor(name: string, config: MySqlTimestampConfig | undefined) {\n\t\tsuper(name, 'object date', 'MySqlTimestamp');\n\t\tthis.config.fsp = config?.fsp;\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlTimestamp(\n\t\t\ttable,\n\t\t\tthis.config as any,\n\t\t);\n\t}\n}\n\nexport class MySqlTimestamp<T extends ColumnBaseConfig<'object date'>>\n\textends MySqlDateBaseColumn<T, MySqlTimestampConfig>\n{\n\tstatic override readonly [entityKind]: string = 'MySqlTimestamp';\n\n\treadonly fsp: number | undefined = this.config.fsp;\n\n\tgetSQLType(): string {\n\t\tconst precision = this.fsp === undefined ? '' : `(${this.fsp})`;\n\t\treturn `timestamp${precision}`;\n\t}\n\n\toverride mapFromDriverValue(value: Date | string): Date {\n\t\tif (typeof value === 'string') return new Date(value + '+0000');\n\n\t\treturn value;\n\t}\n\n\toverride mapToDriverValue(value: Date): string {\n\t\treturn value.toISOString().slice(0, -1).replace('T', ' ');\n\t}\n}\n\nexport class MySqlTimestampStringBuilder extends MySqlDateColumnBaseBuilder<{\n\tname: string;\n\tdataType: 'string timestamp';\n\tdata: string;\n\tdriverParam: string | number;\n}, MySqlTimestampConfig> {\n\tstatic override readonly [entityKind]: string = 'MySqlTimestampStringBuilder';\n\n\tconstructor(name: string, config: MySqlTimestampConfig | undefined) {\n\t\tsuper(name, 'string timestamp', 'MySqlTimestampString');\n\t\tthis.config.fsp = config?.fsp;\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlTimestampString(\n\t\t\ttable,\n\t\t\tthis.config as any,\n\t\t);\n\t}\n}\n\nexport class MySqlTimestampString<T extends ColumnBaseConfig<'string timestamp'>>\n\textends MySqlDateBaseColumn<T, MySqlTimestampConfig>\n{\n\tstatic override readonly [entityKind]: string = 'MySqlTimestampString';\n\n\treadonly fsp: number | undefined = this.config.fsp;\n\n\tgetSQLType(): string {\n\t\tconst precision = this.fsp === undefined ? '' : `(${this.fsp})`;\n\t\treturn `timestamp${precision}`;\n\t}\n\n\toverride mapFromDriverValue(value: Date | string): string {\n\t\tif (typeof value === 'string') return value;\n\n\t\tconst shortened = value.toISOString().slice(0, -1).replace('T', ' ');\n\t\tif (shortened.endsWith('.000')) return shortened.slice(0, -4);\n\n\t\treturn shortened;\n\t}\n}\n\nexport type TimestampFsp = 0 | 1 | 2 | 3 | 4 | 5 | 6;\n\nexport interface MySqlTimestampConfig<TMode extends 'string' | 'date' = 'string' | 'date'> {\n\tmode?: TMode;\n\tfsp?: TimestampFsp;\n}\n\nexport function timestamp<TMode extends MySqlTimestampConfig['mode'] & {}>(\n\tconfig?: MySqlTimestampConfig<TMode>,\n): Equal<TMode, 'string'> extends true ? MySqlTimestampStringBuilder\n\t: MySqlTimestampBuilder;\nexport function timestamp<TMode extends MySqlTimestampConfig['mode'] & {}>(\n\tname: string,\n\tconfig?: MySqlTimestampConfig<TMode>,\n): Equal<TMode, 'string'> extends true ? MySqlTimestampStringBuilder\n\t: MySqlTimestampBuilder;\nexport function timestamp(a?: string | MySqlTimestampConfig, b: MySqlTimestampConfig = {}) {\n\tconst { name, config } = getColumnNameAndConfig<MySqlTimestampConfig | undefined>(a, b);\n\tif (config?.mode === 'string') {\n\t\treturn new MySqlTimestampStringBuilder(name, config);\n\t}\n\treturn new MySqlTimestampBuilder(name, config);\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,oBAA2B;AAE3B,mBAAmD;AACnD,yBAAgE;AAEzD,MAAM,8BAA8B,8CAKlB;AAAA,EACxB,QAA0B,wBAAU,IAAY;AAAA,EAEhD,YAAY,MAAc,QAA0C;AACnE,UAAM,MAAM,eAAe,gBAAgB;AAC3C,SAAK,OAAO,MAAM,QAAQ;AAAA,EAC3B;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI;AAAA,MACV;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AACD;AAEO,MAAM,uBACJ,uCACT;AAAA,EACC,QAA0B,wBAAU,IAAY;AAAA,EAEvC,MAA0B,KAAK,OAAO;AAAA,EAE/C,aAAqB;AACpB,UAAM,YAAY,KAAK,QAAQ,SAAY,KAAK,IAAI,KAAK,GAAG;AAC5D,WAAO,YAAY,SAAS;AAAA,EAC7B;AAAA,EAES,mBAAmB,OAA4B;AACvD,QAAI,OAAO,UAAU,SAAU,QAAO,oBAAI,KAAK,QAAQ,OAAO;AAE9D,WAAO;AAAA,EACR;AAAA,EAES,iBAAiB,OAAqB;AAC9C,WAAO,MAAM,YAAY,EAAE,MAAM,GAAG,EAAE,EAAE,QAAQ,KAAK,GAAG;AAAA,EACzD;AACD;AAEO,MAAM,oCAAoC,8CAKxB;AAAA,EACxB,QAA0B,wBAAU,IAAY;AAAA,EAEhD,YAAY,MAAc,QAA0C;AACnE,UAAM,MAAM,oBAAoB,sBAAsB;AACtD,SAAK,OAAO,MAAM,QAAQ;AAAA,EAC3B;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI;AAAA,MACV;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AACD;AAEO,MAAM,6BACJ,uCACT;AAAA,EACC,QAA0B,wBAAU,IAAY;AAAA,EAEvC,MAA0B,KAAK,OAAO;AAAA,EAE/C,aAAqB;AACpB,UAAM,YAAY,KAAK,QAAQ,SAAY,KAAK,IAAI,KAAK,GAAG;AAC5D,WAAO,YAAY,SAAS;AAAA,EAC7B;AAAA,EAES,mBAAmB,OAA8B;AACzD,QAAI,OAAO,UAAU,SAAU,QAAO;AAEtC,UAAM,YAAY,MAAM,YAAY,EAAE,MAAM,GAAG,EAAE,EAAE,QAAQ,KAAK,GAAG;AACnE,QAAI,UAAU,SAAS,MAAM,EAAG,QAAO,UAAU,MAAM,GAAG,EAAE;AAE5D,WAAO;AAAA,EACR;AACD;AAkBO,SAAS,UAAU,GAAmC,IAA0B,CAAC,GAAG;AAC1F,QAAM,EAAE,MAAM,OAAO,QAAI,qCAAyD,GAAG,CAAC;AACtF,MAAI,QAAQ,SAAS,UAAU;AAC9B,WAAO,IAAI,4BAA4B,MAAM,MAAM;AAAA,EACpD;AACA,SAAO,IAAI,sBAAsB,MAAM,MAAM;AAC9C;","names":[]}

package/mysql-core/columns/timestamp.d.cts

@@ -15,7 +15,7 @@ export declare class MySqlTimestamp<T extends ColumnBaseConfig<'object date'>> e
     static readonly [entityKind]: string;
     readonly fsp: number | undefined;
     getSQLType(): string;
-    mapFromDriverValue(value: string): Date;
+    mapFromDriverValue(value: Date | string): Date;
     mapToDriverValue(value: Date): string;
 }
 export declare class MySqlTimestampStringBuilder extends MySqlDateColumnBaseBuilder<{
@@ -31,6 +31,7 @@ export declare class MySqlTimestampString<T extends ColumnBaseConfig<'string tim
     static readonly [entityKind]: string;
     readonly fsp: number | undefined;
     getSQLType(): string;
+    mapFromDriverValue(value: Date | string): string;
 }
 export type TimestampFsp = 0 | 1 | 2 | 3 | 4 | 5 | 6;
 export interface MySqlTimestampConfig<TMode extends 'string' | 'date' = 'string' | 'date'> {

package/mysql-core/columns/timestamp.d.ts

@@ -15,7 +15,7 @@ export declare class MySqlTimestamp<T extends ColumnBaseConfig<'object date'>> e
     static readonly [entityKind]: string;
     readonly fsp: number | undefined;
     getSQLType(): string;
-    mapFromDriverValue(value: string): Date;
+    mapFromDriverValue(value: Date | string): Date;
     mapToDriverValue(value: Date): string;
 }
 export declare class MySqlTimestampStringBuilder extends MySqlDateColumnBaseBuilder<{
@@ -31,6 +31,7 @@ export declare class MySqlTimestampString<T extends ColumnBaseConfig<'string tim
     static readonly [entityKind]: string;
     readonly fsp: number | undefined;
     getSQLType(): string;
+    mapFromDriverValue(value: Date | string): string;
 }
 export type TimestampFsp = 0 | 1 | 2 | 3 | 4 | 5 | 6;
 export interface MySqlTimestampConfig<TMode extends 'string' | 'date' = 'string' | 'date'> {

package/mysql-core/columns/timestamp.js

@@ -23,7 +23,8 @@ class MySqlTimestamp extends MySqlDateBaseColumn {
     return `timestamp${precision}`;
   }
   mapFromDriverValue(value) {
-    return /* @__PURE__ */ new Date(value + "+0000");
+    if (typeof value === "string") return /* @__PURE__ */ new Date(value + "+0000");
+    return value;
   }
   mapToDriverValue(value) {
     return value.toISOString().slice(0, -1).replace("T", " ");
@@ -50,6 +51,12 @@ class MySqlTimestampString extends MySqlDateBaseColumn {
     const precision = this.fsp === void 0 ? "" : `(${this.fsp})`;
     return `timestamp${precision}`;
   }
+  mapFromDriverValue(value) {
+    if (typeof value === "string") return value;
+    const shortened = value.toISOString().slice(0, -1).replace("T", " ");
+    if (shortened.endsWith(".000")) return shortened.slice(0, -4);
+    return shortened;
+  }
 }
 function timestamp(a, b = {}) {
   const { name, config } = getColumnNameAndConfig(a, b);

package/mysql-core/columns/timestamp.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/mysql-core/columns/timestamp.ts"],"sourcesContent":["import type { ColumnBaseConfig } from '~/column.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport { type Equal, getColumnNameAndConfig } from '~/utils.ts';\nimport { MySqlDateBaseColumn, MySqlDateColumnBaseBuilder } from './date.common.ts';\n\nexport class MySqlTimestampBuilder extends MySqlDateColumnBaseBuilder<{\n\tname: string;\n\tdataType: 'object date';\n\tdata: Date;\n\tdriverParam: string | number;\n}, MySqlTimestampConfig> {\n\tstatic override readonly [entityKind]: string = 'MySqlTimestampBuilder';\n\n\tconstructor(name: string, config: MySqlTimestampConfig | undefined) {\n\t\tsuper(name, 'object date', 'MySqlTimestamp');\n\t\tthis.config.fsp = config?.fsp;\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlTimestamp(\n\t\t\ttable,\n\t\t\tthis.config as any,\n\t\t);\n\t}\n}\n\nexport class MySqlTimestamp<T extends ColumnBaseConfig<'object date'>>\n\textends MySqlDateBaseColumn<T, MySqlTimestampConfig>\n{\n\tstatic override readonly [entityKind]: string = 'MySqlTimestamp';\n\n\treadonly fsp: number | undefined = this.config.fsp;\n\n\tgetSQLType(): string {\n\t\tconst precision = this.fsp === undefined ? '' : `(${this.fsp})`;\n\t\treturn `timestamp${precision}`;\n\t}\n\n\toverride mapFromDriverValue(value: string): Date {\n\t\treturn new Date(value + '+0000');\n\t}\n\n\toverride mapToDriverValue(value: Date): string {\n\t\treturn value.toISOString().slice(0, -1).replace('T', ' ');\n\t}\n}\n\nexport class MySqlTimestampStringBuilder extends MySqlDateColumnBaseBuilder<{\n\tname: string;\n\tdataType: 'string timestamp';\n\tdata: string;\n\tdriverParam: string | number;\n}, MySqlTimestampConfig> {\n\tstatic override readonly [entityKind]: string = 'MySqlTimestampStringBuilder';\n\n\tconstructor(name: string, config: MySqlTimestampConfig | undefined) {\n\t\tsuper(name, 'string timestamp', 'MySqlTimestampString');\n\t\tthis.config.fsp = config?.fsp;\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlTimestampString(\n\t\t\ttable,\n\t\t\tthis.config as any,\n\t\t);\n\t}\n}\n\nexport class MySqlTimestampString<T extends ColumnBaseConfig<'string timestamp'>>\n\textends MySqlDateBaseColumn<T, MySqlTimestampConfig>\n{\n\tstatic override readonly [entityKind]: string = 'MySqlTimestampString';\n\n\treadonly fsp: number | undefined = this.config.fsp;\n\n\tgetSQLType(): string {\n\t\tconst precision = this.fsp === undefined ? '' : `(${this.fsp})`;\n\t\treturn `timestamp${precision}`;\n\t}\n}\n\nexport type TimestampFsp = 0 | 1 | 2 | 3 | 4 | 5 | 6;\n\nexport interface MySqlTimestampConfig<TMode extends 'string' | 'date' = 'string' | 'date'> {\n\tmode?: TMode;\n\tfsp?: TimestampFsp;\n}\n\nexport function timestamp<TMode extends MySqlTimestampConfig['mode'] & {}>(\n\tconfig?: MySqlTimestampConfig<TMode>,\n): Equal<TMode, 'string'> extends true ? MySqlTimestampStringBuilder\n\t: MySqlTimestampBuilder;\nexport function timestamp<TMode extends MySqlTimestampConfig['mode'] & {}>(\n\tname: string,\n\tconfig?: MySqlTimestampConfig<TMode>,\n): Equal<TMode, 'string'> extends true ? MySqlTimestampStringBuilder\n\t: MySqlTimestampBuilder;\nexport function timestamp(a?: string | MySqlTimestampConfig, b: MySqlTimestampConfig = {}) {\n\tconst { name, config } = getColumnNameAndConfig<MySqlTimestampConfig | undefined>(a, b);\n\tif (config?.mode === 'string') {\n\t\treturn new MySqlTimestampStringBuilder(name, config);\n\t}\n\treturn new MySqlTimestampBuilder(name, config);\n}\n"],"mappings":"AACA,SAAS,kBAAkB;AAE3B,SAAqB,8BAA8B;AACnD,SAAS,qBAAqB,kCAAkC;AAEzD,MAAM,8BAA8B,2BAKlB;AAAA,EACxB,QAA0B,UAAU,IAAY;AAAA,EAEhD,YAAY,MAAc,QAA0C;AACnE,UAAM,MAAM,eAAe,gBAAgB;AAC3C,SAAK,OAAO,MAAM,QAAQ;AAAA,EAC3B;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI;AAAA,MACV;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AACD;AAEO,MAAM,uBACJ,oBACT;AAAA,EACC,QAA0B,UAAU,IAAY;AAAA,EAEvC,MAA0B,KAAK,OAAO;AAAA,EAE/C,aAAqB;AACpB,UAAM,YAAY,KAAK,QAAQ,SAAY,KAAK,IAAI,KAAK,GAAG;AAC5D,WAAO,YAAY,SAAS;AAAA,EAC7B;AAAA,EAES,mBAAmB,OAAqB;AAChD,WAAO,oBAAI,KAAK,QAAQ,OAAO;AAAA,EAChC;AAAA,EAES,iBAAiB,OAAqB;AAC9C,WAAO,MAAM,YAAY,EAAE,MAAM,GAAG,EAAE,EAAE,QAAQ,KAAK,GAAG;AAAA,EACzD;AACD;AAEO,MAAM,oCAAoC,2BAKxB;AAAA,EACxB,QAA0B,UAAU,IAAY;AAAA,EAEhD,YAAY,MAAc,QAA0C;AACnE,UAAM,MAAM,oBAAoB,sBAAsB;AACtD,SAAK,OAAO,MAAM,QAAQ;AAAA,EAC3B;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI;AAAA,MACV;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AACD;AAEO,MAAM,6BACJ,oBACT;AAAA,EACC,QAA0B,UAAU,IAAY;AAAA,EAEvC,MAA0B,KAAK,OAAO;AAAA,EAE/C,aAAqB;AACpB,UAAM,YAAY,KAAK,QAAQ,SAAY,KAAK,IAAI,KAAK,GAAG;AAC5D,WAAO,YAAY,SAAS;AAAA,EAC7B;AACD;AAkBO,SAAS,UAAU,GAAmC,IAA0B,CAAC,GAAG;AAC1F,QAAM,EAAE,MAAM,OAAO,IAAI,uBAAyD,GAAG,CAAC;AACtF,MAAI,QAAQ,SAAS,UAAU;AAC9B,WAAO,IAAI,4BAA4B,MAAM,MAAM;AAAA,EACpD;AACA,SAAO,IAAI,sBAAsB,MAAM,MAAM;AAC9C;","names":[]}
+{"version":3,"sources":["../../../src/mysql-core/columns/timestamp.ts"],"sourcesContent":["import type { ColumnBaseConfig } from '~/column.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport { type Equal, getColumnNameAndConfig } from '~/utils.ts';\nimport { MySqlDateBaseColumn, MySqlDateColumnBaseBuilder } from './date.common.ts';\n\nexport class MySqlTimestampBuilder extends MySqlDateColumnBaseBuilder<{\n\tname: string;\n\tdataType: 'object date';\n\tdata: Date;\n\tdriverParam: string | number;\n}, MySqlTimestampConfig> {\n\tstatic override readonly [entityKind]: string = 'MySqlTimestampBuilder';\n\n\tconstructor(name: string, config: MySqlTimestampConfig | undefined) {\n\t\tsuper(name, 'object date', 'MySqlTimestamp');\n\t\tthis.config.fsp = config?.fsp;\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlTimestamp(\n\t\t\ttable,\n\t\t\tthis.config as any,\n\t\t);\n\t}\n}\n\nexport class MySqlTimestamp<T extends ColumnBaseConfig<'object date'>>\n\textends MySqlDateBaseColumn<T, MySqlTimestampConfig>\n{\n\tstatic override readonly [entityKind]: string = 'MySqlTimestamp';\n\n\treadonly fsp: number | undefined = this.config.fsp;\n\n\tgetSQLType(): string {\n\t\tconst precision = this.fsp === undefined ? '' : `(${this.fsp})`;\n\t\treturn `timestamp${precision}`;\n\t}\n\n\toverride mapFromDriverValue(value: Date | string): Date {\n\t\tif (typeof value === 'string') return new Date(value + '+0000');\n\n\t\treturn value;\n\t}\n\n\toverride mapToDriverValue(value: Date): string {\n\t\treturn value.toISOString().slice(0, -1).replace('T', ' ');\n\t}\n}\n\nexport class MySqlTimestampStringBuilder extends MySqlDateColumnBaseBuilder<{\n\tname: string;\n\tdataType: 'string timestamp';\n\tdata: string;\n\tdriverParam: string | number;\n}, MySqlTimestampConfig> {\n\tstatic override readonly [entityKind]: string = 'MySqlTimestampStringBuilder';\n\n\tconstructor(name: string, config: MySqlTimestampConfig | undefined) {\n\t\tsuper(name, 'string timestamp', 'MySqlTimestampString');\n\t\tthis.config.fsp = config?.fsp;\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlTimestampString(\n\t\t\ttable,\n\t\t\tthis.config as any,\n\t\t);\n\t}\n}\n\nexport class MySqlTimestampString<T extends ColumnBaseConfig<'string timestamp'>>\n\textends MySqlDateBaseColumn<T, MySqlTimestampConfig>\n{\n\tstatic override readonly [entityKind]: string = 'MySqlTimestampString';\n\n\treadonly fsp: number | undefined = this.config.fsp;\n\n\tgetSQLType(): string {\n\t\tconst precision = this.fsp === undefined ? '' : `(${this.fsp})`;\n\t\treturn `timestamp${precision}`;\n\t}\n\n\toverride mapFromDriverValue(value: Date | string): string {\n\t\tif (typeof value === 'string') return value;\n\n\t\tconst shortened = value.toISOString().slice(0, -1).replace('T', ' ');\n\t\tif (shortened.endsWith('.000')) return shortened.slice(0, -4);\n\n\t\treturn shortened;\n\t}\n}\n\nexport type TimestampFsp = 0 | 1 | 2 | 3 | 4 | 5 | 6;\n\nexport interface MySqlTimestampConfig<TMode extends 'string' | 'date' = 'string' | 'date'> {\n\tmode?: TMode;\n\tfsp?: TimestampFsp;\n}\n\nexport function timestamp<TMode extends MySqlTimestampConfig['mode'] & {}>(\n\tconfig?: MySqlTimestampConfig<TMode>,\n): Equal<TMode, 'string'> extends true ? MySqlTimestampStringBuilder\n\t: MySqlTimestampBuilder;\nexport function timestamp<TMode extends MySqlTimestampConfig['mode'] & {}>(\n\tname: string,\n\tconfig?: MySqlTimestampConfig<TMode>,\n): Equal<TMode, 'string'> extends true ? MySqlTimestampStringBuilder\n\t: MySqlTimestampBuilder;\nexport function timestamp(a?: string | MySqlTimestampConfig, b: MySqlTimestampConfig = {}) {\n\tconst { name, config } = getColumnNameAndConfig<MySqlTimestampConfig | undefined>(a, b);\n\tif (config?.mode === 'string') {\n\t\treturn new MySqlTimestampStringBuilder(name, config);\n\t}\n\treturn new MySqlTimestampBuilder(name, config);\n}\n"],"mappings":"AACA,SAAS,kBAAkB;AAE3B,SAAqB,8BAA8B;AACnD,SAAS,qBAAqB,kCAAkC;AAEzD,MAAM,8BAA8B,2BAKlB;AAAA,EACxB,QAA0B,UAAU,IAAY;AAAA,EAEhD,YAAY,MAAc,QAA0C;AACnE,UAAM,MAAM,eAAe,gBAAgB;AAC3C,SAAK,OAAO,MAAM,QAAQ;AAAA,EAC3B;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI;AAAA,MACV;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AACD;AAEO,MAAM,uBACJ,oBACT;AAAA,EACC,QAA0B,UAAU,IAAY;AAAA,EAEvC,MAA0B,KAAK,OAAO;AAAA,EAE/C,aAAqB;AACpB,UAAM,YAAY,KAAK,QAAQ,SAAY,KAAK,IAAI,KAAK,GAAG;AAC5D,WAAO,YAAY,SAAS;AAAA,EAC7B;AAAA,EAES,mBAAmB,OAA4B;AACvD,QAAI,OAAO,UAAU,SAAU,QAAO,oBAAI,KAAK,QAAQ,OAAO;AAE9D,WAAO;AAAA,EACR;AAAA,EAES,iBAAiB,OAAqB;AAC9C,WAAO,MAAM,YAAY,EAAE,MAAM,GAAG,EAAE,EAAE,QAAQ,KAAK,GAAG;AAAA,EACzD;AACD;AAEO,MAAM,oCAAoC,2BAKxB;AAAA,EACxB,QAA0B,UAAU,IAAY;AAAA,EAEhD,YAAY,MAAc,QAA0C;AACnE,UAAM,MAAM,oBAAoB,sBAAsB;AACtD,SAAK,OAAO,MAAM,QAAQ;AAAA,EAC3B;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI;AAAA,MACV;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AACD;AAEO,MAAM,6BACJ,oBACT;AAAA,EACC,QAA0B,UAAU,IAAY;AAAA,EAEvC,MAA0B,KAAK,OAAO;AAAA,EAE/C,aAAqB;AACpB,UAAM,YAAY,KAAK,QAAQ,SAAY,KAAK,IAAI,KAAK,GAAG;AAC5D,WAAO,YAAY,SAAS;AAAA,EAC7B;AAAA,EAES,mBAAmB,OAA8B;AACzD,QAAI,OAAO,UAAU,SAAU,QAAO;AAEtC,UAAM,YAAY,MAAM,YAAY,EAAE,MAAM,GAAG,EAAE,EAAE,QAAQ,KAAK,GAAG;AACnE,QAAI,UAAU,SAAS,MAAM,EAAG,QAAO,UAAU,MAAM,GAAG,EAAE;AAE5D,WAAO;AAAA,EACR;AACD;AAkBO,SAAS,UAAU,GAAmC,IAA0B,CAAC,GAAG;AAC1F,QAAM,EAAE,MAAM,OAAO,IAAI,uBAAyD,GAAG,CAAC;AACtF,MAAI,QAAQ,SAAS,UAAU;AAC9B,WAAO,IAAI,4BAA4B,MAAM,MAAM;AAAA,EACpD;AACA,SAAO,IAAI,sBAAsB,MAAM,MAAM;AAC9C;","names":[]}

package/mysql-core/columns/varchar.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/mysql-core/columns/varchar.ts"],"sourcesContent":["import type { ColumnBaseConfig } from '~/column.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport { type Equal, getColumnNameAndConfig, type Writable } from '~/utils.ts';\nimport { MySqlColumn, MySqlColumnBuilder } from './common.ts';\n\nexport class MySqlVarCharBuilder<\n\tTEnum extends [string, ...string[]],\n> extends MySqlColumnBuilder<{\n\tname: string;\n\tdataType: Equal<TEnum, [string, ...string[]]> extends true ? 'string text' : 'string enum';\n\tdata: TEnum[number];\n\tdriverParam: number | string;\n\tenumValues: TEnum;\n}, MySqlVarCharConfig<TEnum>> {\n\tstatic override readonly [entityKind]: string = 'MySqlVarCharBuilder';\n\n\t/** @internal */\n\tconstructor(name: string, config: MySqlVarCharConfig<TEnum>) {\n\t\tsuper(name, config.enum?.length ? 'string enum' : 'string text', 'MySqlVarChar');\n\t\tthis.config.length = config.length;\n\t\tthis.config.enum = config.enum;\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlVarChar(\n\t\t\ttable,\n\t\t\tthis.config as any,\n\t\t);\n\t}\n}\n\nexport class MySqlVarChar<\n\tT extends ColumnBaseConfig<'string' | 'string enum'> & { length: number },\n> extends MySqlColumn<T, MySqlVarCharConfig<T['enumValues']>> {\n\tstatic override readonly [entityKind]: string = 'MySqlVarChar';\n\n\toverride readonly enumValues = this.config.enum;\n\n\tgetSQLType(): string {\n\t\treturn `varchar(${this.length})`;\n\t}\n}\n\nexport interface MySqlVarCharConfig<\n\tTEnum extends string[] | readonly string[] | undefined = string[] | readonly string[] | undefined,\n> {\n\tenum?: TEnum;\n\tlength: number;\n}\n\nexport function varchar<U extends string, T extends Readonly<[U, ...U[]]>>(\n\tconfig: MySqlVarCharConfig<T | Writable<T>>,\n): MySqlVarCharBuilder<Writable<T>>;\nexport function varchar<\n\tU extends string,\n\tT extends Readonly<[U, ...U[]]>,\n>(\n\tname: string,\n\tconfig: MySqlVarCharConfig<T | Writable<T>>,\n): MySqlVarCharBuilder<Writable<T>>;\nexport function varchar(a?: string | MySqlVarCharConfig, b?: MySqlVarCharConfig): any {\n\tconst { name, config } = getColumnNameAndConfig<MySqlVarCharConfig>(a, b);\n\treturn new MySqlVarCharBuilder(name, config as any);\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,oBAA2B;AAE3B,mBAAkE;AAClE,oBAAgD;AAEzC,MAAM,4BAEH,iCAMoB;AAAA,EAC7B,QAA0B,wBAAU,IAAY;AAAA;AAAA,EAGhD,YAAY,MAAc,QAAmC;AAC5D,UAAM,MAAM,OAAO,MAAM,SAAS,gBAAgB,eAAe,cAAc;AAC/E,SAAK,OAAO,SAAS,OAAO;AAC5B,SAAK,OAAO,OAAO,OAAO;AAAA,EAC3B;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI;AAAA,MACV;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AACD;AAEO,MAAM,qBAEH,0BAAoD;AAAA,EAC7D,QAA0B,wBAAU,IAAY;AAAA,EAE9B,aAAa,KAAK,OAAO;AAAA,EAE3C,aAAqB;AACpB,WAAO,WAAW,KAAK,MAAM;AAAA,EAC9B;AACD;AAmBO,SAAS,QAAQ,GAAiC,GAA6B;AACrF,QAAM,EAAE,MAAM,OAAO,QAAI,qCAA2C,GAAG,CAAC;AACxE,SAAO,IAAI,oBAAoB,MAAM,MAAa;AACnD;","names":[]}
+{"version":3,"sources":["../../../src/mysql-core/columns/varchar.ts"],"sourcesContent":["import type { ColumnBaseConfig } from '~/column.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport { type Equal, getColumnNameAndConfig, type Writable } from '~/utils.ts';\nimport { MySqlColumn, MySqlColumnBuilder } from './common.ts';\n\nexport class MySqlVarCharBuilder<\n\tTEnum extends [string, ...string[]],\n> extends MySqlColumnBuilder<{\n\tname: string;\n\tdataType: Equal<TEnum, [string, ...string[]]> extends true ? 'string text' : 'string enum';\n\tdata: TEnum[number];\n\tdriverParam: number | string;\n\tenumValues: TEnum;\n}, MySqlVarCharConfig<TEnum>> {\n\tstatic override readonly [entityKind]: string = 'MySqlVarCharBuilder';\n\n\t/** @internal */\n\tconstructor(name: string, config: MySqlVarCharConfig<TEnum>) {\n\t\tsuper(name, config.enum?.length ? 'string enum' : 'string text', 'MySqlVarChar');\n\t\tthis.config.length = config.length;\n\t\tthis.config.enum = config.enum;\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlVarChar(\n\t\t\ttable,\n\t\t\tthis.config as any,\n\t\t);\n\t}\n}\n\nexport class MySqlVarChar<\n\tT extends ColumnBaseConfig<'string' | 'string enum'> & { length: number },\n> extends MySqlColumn<T, MySqlVarCharConfig<T['enumValues']>> {\n\tstatic override readonly [entityKind]: string = 'MySqlVarChar';\n\n\toverride readonly enumValues = this.config.enum;\n\n\tgetSQLType(): string {\n\t\treturn `varchar(${this.length})`;\n\t}\n}\n\nexport interface MySqlVarCharConfig<\n\tTEnum extends string[] | readonly string[] | undefined = string[] | readonly string[] | undefined,\n> {\n\tenum?: TEnum;\n\tlength: number;\n}\n\nexport function varchar<U extends string, T extends Readonly<[U, ...U[]]>>(\n\tconfig: MySqlVarCharConfig<T | Writable<T>>,\n): MySqlVarCharBuilder<Writable<T>>;\nexport function varchar<\n\tU extends string,\n\tT extends Readonly<[U, ...U[]]>,\n>(\n\tname: string,\n\tconfig: MySqlVarCharConfig<T | Writable<T>>,\n): MySqlVarCharBuilder<Writable<T>>;\nexport function varchar(a: string | MySqlVarCharConfig, b?: MySqlVarCharConfig): any {\n\tconst { name, config } = getColumnNameAndConfig<MySqlVarCharConfig>(a, b);\n\treturn new MySqlVarCharBuilder(name, config as any);\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,oBAA2B;AAE3B,mBAAkE;AAClE,oBAAgD;AAEzC,MAAM,4BAEH,iCAMoB;AAAA,EAC7B,QAA0B,wBAAU,IAAY;AAAA;AAAA,EAGhD,YAAY,MAAc,QAAmC;AAC5D,UAAM,MAAM,OAAO,MAAM,SAAS,gBAAgB,eAAe,cAAc;AAC/E,SAAK,OAAO,SAAS,OAAO;AAC5B,SAAK,OAAO,OAAO,OAAO;AAAA,EAC3B;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI;AAAA,MACV;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AACD;AAEO,MAAM,qBAEH,0BAAoD;AAAA,EAC7D,QAA0B,wBAAU,IAAY;AAAA,EAE9B,aAAa,KAAK,OAAO;AAAA,EAE3C,aAAqB;AACpB,WAAO,WAAW,KAAK,MAAM;AAAA,EAC9B;AACD;AAmBO,SAAS,QAAQ,GAAgC,GAA6B;AACpF,QAAM,EAAE,MAAM,OAAO,QAAI,qCAA2C,GAAG,CAAC;AACxE,SAAO,IAAI,oBAAoB,MAAM,MAAa;AACnD;","names":[]}

package/mysql-core/columns/varchar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/mysql-core/columns/varchar.ts"],"sourcesContent":["import type { ColumnBaseConfig } from '~/column.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport { type Equal, getColumnNameAndConfig, type Writable } from '~/utils.ts';\nimport { MySqlColumn, MySqlColumnBuilder } from './common.ts';\n\nexport class MySqlVarCharBuilder<\n\tTEnum extends [string, ...string[]],\n> extends MySqlColumnBuilder<{\n\tname: string;\n\tdataType: Equal<TEnum, [string, ...string[]]> extends true ? 'string text' : 'string enum';\n\tdata: TEnum[number];\n\tdriverParam: number | string;\n\tenumValues: TEnum;\n}, MySqlVarCharConfig<TEnum>> {\n\tstatic override readonly [entityKind]: string = 'MySqlVarCharBuilder';\n\n\t/** @internal */\n\tconstructor(name: string, config: MySqlVarCharConfig<TEnum>) {\n\t\tsuper(name, config.enum?.length ? 'string enum' : 'string text', 'MySqlVarChar');\n\t\tthis.config.length = config.length;\n\t\tthis.config.enum = config.enum;\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlVarChar(\n\t\t\ttable,\n\t\t\tthis.config as any,\n\t\t);\n\t}\n}\n\nexport class MySqlVarChar<\n\tT extends ColumnBaseConfig<'string' | 'string enum'> & { length: number },\n> extends MySqlColumn<T, MySqlVarCharConfig<T['enumValues']>> {\n\tstatic override readonly [entityKind]: string = 'MySqlVarChar';\n\n\toverride readonly enumValues = this.config.enum;\n\n\tgetSQLType(): string {\n\t\treturn `varchar(${this.length})`;\n\t}\n}\n\nexport interface MySqlVarCharConfig<\n\tTEnum extends string[] | readonly string[] | undefined = string[] | readonly string[] | undefined,\n> {\n\tenum?: TEnum;\n\tlength: number;\n}\n\nexport function varchar<U extends string, T extends Readonly<[U, ...U[]]>>(\n\tconfig: MySqlVarCharConfig<T | Writable<T>>,\n): MySqlVarCharBuilder<Writable<T>>;\nexport function varchar<\n\tU extends string,\n\tT extends Readonly<[U, ...U[]]>,\n>(\n\tname: string,\n\tconfig: MySqlVarCharConfig<T | Writable<T>>,\n): MySqlVarCharBuilder<Writable<T>>;\nexport function varchar(a?: string | MySqlVarCharConfig, b?: MySqlVarCharConfig): any {\n\tconst { name, config } = getColumnNameAndConfig<MySqlVarCharConfig>(a, b);\n\treturn new MySqlVarCharBuilder(name, config as any);\n}\n"],"mappings":"AACA,SAAS,kBAAkB;AAE3B,SAAqB,8BAA6C;AAClE,SAAS,aAAa,0BAA0B;AAEzC,MAAM,4BAEH,mBAMoB;AAAA,EAC7B,QAA0B,UAAU,IAAY;AAAA;AAAA,EAGhD,YAAY,MAAc,QAAmC;AAC5D,UAAM,MAAM,OAAO,MAAM,SAAS,gBAAgB,eAAe,cAAc;AAC/E,SAAK,OAAO,SAAS,OAAO;AAC5B,SAAK,OAAO,OAAO,OAAO;AAAA,EAC3B;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI;AAAA,MACV;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AACD;AAEO,MAAM,qBAEH,YAAoD;AAAA,EAC7D,QAA0B,UAAU,IAAY;AAAA,EAE9B,aAAa,KAAK,OAAO;AAAA,EAE3C,aAAqB;AACpB,WAAO,WAAW,KAAK,MAAM;AAAA,EAC9B;AACD;AAmBO,SAAS,QAAQ,GAAiC,GAA6B;AACrF,QAAM,EAAE,MAAM,OAAO,IAAI,uBAA2C,GAAG,CAAC;AACxE,SAAO,IAAI,oBAAoB,MAAM,MAAa;AACnD;","names":[]}
+{"version":3,"sources":["../../../src/mysql-core/columns/varchar.ts"],"sourcesContent":["import type { ColumnBaseConfig } from '~/column.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport { type Equal, getColumnNameAndConfig, type Writable } from '~/utils.ts';\nimport { MySqlColumn, MySqlColumnBuilder } from './common.ts';\n\nexport class MySqlVarCharBuilder<\n\tTEnum extends [string, ...string[]],\n> extends MySqlColumnBuilder<{\n\tname: string;\n\tdataType: Equal<TEnum, [string, ...string[]]> extends true ? 'string text' : 'string enum';\n\tdata: TEnum[number];\n\tdriverParam: number | string;\n\tenumValues: TEnum;\n}, MySqlVarCharConfig<TEnum>> {\n\tstatic override readonly [entityKind]: string = 'MySqlVarCharBuilder';\n\n\t/** @internal */\n\tconstructor(name: string, config: MySqlVarCharConfig<TEnum>) {\n\t\tsuper(name, config.enum?.length ? 'string enum' : 'string text', 'MySqlVarChar');\n\t\tthis.config.length = config.length;\n\t\tthis.config.enum = config.enum;\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlVarChar(\n\t\t\ttable,\n\t\t\tthis.config as any,\n\t\t);\n\t}\n}\n\nexport class MySqlVarChar<\n\tT extends ColumnBaseConfig<'string' | 'string enum'> & { length: number },\n> extends MySqlColumn<T, MySqlVarCharConfig<T['enumValues']>> {\n\tstatic override readonly [entityKind]: string = 'MySqlVarChar';\n\n\toverride readonly enumValues = this.config.enum;\n\n\tgetSQLType(): string {\n\t\treturn `varchar(${this.length})`;\n\t}\n}\n\nexport interface MySqlVarCharConfig<\n\tTEnum extends string[] | readonly string[] | undefined = string[] | readonly string[] | undefined,\n> {\n\tenum?: TEnum;\n\tlength: number;\n}\n\nexport function varchar<U extends string, T extends Readonly<[U, ...U[]]>>(\n\tconfig: MySqlVarCharConfig<T | Writable<T>>,\n): MySqlVarCharBuilder<Writable<T>>;\nexport function varchar<\n\tU extends string,\n\tT extends Readonly<[U, ...U[]]>,\n>(\n\tname: string,\n\tconfig: MySqlVarCharConfig<T | Writable<T>>,\n): MySqlVarCharBuilder<Writable<T>>;\nexport function varchar(a: string | MySqlVarCharConfig, b?: MySqlVarCharConfig): any {\n\tconst { name, config } = getColumnNameAndConfig<MySqlVarCharConfig>(a, b);\n\treturn new MySqlVarCharBuilder(name, config as any);\n}\n"],"mappings":"AACA,SAAS,kBAAkB;AAE3B,SAAqB,8BAA6C;AAClE,SAAS,aAAa,0BAA0B;AAEzC,MAAM,4BAEH,mBAMoB;AAAA,EAC7B,QAA0B,UAAU,IAAY;AAAA;AAAA,EAGhD,YAAY,MAAc,QAAmC;AAC5D,UAAM,MAAM,OAAO,MAAM,SAAS,gBAAgB,eAAe,cAAc;AAC/E,SAAK,OAAO,SAAS,OAAO;AAC5B,SAAK,OAAO,OAAO,OAAO;AAAA,EAC3B;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI;AAAA,MACV;AAAA,MACA,KAAK;AAAA,IACN;AAAA,EACD;AACD;AAEO,MAAM,qBAEH,YAAoD;AAAA,EAC7D,QAA0B,UAAU,IAAY;AAAA,EAE9B,aAAa,KAAK,OAAO;AAAA,EAE3C,aAAqB;AACpB,WAAO,WAAW,KAAK,MAAM;AAAA,EAC9B;AACD;AAmBO,SAAS,QAAQ,GAAgC,GAA6B;AACpF,QAAM,EAAE,MAAM,OAAO,IAAI,uBAA2C,GAAG,CAAC;AACxE,SAAO,IAAI,oBAAoB,MAAM,MAAa;AACnD;","names":[]}

package/mysql-core/columns/year.cjs

@@ -40,6 +40,10 @@ class MySqlYear extends import_common.MySqlColumn {
   getSQLType() {
     return `year`;
   }
+  mapFromDriverValue(value) {
+    if (typeof value === "number") return value;
+    return Number(value);
+  }
 }
 function year(name) {
   return new MySqlYearBuilder(name ?? "");

package/mysql-core/columns/year.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/mysql-core/columns/year.ts"],"sourcesContent":["import type { ColumnBaseConfig } from '~/column.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport { MySqlColumn, MySqlColumnBuilder } from './common.ts';\n\nexport class MySqlYearBuilder extends MySqlColumnBuilder<{\n\tname: string;\n\tdataType: 'number year';\n\tdata: number;\n\tdriverParam: number;\n}> {\n\tstatic override readonly [entityKind]: string = 'MySqlYearBuilder';\n\n\tconstructor(name: string) {\n\t\tsuper(name, 'number year', 'MySqlYear');\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlYear(table, this.config as any);\n\t}\n}\n\nexport class MySqlYear<\n\tT extends ColumnBaseConfig<'number year'>,\n> extends MySqlColumn<T> {\n\tstatic override readonly [entityKind]: string = 'MySqlYear';\n\n\tgetSQLType(): string {\n\t\treturn `year`;\n\t}\n}\n\nexport function year(name?: string): MySqlYearBuilder {\n\treturn new MySqlYearBuilder(name ?? '');\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,oBAA2B;AAE3B,oBAAgD;AAEzC,MAAM,yBAAyB,iCAKnC;AAAA,EACF,QAA0B,wBAAU,IAAY;AAAA,EAEhD,YAAY,MAAc;AACzB,UAAM,MAAM,eAAe,WAAW;AAAA,EACvC;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI,UAAU,OAAO,KAAK,MAAa;AAAA,EAC/C;AACD;AAEO,MAAM,kBAEH,0BAAe;AAAA,EACxB,QAA0B,wBAAU,IAAY;AAAA,EAEhD,aAAqB;AACpB,WAAO;AAAA,EACR;AACD;AAEO,SAAS,KAAK,MAAiC;AACrD,SAAO,IAAI,iBAAiB,QAAQ,EAAE;AACvC;","names":[]}
+{"version":3,"sources":["../../../src/mysql-core/columns/year.ts"],"sourcesContent":["import type { ColumnBaseConfig } from '~/column.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport { MySqlColumn, MySqlColumnBuilder } from './common.ts';\n\nexport class MySqlYearBuilder extends MySqlColumnBuilder<{\n\tname: string;\n\tdataType: 'number year';\n\tdata: number;\n\tdriverParam: number;\n}> {\n\tstatic override readonly [entityKind]: string = 'MySqlYearBuilder';\n\n\tconstructor(name: string) {\n\t\tsuper(name, 'number year', 'MySqlYear');\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlYear(table, this.config as any);\n\t}\n}\n\nexport class MySqlYear<\n\tT extends ColumnBaseConfig<'number year'>,\n> extends MySqlColumn<T> {\n\tstatic override readonly [entityKind]: string = 'MySqlYear';\n\n\tgetSQLType(): string {\n\t\treturn `year`;\n\t}\n\n\toverride mapFromDriverValue(value: number | string): number {\n\t\tif (typeof value === 'number') return value;\n\n\t\treturn Number(value);\n\t}\n}\n\nexport function year(name?: string): MySqlYearBuilder {\n\treturn new MySqlYearBuilder(name ?? '');\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,oBAA2B;AAE3B,oBAAgD;AAEzC,MAAM,yBAAyB,iCAKnC;AAAA,EACF,QAA0B,wBAAU,IAAY;AAAA,EAEhD,YAAY,MAAc;AACzB,UAAM,MAAM,eAAe,WAAW;AAAA,EACvC;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI,UAAU,OAAO,KAAK,MAAa;AAAA,EAC/C;AACD;AAEO,MAAM,kBAEH,0BAAe;AAAA,EACxB,QAA0B,wBAAU,IAAY;AAAA,EAEhD,aAAqB;AACpB,WAAO;AAAA,EACR;AAAA,EAES,mBAAmB,OAAgC;AAC3D,QAAI,OAAO,UAAU,SAAU,QAAO;AAEtC,WAAO,OAAO,KAAK;AAAA,EACpB;AACD;AAEO,SAAS,KAAK,MAAiC;AACrD,SAAO,IAAI,iBAAiB,QAAQ,EAAE;AACvC;","names":[]}

package/mysql-core/columns/year.d.cts

@@ -13,5 +13,6 @@ export declare class MySqlYearBuilder extends MySqlColumnBuilder<{
 export declare class MySqlYear<T extends ColumnBaseConfig<'number year'>> extends MySqlColumn<T> {
     static readonly [entityKind]: string;
     getSQLType(): string;
+    mapFromDriverValue(value: number | string): number;
 }
 export declare function year(name?: string): MySqlYearBuilder;

package/mysql-core/columns/year.d.ts

@@ -13,5 +13,6 @@ export declare class MySqlYearBuilder extends MySqlColumnBuilder<{
 export declare class MySqlYear<T extends ColumnBaseConfig<'number year'>> extends MySqlColumn<T> {
     static readonly [entityKind]: string;
     getSQLType(): string;
+    mapFromDriverValue(value: number | string): number;
 }
 export declare function year(name?: string): MySqlYearBuilder;

package/mysql-core/columns/year.js

@@ -15,6 +15,10 @@ class MySqlYear extends MySqlColumn {
   getSQLType() {
     return `year`;
   }
+  mapFromDriverValue(value) {
+    if (typeof value === "number") return value;
+    return Number(value);
+  }
 }
 function year(name) {
   return new MySqlYearBuilder(name ?? "");

package/mysql-core/columns/year.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/mysql-core/columns/year.ts"],"sourcesContent":["import type { ColumnBaseConfig } from '~/column.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport { MySqlColumn, MySqlColumnBuilder } from './common.ts';\n\nexport class MySqlYearBuilder extends MySqlColumnBuilder<{\n\tname: string;\n\tdataType: 'number year';\n\tdata: number;\n\tdriverParam: number;\n}> {\n\tstatic override readonly [entityKind]: string = 'MySqlYearBuilder';\n\n\tconstructor(name: string) {\n\t\tsuper(name, 'number year', 'MySqlYear');\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlYear(table, this.config as any);\n\t}\n}\n\nexport class MySqlYear<\n\tT extends ColumnBaseConfig<'number year'>,\n> extends MySqlColumn<T> {\n\tstatic override readonly [entityKind]: string = 'MySqlYear';\n\n\tgetSQLType(): string {\n\t\treturn `year`;\n\t}\n}\n\nexport function year(name?: string): MySqlYearBuilder {\n\treturn new MySqlYearBuilder(name ?? '');\n}\n"],"mappings":"AACA,SAAS,kBAAkB;AAE3B,SAAS,aAAa,0BAA0B;AAEzC,MAAM,yBAAyB,mBAKnC;AAAA,EACF,QAA0B,UAAU,IAAY;AAAA,EAEhD,YAAY,MAAc;AACzB,UAAM,MAAM,eAAe,WAAW;AAAA,EACvC;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI,UAAU,OAAO,KAAK,MAAa;AAAA,EAC/C;AACD;AAEO,MAAM,kBAEH,YAAe;AAAA,EACxB,QAA0B,UAAU,IAAY;AAAA,EAEhD,aAAqB;AACpB,WAAO;AAAA,EACR;AACD;AAEO,SAAS,KAAK,MAAiC;AACrD,SAAO,IAAI,iBAAiB,QAAQ,EAAE;AACvC;","names":[]}
+{"version":3,"sources":["../../../src/mysql-core/columns/year.ts"],"sourcesContent":["import type { ColumnBaseConfig } from '~/column.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { MySqlTable } from '~/mysql-core/table.ts';\nimport { MySqlColumn, MySqlColumnBuilder } from './common.ts';\n\nexport class MySqlYearBuilder extends MySqlColumnBuilder<{\n\tname: string;\n\tdataType: 'number year';\n\tdata: number;\n\tdriverParam: number;\n}> {\n\tstatic override readonly [entityKind]: string = 'MySqlYearBuilder';\n\n\tconstructor(name: string) {\n\t\tsuper(name, 'number year', 'MySqlYear');\n\t}\n\n\t/** @internal */\n\toverride build(table: MySqlTable) {\n\t\treturn new MySqlYear(table, this.config as any);\n\t}\n}\n\nexport class MySqlYear<\n\tT extends ColumnBaseConfig<'number year'>,\n> extends MySqlColumn<T> {\n\tstatic override readonly [entityKind]: string = 'MySqlYear';\n\n\tgetSQLType(): string {\n\t\treturn `year`;\n\t}\n\n\toverride mapFromDriverValue(value: number | string): number {\n\t\tif (typeof value === 'number') return value;\n\n\t\treturn Number(value);\n\t}\n}\n\nexport function year(name?: string): MySqlYearBuilder {\n\treturn new MySqlYearBuilder(name ?? '');\n}\n"],"mappings":"AACA,SAAS,kBAAkB;AAE3B,SAAS,aAAa,0BAA0B;AAEzC,MAAM,yBAAyB,mBAKnC;AAAA,EACF,QAA0B,UAAU,IAAY;AAAA,EAEhD,YAAY,MAAc;AACzB,UAAM,MAAM,eAAe,WAAW;AAAA,EACvC;AAAA;AAAA,EAGS,MAAM,OAAmB;AACjC,WAAO,IAAI,UAAU,OAAO,KAAK,MAAa;AAAA,EAC/C;AACD;AAEO,MAAM,kBAEH,YAAe;AAAA,EACxB,QAA0B,UAAU,IAAY;AAAA,EAEhD,aAAqB;AACpB,WAAO;AAAA,EACR;AAAA,EAES,mBAAmB,OAAgC;AAC3D,QAAI,OAAO,UAAU,SAAU,QAAO;AAEtC,WAAO,OAAO,KAAK;AAAA,EACpB;AACD;AAEO,SAAS,KAAK,MAAiC;AACrD,SAAO,IAAI,iBAAiB,QAAQ,EAAE;AACvC;","names":[]}

package/mysql-core/utils.cjs

@@ -26,7 +26,7 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_entity = require("../entity.cjs");
-var import__ = require("../index.cjs");
+var import_sql = require("../sql/sql.cjs");
 var import_subquery = require("../subquery.cjs");
 var import_table = require("../table.cjs");
 var import_view_common = require("../view-common.cjs");
@@ -44,7 +44,7 @@ function extractUsedTable(table) {
   if ((0, import_entity.is)(table, import_subquery.Subquery)) {
     return table._.usedTables ?? [];
   }
-  if ((0, import_entity.is)(table, import__.SQL)) {
+  if ((0, import_entity.is)(table, import_sql.SQL)) {
     return table.usedTables ?? [];
   }
   return [];

package/mysql-core/utils.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mysql-core/utils.ts"],"sourcesContent":["import { is } from '~/entity.ts';\nimport { SQL } from '~/index.ts';\nimport { Subquery } from '~/subquery.ts';\nimport { Table } from '~/table.ts';\nimport { ViewBaseConfig } from '~/view-common.ts';\nimport type { Check } from './checks.ts';\nimport { CheckBuilder } from './checks.ts';\nimport type { ForeignKey } from './foreign-keys.ts';\nimport { ForeignKeyBuilder } from './foreign-keys.ts';\nimport type { Index } from './indexes.ts';\nimport { IndexBuilder } from './indexes.ts';\nimport type { PrimaryKey } from './primary-keys.ts';\nimport { PrimaryKeyBuilder } from './primary-keys.ts';\nimport type { IndexForHint } from './query-builders/select.ts';\nimport { MySqlTable } from './table.ts';\nimport { type UniqueConstraint, UniqueConstraintBuilder } from './unique-constraint.ts';\nimport type { MySqlViewBase } from './view-base.ts';\nimport { MySqlViewConfig } from './view-common.ts';\nimport type { MySqlView } from './view.ts';\n\nexport function extractUsedTable(table: MySqlTable | Subquery | MySqlViewBase | SQL): string[] {\n\tif (is(table, MySqlTable)) {\n\t\treturn [`${table[Table.Symbol.BaseName]}`];\n\t}\n\tif (is(table, Subquery)) {\n\t\treturn table._.usedTables ?? [];\n\t}\n\tif (is(table, SQL)) {\n\t\treturn table.usedTables ?? [];\n\t}\n\treturn [];\n}\n\nexport function getTableConfig(table: MySqlTable) {\n\tconst columns = Object.values(table[MySqlTable.Symbol.Columns]);\n\tconst indexes: Index[] = [];\n\tconst checks: Check[] = [];\n\tconst primaryKeys: PrimaryKey[] = [];\n\tconst uniqueConstraints: UniqueConstraint[] = [];\n\tconst foreignKeys: ForeignKey[] = Object.values(table[MySqlTable.Symbol.InlineForeignKeys]);\n\tconst name = table[Table.Symbol.Name];\n\tconst schema = table[Table.Symbol.Schema];\n\tconst baseName = table[Table.Symbol.BaseName];\n\n\tconst extraConfigBuilder = table[MySqlTable.Symbol.ExtraConfigBuilder];\n\n\tif (extraConfigBuilder !== undefined) {\n\t\tconst extraConfig = extraConfigBuilder(table[MySqlTable.Symbol.Columns]);\n\t\tconst extraValues = Array.isArray(extraConfig) ? extraConfig.flat(1) as any[] : Object.values(extraConfig);\n\t\tfor (const builder of Object.values(extraValues)) {\n\t\t\tif (is(builder, IndexBuilder)) {\n\t\t\t\tindexes.push(builder.build(table));\n\t\t\t} else if (is(builder, CheckBuilder)) {\n\t\t\t\tchecks.push(builder.build(table));\n\t\t\t} else if (is(builder, UniqueConstraintBuilder)) {\n\t\t\t\tuniqueConstraints.push(builder.build(table));\n\t\t\t} else if (is(builder, PrimaryKeyBuilder)) {\n\t\t\t\tprimaryKeys.push(builder.build(table));\n\t\t\t} else if (is(builder, ForeignKeyBuilder)) {\n\t\t\t\tforeignKeys.push(builder.build(table));\n\t\t\t}\n\t\t}\n\t}\n\n\treturn {\n\t\tcolumns,\n\t\tindexes,\n\t\tforeignKeys,\n\t\tchecks,\n\t\tprimaryKeys,\n\t\tuniqueConstraints,\n\t\tname,\n\t\tschema,\n\t\tbaseName,\n\t};\n}\n\nexport function getViewConfig<\n\tTName extends string = string,\n\tTExisting extends boolean = boolean,\n>(view: MySqlView<TName, TExisting>) {\n\treturn {\n\t\t...view[ViewBaseConfig],\n\t\t...view[MySqlViewConfig],\n\t};\n}\n\nexport function convertIndexToString(indexes: IndexForHint[]) {\n\treturn indexes.map((idx) => {\n\t\treturn typeof idx === 'object' ? idx.config.name : idx;\n\t});\n}\n\nexport function toArray<T>(value: T | T[]): T[] {\n\treturn Array.isArray(value) ? value : [value];\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAmB;AACnB,eAAoB;AACpB,sBAAyB;AACzB,mBAAsB;AACtB,yBAA+B;AAE/B,oBAA6B;AAE7B,0BAAkC;AAElC,qBAA6B;AAE7B,0BAAkC;AAElC,IAAAA,gBAA2B;AAC3B,+BAA+D;AAE/D,IAAAC,sBAAgC;AAGzB,SAAS,iBAAiB,OAA8D;AAC9F,UAAI,kBAAG,OAAO,wBAAU,GAAG;AAC1B,WAAO,CAAC,GAAG,MAAM,mBAAM,OAAO,QAAQ,CAAC,EAAE;AAAA,EAC1C;AACA,UAAI,kBAAG,OAAO,wBAAQ,GAAG;AACxB,WAAO,MAAM,EAAE,cAAc,CAAC;AAAA,EAC/B;AACA,UAAI,kBAAG,OAAO,YAAG,GAAG;AACnB,WAAO,MAAM,cAAc,CAAC;AAAA,EAC7B;AACA,SAAO,CAAC;AACT;AAEO,SAAS,eAAe,OAAmB;AACjD,QAAM,UAAU,OAAO,OAAO,MAAM,yBAAW,OAAO,OAAO,CAAC;AAC9D,QAAM,UAAmB,CAAC;AAC1B,QAAM,SAAkB,CAAC;AACzB,QAAM,cAA4B,CAAC;AACnC,QAAM,oBAAwC,CAAC;AAC/C,QAAM,cAA4B,OAAO,OAAO,MAAM,yBAAW,OAAO,iBAAiB,CAAC;AAC1F,QAAM,OAAO,MAAM,mBAAM,OAAO,IAAI;AACpC,QAAM,SAAS,MAAM,mBAAM,OAAO,MAAM;AACxC,QAAM,WAAW,MAAM,mBAAM,OAAO,QAAQ;AAE5C,QAAM,qBAAqB,MAAM,yBAAW,OAAO,kBAAkB;AAErE,MAAI,uBAAuB,QAAW;AACrC,UAAM,cAAc,mBAAmB,MAAM,yBAAW,OAAO,OAAO,CAAC;AACvE,UAAM,cAAc,MAAM,QAAQ,WAAW,IAAI,YAAY,KAAK,CAAC,IAAa,OAAO,OAAO,WAAW;AACzG,eAAW,WAAW,OAAO,OAAO,WAAW,GAAG;AACjD,cAAI,kBAAG,SAAS,2BAAY,GAAG;AAC9B,gBAAQ,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MAClC,eAAW,kBAAG,SAAS,0BAAY,GAAG;AACrC,eAAO,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MACjC,eAAW,kBAAG,SAAS,gDAAuB,GAAG;AAChD,0BAAkB,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MAC5C,eAAW,kBAAG,SAAS,qCAAiB,GAAG;AAC1C,oBAAY,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MACtC,eAAW,kBAAG,SAAS,qCAAiB,GAAG;AAC1C,oBAAY,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MACtC;AAAA,IACD;AAAA,EACD;AAEA,SAAO;AAAA,IACN;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACD;AACD;AAEO,SAAS,cAGd,MAAmC;AACpC,SAAO;AAAA,IACN,GAAG,KAAK,iCAAc;AAAA,IACtB,GAAG,KAAK,mCAAe;AAAA,EACxB;AACD;AAEO,SAAS,qBAAqB,SAAyB;AAC7D,SAAO,QAAQ,IAAI,CAAC,QAAQ;AAC3B,WAAO,OAAO,QAAQ,WAAW,IAAI,OAAO,OAAO;AAAA,EACpD,CAAC;AACF;AAEO,SAAS,QAAW,OAAqB;AAC/C,SAAO,MAAM,QAAQ,KAAK,IAAI,QAAQ,CAAC,KAAK;AAC7C;","names":["import_table","import_view_common"]}
+{"version":3,"sources":["../../src/mysql-core/utils.ts"],"sourcesContent":["import { is } from '~/entity.ts';\nimport { SQL } from '~/sql/sql.ts';\nimport { Subquery } from '~/subquery.ts';\nimport { Table } from '~/table.ts';\nimport { ViewBaseConfig } from '~/view-common.ts';\nimport type { Check } from './checks.ts';\nimport { CheckBuilder } from './checks.ts';\nimport type { ForeignKey } from './foreign-keys.ts';\nimport { ForeignKeyBuilder } from './foreign-keys.ts';\nimport type { Index } from './indexes.ts';\nimport { IndexBuilder } from './indexes.ts';\nimport type { PrimaryKey } from './primary-keys.ts';\nimport { PrimaryKeyBuilder } from './primary-keys.ts';\nimport type { IndexForHint } from './query-builders/select.ts';\nimport { MySqlTable } from './table.ts';\nimport { type UniqueConstraint, UniqueConstraintBuilder } from './unique-constraint.ts';\nimport type { MySqlViewBase } from './view-base.ts';\nimport { MySqlViewConfig } from './view-common.ts';\nimport type { MySqlView } from './view.ts';\n\nexport function extractUsedTable(table: MySqlTable | Subquery | MySqlViewBase | SQL): string[] {\n\tif (is(table, MySqlTable)) {\n\t\treturn [`${table[Table.Symbol.BaseName]}`];\n\t}\n\tif (is(table, Subquery)) {\n\t\treturn table._.usedTables ?? [];\n\t}\n\tif (is(table, SQL)) {\n\t\treturn table.usedTables ?? [];\n\t}\n\treturn [];\n}\n\nexport function getTableConfig(table: MySqlTable) {\n\tconst columns = Object.values(table[MySqlTable.Symbol.Columns]);\n\tconst indexes: Index[] = [];\n\tconst checks: Check[] = [];\n\tconst primaryKeys: PrimaryKey[] = [];\n\tconst uniqueConstraints: UniqueConstraint[] = [];\n\tconst foreignKeys: ForeignKey[] = Object.values(table[MySqlTable.Symbol.InlineForeignKeys]);\n\tconst name = table[Table.Symbol.Name];\n\tconst schema = table[Table.Symbol.Schema];\n\tconst baseName = table[Table.Symbol.BaseName];\n\n\tconst extraConfigBuilder = table[MySqlTable.Symbol.ExtraConfigBuilder];\n\n\tif (extraConfigBuilder !== undefined) {\n\t\tconst extraConfig = extraConfigBuilder(table[MySqlTable.Symbol.Columns]);\n\t\tconst extraValues = Array.isArray(extraConfig) ? extraConfig.flat(1) as any[] : Object.values(extraConfig);\n\t\tfor (const builder of Object.values(extraValues)) {\n\t\t\tif (is(builder, IndexBuilder)) {\n\t\t\t\tindexes.push(builder.build(table));\n\t\t\t} else if (is(builder, CheckBuilder)) {\n\t\t\t\tchecks.push(builder.build(table));\n\t\t\t} else if (is(builder, UniqueConstraintBuilder)) {\n\t\t\t\tuniqueConstraints.push(builder.build(table));\n\t\t\t} else if (is(builder, PrimaryKeyBuilder)) {\n\t\t\t\tprimaryKeys.push(builder.build(table));\n\t\t\t} else if (is(builder, ForeignKeyBuilder)) {\n\t\t\t\tforeignKeys.push(builder.build(table));\n\t\t\t}\n\t\t}\n\t}\n\n\treturn {\n\t\tcolumns,\n\t\tindexes,\n\t\tforeignKeys,\n\t\tchecks,\n\t\tprimaryKeys,\n\t\tuniqueConstraints,\n\t\tname,\n\t\tschema,\n\t\tbaseName,\n\t};\n}\n\nexport function getViewConfig<\n\tTName extends string = string,\n\tTExisting extends boolean = boolean,\n>(view: MySqlView<TName, TExisting>) {\n\treturn {\n\t\t...view[ViewBaseConfig],\n\t\t...view[MySqlViewConfig],\n\t};\n}\n\nexport function convertIndexToString(indexes: IndexForHint[]) {\n\treturn indexes.map((idx) => {\n\t\treturn typeof idx === 'object' ? idx.config.name : idx;\n\t});\n}\n\nexport function toArray<T>(value: T | T[]): T[] {\n\treturn Array.isArray(value) ? value : [value];\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAmB;AACnB,iBAAoB;AACpB,sBAAyB;AACzB,mBAAsB;AACtB,yBAA+B;AAE/B,oBAA6B;AAE7B,0BAAkC;AAElC,qBAA6B;AAE7B,0BAAkC;AAElC,IAAAA,gBAA2B;AAC3B,+BAA+D;AAE/D,IAAAC,sBAAgC;AAGzB,SAAS,iBAAiB,OAA8D;AAC9F,UAAI,kBAAG,OAAO,wBAAU,GAAG;AAC1B,WAAO,CAAC,GAAG,MAAM,mBAAM,OAAO,QAAQ,CAAC,EAAE;AAAA,EAC1C;AACA,UAAI,kBAAG,OAAO,wBAAQ,GAAG;AACxB,WAAO,MAAM,EAAE,cAAc,CAAC;AAAA,EAC/B;AACA,UAAI,kBAAG,OAAO,cAAG,GAAG;AACnB,WAAO,MAAM,cAAc,CAAC;AAAA,EAC7B;AACA,SAAO,CAAC;AACT;AAEO,SAAS,eAAe,OAAmB;AACjD,QAAM,UAAU,OAAO,OAAO,MAAM,yBAAW,OAAO,OAAO,CAAC;AAC9D,QAAM,UAAmB,CAAC;AAC1B,QAAM,SAAkB,CAAC;AACzB,QAAM,cAA4B,CAAC;AACnC,QAAM,oBAAwC,CAAC;AAC/C,QAAM,cAA4B,OAAO,OAAO,MAAM,yBAAW,OAAO,iBAAiB,CAAC;AAC1F,QAAM,OAAO,MAAM,mBAAM,OAAO,IAAI;AACpC,QAAM,SAAS,MAAM,mBAAM,OAAO,MAAM;AACxC,QAAM,WAAW,MAAM,mBAAM,OAAO,QAAQ;AAE5C,QAAM,qBAAqB,MAAM,yBAAW,OAAO,kBAAkB;AAErE,MAAI,uBAAuB,QAAW;AACrC,UAAM,cAAc,mBAAmB,MAAM,yBAAW,OAAO,OAAO,CAAC;AACvE,UAAM,cAAc,MAAM,QAAQ,WAAW,IAAI,YAAY,KAAK,CAAC,IAAa,OAAO,OAAO,WAAW;AACzG,eAAW,WAAW,OAAO,OAAO,WAAW,GAAG;AACjD,cAAI,kBAAG,SAAS,2BAAY,GAAG;AAC9B,gBAAQ,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MAClC,eAAW,kBAAG,SAAS,0BAAY,GAAG;AACrC,eAAO,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MACjC,eAAW,kBAAG,SAAS,gDAAuB,GAAG;AAChD,0BAAkB,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MAC5C,eAAW,kBAAG,SAAS,qCAAiB,GAAG;AAC1C,oBAAY,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MACtC,eAAW,kBAAG,SAAS,qCAAiB,GAAG;AAC1C,oBAAY,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MACtC;AAAA,IACD;AAAA,EACD;AAEA,SAAO;AAAA,IACN;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACD;AACD;AAEO,SAAS,cAGd,MAAmC;AACpC,SAAO;AAAA,IACN,GAAG,KAAK,iCAAc;AAAA,IACtB,GAAG,KAAK,mCAAe;AAAA,EACxB;AACD;AAEO,SAAS,qBAAqB,SAAyB;AAC7D,SAAO,QAAQ,IAAI,CAAC,QAAQ;AAC3B,WAAO,OAAO,QAAQ,WAAW,IAAI,OAAO,OAAO;AAAA,EACpD,CAAC;AACF;AAEO,SAAS,QAAW,OAAqB;AAC/C,SAAO,MAAM,QAAQ,KAAK,IAAI,QAAQ,CAAC,KAAK;AAC7C;","names":["import_table","import_view_common"]}

package/mysql-core/utils.d.cts

@@ -1,4 +1,4 @@
-import { SQL } from "../index.cjs";
+import { SQL } from "../sql/sql.cjs";
 import { Subquery } from "../subquery.cjs";
 import type { Check } from "./checks.cjs";
 import type { ForeignKey } from "./foreign-keys.cjs";
@@ -28,7 +28,7 @@ export declare function getViewConfig<TName extends string = string, TExisting e
     name: TName;
     originalName: TName;
     schema: string | undefined;
-    selectedFields: import("../index.ts").ColumnsSelection;
+    selectedFields: import("../sql/sql.ts").ColumnsSelection;
     isExisting: TExisting;
     query: TExisting extends true ? undefined : SQL<unknown>;
     isAlias: boolean;

package/mysql-core/utils.d.ts

@@ -1,4 +1,4 @@
-import { SQL } from "../index.js";
+import { SQL } from "../sql/sql.js";
 import { Subquery } from "../subquery.js";
 import type { Check } from "./checks.js";
 import type { ForeignKey } from "./foreign-keys.js";
@@ -28,7 +28,7 @@ export declare function getViewConfig<TName extends string = string, TExisting e
     name: TName;
     originalName: TName;
     schema: string | undefined;
-    selectedFields: import("../index.js").ColumnsSelection;
+    selectedFields: import("../sql/sql.js").ColumnsSelection;
     isExisting: TExisting;
     query: TExisting extends true ? undefined : SQL<unknown>;
     isAlias: boolean;

package/mysql-core/utils.js

@@ -1,5 +1,5 @@
 import { is } from "../entity.js";
-import { SQL } from "../index.js";
+import { SQL } from "../sql/sql.js";
 import { Subquery } from "../subquery.js";
 import { Table } from "../table.js";
 import { ViewBaseConfig } from "../view-common.js";

package/mysql-core/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mysql-core/utils.ts"],"sourcesContent":["import { is } from '~/entity.ts';\nimport { SQL } from '~/index.ts';\nimport { Subquery } from '~/subquery.ts';\nimport { Table } from '~/table.ts';\nimport { ViewBaseConfig } from '~/view-common.ts';\nimport type { Check } from './checks.ts';\nimport { CheckBuilder } from './checks.ts';\nimport type { ForeignKey } from './foreign-keys.ts';\nimport { ForeignKeyBuilder } from './foreign-keys.ts';\nimport type { Index } from './indexes.ts';\nimport { IndexBuilder } from './indexes.ts';\nimport type { PrimaryKey } from './primary-keys.ts';\nimport { PrimaryKeyBuilder } from './primary-keys.ts';\nimport type { IndexForHint } from './query-builders/select.ts';\nimport { MySqlTable } from './table.ts';\nimport { type UniqueConstraint, UniqueConstraintBuilder } from './unique-constraint.ts';\nimport type { MySqlViewBase } from './view-base.ts';\nimport { MySqlViewConfig } from './view-common.ts';\nimport type { MySqlView } from './view.ts';\n\nexport function extractUsedTable(table: MySqlTable | Subquery | MySqlViewBase | SQL): string[] {\n\tif (is(table, MySqlTable)) {\n\t\treturn [`${table[Table.Symbol.BaseName]}`];\n\t}\n\tif (is(table, Subquery)) {\n\t\treturn table._.usedTables ?? [];\n\t}\n\tif (is(table, SQL)) {\n\t\treturn table.usedTables ?? [];\n\t}\n\treturn [];\n}\n\nexport function getTableConfig(table: MySqlTable) {\n\tconst columns = Object.values(table[MySqlTable.Symbol.Columns]);\n\tconst indexes: Index[] = [];\n\tconst checks: Check[] = [];\n\tconst primaryKeys: PrimaryKey[] = [];\n\tconst uniqueConstraints: UniqueConstraint[] = [];\n\tconst foreignKeys: ForeignKey[] = Object.values(table[MySqlTable.Symbol.InlineForeignKeys]);\n\tconst name = table[Table.Symbol.Name];\n\tconst schema = table[Table.Symbol.Schema];\n\tconst baseName = table[Table.Symbol.BaseName];\n\n\tconst extraConfigBuilder = table[MySqlTable.Symbol.ExtraConfigBuilder];\n\n\tif (extraConfigBuilder !== undefined) {\n\t\tconst extraConfig = extraConfigBuilder(table[MySqlTable.Symbol.Columns]);\n\t\tconst extraValues = Array.isArray(extraConfig) ? extraConfig.flat(1) as any[] : Object.values(extraConfig);\n\t\tfor (const builder of Object.values(extraValues)) {\n\t\t\tif (is(builder, IndexBuilder)) {\n\t\t\t\tindexes.push(builder.build(table));\n\t\t\t} else if (is(builder, CheckBuilder)) {\n\t\t\t\tchecks.push(builder.build(table));\n\t\t\t} else if (is(builder, UniqueConstraintBuilder)) {\n\t\t\t\tuniqueConstraints.push(builder.build(table));\n\t\t\t} else if (is(builder, PrimaryKeyBuilder)) {\n\t\t\t\tprimaryKeys.push(builder.build(table));\n\t\t\t} else if (is(builder, ForeignKeyBuilder)) {\n\t\t\t\tforeignKeys.push(builder.build(table));\n\t\t\t}\n\t\t}\n\t}\n\n\treturn {\n\t\tcolumns,\n\t\tindexes,\n\t\tforeignKeys,\n\t\tchecks,\n\t\tprimaryKeys,\n\t\tuniqueConstraints,\n\t\tname,\n\t\tschema,\n\t\tbaseName,\n\t};\n}\n\nexport function getViewConfig<\n\tTName extends string = string,\n\tTExisting extends boolean = boolean,\n>(view: MySqlView<TName, TExisting>) {\n\treturn {\n\t\t...view[ViewBaseConfig],\n\t\t...view[MySqlViewConfig],\n\t};\n}\n\nexport function convertIndexToString(indexes: IndexForHint[]) {\n\treturn indexes.map((idx) => {\n\t\treturn typeof idx === 'object' ? idx.config.name : idx;\n\t});\n}\n\nexport function toArray<T>(value: T | T[]): T[] {\n\treturn Array.isArray(value) ? value : [value];\n}\n"],"mappings":"AAAA,SAAS,UAAU;AACnB,SAAS,WAAW;AACpB,SAAS,gBAAgB;AACzB,SAAS,aAAa;AACtB,SAAS,sBAAsB;AAE/B,SAAS,oBAAoB;AAE7B,SAAS,yBAAyB;AAElC,SAAS,oBAAoB;AAE7B,SAAS,yBAAyB;AAElC,SAAS,kBAAkB;AAC3B,SAAgC,+BAA+B;AAE/D,SAAS,uBAAuB;AAGzB,SAAS,iBAAiB,OAA8D;AAC9F,MAAI,GAAG,OAAO,UAAU,GAAG;AAC1B,WAAO,CAAC,GAAG,MAAM,MAAM,OAAO,QAAQ,CAAC,EAAE;AAAA,EAC1C;AACA,MAAI,GAAG,OAAO,QAAQ,GAAG;AACxB,WAAO,MAAM,EAAE,cAAc,CAAC;AAAA,EAC/B;AACA,MAAI,GAAG,OAAO,GAAG,GAAG;AACnB,WAAO,MAAM,cAAc,CAAC;AAAA,EAC7B;AACA,SAAO,CAAC;AACT;AAEO,SAAS,eAAe,OAAmB;AACjD,QAAM,UAAU,OAAO,OAAO,MAAM,WAAW,OAAO,OAAO,CAAC;AAC9D,QAAM,UAAmB,CAAC;AAC1B,QAAM,SAAkB,CAAC;AACzB,QAAM,cAA4B,CAAC;AACnC,QAAM,oBAAwC,CAAC;AAC/C,QAAM,cAA4B,OAAO,OAAO,MAAM,WAAW,OAAO,iBAAiB,CAAC;AAC1F,QAAM,OAAO,MAAM,MAAM,OAAO,IAAI;AACpC,QAAM,SAAS,MAAM,MAAM,OAAO,MAAM;AACxC,QAAM,WAAW,MAAM,MAAM,OAAO,QAAQ;AAE5C,QAAM,qBAAqB,MAAM,WAAW,OAAO,kBAAkB;AAErE,MAAI,uBAAuB,QAAW;AACrC,UAAM,cAAc,mBAAmB,MAAM,WAAW,OAAO,OAAO,CAAC;AACvE,UAAM,cAAc,MAAM,QAAQ,WAAW,IAAI,YAAY,KAAK,CAAC,IAAa,OAAO,OAAO,WAAW;AACzG,eAAW,WAAW,OAAO,OAAO,WAAW,GAAG;AACjD,UAAI,GAAG,SAAS,YAAY,GAAG;AAC9B,gBAAQ,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MAClC,WAAW,GAAG,SAAS,YAAY,GAAG;AACrC,eAAO,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MACjC,WAAW,GAAG,SAAS,uBAAuB,GAAG;AAChD,0BAAkB,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MAC5C,WAAW,GAAG,SAAS,iBAAiB,GAAG;AAC1C,oBAAY,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MACtC,WAAW,GAAG,SAAS,iBAAiB,GAAG;AAC1C,oBAAY,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MACtC;AAAA,IACD;AAAA,EACD;AAEA,SAAO;AAAA,IACN;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACD;AACD;AAEO,SAAS,cAGd,MAAmC;AACpC,SAAO;AAAA,IACN,GAAG,KAAK,cAAc;AAAA,IACtB,GAAG,KAAK,eAAe;AAAA,EACxB;AACD;AAEO,SAAS,qBAAqB,SAAyB;AAC7D,SAAO,QAAQ,IAAI,CAAC,QAAQ;AAC3B,WAAO,OAAO,QAAQ,WAAW,IAAI,OAAO,OAAO;AAAA,EACpD,CAAC;AACF;AAEO,SAAS,QAAW,OAAqB;AAC/C,SAAO,MAAM,QAAQ,KAAK,IAAI,QAAQ,CAAC,KAAK;AAC7C;","names":[]}
+{"version":3,"sources":["../../src/mysql-core/utils.ts"],"sourcesContent":["import { is } from '~/entity.ts';\nimport { SQL } from '~/sql/sql.ts';\nimport { Subquery } from '~/subquery.ts';\nimport { Table } from '~/table.ts';\nimport { ViewBaseConfig } from '~/view-common.ts';\nimport type { Check } from './checks.ts';\nimport { CheckBuilder } from './checks.ts';\nimport type { ForeignKey } from './foreign-keys.ts';\nimport { ForeignKeyBuilder } from './foreign-keys.ts';\nimport type { Index } from './indexes.ts';\nimport { IndexBuilder } from './indexes.ts';\nimport type { PrimaryKey } from './primary-keys.ts';\nimport { PrimaryKeyBuilder } from './primary-keys.ts';\nimport type { IndexForHint } from './query-builders/select.ts';\nimport { MySqlTable } from './table.ts';\nimport { type UniqueConstraint, UniqueConstraintBuilder } from './unique-constraint.ts';\nimport type { MySqlViewBase } from './view-base.ts';\nimport { MySqlViewConfig } from './view-common.ts';\nimport type { MySqlView } from './view.ts';\n\nexport function extractUsedTable(table: MySqlTable | Subquery | MySqlViewBase | SQL): string[] {\n\tif (is(table, MySqlTable)) {\n\t\treturn [`${table[Table.Symbol.BaseName]}`];\n\t}\n\tif (is(table, Subquery)) {\n\t\treturn table._.usedTables ?? [];\n\t}\n\tif (is(table, SQL)) {\n\t\treturn table.usedTables ?? [];\n\t}\n\treturn [];\n}\n\nexport function getTableConfig(table: MySqlTable) {\n\tconst columns = Object.values(table[MySqlTable.Symbol.Columns]);\n\tconst indexes: Index[] = [];\n\tconst checks: Check[] = [];\n\tconst primaryKeys: PrimaryKey[] = [];\n\tconst uniqueConstraints: UniqueConstraint[] = [];\n\tconst foreignKeys: ForeignKey[] = Object.values(table[MySqlTable.Symbol.InlineForeignKeys]);\n\tconst name = table[Table.Symbol.Name];\n\tconst schema = table[Table.Symbol.Schema];\n\tconst baseName = table[Table.Symbol.BaseName];\n\n\tconst extraConfigBuilder = table[MySqlTable.Symbol.ExtraConfigBuilder];\n\n\tif (extraConfigBuilder !== undefined) {\n\t\tconst extraConfig = extraConfigBuilder(table[MySqlTable.Symbol.Columns]);\n\t\tconst extraValues = Array.isArray(extraConfig) ? extraConfig.flat(1) as any[] : Object.values(extraConfig);\n\t\tfor (const builder of Object.values(extraValues)) {\n\t\t\tif (is(builder, IndexBuilder)) {\n\t\t\t\tindexes.push(builder.build(table));\n\t\t\t} else if (is(builder, CheckBuilder)) {\n\t\t\t\tchecks.push(builder.build(table));\n\t\t\t} else if (is(builder, UniqueConstraintBuilder)) {\n\t\t\t\tuniqueConstraints.push(builder.build(table));\n\t\t\t} else if (is(builder, PrimaryKeyBuilder)) {\n\t\t\t\tprimaryKeys.push(builder.build(table));\n\t\t\t} else if (is(builder, ForeignKeyBuilder)) {\n\t\t\t\tforeignKeys.push(builder.build(table));\n\t\t\t}\n\t\t}\n\t}\n\n\treturn {\n\t\tcolumns,\n\t\tindexes,\n\t\tforeignKeys,\n\t\tchecks,\n\t\tprimaryKeys,\n\t\tuniqueConstraints,\n\t\tname,\n\t\tschema,\n\t\tbaseName,\n\t};\n}\n\nexport function getViewConfig<\n\tTName extends string = string,\n\tTExisting extends boolean = boolean,\n>(view: MySqlView<TName, TExisting>) {\n\treturn {\n\t\t...view[ViewBaseConfig],\n\t\t...view[MySqlViewConfig],\n\t};\n}\n\nexport function convertIndexToString(indexes: IndexForHint[]) {\n\treturn indexes.map((idx) => {\n\t\treturn typeof idx === 'object' ? idx.config.name : idx;\n\t});\n}\n\nexport function toArray<T>(value: T | T[]): T[] {\n\treturn Array.isArray(value) ? value : [value];\n}\n"],"mappings":"AAAA,SAAS,UAAU;AACnB,SAAS,WAAW;AACpB,SAAS,gBAAgB;AACzB,SAAS,aAAa;AACtB,SAAS,sBAAsB;AAE/B,SAAS,oBAAoB;AAE7B,SAAS,yBAAyB;AAElC,SAAS,oBAAoB;AAE7B,SAAS,yBAAyB;AAElC,SAAS,kBAAkB;AAC3B,SAAgC,+BAA+B;AAE/D,SAAS,uBAAuB;AAGzB,SAAS,iBAAiB,OAA8D;AAC9F,MAAI,GAAG,OAAO,UAAU,GAAG;AAC1B,WAAO,CAAC,GAAG,MAAM,MAAM,OAAO,QAAQ,CAAC,EAAE;AAAA,EAC1C;AACA,MAAI,GAAG,OAAO,QAAQ,GAAG;AACxB,WAAO,MAAM,EAAE,cAAc,CAAC;AAAA,EAC/B;AACA,MAAI,GAAG,OAAO,GAAG,GAAG;AACnB,WAAO,MAAM,cAAc,CAAC;AAAA,EAC7B;AACA,SAAO,CAAC;AACT;AAEO,SAAS,eAAe,OAAmB;AACjD,QAAM,UAAU,OAAO,OAAO,MAAM,WAAW,OAAO,OAAO,CAAC;AAC9D,QAAM,UAAmB,CAAC;AAC1B,QAAM,SAAkB,CAAC;AACzB,QAAM,cAA4B,CAAC;AACnC,QAAM,oBAAwC,CAAC;AAC/C,QAAM,cAA4B,OAAO,OAAO,MAAM,WAAW,OAAO,iBAAiB,CAAC;AAC1F,QAAM,OAAO,MAAM,MAAM,OAAO,IAAI;AACpC,QAAM,SAAS,MAAM,MAAM,OAAO,MAAM;AACxC,QAAM,WAAW,MAAM,MAAM,OAAO,QAAQ;AAE5C,QAAM,qBAAqB,MAAM,WAAW,OAAO,kBAAkB;AAErE,MAAI,uBAAuB,QAAW;AACrC,UAAM,cAAc,mBAAmB,MAAM,WAAW,OAAO,OAAO,CAAC;AACvE,UAAM,cAAc,MAAM,QAAQ,WAAW,IAAI,YAAY,KAAK,CAAC,IAAa,OAAO,OAAO,WAAW;AACzG,eAAW,WAAW,OAAO,OAAO,WAAW,GAAG;AACjD,UAAI,GAAG,SAAS,YAAY,GAAG;AAC9B,gBAAQ,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MAClC,WAAW,GAAG,SAAS,YAAY,GAAG;AACrC,eAAO,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MACjC,WAAW,GAAG,SAAS,uBAAuB,GAAG;AAChD,0BAAkB,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MAC5C,WAAW,GAAG,SAAS,iBAAiB,GAAG;AAC1C,oBAAY,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MACtC,WAAW,GAAG,SAAS,iBAAiB,GAAG;AAC1C,oBAAY,KAAK,QAAQ,MAAM,KAAK,CAAC;AAAA,MACtC;AAAA,IACD;AAAA,EACD;AAEA,SAAO;AAAA,IACN;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACD;AACD;AAEO,SAAS,cAGd,MAAmC;AACpC,SAAO;AAAA,IACN,GAAG,KAAK,cAAc;AAAA,IACtB,GAAG,KAAK,eAAe;AAAA,EACxB;AACD;AAEO,SAAS,qBAAqB,SAAyB;AAC7D,SAAO,QAAQ,IAAI,CAAC,QAAQ;AAC3B,WAAO,OAAO,QAAQ,WAAW,IAAI,OAAO,OAAO;AAAA,EACpD,CAAC;AACF;AAEO,SAAS,QAAW,OAAqB;AAC/C,SAAO,MAAM,QAAQ,KAAK,IAAI,QAAQ,CAAC,KAAK;AAC7C;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-orm",
-  "version": "1.0.0-beta.1-fd8bfcc",
+  "version": "1.0.0-beta.1-17c242e",
   "description": "Drizzle ORM package for SQL databases",
   "type": "module",
   "scripts": {
@@ -59,18 +59,18 @@
     "@types/better-sqlite3": "*",
     "@types/pg": "*",
     "@types/sql.js": "*",
+    "@upstash/redis": ">=1.34.7",
     "@vercel/postgres": ">=0.8.0",
     "@xata.io/client": "*",
     "better-sqlite3": ">=9.3.0",
     "bun-types": "*",
     "expo-sqlite": ">=14.0.0",
+    "gel": ">=2",
     "mysql2": ">=2",
     "pg": ">=8",
     "postgres": ">=3",
     "sql.js": ">=1",
-    "sqlite3": ">=5",
-    "gel": ">=2",
-    "@upstash/redis": ">=1.34.7"
+    "sqlite3": ">=5"
   },
   "peerDependenciesMeta": {
     "mysql2": {
@@ -179,7 +179,7 @@
     "@vercel/postgres": "^0.8.0",
     "@xata.io/client": "^0.29.3",
     "better-sqlite3": "^11.9.1",
-    "bun-types": "^1.2.0",
+    "bun-types": "^1.2.23",
     "cpy": "^10.1.0",
     "expo-sqlite": "^14.0.0",
     "gel": "^2.0.0",
@@ -3020,6 +3020,150 @@
       "types": "./aws-data-api/pg/session.d.ts",
       "default": "./aws-data-api/pg/session.js"
     },
+    "./bun-sql/mysql/driver": {
+      "import": {
+        "types": "./bun-sql/mysql/driver.d.ts",
+        "default": "./bun-sql/mysql/driver.js"
+      },
+      "require": {
+        "types": "./bun-sql/mysql/driver.d.cts",
+        "default": "./bun-sql/mysql/driver.cjs"
+      },
+      "types": "./bun-sql/mysql/driver.d.ts",
+      "default": "./bun-sql/mysql/driver.js"
+    },
+    "./bun-sql/mysql": {
+      "import": {
+        "types": "./bun-sql/mysql/index.d.ts",
+        "default": "./bun-sql/mysql/index.js"
+      },
+      "require": {
+        "types": "./bun-sql/mysql/index.d.cts",
+        "default": "./bun-sql/mysql/index.cjs"
+      },
+      "types": "./bun-sql/mysql/index.d.ts",
+      "default": "./bun-sql/mysql/index.js"
+    },
+    "./bun-sql/mysql/migrator": {
+      "import": {
+        "types": "./bun-sql/mysql/migrator.d.ts",
+        "default": "./bun-sql/mysql/migrator.js"
+      },
+      "require": {
+        "types": "./bun-sql/mysql/migrator.d.cts",
+        "default": "./bun-sql/mysql/migrator.cjs"
+      },
+      "types": "./bun-sql/mysql/migrator.d.ts",
+      "default": "./bun-sql/mysql/migrator.js"
+    },
+    "./bun-sql/mysql/session": {
+      "import": {
+        "types": "./bun-sql/mysql/session.d.ts",
+        "default": "./bun-sql/mysql/session.js"
+      },
+      "require": {
+        "types": "./bun-sql/mysql/session.d.cts",
+        "default": "./bun-sql/mysql/session.cjs"
+      },
+      "types": "./bun-sql/mysql/session.d.ts",
+      "default": "./bun-sql/mysql/session.js"
+    },
+    "./bun-sql/postgres/driver": {
+      "import": {
+        "types": "./bun-sql/postgres/driver.d.ts",
+        "default": "./bun-sql/postgres/driver.js"
+      },
+      "require": {
+        "types": "./bun-sql/postgres/driver.d.cts",
+        "default": "./bun-sql/postgres/driver.cjs"
+      },
+      "types": "./bun-sql/postgres/driver.d.ts",
+      "default": "./bun-sql/postgres/driver.js"
+    },
+    "./bun-sql/postgres": {
+      "import": {
+        "types": "./bun-sql/postgres/index.d.ts",
+        "default": "./bun-sql/postgres/index.js"
+      },
+      "require": {
+        "types": "./bun-sql/postgres/index.d.cts",
+        "default": "./bun-sql/postgres/index.cjs"
+      },
+      "types": "./bun-sql/postgres/index.d.ts",
+      "default": "./bun-sql/postgres/index.js"
+    },
+    "./bun-sql/postgres/migrator": {
+      "import": {
+        "types": "./bun-sql/postgres/migrator.d.ts",
+        "default": "./bun-sql/postgres/migrator.js"
+      },
+      "require": {
+        "types": "./bun-sql/postgres/migrator.d.cts",
+        "default": "./bun-sql/postgres/migrator.cjs"
+      },
+      "types": "./bun-sql/postgres/migrator.d.ts",
+      "default": "./bun-sql/postgres/migrator.js"
+    },
+    "./bun-sql/postgres/session": {
+      "import": {
+        "types": "./bun-sql/postgres/session.d.ts",
+        "default": "./bun-sql/postgres/session.js"
+      },
+      "require": {
+        "types": "./bun-sql/postgres/session.d.cts",
+        "default": "./bun-sql/postgres/session.cjs"
+      },
+      "types": "./bun-sql/postgres/session.d.ts",
+      "default": "./bun-sql/postgres/session.js"
+    },
+    "./bun-sql/sqlite/driver": {
+      "import": {
+        "types": "./bun-sql/sqlite/driver.d.ts",
+        "default": "./bun-sql/sqlite/driver.js"
+      },
+      "require": {
+        "types": "./bun-sql/sqlite/driver.d.cts",
+        "default": "./bun-sql/sqlite/driver.cjs"
+      },
+      "types": "./bun-sql/sqlite/driver.d.ts",
+      "default": "./bun-sql/sqlite/driver.js"
+    },
+    "./bun-sql/sqlite": {
+      "import": {
+        "types": "./bun-sql/sqlite/index.d.ts",
+        "default": "./bun-sql/sqlite/index.js"
+      },
+      "require": {
+        "types": "./bun-sql/sqlite/index.d.cts",
+        "default": "./bun-sql/sqlite/index.cjs"
+      },
+      "types": "./bun-sql/sqlite/index.d.ts",
+      "default": "./bun-sql/sqlite/index.js"
+    },
+    "./bun-sql/sqlite/migrator": {
+      "import": {
+        "types": "./bun-sql/sqlite/migrator.d.ts",
+        "default": "./bun-sql/sqlite/migrator.js"
+      },
+      "require": {
+        "types": "./bun-sql/sqlite/migrator.d.cts",
+        "default": "./bun-sql/sqlite/migrator.cjs"
+      },
+      "types": "./bun-sql/sqlite/migrator.d.ts",
+      "default": "./bun-sql/sqlite/migrator.js"
+    },
+    "./bun-sql/sqlite/session": {
+      "import": {
+        "types": "./bun-sql/sqlite/session.d.ts",
+        "default": "./bun-sql/sqlite/session.js"
+      },
+      "require": {
+        "types": "./bun-sql/sqlite/session.d.cts",
+        "default": "./bun-sql/sqlite/session.cjs"
+      },
+      "types": "./bun-sql/sqlite/session.d.ts",
+      "default": "./bun-sql/sqlite/session.js"
+    },
     "./cache/core/cache": {
       "import": {
         "types": "./cache/core/cache.d.ts",

package/relations.cjs

@@ -365,7 +365,10 @@ function mapRelationalRow(row, buildQueryResultSelection, mapColumnValue = (valu
     if (selectionItem.selection) {
       const currentPath = `${path ? `${path}.` : ""}${selectionItem.key}`;
       if (row[selectionItem.key] === null) continue;
-      if (parseJson) row[selectionItem.key] = JSON.parse(row[selectionItem.key]);
+      if (parseJson) {
+        row[selectionItem.key] = JSON.parse(row[selectionItem.key]);
+        if (row[selectionItem.key] === null) continue;
+      }
       if (parseJsonIfString && typeof row[selectionItem.key] === "string") {
         row[selectionItem.key] = JSON.parse(row[selectionItem.key]);
       }