drizzle-orm 0.20.3 → 0.21.0-0e65c4d

package/migrator.d.ts

@@ -9,6 +9,7 @@ export interface MigrationMeta {
     sql: string;
     folderMillis: number;
     hash: string;
+    bps: boolean;
 }
 export declare function readMigrationFiles(config: string | MigrationConfig): MigrationMeta[];
 //# sourceMappingURL=migrator.d.ts.map

package/migrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrator.d.ts","sourceRoot":"","sources":["../src/migrator.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,SAAS;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,eAAe;IAC/B,gBAAgB,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACb;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,GAAG,aAAa,EAAE,CA6CpF"}
+{"version":3,"file":"migrator.d.ts","sourceRoot":"","sources":["../src/migrator.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,SAAS;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,eAAe;IAC/B,gBAAgB,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;CACb;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,GAAG,aAAa,EAAE,CA6CpF"}

package/migrator.js

@@ -20,31 +20,29 @@ function readMigrationFiles(config) {
     if (!migrationFolderTo) {
         throw Error('no migration folder defined');
     }
-    const files = fs_1.default.readdirSync(migrationFolderTo);
     const migrationQueries = [];
-    for (const migrationFolder of files) {
-        if (migrationFolder === '.DS_Store') {
-            continue;
+    let journalAsString = '';
+    try {
+        journalAsString = fs_1.default.readFileSync(`${migrationFolderTo}/meta/_journal.json`).toString();
+    }
+    catch (e) {
+        throw Error(`Can't find meta/_journal.json file`);
+    }
+    const journal = JSON.parse(journalAsString);
+    for (const journalEntry of journal.entries) {
+        const migrationPath = `${migrationFolderTo}/${journalEntry.tag}.sql`;
+        try {
+            const query = fs_1.default.readFileSync(`${migrationFolderTo}/${journalEntry.tag}.sql`).toString();
+            migrationQueries.push({
+                sql: query,
+                bps: journalEntry.breakpoints,
+                folderMillis: journalEntry.when,
+                hash: crypto_1.default.createHash('sha256').update(query).digest('hex'),
+            });
+        }
+        catch (e) {
+            throw Error(`No file ${migrationPath} found in ${migrationFolderTo} folder`);
         }
-        const migrationFiles = fs_1.default.readdirSync(`${migrationFolderTo}/${migrationFolder}`);
-        const migrationFile = migrationFiles.filter((file) => file === 'migration.sql')[0];
-        const query = fs_1.default
-            .readFileSync(`${migrationFolderTo}/${migrationFolder}/${migrationFile}`)
-            .toString();
-        const year = Number(migrationFolder.slice(0, 4));
-        // second param for Date() is month index, that started from 0, so we need
-        // to decrement a value for month
-        const month = Number(migrationFolder.slice(4, 6)) - 1;
-        const day = Number(migrationFolder.slice(6, 8));
-        const hour = Number(migrationFolder.slice(8, 10));
-        const min = Number(migrationFolder.slice(10, 12));
-        const sec = Number(migrationFolder.slice(12, 14));
-        const folderAsMillis = Date.UTC(year, month, day, hour, min, sec);
-        migrationQueries.push({
-            sql: query,
-            folderMillis: folderAsMillis,
-            hash: crypto_1.default.createHash('sha256').update(query).digest('hex'),
-        });
     }
     return migrationQueries;
 }

package/migrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrator.js","sourceRoot":"","sources":["../src/migrator.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,4CAAoB;AACpB,gDAAwB;AAiBxB,SAAgB,kBAAkB,CAAC,MAAgC;IAClE,IAAI,iBAAqC,CAAC;IAC1C,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC/B,MAAM,cAAc,GAAG,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAc,CAAC;QAC3D,iBAAiB,GAAG,UAAU,CAAC,GAAG,CAAC;KACnC;SAAM;QACN,iBAAiB,GAAG,MAAM,CAAC,gBAAgB,CAAC;KAC5C;IAED,IAAI,CAAC,iBAAiB,EAAE;QACvB,MAAM,KAAK,CAAC,6BAA6B,CAAC,CAAC;KAC3C;IAED,MAAM,KAAK,GAAG,YAAE,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;IAChD,MAAM,gBAAgB,GAAoB,EAAE,CAAC;IAC7C,KAAK,MAAM,eAAe,IAAI,KAAK,EAAE;QACpC,IAAI,eAAe,KAAK,WAAW,EAAE;YACpC,SAAS;SACT;QACD,MAAM,cAAc,GAAG,YAAE,CAAC,WAAW,CAAC,GAAG,iBAAiB,IAAI,eAAe,EAAE,CAAC,CAAC;QACjF,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnF,MAAM,KAAK,GAAG,YAAE;aACd,YAAY,CAAC,GAAG,iBAAiB,IAAI,eAAe,IAAI,aAAa,EAAE,CAAC;aACxE,QAAQ,EAAE,CAAC;QAEb,MAAM,IAAI,GAAG,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACjD,0EAA0E;QAC1E,iCAAiC;QACjC,MAAM,KAAK,GAAG,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACtD,MAAM,GAAG,GAAG,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAClD,MAAM,GAAG,GAAG,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;QAClD,MAAM,GAAG,GAAG,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;QAElD,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAClE,gBAAgB,CAAC,IAAI,CAAC;YACrB,GAAG,EAAE,KAAK;YACV,YAAY,EAAE,cAAc;YAC5B,IAAI,EAAE,gBAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;SAC7D,CAAC,CAAC;KACH;IAED,OAAO,gBAAgB,CAAC;AACzB,CAAC;AA7CD,gDA6CC"}
+{"version":3,"file":"migrator.js","sourceRoot":"","sources":["../src/migrator.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,4CAAoB;AACpB,gDAAwB;AAkBxB,SAAgB,kBAAkB,CAAC,MAAgC;IAClE,IAAI,iBAAqC,CAAC;IAC1C,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC/B,MAAM,cAAc,GAAG,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;QAC1E,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAc,CAAC;QAC3D,iBAAiB,GAAG,UAAU,CAAC,GAAG,CAAC;KACnC;SAAM;QACN,iBAAiB,GAAG,MAAM,CAAC,gBAAgB,CAAC;KAC5C;IAED,IAAI,CAAC,iBAAiB,EAAE;QACvB,MAAM,KAAK,CAAC,6BAA6B,CAAC,CAAC;KAC3C;IAED,MAAM,gBAAgB,GAAoB,EAAE,CAAC;IAE7C,IAAI,eAAe,GAAG,EAAE,CAAC;IACzB,IAAI;QACH,eAAe,GAAG,YAAE,CAAC,YAAY,CAAC,GAAG,iBAAiB,qBAAqB,CAAC,CAAC,QAAQ,EAAE,CAAC;KACxF;IAAC,OAAO,CAAC,EAAE;QACX,MAAM,KAAK,CAAC,oCAAoC,CAAC,CAAC;KAClD;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAEzC,CAAC;IAEF,KAAK,MAAM,YAAY,IAAI,OAAO,CAAC,OAAO,EAAE;QAC3C,MAAM,aAAa,GAAG,GAAG,iBAAiB,IAAI,YAAY,CAAC,GAAG,MAAM,CAAC;QAErE,IAAI;YACH,MAAM,KAAK,GAAG,YAAE,CAAC,YAAY,CAAC,GAAG,iBAAiB,IAAI,YAAY,CAAC,GAAG,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;YAEzF,gBAAgB,CAAC,IAAI,CAAC;gBACrB,GAAG,EAAE,KAAK;gBACV,GAAG,EAAE,YAAY,CAAC,WAAW;gBAC7B,YAAY,EAAE,YAAY,CAAC,IAAI;gBAC/B,IAAI,EAAE,gBAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC7D,CAAC,CAAC;SACH;QAAC,OAAO,CAAC,EAAE;YACX,MAAM,KAAK,CAAC,WAAW,aAAa,aAAa,iBAAiB,SAAS,CAAC,CAAA;SAC5E;KACD;IAED,OAAO,gBAAgB,CAAC;AACzB,CAAC;AA7CD,gDA6CC"}

package/mysql-core/columns/date.common.d.ts

@@ -1,7 +1,11 @@
+import { ColumnBaseConfig } from '../../column';
 import { ColumnBuilderBaseConfig, UpdateCBConfig } from '../../column-builder';
 import { SQL } from '../../sql';
-import { MySqlColumnBuilder } from './common';
-export declare abstract class MySqlDateColumnBaseBuilder<T extends ColumnBuilderBaseConfig, TConfig extends Record<string, unknown> = {}> extends MySqlColumnBuilder<T, TConfig> {
+import { AnyMySqlTable } from '../table';
+import { MySqlColumn, MySqlColumnBuilder } from './common';
+export declare abstract class MySqlDateColumnBaseBuilder<T extends Partial<ColumnBuilderBaseConfig>, TConfig extends Record<string, unknown> = {}> extends MySqlColumnBuilder<T, TConfig & {
+    hasOnUpdateNow: boolean;
+}> {
     hasOnUpdateNow: boolean;
     notNull(): MySqlDateColumnBaseBuilder<UpdateCBConfig<T, {
         notNull: true;
@@ -19,4 +23,16 @@ export declare abstract class MySqlDateColumnBaseBuilder<T extends ColumnBuilder
         hasDefault: true;
     }>>;
 }
+export declare abstract class MySqlDateBaseColumn<T extends Partial<ColumnBaseConfig & {
+    hasOnUpdateNow: boolean;
+}>> extends MySqlColumn<T> {
+    readonly table: AnyMySqlTable<{
+        name: T['tableName'];
+    }>;
+    protected $hasOnUpdateNow: T['hasOnUpdateNow'];
+    readonly hasOnUpdateNow: boolean;
+    constructor(table: AnyMySqlTable<{
+        name: T['tableName'];
+    }>, config: MySqlDateColumnBaseBuilder<Omit<T, 'tableName'>>['config']);
+}
 //# sourceMappingURL=date.common.d.ts.map

package/mysql-core/columns/date.common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"date.common.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/columns/date.common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,GAAG,EAAO,MAAM,OAAO,CAAC;AAEjC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE9C,8BAAsB,0BAA0B,CAC/C,CAAC,SAAS,uBAAuB,EACjC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAC3C,SAAQ,kBAAkB,CAAC,CAAC,EAAE,OAAO,CAAC;IACvC,cAAc,EAAE,OAAO,CAAS;IAEvB,OAAO,IAAI,0BAA0B,CAAC,cAAc,CAAC,CAAC,EAAE;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC,CAAC;IAI3E,OAAO,CACf,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,GAAG,GACpB,0BAA0B,CAAC,cAAc,CAAC,CAAC,EAAE;QAAE,UAAU,EAAE,IAAI,CAAA;KAAE,CAAC,CAAC;IAI7D,UAAU,IAAI,0BAA0B,CAAC,cAAc,CAAC,CAAC,EAAE;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC,CAAC;IAIvF,UAAU;;;IAIV,WAAW,IAAI,0BAA0B,CAAC,cAAc,CAAC,CAAC,EAAE;QAAE,UAAU,EAAE,IAAI,CAAA;KAAE,CAAC,CAAC;CAKlF"}
+{"version":3,"file":"date.common.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/columns/date.common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,GAAG,EAAO,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE3D,8BAAsB,0BAA0B,CAC/C,CAAC,SAAS,OAAO,CAAC,uBAAuB,CAAC,EAC1C,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAC3C,SAAQ,kBAAkB,CAAC,CAAC,EAAE,OAAO,GAAG;IAAE,cAAc,EAAE,OAAO,CAAA;CAAE,CAAC;IACrE,cAAc,EAAE,OAAO,CAAS;IAEvB,OAAO,IAAI,0BAA0B,CAAC,cAAc,CAAC,CAAC,EAAE;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC,CAAC;IAI3E,OAAO,CACf,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,GAAG,GACpB,0BAA0B,CAAC,cAAc,CAAC,CAAC,EAAE;QAAE,UAAU,EAAE,IAAI,CAAA;KAAE,CAAC,CAAC;IAI7D,UAAU,IAAI,0BAA0B,CAAC,cAAc,CAAC,CAAC,EAAE;QAAE,OAAO,EAAE,IAAI,CAAA;KAAE,CAAC,CAAC;IAIvF,UAAU;;;IAIV,WAAW,IAAI,0BAA0B,CAAC,cAAc,CAAC,CAAC,EAAE;QAAE,UAAU,EAAE,IAAI,CAAA;KAAE,CAAC,CAAC;CAKlF;AAED,8BAAsB,mBAAmB,CAAC,CAAC,SAAS,OAAO,CAAC,gBAAgB,GAAG;IAAE,cAAc,EAAE,OAAO,CAAA;CAAE,CAAC,CAC1G,SAAQ,WAAW,CAAC,CAAC,CAAC;aAOH,KAAK,EAAE,aAAa,CAAC;QAAE,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,CAAA;KAAE,CAAC;IALjE,UAAkB,eAAe,EAAE,CAAC,CAAC,gBAAgB,CAAC,CAAC;IAEvD,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;gBAGd,KAAK,EAAE,aAAa,CAAC;QAAE,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,CAAA;KAAE,CAAC,EAChE,MAAM,EAAE,0BAA0B,CAAC,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC;CAKnE"}

package/mysql-core/columns/date.common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MySqlDateColumnBaseBuilder = void 0;
+exports.MySqlDateBaseColumn = exports.MySqlDateColumnBaseBuilder = void 0;
 const sql_1 = require("../../sql");
 const common_1 = require("./common");
 class MySqlDateColumnBaseBuilder extends common_1.MySqlColumnBuilder {
@@ -18,29 +18,21 @@ class MySqlDateColumnBaseBuilder extends common_1.MySqlColumnBuilder {
         return super.primaryKey();
     }
     defaultNow() {
-        return this.default((0, sql_1.sql) `now()`);
+        return this.default((0, sql_1.sql) `(now())`);
     }
     onUpdateNow() {
-        this.hasOnUpdateNow = true;
+        this.config.hasOnUpdateNow = true;
         this.config.hasDefault = true;
         return this;
     }
 }
 exports.MySqlDateColumnBaseBuilder = MySqlDateColumnBaseBuilder;
-// export abstract class MySqlDateBaseColumn<
-// 	TTableName extends string,
-// 	TData extends ColumnData,
-// 	TDriverParam extends MySqlColumnDriverParam,
-// 	TNotNull extends boolean,
-// 	THasDefault extends boolean,
-// > extends MySqlColumn<TTableName, TData, TDriverParam, TNotNull, THasDefault> {
-// 	readonly hasOnUpdateNow: boolean;
-// 	constructor(
-// 		table: AnyMySqlTable<TTableName>,
-// 		builder: MySqlDateColumnBaseBuilder<TData, TDriverParam, TNotNull, THasDefault>,
-// 	) {
-// 		super(table, builder);
-// 		this.hasOnUpdateNow = builder.hasOnUpdateNow;
-// 	}
-// }
+class MySqlDateBaseColumn extends common_1.MySqlColumn {
+    constructor(table, config) {
+        super(table, config);
+        this.table = table;
+        this.hasOnUpdateNow = config.hasOnUpdateNow;
+    }
+}
+exports.MySqlDateBaseColumn = MySqlDateBaseColumn;
 //# sourceMappingURL=date.common.js.map

package/mysql-core/columns/date.common.js.map

@@ -1 +1 @@
-{"version":3,"file":"date.common.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/date.common.ts"],"names":[],"mappings":";;;AACA,+BAAiC;AAEjC,qCAA8C;AAE9C,MAAsB,0BAGpB,SAAQ,2BAA8B;IAHxC;;QAIC,mBAAc,GAAY,KAAK,CAAC;IAyBjC,CAAC;IAvBS,OAAO;QACf,OAAO,KAAK,CAAC,OAAO,EAAiC,CAAC;IACvD,CAAC;IAEQ,OAAO,CACf,KAAsB;QAEtB,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAgC,CAAC;IAC5D,CAAC;IAEQ,UAAU;QAClB,OAAO,KAAK,CAAC,UAAU,EAAoC,CAAC;IAC7D,CAAC;IAED,UAAU;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,IAAA,SAAG,EAAA,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,WAAW;QACV,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;QAC9B,OAAO,IAAuC,CAAC;IAChD,CAAC;CACD;AA7BD,gEA6BC;AAED,6CAA6C;AAC7C,8BAA8B;AAC9B,6BAA6B;AAC7B,gDAAgD;AAChD,6BAA6B;AAC7B,gCAAgC;AAChC,kFAAkF;AAClF,qCAAqC;AAErC,gBAAgB;AAChB,sCAAsC;AACtC,qFAAqF;AACrF,OAAO;AACP,2BAA2B;AAC3B,kDAAkD;AAClD,KAAK;AACL,IAAI"}
+{"version":3,"file":"date.common.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/date.common.ts"],"names":[],"mappings":";;;AAEA,+BAAiC;AAGjC,qCAA2D;AAE3D,MAAsB,0BAGpB,SAAQ,2BAA4D;IAHtE;;QAIC,mBAAc,GAAY,KAAK,CAAC;IAyBjC,CAAC;IAvBS,OAAO;QACf,OAAO,KAAK,CAAC,OAAO,EAAiC,CAAC;IACvD,CAAC;IAEQ,OAAO,CACf,KAAsB;QAEtB,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAgC,CAAC;IAC5D,CAAC;IAEQ,UAAU;QAClB,OAAO,KAAK,CAAC,UAAU,EAAoC,CAAC;IAC7D,CAAC;IAED,UAAU;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,IAAA,SAAG,EAAA,SAAS,CAAC,CAAC;IACnC,CAAC;IAED,WAAW;QACV,IAAI,CAAC,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;QAC9B,OAAO,IAAuC,CAAC;IAChD,CAAC;CACD;AA7BD,gEA6BC;AAED,MAAsB,mBACrB,SAAQ,oBAAc;IAMtB,YACmB,KAA8C,EAChE,MAAkE;QAElE,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAHH,UAAK,GAAL,KAAK,CAAyC;QAIhE,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,cAAc,CAAC;IAC7C,CAAC;CACD;AAdD,kDAcC"}

package/mysql-core/columns/datetime.js

@@ -19,7 +19,7 @@ class MySqlDateTime extends common_1.MySqlColumn {
         this.fsp = config.fsp;
     }
     getSQLType() {
-        const precision = typeof this.fsp !== 'undefined' ? ` (${this.fsp})` : '';
+        const precision = typeof this.fsp !== 'undefined' ? `(${this.fsp})` : '';
         return `datetime${precision}`;
     }
     mapFromDriverValue(value) {
@@ -44,7 +44,7 @@ class MySqlDateTimeString extends common_1.MySqlColumn {
         this.fsp = config.fsp;
     }
     getSQLType() {
-        const precision = typeof this.fsp !== 'undefined' ? ` (${this.fsp})` : '';
+        const precision = typeof this.fsp !== 'undefined' ? `(${this.fsp})` : '';
         return `datetime${precision}`;
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"datetime.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/datetime.ts"],"names":[],"mappings":";;;AAGA,qCAA2D;AAE3D,MAAa,oBAAqB,SAAQ,2BAGzC;IACA,YACC,IAAY,EACZ,GAAuB;QAEvB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;IACvB,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;CACD;AAlBD,oDAkBC;AAED,MAAa,aAEX,SAAQ,oBAMT;IAKA,YACC,KAA0C,EAC1C,MAAsC;QAEtC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,UAAU;QACT,MAAM,SAAS,GAAG,OAAO,IAAI,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,OAAO,WAAW,SAAS,EAAE,CAAC;IAC/B,CAAC;IAEQ,kBAAkB,CAAC,KAAa;QACxC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;CACD;AA7BD,sCA6BC;AAED,MAAa,0BAA2B,SAAQ,2BAG/C;IACA,YACC,IAAY,EACZ,GAAuB;QAEvB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;IACvB,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;CACD;AAlBD,gEAkBC;AAED,MAAa,mBAEX,SAAQ,oBAMT;IAKA,YACC,KAA0C,EAC1C,MAA4C;QAE5C,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,UAAU;QACT,MAAM,SAAS,GAAG,OAAO,IAAI,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,OAAO,WAAW,SAAS,EAAE,CAAC;IAC/B,CAAC;CACD;AAzBD,kDAyBC;AAaD,SAAgB,QAAQ,CACvB,IAAY,EACZ,MAAwD;IAExD,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,QAAQ,EAAE;QAC9B,OAAO,IAAI,0BAA0B,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;KACxD;IACD,OAAO,IAAI,oBAAoB,CAAC,IAAI,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC,CAAC;AACpD,CAAC;AARD,4BAQC"}
+{"version":3,"file":"datetime.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/datetime.ts"],"names":[],"mappings":";;;AAGA,qCAA2D;AAE3D,MAAa,oBAAqB,SAAQ,2BAGzC;IACA,YACC,IAAY,EACZ,GAAuB;QAEvB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;IACvB,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;CACD;AAlBD,oDAkBC;AAED,MAAa,aAEX,SAAQ,oBAMT;IAKA,YACC,KAA0C,EAC1C,MAAsC;QAEtC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,UAAU;QACT,MAAM,SAAS,GAAG,OAAO,IAAI,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO,WAAW,SAAS,EAAE,CAAC;IAC/B,CAAC;IAEQ,kBAAkB,CAAC,KAAa;QACxC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;CACD;AA7BD,sCA6BC;AAED,MAAa,0BAA2B,SAAQ,2BAG/C;IACA,YACC,IAAY,EACZ,GAAuB;QAEvB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;IACvB,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;CACD;AAlBD,gEAkBC;AAED,MAAa,mBAEX,SAAQ,oBAMT;IAKA,YACC,KAA0C,EAC1C,MAA4C;QAE5C,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,UAAU;QACT,MAAM,SAAS,GAAG,OAAO,IAAI,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO,WAAW,SAAS,EAAE,CAAC;IAC/B,CAAC;CACD;AAzBD,kDAyBC;AAaD,SAAgB,QAAQ,CACvB,IAAY,EACZ,MAAwD;IAExD,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,QAAQ,EAAE;QAC9B,OAAO,IAAI,0BAA0B,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;KACxD;IACD,OAAO,IAAI,oBAAoB,CAAC,IAAI,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC,CAAC;AACpD,CAAC;AARD,4BAQC"}

package/mysql-core/columns/decimal.js

@@ -22,7 +22,7 @@ class MySqlDecimal extends common_1.MySqlColumnWithAutoIncrement {
     }
     getSQLType() {
         if (typeof this.precision !== 'undefined' && typeof this.scale !== 'undefined') {
-            return `decimal(${this.precision}, ${this.scale})`;
+            return `decimal(${this.precision},${this.scale})`;
         }
         else if (typeof this.precision === 'undefined') {
             return 'decimal';

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

@@ -1 +1 @@
-{"version":3,"file":"decimal.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/decimal.ts"],"names":[],"mappings":";;;AAGA,qCAA0G;AAE1G,MAAa,mBAAoB,SAAQ,4CAMxC;IACA,YAAY,IAAY,EAAE,SAAkB,EAAE,KAAc;QAC3D,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;CACD;AAnBD,kDAmBC;AAED,MAAa,YAAwC,SAAQ,qCAM5D;IAMA,YAAY,KAA0C,EAAE,MAAqC;QAC5F,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,CAAC;IAED,UAAU;QACT,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,WAAW,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,WAAW,EAAE;YAC/E,OAAO,WAAW,IAAI,CAAC,SAAS,KAAK,IAAI,CAAC,KAAK,GAAG,CAAC;SACnD;aAAM,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,WAAW,EAAE;YACjD,OAAO,SAAS,CAAC;SACjB;aAAM;YACN,OAAO,WAAW,IAAI,CAAC,SAAS,GAAG,CAAC;SACpC;IACF,CAAC;CACD;AA3BD,oCA2BC;AAOD,SAAgB,OAAO,CAAC,IAAY,EAAE,SAA6B,EAAE;IACpE,OAAO,IAAI,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;AACtE,CAAC;AAFD,0BAEC"}
+{"version":3,"file":"decimal.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/decimal.ts"],"names":[],"mappings":";;;AAGA,qCAA0G;AAE1G,MAAa,mBAAoB,SAAQ,4CAMxC;IACA,YAAY,IAAY,EAAE,SAAkB,EAAE,KAAc;QAC3D,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;CACD;AAnBD,kDAmBC;AAED,MAAa,YAAwC,SAAQ,qCAM5D;IAMA,YAAY,KAA0C,EAAE,MAAqC;QAC5F,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,CAAC;IAED,UAAU;QACT,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,WAAW,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,WAAW,EAAE;YAC/E,OAAO,WAAW,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC;SAClD;aAAM,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,WAAW,EAAE;YACjD,OAAO,SAAS,CAAC;SACjB;aAAM;YACN,OAAO,WAAW,IAAI,CAAC,SAAS,GAAG,CAAC;SACpC;IACF,CAAC;CACD;AA3BD,oCA2BC;AAOD,SAAgB,OAAO,CAAC,IAAY,EAAE,SAA6B,EAAE;IACpE,OAAO,IAAI,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;AACtE,CAAC;AAFD,0BAEC"}

package/mysql-core/columns/double.js

@@ -21,14 +21,16 @@ class MySqlDouble extends common_1.MySqlColumnWithAutoIncrement {
         this.scale = config.scale;
     }
     getSQLType() {
-        return 'double';
-        // if (typeof this.precision !== 'undefined' && typeof this.scale !== 'undefined') {
-        // 	return `double(${this.precision}, ${this.scale})`;
-        // } else if (typeof this.precision === 'undefined') {
-        // 	return 'double';
-        // } else {
-        // 	return `double(${this.precision})`;
-        // }
+        // return 'double';
+        if (typeof this.precision !== 'undefined' && typeof this.scale !== 'undefined') {
+            return `double(${this.precision},${this.scale})`;
+        }
+        else if (typeof this.precision === 'undefined') {
+            return 'double';
+        }
+        else {
+            return `double(${this.precision})`;
+        }
     }
 }
 exports.MySqlDouble = MySqlDouble;

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

