drizzle-orm 0.20.2 → 0.21.0-e8bca2b

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/migrator.d.ts CHANGED
@@ -9,6 +9,7 @@ export interface MigrationMeta {
9
9
  sql: string;
10
10
  folderMillis: number;
11
11
  hash: string;
12
+ bps: number[];
12
13
  }
13
14
  export declare function readMigrationFiles(config: string | MigrationConfig): MigrationMeta[];
14
15
  //# sourceMappingURL=migrator.d.ts.map
package/migrator.d.ts.map CHANGED
@@ -1 +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"}
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;IACb,GAAG,EAAE,MAAM,EAAE,CAAC;CACd;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,GAAG,aAAa,EAAE,CA6CpF"}
package/migrator.js CHANGED
@@ -20,31 +20,29 @@ function readMigrationFiles(config) {
20
20
  if (!migrationFolderTo) {
21
21
  throw Error('no migration folder defined');
22
22
  }
23
- const files = fs_1.default.readdirSync(migrationFolderTo);
24
23
  const migrationQueries = [];
25
- for (const migrationFolder of files) {
26
- if (migrationFolder === '.DS_Store') {
27
- continue;
24
+ let journalAsString = '';
25
+ try {
26
+ journalAsString = fs_1.default.readFileSync(`${migrationFolderTo}/meta/_journal.json`).toString();
27
+ }
28
+ catch (e) {
29
+ throw Error(`Can't find journal meta file`);
30
+ }
31
+ const journal = JSON.parse(journalAsString);
32
+ for (const journalEntry of journal.entries) {
33
+ const migrationPath = `${migrationFolderTo}/${journalEntry.tag}.sql`;
34
+ try {
35
+ const query = fs_1.default.readFileSync(`${migrationFolderTo}/${journalEntry.tag}.sql`).toString();
36
+ migrationQueries.push({
37
+ sql: query,
38
+ bps: journalEntry.breakpoints,
39
+ folderMillis: journalEntry.when,
40
+ hash: crypto_1.default.createHash('sha256').update(query).digest('hex'),
41
+ });
42
+ }
43
+ catch (e) {
44
+ throw Error(`No file ${migrationPath} found in ${migrationFolderTo} folder`);
28
45
  }
29
- const migrationFiles = fs_1.default.readdirSync(`${migrationFolderTo}/${migrationFolder}`);
30
- const migrationFile = migrationFiles.filter((file) => file === 'migration.sql')[0];
31
- const query = fs_1.default
32
- .readFileSync(`${migrationFolderTo}/${migrationFolder}/${migrationFile}`)
33
- .toString();
34
- const year = Number(migrationFolder.slice(0, 4));
35
- // second param for Date() is month index, that started from 0, so we need
36
- // to decrement a value for month
37
- const month = Number(migrationFolder.slice(4, 6)) - 1;
38
- const day = Number(migrationFolder.slice(6, 8));
39
- const hour = Number(migrationFolder.slice(8, 10));
40
- const min = Number(migrationFolder.slice(10, 12));
41
- const sec = Number(migrationFolder.slice(12, 14));
42
- const folderAsMillis = Date.UTC(year, month, day, hour, min, sec);
43
- migrationQueries.push({
44
- sql: query,
45
- folderMillis: folderAsMillis,
46
- hash: crypto_1.default.createHash('sha256').update(query).digest('hex'),
47
- });
48
46
  }
49
47
  return migrationQueries;
50
48
  }
package/migrator.js.map CHANGED
@@ -1 +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"}
1
+ {"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,8BAA8B,CAAC,CAAC;KAC5C;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"}
@@ -1,7 +1,11 @@
1
+ import { ColumnBaseConfig } from '../../column';
1
2
  import { ColumnBuilderBaseConfig, UpdateCBConfig } from '../../column-builder';
2
3
  import { SQL } from '../../sql';
3
- import { MySqlColumnBuilder } from './common';
4
- export declare abstract class MySqlDateColumnBaseBuilder<T extends ColumnBuilderBaseConfig, TConfig extends Record<string, unknown> = {}> extends MySqlColumnBuilder<T, TConfig> {
4
+ import { AnyMySqlTable } from '../table';
5
+ import { MySqlColumn, MySqlColumnBuilder } from './common';
6
+ export declare abstract class MySqlDateColumnBaseBuilder<T extends Partial<ColumnBuilderBaseConfig>, TConfig extends Record<string, unknown> = {}> extends MySqlColumnBuilder<T, TConfig & {
7
+ hasOnUpdateNow: boolean;
8
+ }> {
5
9
  hasOnUpdateNow: boolean;
6
10
  notNull(): MySqlDateColumnBaseBuilder<UpdateCBConfig<T, {
7
11
  notNull: true;
@@ -19,4 +23,16 @@ export declare abstract class MySqlDateColumnBaseBuilder<T extends ColumnBuilder
19
23
  hasDefault: true;
20
24
  }>>;
21
25
  }
26
+ export declare abstract class MySqlDateBaseColumn<T extends Partial<ColumnBaseConfig & {
27
+ hasOnUpdateNow: boolean;
28
+ }>> extends MySqlColumn<T> {
29
+ readonly table: AnyMySqlTable<{
30
+ name: T['tableName'];
31
+ }>;
32
+ protected $hasOnUpdateNow: T['hasOnUpdateNow'];
33
+ readonly hasOnUpdateNow: boolean;
34
+ constructor(table: AnyMySqlTable<{
35
+ name: T['tableName'];
36
+ }>, config: MySqlDateColumnBaseBuilder<Omit<T, 'tableName'>>['config']);
37
+ }
22
38
  //# sourceMappingURL=date.common.d.ts.map
@@ -1 +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"}
1
+ {"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"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.MySqlDateColumnBaseBuilder = void 0;
3
+ exports.MySqlDateBaseColumn = exports.MySqlDateColumnBaseBuilder = void 0;
4
4
  const sql_1 = require("../../sql");
5
5
  const common_1 = require("./common");
6
6
  class MySqlDateColumnBaseBuilder extends common_1.MySqlColumnBuilder {
@@ -21,26 +21,18 @@ class MySqlDateColumnBaseBuilder extends common_1.MySqlColumnBuilder {
21
21
  return this.default((0, sql_1.sql) `now()`);
22
22
  }
23
23
  onUpdateNow() {
24
- this.hasOnUpdateNow = true;
24
+ this.config.hasOnUpdateNow = true;
25
25
  this.config.hasDefault = true;
26
26
  return this;
27
27
  }
28
28
  }
29
29
  exports.MySqlDateColumnBaseBuilder = MySqlDateColumnBaseBuilder;
30
- // export abstract class MySqlDateBaseColumn<
31
- // TTableName extends string,
32
- // TData extends ColumnData,
33
- // TDriverParam extends MySqlColumnDriverParam,
34
- // TNotNull extends boolean,
35
- // THasDefault extends boolean,
36
- // > extends MySqlColumn<TTableName, TData, TDriverParam, TNotNull, THasDefault> {
37
- // readonly hasOnUpdateNow: boolean;
38
- // constructor(
39
- // table: AnyMySqlTable<TTableName>,
40
- // builder: MySqlDateColumnBaseBuilder<TData, TDriverParam, TNotNull, THasDefault>,
41
- // ) {
42
- // super(table, builder);
43
- // this.hasOnUpdateNow = builder.hasOnUpdateNow;
44
- // }
45
- // }
30
+ class MySqlDateBaseColumn extends common_1.MySqlColumn {
31
+ constructor(table, config) {
32
+ super(table, config);
33
+ this.table = table;
34
+ this.hasOnUpdateNow = config.hasOnUpdateNow;
35
+ }
36
+ }
37
+ exports.MySqlDateBaseColumn = MySqlDateBaseColumn;
46
38
  //# sourceMappingURL=date.common.js.map
@@ -1 +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"}
1
+ {"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,OAAO,CAAC,CAAC;IACjC,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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "drizzle-orm",
3
- "version": "0.20.2",
3
+ "version": "0.21.0-e8bca2b",
4
4
  "description": "Drizzle ORM package for SQL databases",
5
5
  "scripts": {
6
6
  "build": "tsc && resolve-tspaths && cp ../README.md package.json dist/",
@@ -1 +1 @@
1
- {"version":3,"file":"migrator.d.ts","sourceRoot":"","sources":["../../src/planetscale-serverless/migrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAsB,MAAM,YAAY,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG/C,wBAAsB,OAAO,CAAC,EAAE,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe,iBA+BtF"}
1
+ {"version":3,"file":"migrator.d.ts","sourceRoot":"","sources":["../../src/planetscale-serverless/migrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAsB,MAAM,YAAY,CAAC;AAEjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAK/C,wBAAsB,OAAO,CAAC,EAAE,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe,iBA4CtF"}
@@ -27,7 +27,18 @@ function migrate(db, config) {
27
27
  for (const migration of migrations) {
28
28
  if (!lastDbMigration
29
29
  || parseInt(lastDbMigration.created_at, 10) < migration.folderMillis) {
30
- queries.push({ sql: migration.sql });
30
+ if (typeof migration.bps === 'undefined') {
31
+ queries.push({ sql: migration.sql });
32
+ console.log(`Warning: If you are seeing "got extra characters encountered after end of DDL" error it means, that current migrations were generated by older drizzle-kit version.\n\n1. Upgrade drizzle-kit to latest version;\n2. Delete old migration folders\n3. Generate new migration with drizzle-kit generate:mysql\n`);
33
+ }
34
+ else {
35
+ const result = migration.bps.reduce((res, it) => {
36
+ res.acc.push({ sql: migration.sql.slice(res.prev, it) });
37
+ res.prev = it;
38
+ return res;
39
+ }, { prev: 0, acc: [] });
40
+ queries.push(...result.acc);
41
+ }
31
42
  queries.push({
32
43
  sql: `INSERT INTO \`__drizzle_migrations\` (\`hash\`, \`created_at\`) VALUES(?, ?)`,
33
44
  params: [migration.hash, migration.folderMillis],
@@ -1 +1 @@
1
- {"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../src/planetscale-serverless/migrator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAiE;AACjE,+BAA4B;AAI5B,SAAsB,OAAO,CAAC,EAAuB,EAAE,MAAgC;;QACtF,MAAM,UAAU,GAAG,IAAA,6BAAkB,EAAC,MAAM,CAAC,CAAC;QAC9C,MAAM,oBAAoB,GAAG,IAAA,SAAG,EAAA;;;;GAI9B,CAAC;QACH,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAE/C,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CACxC,IAAA,SAAG,EAAA,4FAA4F,CAC/F,CAAC;QAEF,MAAM,eAAe,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAExC,MAAM,OAAO,GAAsC,EAAE,CAAC;QAEtD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YACnC,IACC,CAAC,eAAe;mBACb,QAAQ,CAAC,eAAe,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,YAAY,EACnE;gBACD,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC;gBACrC,OAAO,CAAC,IAAI,CAAC;oBACZ,GAAG,EAAE,8EAA8E;oBACnF,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,YAAY,CAAC;iBAChD,CAAC,CAAC;aACH;SACD;QAED,MAAO,EAAE,CAAC,OAA8B,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;CAAA;AA/BD,0BA+BC"}
1
+ {"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../src/planetscale-serverless/migrator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAiE;AACjE,+BAA4B;AAM5B,SAAsB,OAAO,CAAC,EAAuB,EAAE,MAAgC;;QACtF,MAAM,UAAU,GAAG,IAAA,6BAAkB,EAAC,MAAM,CAAC,CAAC;QAC9C,MAAM,oBAAoB,GAAG,IAAA,SAAG,EAAA;;;;GAI9B,CAAC;QACH,MAAM,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAE/C,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CACxC,IAAA,SAAG,EAAA,4FAA4F,CAC/F,CAAC;QAEF,MAAM,eAAe,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAExC,MAAM,OAAO,GAAsC,EAAE,CAAC;QAEtD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YACnC,IACC,CAAC,eAAe;mBACb,QAAQ,CAAC,eAAe,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,YAAY,EACnE;gBACD,IAAI,OAAO,SAAS,CAAC,GAAG,KAAK,WAAW,EAAE;oBACzC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC;oBACrC,OAAO,CAAC,GAAG,CACV,gTAAgT,CAChT,CAAC;iBACF;qBAAM;oBACN,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAM,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE;wBACpD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;wBACzD,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;wBACd,OAAO,GAAG,CAAC;oBACZ,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;oBAEzB,OAAO,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;iBAC5B;gBACD,OAAO,CAAC,IAAI,CAAC;oBACZ,GAAG,EAAE,8EAA8E;oBACnF,MAAM,EAAE,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,YAAY,CAAC;iBAChD,CAAC,CAAC;aACH;SACD;QAED,MAAO,EAAE,CAAC,OAA8B,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;CAAA;AA5CD,0BA4CC"}
package/version.d.ts CHANGED
@@ -1,3 +1,3 @@
1
- export declare const compatibilityVersion = 2;
1
+ export declare const compatibilityVersion = 3;
2
2
  export declare const npmVersion: string;
3
3
  //# sourceMappingURL=version.d.ts.map
package/version.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.npmVersion = exports.compatibilityVersion = void 0;
4
- exports.compatibilityVersion = 2;
4
+ exports.compatibilityVersion = 3;
5
5
  exports.npmVersion = require('./package.json').version;
6
6
  //# sourceMappingURL=version.js.map