@@ -1 +1 @@
-{"version":3,"file":"double.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/double.ts"],"names":[],"mappings":";;;AAGA,qCAA0G;AAE1G,MAAa,kBAAmB,SAAQ,4CAMvC;IACA,YAAY,IAAY,EAAE,SAAkB,EAAE,KAAc;QAC3D,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;CACD;AAnBD,gDAmBC;AAED,MAAa,WAEX,SAAQ,qCAMT;IAMA,YAAY,KAA0C,EAAE,MAAoC;QAC3F,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,CAAC;IAED,UAAU;QACT,OAAO,QAAQ,CAAC;QAChB,oFAAoF;QACpF,sDAAsD;QACtD,sDAAsD;QACtD,oBAAoB;QACpB,WAAW;QACX,uCAAuC;QACvC,IAAI;IACL,CAAC;CACD;AA9BD,kCA8BC;AAOD,SAAgB,MAAM,CAAC,IAAY,EAAE,MAA0B;IAC9D,OAAO,IAAI,kBAAkB,CAAC,IAAI,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,CAAC;AACvE,CAAC;AAFD,wBAEC"}
+{"version":3,"file":"double.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/double.ts"],"names":[],"mappings":";;;AAGA,qCAA0G;AAE1G,MAAa,kBAAmB,SAAQ,4CAMvC;IACA,YAAY,IAAY,EAAE,SAAkB,EAAE,KAAc;QAC3D,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;CACD;AAnBD,gDAmBC;AAED,MAAa,WAEX,SAAQ,qCAMT;IAMA,YAAY,KAA0C,EAAE,MAAoC;QAC3F,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,CAAC;IAED,UAAU;QACT,mBAAmB;QACnB,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,WAAW,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,WAAW,EAAE;YAC/E,OAAO,UAAU,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC;SACjD;aAAM,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,WAAW,EAAE;YACjD,OAAO,QAAQ,CAAC;SAChB;aAAM;YACN,OAAO,UAAU,IAAI,CAAC,SAAS,GAAG,CAAC;SACnC;IACF,CAAC;CACD;AA9BD,kCA8BC;AAOD,SAAgB,MAAM,CAAC,IAAY,EAAE,MAA0B;IAC9D,OAAO,IAAI,kBAAkB,CAAC,IAAI,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,CAAC;AACvE,CAAC;AAFD,wBAEC"}

package/mysql-core/columns/enum.js

@@ -19,7 +19,7 @@ class MySqlEnumColumn extends common_1.MySqlColumn {
         this.values = config.values;
     }
     getSQLType() {
-        return `ENUM(${this.values.map((value) => `'${value}'`).join(',')})`;
+        return `enum(${this.values.map((value) => `'${value}'`).join(',')})`;
     }
 }
 exports.MySqlEnumColumn = MySqlEnumColumn;

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

@@ -1,5 +1,5 @@
-import { MySqlColumn, MySqlColumnBuilder } from './common';
-export declare class MySqlSerialBuilder extends MySqlColumnBuilder<{
+import { MySqlColumnBuilderWithAutoIncrement, MySqlColumnWithAutoIncrement } from './common';
+export declare class MySqlSerialBuilder extends MySqlColumnBuilderWithAutoIncrement<{
     data: number;
     driverParam: number;
     notNull: true;
@@ -7,7 +7,7 @@ export declare class MySqlSerialBuilder extends MySqlColumnBuilder<{
 }> {
     constructor(name: string);
 }
-export declare class MySqlSerial<TTableName extends string> extends MySqlColumn<{
+export declare class MySqlSerial<TTableName extends string> extends MySqlColumnWithAutoIncrement<{
     tableName: TTableName;
     data: number;
     driverParam: number;

package/mysql-core/columns/serial.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serial.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/columns/serial.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE3D,qBAAa,kBAAmB,SAAQ,kBAAkB,CAAC;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,IAAI,CAAC;IACd,UAAU,EAAE,IAAI,CAAC;CACjB,CAAC;gBACW,IAAI,EAAE,MAAM;CAWxB;AAED,qBAAa,WAAW,CACvB,UAAU,SAAS,MAAM,CACxB,SAAQ,WAAW,CAAC;IACrB,SAAS,EAAE,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,IAAI,CAAC;IACd,UAAU,EAAE,IAAI,CAAC;CACjB,CAAC;IACD,UAAmB,iBAAiB,EAAG,aAAa,CAAC;IAErD,UAAU,IAAI,MAAM;IAIX,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM;CAM3D;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,sBAElC"}
+{"version":3,"file":"serial.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/columns/serial.ts"],"names":[],"mappings":"AACA,OAAO,EAAmC,mCAAmC,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAE9H,qBAAa,kBAAmB,SAAQ,mCAAmC,CAAC;IAC3E,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,IAAI,CAAC;IACd,UAAU,EAAE,IAAI,CAAC;CACjB,CAAC;gBACW,IAAI,EAAE,MAAM;CAYxB;AAED,qBAAa,WAAW,CACvB,UAAU,SAAS,MAAM,CACxB,SAAQ,4BAA4B,CAAC;IACtC,SAAS,EAAE,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,IAAI,CAAC;IACd,UAAU,EAAE,IAAI,CAAC;CACjB,CAAC;IACD,UAAmB,iBAAiB,EAAG,aAAa,CAAC;IAErD,UAAU,IAAI,MAAM;IAIX,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM;CAM3D;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,sBAElC"}

package/mysql-core/columns/serial.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serial = exports.MySqlSerial = exports.MySqlSerialBuilder = void 0;
 const common_1 = require("./common");
-class MySqlSerialBuilder extends common_1.MySqlColumnBuilder {
+class MySqlSerialBuilder extends common_1.MySqlColumnBuilderWithAutoIncrement {
     constructor(name) {
         super(name);
         this.config.hasDefault = true;
+        this.config.autoIncrement = true;
     }
     /** @internal */
     build(table) {
@@ -13,7 +14,7 @@ class MySqlSerialBuilder extends common_1.MySqlColumnBuilder {
     }
 }
 exports.MySqlSerialBuilder = MySqlSerialBuilder;
-class MySqlSerial extends common_1.MySqlColumn {
+class MySqlSerial extends common_1.MySqlColumnWithAutoIncrement {
     getSQLType() {
         return 'serial';
     }

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

@@ -1 +1 @@
-{"version":3,"file":"serial.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/serial.ts"],"names":[],"mappings":";;;AACA,qCAA2D;AAE3D,MAAa,kBAAmB,SAAQ,2BAKtC;IACD,YAAY,IAAY;QACvB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;IAC/B,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;CACD;AAjBD,gDAiBC;AAED,MAAa,WAEX,SAAQ,oBAMR;IAGD,UAAU;QACT,OAAO,QAAQ,CAAC;IACjB,CAAC;IAEQ,kBAAkB,CAAC,KAAsB;QACjD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC9B,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;SACvB;QACD,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AArBD,kCAqBC;AAED,SAAgB,MAAM,CAAC,IAAY;IAClC,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC;AAFD,wBAEC"}
+{"version":3,"file":"serial.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/serial.ts"],"names":[],"mappings":";;;AACA,qCAA8H;AAE9H,MAAa,kBAAmB,SAAQ,4CAKtC;IACD,YAAY,IAAY;QACvB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;IAClC,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,WAAW,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;CACD;AAlBD,gDAkBC;AAED,MAAa,WAEX,SAAQ,qCAMR;IAGD,UAAU;QACT,OAAO,QAAQ,CAAC;IACjB,CAAC;IAEQ,kBAAkB,CAAC,KAAsB;QACjD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC9B,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;SACvB;QACD,OAAO,KAAK,CAAC;IACd,CAAC;CACD;AArBD,kCAqBC;AAED,SAAgB,MAAM,CAAC,IAAY;IAClC,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC;AAFD,wBAEC"}

package/mysql-core/columns/time.js

@@ -19,7 +19,7 @@ class MySqlTime extends common_1.MySqlColumn {
         this.fsp = config.fsp;
     }
     getSQLType() {
-        const precision = typeof this.fsp !== 'undefined' ? ` (${this.fsp})` : '';
+        const precision = typeof this.fsp !== 'undefined' ? `(${this.fsp})` : '';
         return `time${precision}`;
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"time.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/time.ts"],"names":[],"mappings":";;;AAGA,qCAA2D;AAE3D,MAAa,gBAAiB,SAAQ,2BAGrC;IACA,YACC,IAAY,EACZ,GAAuB;QAEvB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;IACvB,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;CACD;AAlBD,4CAkBC;AAED,MAAa,SAEX,SAAQ,oBAMT;IAKA,YACC,KAA0C,EAC1C,MAAkC;QAElC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,UAAU;QACT,MAAM,SAAS,GAAG,OAAO,IAAI,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,OAAO,OAAO,SAAS,EAAE,CAAC;IAC3B,CAAC;CACD;AAzBD,8BAyBC;AAMD,SAAgB,IAAI,CAAC,IAAY,EAAE,MAAmB;IACrD,OAAO,IAAI,gBAAgB,CAAC,IAAI,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC,CAAC;AAChD,CAAC;AAFD,oBAEC"}
+{"version":3,"file":"time.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/time.ts"],"names":[],"mappings":";;;AAGA,qCAA2D;AAE3D,MAAa,gBAAiB,SAAQ,2BAGrC;IACA,YACC,IAAY,EACZ,GAAuB;QAEvB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;IACvB,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;CACD;AAlBD,4CAkBC;AAED,MAAa,SAEX,SAAQ,oBAMT;IAKA,YACC,KAA0C,EAC1C,MAAkC;QAElC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,UAAU;QACT,MAAM,SAAS,GAAG,OAAO,IAAI,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO,OAAO,SAAS,EAAE,CAAC;IAC3B,CAAC;CACD;AAzBD,8BAyBC;AAMD,SAAgB,IAAI,CAAC,IAAY,EAAE,MAAmB;IACrD,OAAO,IAAI,gBAAgB,CAAC,IAAI,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC,CAAC;AAChD,CAAC;AAFD,oBAEC"}

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

@@ -1,8 +1,7 @@
 import { ColumnConfig } from '../../column';
 import { ColumnBuilderConfig } from '../../column-builder';
 import { AnyMySqlTable } from '../table';
-import { MySqlColumn } from './common';
-import { MySqlDateColumnBaseBuilder } from './date.common';
+import { MySqlDateBaseColumn, MySqlDateColumnBaseBuilder } from './date.common';
 export declare class MySqlTimestampBuilder extends MySqlDateColumnBaseBuilder<ColumnBuilderConfig<{
     data: Date;
     driverParam: string | number;
@@ -11,7 +10,7 @@ export declare class MySqlTimestampBuilder extends MySqlDateColumnBaseBuilder<Co
 }> {
     constructor(name: string, fsp: number | undefined);
 }
-export declare class MySqlTimestamp<TTableName extends string> extends MySqlColumn<ColumnConfig<{
+export declare class MySqlTimestamp<TTableName extends string> extends MySqlDateBaseColumn<ColumnConfig<{
     tableName: TTableName;
     data: Date;
     driverParam: number | string;
@@ -32,7 +31,7 @@ export declare class MySqlTimestampStringBuilder extends MySqlDateColumnBaseBuil
 }> {
     constructor(name: string, fsp: number | undefined);
 }
-export declare class MySqlTimestampString<TTableName extends string> extends MySqlColumn<ColumnConfig<{
+export declare class MySqlTimestampString<TTableName extends string> extends MySqlDateBaseColumn<ColumnConfig<{
     tableName: TTableName;
     data: string;
     driverParam: number | string;

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

@@ -1 +1 @@
-{"version":3,"file":"timestamp.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/columns/timestamp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAC3D,qBAAa,qBAAsB,SAAQ,0BAA0B,CACpE,mBAAmB,CAAC;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC,EACjE;IAAE,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAC3B;gBAEC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,GAAG,SAAS;CAYxB;AAED,qBAAa,cAAc,CAC1B,UAAU,SAAS,MAAM,CACxB,SAAQ,WAAW,CACpB,YAAY,CAAC;IACZ,SAAS,EAAE,UAAU,CAAC;IACtB,IAAI,EAAE,IAAI,CAAC;IACX,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B,CAAC,CACF;IACA,UAAmB,iBAAiB,EAAG,gBAAgB,CAAC;IAExD,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;gBAGhC,KAAK,EAAE,aAAa,CAAC;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,EAC1C,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC;IAMxC,UAAU,IAAI,MAAM;IAKX,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAGhD;AAED,qBAAa,2BAA4B,SAAQ,0BAA0B,CAC1E,mBAAmB,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC,EACnE;IAAE,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAC3B;gBAEC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,GAAG,SAAS;CAYxB;AAED,qBAAa,oBAAoB,CAChC,UAAU,SAAS,MAAM,CACxB,SAAQ,WAAW,CACpB,YAAY,CAAC;IACZ,SAAS,EAAE,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B,CAAC,CACF;IACA,UAAmB,iBAAiB,EAAG,sBAAsB,CAAC;IAE9D,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;gBAGhC,KAAK,EAAE,aAAa,CAAC;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,EAC1C,MAAM,EAAE,2BAA2B,CAAC,QAAQ,CAAC;IAM9C,UAAU,IAAI,MAAM;CAIpB;AAED,oBAAY,YAAY,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAErD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,qBAAqB,CAAC;AAC/D,wBAAgB,SAAS,CACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,GAAG,CAAC,EAAE,YAAY,CAAA;CAAE,GAC5C,2BAA2B,CAAC;AAC/B,wBAAgB,SAAS,CACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,YAAY,CAAA;CAAE,GAC3C,qBAAqB,CAAC"}
+{"version":3,"file":"timestamp.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/columns/timestamp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAChF,qBAAa,qBAAsB,SAAQ,0BAA0B,CACpE,mBAAmB,CAAC;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC,EACjE;IAAE,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAC3B;gBAEC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,GAAG,SAAS;CAYxB;AAED,qBAAa,cAAc,CAC1B,UAAU,SAAS,MAAM,CACxB,SAAQ,mBAAmB,CAC5B,YAAY,CAAC;IACZ,SAAS,EAAE,UAAU,CAAC;IACtB,IAAI,EAAE,IAAI,CAAC;IACX,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B,CAAC,CACF;IACA,UAAmB,iBAAiB,EAAG,gBAAgB,CAAC;IAExD,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;gBAGhC,KAAK,EAAE,aAAa,CAAC;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,EAC1C,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC;IAMxC,UAAU,IAAI,MAAM;IAKX,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;CAGhD;AAED,qBAAa,2BAA4B,SAAQ,0BAA0B,CAC1E,mBAAmB,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC,EACnE;IAAE,GAAG,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,CAC3B;gBAEC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,GAAG,SAAS;CAYxB;AAED,qBAAa,oBAAoB,CAChC,UAAU,SAAS,MAAM,CACxB,SAAQ,mBAAmB,CAC5B,YAAY,CAAC;IACZ,SAAS,EAAE,UAAU,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B,CAAC,CACF;IACA,UAAmB,iBAAiB,EAAG,sBAAsB,CAAC;IAE9D,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;gBAGhC,KAAK,EAAE,aAAa,CAAC;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,EAC1C,MAAM,EAAE,2BAA2B,CAAC,QAAQ,CAAC;IAM9C,UAAU,IAAI,MAAM;CAIpB;AAED,oBAAY,YAAY,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAErD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,qBAAqB,CAAC;AAC/D,wBAAgB,SAAS,CACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,GAAG,CAAC,EAAE,YAAY,CAAA;CAAE,GAC5C,2BAA2B,CAAC;AAC/B,wBAAgB,SAAS,CACxB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,YAAY,CAAA;CAAE,GAC3C,qBAAqB,CAAC"}

package/mysql-core/columns/timestamp.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.timestamp = exports.MySqlTimestampString = exports.MySqlTimestampStringBuilder = exports.MySqlTimestamp = exports.MySqlTimestampBuilder = void 0;
-const common_1 = require("./common");
 const date_common_1 = require("./date.common");
 class MySqlTimestampBuilder extends date_common_1.MySqlDateColumnBaseBuilder {
     constructor(name, fsp) {
@@ -14,13 +13,13 @@ class MySqlTimestampBuilder extends date_common_1.MySqlDateColumnBaseBuilder {
     }
 }
 exports.MySqlTimestampBuilder = MySqlTimestampBuilder;
-class MySqlTimestamp extends common_1.MySqlColumn {
+class MySqlTimestamp extends date_common_1.MySqlDateBaseColumn {
     constructor(table, config) {
         super(table, config);
         this.fsp = config.fsp;
     }
     getSQLType() {
-        const precision = typeof this.fsp !== 'undefined' ? ` (${this.fsp})` : '';
+        const precision = typeof this.fsp !== 'undefined' ? `(${this.fsp})` : '';
         return `timestamp${precision}`;
     }
     mapFromDriverValue(value) {
@@ -39,13 +38,13 @@ class MySqlTimestampStringBuilder extends date_common_1.MySqlDateColumnBaseBuild
     }
 }
 exports.MySqlTimestampStringBuilder = MySqlTimestampStringBuilder;
-class MySqlTimestampString extends common_1.MySqlColumn {
+class MySqlTimestampString extends date_common_1.MySqlDateBaseColumn {
     constructor(table, config) {
         super(table, config);
         this.fsp = config.fsp;
     }
     getSQLType() {
-        const precision = typeof this.fsp !== 'undefined' ? ` (${this.fsp})` : '';
+        const precision = typeof this.fsp !== 'undefined' ? `(${this.fsp})` : '';
         return `timestamp${precision}`;
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"timestamp.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/timestamp.ts"],"names":[],"mappings":";;;AAGA,qCAAuC;AACvC,+CAA2D;AAC3D,MAAa,qBAAsB,SAAQ,wCAG1C;IACA,YACC,IAAY,EACZ,GAAuB;QAEvB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;IACvB,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;CACD;AAlBD,sDAkBC;AAED,MAAa,cAEX,SAAQ,oBAMT;IAKA,YACC,KAA0C,EAC1C,MAAuC;QAEvC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,UAAU;QACT,MAAM,SAAS,GAAG,OAAO,IAAI,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,OAAO,YAAY,SAAS,EAAE,CAAC;IAChC,CAAC;IAEQ,kBAAkB,CAAC,KAAa;QACxC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;CACD;AA7BD,wCA6BC;AAED,MAAa,2BAA4B,SAAQ,wCAGhD;IACA,YACC,IAAY,EACZ,GAAuB;QAEvB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;IACvB,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,oBAAoB,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACrD,CAAC;CACD;AAlBD,kEAkBC;AAED,MAAa,oBAEX,SAAQ,oBAMT;IAKA,YACC,KAA0C,EAC1C,MAA6C;QAE7C,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,UAAU;QACT,MAAM,SAAS,GAAG,OAAO,IAAI,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,OAAO,YAAY,SAAS,EAAE,CAAC;IAChC,CAAC;CACD;AAzBD,oDAyBC;AAaD,SAAgB,SAAS,CACxB,IAAY,EACZ,MAAyD;IAEzD,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,QAAQ,EAAE;QAC9B,OAAO,IAAI,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;KACzD;IACD,OAAO,IAAI,qBAAqB,CAAC,IAAI,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC,CAAC;AACrD,CAAC;AARD,8BAQC"}
+{"version":3,"file":"timestamp.js","sourceRoot":"","sources":["../../../src/mysql-core/columns/timestamp.ts"],"names":[],"mappings":";;;AAIA,+CAAgF;AAChF,MAAa,qBAAsB,SAAQ,wCAG1C;IACA,YACC,IAAY,EACZ,GAAuB;QAEvB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;IACvB,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;CACD;AAlBD,sDAkBC;AAED,MAAa,cAEX,SAAQ,iCAMT;IAKA,YACC,KAA0C,EAC1C,MAAuC;QAEvC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,UAAU;QACT,MAAM,SAAS,GAAG,OAAO,IAAI,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO,YAAY,SAAS,EAAE,CAAC;IAChC,CAAC;IAEQ,kBAAkB,CAAC,KAAa;QACxC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;CACD;AA7BD,wCA6BC;AAED,MAAa,2BAA4B,SAAQ,wCAGhD;IACA,YACC,IAAY,EACZ,GAAuB;QAEvB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;IACvB,CAAC;IAED,gBAAgB;IACP,KAAK,CACb,KAA0C;QAE1C,OAAO,IAAI,oBAAoB,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACrD,CAAC;CACD;AAlBD,kEAkBC;AAED,MAAa,oBAEX,SAAQ,iCAMT;IAKA,YACC,KAA0C,EAC1C,MAA6C;QAE7C,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IACvB,CAAC;IAED,UAAU;QACT,MAAM,SAAS,GAAG,OAAO,IAAI,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACzE,OAAO,YAAY,SAAS,EAAE,CAAC;IAChC,CAAC;CACD;AAzBD,oDAyBC;AAaD,SAAgB,SAAS,CACxB,IAAY,EACZ,MAAyD;IAEzD,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,MAAK,QAAQ,EAAE;QAC9B,OAAO,IAAI,2BAA2B,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;KACzD;IACD,OAAO,IAAI,qBAAqB,CAAC,IAAI,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,CAAC,CAAC;AACrD,CAAC;AARD,8BAQC"}

package/mysql-core/index.d.ts

@@ -5,6 +5,7 @@ export * from './db';
 export * from './dialect';
 export * from './foreign-keys';
 export * from './indexes';
+export * from './primary-keys';
 export * from './session';
 export * from './table';
 //# sourceMappingURL=index.d.ts.map

package/mysql-core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mysql-core/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,MAAM,CAAC;AACrB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mysql-core/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,MAAM,CAAC;AACrB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC"}

package/mysql-core/index.js

@@ -21,6 +21,7 @@ __exportStar(require("./db"), exports);
 __exportStar(require("./dialect"), exports);
 __exportStar(require("./foreign-keys"), exports);
 __exportStar(require("./indexes"), exports);
+__exportStar(require("./primary-keys"), exports);
 __exportStar(require("./session"), exports);
 __exportStar(require("./table"), exports);
 //# sourceMappingURL=index.js.map

package/mysql-core/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mysql-core/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,2CAAyB;AACzB,4CAA0B;AAC1B,uCAAqB;AACrB,4CAA0B;AAC1B,iDAA+B;AAC/B,4CAA0B;AAC1B,4CAA0B;AAC1B,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mysql-core/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,2CAAyB;AACzB,4CAA0B;AAC1B,uCAAqB;AACrB,4CAA0B;AAC1B,iDAA+B;AAC/B,4CAA0B;AAC1B,iDAA+B;AAC/B,4CAA0B;AAC1B,0CAAwB"}

package/mysql-core/primary-keys.d.ts

@@ -0,0 +1,16 @@
+import { AnyMySqlColumn } from './columns';
+import { AnyMySqlTable } from './table';
+export declare function primaryKey<TTableName extends string, TColumns extends AnyMySqlColumn<{
+    tableName: TTableName;
+}>[]>(...columns: TColumns): PrimaryKeyBuilder;
+export declare class PrimaryKeyBuilder {
+    protected $brand: 'MySqlPrimaryKeyBuilder';
+    constructor(columns: AnyMySqlColumn[]);
+}
+export declare class PrimaryKey {
+    readonly table: AnyMySqlTable;
+    readonly columns: AnyMySqlColumn<{}>[];
+    constructor(table: AnyMySqlTable, columns: AnyMySqlColumn<{}>[]);
+    getName(): string;
+}
+//# sourceMappingURL=primary-keys.d.ts.map

package/mysql-core/primary-keys.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"primary-keys.d.ts","sourceRoot":"","sources":["../../src/mysql-core/primary-keys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAc,MAAM,SAAS,CAAC;AAEpD,wBAAgB,UAAU,CACzB,UAAU,SAAS,MAAM,EACzB,QAAQ,SAAS,cAAc,CAAC;IAAE,SAAS,EAAE,UAAU,CAAA;CAAE,CAAC,EAAE,EAC3D,GAAG,OAAO,EAAE,QAAQ,GAAG,iBAAiB,CAEzC;AAED,qBAAa,iBAAiB;IAC7B,UAAkB,MAAM,EAAE,wBAAwB,CAAC;gBAMlD,OAAO,EAAE,cAAc,EAAE;CAS1B;AAED,qBAAa,UAAU;IAGV,QAAQ,CAAC,KAAK,EAAE,aAAa;IAFzC,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC;gBAElB,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,CAAC,EAAE,CAAC,EAAE;IAIxE,OAAO,IAAI,MAAM;CAGjB"}

package/mysql-core/primary-keys.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PrimaryKey = exports.PrimaryKeyBuilder = exports.primaryKey = void 0;
+const table_1 = require("./table");
+function primaryKey(...columns) {
+    return new PrimaryKeyBuilder(columns);
+}
+exports.primaryKey = primaryKey;
+class PrimaryKeyBuilder {
+    constructor(columns) {
+        this.columns = columns;
+    }
+    /** @internal */
+    build(table) {
+        return new PrimaryKey(table, this.columns);
+    }
+}
+exports.PrimaryKeyBuilder = PrimaryKeyBuilder;
+class PrimaryKey {
+    constructor(table, columns) {
+        this.table = table;
+        this.columns = columns;
+    }
+    getName() {
+        return `${this.table[table_1.MySqlTable.Symbol.Name]}_${this.columns.map((column) => column.name).join('_')}_pk`;
+    }
+}
+exports.PrimaryKey = PrimaryKey;
+//# sourceMappingURL=primary-keys.js.map

package/mysql-core/primary-keys.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"primary-keys.js","sourceRoot":"","sources":["../../src/mysql-core/primary-keys.ts"],"names":[],"mappings":";;;AACA,mCAAoD;AAEpD,SAAgB,UAAU,CAGxB,GAAG,OAAiB;IACrB,OAAO,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACvC,CAAC;AALD,gCAKC;AAED,MAAa,iBAAiB;IAM7B,YACC,OAAyB;QAEzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAED,gBAAgB;IAChB,KAAK,CAAC,KAAoB;QACzB,OAAO,IAAI,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;CACD;AAhBD,8CAgBC;AAED,MAAa,UAAU;IAGtB,YAAqB,KAAoB,EAAE,OAA6B;QAAnD,UAAK,GAAL,KAAK,CAAe;QACxC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAED,OAAO;QACN,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;IAC1G,CAAC;CACD;AAVD,gCAUC"}

package/mysql-core/query-builders/select.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,EACN,oBAAoB,EACpB,QAAQ,EAGR,qBAAqB,EAErB,yBAAyB,EACzB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAuB,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGxD,OAAO,EAEN,sBAAsB,EACtB,kBAAkB,EAClB,MAAM,EACN,eAAe,EACf,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,MAAM,gBAAgB,CAAC;AAExB,qBAAa,kBAAkB,CAAC,UAAU,SAAS,YAAY,GAAG,SAAS;IAEzE,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ;gBAHR,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY,EACrB,QAAQ,GAAE,QAAQ,EAAO;IAGlC,IAAI,CAAC,SAAS,SAAS,QAAQ,EAC9B,QAAQ,EAAE,SAAS,GACjB,WAAW,CACb,SAAS,EACT,UAAU,SAAS,SAAS,GAAG,oBAAoB,CAAC,SAAS,CAAC,GAAG,UAAU,EAC3E,UAAU,SAAS,SAAS,GAAG,QAAQ,GAAG,SAAS,CACnD;IACD,IAAI,CAAC,MAAM,SAAS,aAAa,EAChC,KAAK,EAAE,MAAM,GACX,WAAW,CACb,MAAM,EACN,UAAU,SAAS,SAAS,GAAG,cAAc,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,UAAU,EAC7E,UAAU,SAAS,SAAS,GAAG,QAAQ,GAAG,SAAS,CACnD;CAqBD;AAED,MAAM,WAAW,WAAW,CAC3B,MAAM,SAAS,aAAa,GAAG,QAAQ,EACvC,UAAU,EACV,WAAW,SAAS,UAAU,GAAG,QAAQ,EACzC,YAAY,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,CACpG,SAAQ,YAAY,CAAC,YAAY,CAAC,UAAU,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC,EAAE,UAAU;CAAG;AAE5F,qBAAa,WAAW,CACvB,MAAM,SAAS,aAAa,GAAG,QAAQ,EAEvC,UAAU,EACV,WAAW,SAAS,UAAU,GAAG,QAAQ,EACzC,YAAY,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,CACpG,SAAQ,YAAY,CAAC,YAAY,CAAC,UAAU,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,CAAE,YAAW,UAAU;IAajG,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IAdhB,UAAkB,MAAM,EAAE,MAAM,CAAC;IACjC,UAAkB,WAAW,EAAE,WAAW,CAAC;IAC3C,UAAkB,OAAO,EAAE,UAAU,CAAC;IAEtC,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,gBAAgB,CAA0B;IAClD,OAAO,CAAC,SAAS,CAAS;gBAGzB,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACjC,MAAM,EAAE,iBAAiB,CAAC,QAAQ,CAAC,EACnC,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,EACnC,eAAe,EAAE,OAAO,EACxB,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY,EAC7B,QAAQ,EAAE,QAAQ,EAAE;IAgBrB,OAAO,CAAC,UAAU;IAqDlB,QAAQ,gEAA2B;IAEnC,SAAS,iEAA4B;IAErC,SAAS,iEAA4B;IAErC,QAAQ,gEAA2B;IAEnC,KAAK,CAAC,KAAK,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,GAAG,QAAQ,MAAM,CAAC;IAKtE,OAAO,CAAC,GAAG,OAAO,EAAE,CAAC,cAAc,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,GAAG,QAAQ,MAAM,CAAC;IAKtF,OAAO,CAAC,GAAG,OAAO,EAAE,CAAC,cAAc,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,GAAG,QAAQ,MAAM,GAAG,SAAS,CAAC;IAKlG,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,GAAG,QAAQ,MAAM,GAAG,OAAO,CAAC;IAKvE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,GAAG,QAAQ,MAAM,GAAG,QAAQ,CAAC;IAK1E,GAAG,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,GAAE,UAAe,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC;IAUvE,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC;IAK/B,OAAO,CAAC,QAAQ;IAYhB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CACnC,mBAAmB,GAAG;QACrB,OAAO,EAAE,YAAY,CAAC,UAAU,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;KAC/D,CACD;IAIQ,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAEtD;IAEF,EAAE,CAAC,MAAM,SAAS,MAAM,EACvB,KAAK,EAAE,MAAM,GACX,qBAAqB,CAAC,QAAQ,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC;IAOpG,mBAAmB,CAAC,MAAM,SAAS,MAAM,EACxC,KAAK,EAAE,MAAM,GACX,yBAAyB,CAAC,QAAQ,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC;CAMxG"}
+{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../src/mysql-core/query-builders/select.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,EACN,oBAAoB,EACpB,QAAQ,EAGR,qBAAqB,EAErB,yBAAyB,EACzB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAuB,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExD,OAAO,EAEN,sBAAsB,EACtB,kBAAkB,EAClB,MAAM,EACN,eAAe,EACf,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,MAAM,gBAAgB,CAAC;AAExB,qBAAa,kBAAkB,CAAC,UAAU,SAAS,YAAY,GAAG,SAAS;IAEzE,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,QAAQ;gBAHR,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY,EACrB,QAAQ,GAAE,QAAQ,EAAO;IAGlC,IAAI,CAAC,SAAS,SAAS,QAAQ,EAC9B,QAAQ,EAAE,SAAS,GACjB,WAAW,CACb,SAAS,EACT,UAAU,SAAS,SAAS,GAAG,oBAAoB,CAAC,SAAS,CAAC,GAAG,UAAU,EAC3E,UAAU,SAAS,SAAS,GAAG,QAAQ,GAAG,SAAS,CACnD;IACD,IAAI,CAAC,MAAM,SAAS,aAAa,EAChC,KAAK,EAAE,MAAM,GACX,WAAW,CACb,MAAM,EACN,UAAU,SAAS,SAAS,GAAG,cAAc,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,UAAU,EAC7E,UAAU,SAAS,SAAS,GAAG,QAAQ,GAAG,SAAS,CACnD;CAqBD;AAED,MAAM,WAAW,WAAW,CAC3B,MAAM,SAAS,aAAa,GAAG,QAAQ,EACvC,UAAU,EACV,WAAW,SAAS,UAAU,GAAG,QAAQ,EACzC,YAAY,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,CACpG,SAAQ,YAAY,CAAC,YAAY,CAAC,UAAU,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC,EAAE,UAAU;CAAG;AAE5F,qBAAa,WAAW,CACvB,MAAM,SAAS,aAAa,GAAG,QAAQ,EAEvC,UAAU,EACV,WAAW,SAAS,UAAU,GAAG,QAAQ,EACzC,YAAY,SAAS,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,CACpG,SAAQ,YAAY,CAAC,YAAY,CAAC,UAAU,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,CAAE,YAAW,UAAU;IAajG,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IAdhB,UAAkB,MAAM,EAAE,MAAM,CAAC;IACjC,UAAkB,WAAW,EAAE,WAAW,CAAC;IAC3C,UAAkB,OAAO,EAAE,UAAU,CAAC;IAEtC,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,gBAAgB,CAA0B;IAClD,OAAO,CAAC,SAAS,CAAS;gBAGzB,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACjC,MAAM,EAAE,iBAAiB,CAAC,QAAQ,CAAC,EACnC,UAAU,EAAE,iBAAiB,CAAC,YAAY,CAAC,EACnC,eAAe,EAAE,OAAO,EACxB,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,YAAY,EAC7B,QAAQ,EAAE,QAAQ,EAAE;IAgBrB,OAAO,CAAC,UAAU;IAqDlB,QAAQ,gEAA2B;IAEnC,SAAS,iEAA4B;IAErC,SAAS,iEAA4B;IAErC,QAAQ,gEAA2B;IAEnC,KAAK,CAAC,KAAK,EAAE,GAAG,GAAG,SAAS,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,GAAG,QAAQ,MAAM,CAAC;IAKtE,OAAO,CAAC,GAAG,OAAO,EAAE,CAAC,cAAc,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,GAAG,QAAQ,MAAM,CAAC;IAKtF,OAAO,CAAC,GAAG,OAAO,EAAE,CAAC,cAAc,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,GAAG,QAAQ,MAAM,GAAG,SAAS,CAAC;IAKlG,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,GAAG,QAAQ,MAAM,GAAG,OAAO,CAAC;IAKvE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,GAAG,QAAQ,MAAM,GAAG,QAAQ,CAAC;IAK1E,GAAG,CAAC,QAAQ,EAAE,YAAY,EAAE,MAAM,GAAE,UAAe,GAAG,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC;IAUvE,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC;IAK/B,OAAO,CAAC,QAAQ;IAYhB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CACnC,mBAAmB,GAAG;QACrB,OAAO,EAAE,YAAY,CAAC,UAAU,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,CAAC;KAC/D,CACD;IAIQ,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAEtD;IAEF,EAAE,CAAC,MAAM,SAAS,MAAM,EACvB,KAAK,EAAE,MAAM,GACX,qBAAqB,CAAC,QAAQ,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC;IAOpG,mBAAmB,CAAC,MAAM,SAAS,MAAM,EACxC,KAAK,EAAE,MAAM,GACX,yBAAyB,CAAC,QAAQ,CAAC,sBAAsB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC;CAMxG"}

package/mysql-core/query-builders/select.js

@@ -12,11 +12,11 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MySqlSelect = exports.MySqlSelectBuilder = void 0;
+const utils_1 = require("../utils");
 const query_promise_1 = require("../../query-promise");
 const subquery_1 = require("../../subquery");
 const table_1 = require("../../table");
-const utils_1 = require("../../utils");
-const utils_2 = require("../utils");
+const utils_2 = require("../../utils");
 class MySqlSelectBuilder {
     constructor(fields, session, dialect, withList = []) {
         this.fields = fields;
@@ -35,9 +35,9 @@ class MySqlSelectBuilder {
             fields = Object.fromEntries(Object.keys(table[subquery_1.SubqueryConfig].selection).map((key) => [key, table[key]]));
         }
         else {
-            fields = (0, utils_2.getTableColumns)(table, { format: 'object' });
+            fields = (0, utils_1.getTableColumns)(table);
         }
-        const fieldsList = (0, utils_1.orderSelectedFields)(fields);
+        const fieldsList = (0, utils_2.orderSelectedFields)(fields);
         return new MySqlSelect(table, fields, fieldsList, isPartialSelect, this.session, this.dialect, this.withList);
     }
 }
@@ -78,7 +78,7 @@ class MySqlSelect extends query_promise_1.QueryPromise {
                 if (Object.keys(this.joinsNotNullable).length === 1) {
                     this.config.fieldsList = this.config.fieldsList.map((field) => (Object.assign(Object.assign({}, field), { path: [this.tableName, ...field.path] })));
                 }
-                this.config.fieldsList.push(...(0, utils_1.orderSelectedFields)(table instanceof subquery_1.Subquery ? table[subquery_1.SubqueryConfig].selection : table[table_1.Table.Symbol.Columns], [tableName]));
+                this.config.fieldsList.push(...(0, utils_2.orderSelectedFields)(table instanceof subquery_1.Subquery ? table[subquery_1.SubqueryConfig].selection : table[table_1.Table.Symbol.Columns], [tableName]));
             }
             this.config.joins[tableName] = { on, table, joinType };
             switch (joinType) {