drizzle-kit 0.18.1-f3800bf → 0.19.0-07024c4

package/index.d.ts

@@ -3,6 +3,12 @@ export type Config = {
     breakpoints?: boolean | undefined;
     tablesFilter?: string | string[] | undefined;
     schema?: string | string[];
+    verbose?: boolean | undefined;
+    strict?: boolean | undefined;
+} & {
+    introspect?: {
+        casing: "camel" | "preserve";
+    };
 } & ({
     port?: number | undefined;
     password?: string | undefined;
@@ -11,4 +17,50 @@ export type Config = {
     database: string;
 } | {
     connectionString: string;
+} | {
+    driver: "turso";
+    dbCredentials: {
+        url: string;
+        authToken?: string;
+    };
+} | {
+    driver: "better-sqlite";
+    dbCredentials: {
+        url: string;
+    };
+} | {
+    driver: "libsql";
+    dbCredentials: {
+        url: string;
+    };
+} | {
+    driver: "pg";
+    dbCredentials: {
+        host: string;
+        port?: number;
+        user?: string;
+        password?: string;
+        database: string;
+        ssl?: boolean;
+    };
+} | {
+    driver: "pg";
+    dbCredentials: {
+        connectionString: string;
+    };
+} | {
+    driver: "mysql2";
+    dbCredentials: {
+        host: string;
+        port?: number;
+        user?: string;
+        password?: string;
+        database: string;
+        connectionString: string;
+    };
+} | {
+    driver: "mysql2";
+    dbCredentials: {
+        connectionString: string;
+    };
 } | {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.18.1-f3800bf",
+  "version": "0.19.0-07024c4",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -10,14 +10,17 @@
   "scripts": {
     "migrate:old": "drizzle-kit generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
     "push": "node -r esbuild-register ./src/cli/index.ts push:mysql",
+    "push:sqlite": "node -r ./src/loader.mjs ./src/cli/index.ts push:sqlite",
+    "try1": "tsx ./dev/test.ts",
     "migrate:old:mysql": "drizzle-kit generate:mysql --out ./dev/migrations-mysql --schema ./dev/migrations-mysql/schema.ts",
     "start:pg": "node -r esbuild-register ./src/cli/index.ts generate:pg",
-    "start:sqlite": "node -r esbuild-register ./src/cli/index.ts generate:sqlite --out ./dev/migrations-sqlite --schema ./dev/migrations-sqlite/schema.ts",
+    "start:sqlite": "node -r esbuild-register ./src/cli/index.ts generate:sqlite",
     "start:mysql": "node -r esbuild-register ./src/cli/index.ts generate:mysql",
     "check:pg": "node -r esbuild-register ./src/cli/index.ts check --out ./dev/migrations --dialect pg",
     "introspect:mysql": "node -r esbuild-register ./src/cli/index.ts introspect:mysql --config drizzle.config2.ts",
+    "introspect:sqlite": "node -r esbuild-register ./src/cli/index.ts introspect:sqlite --driver=sqlite",
     "introspect:pg": "node -r esbuild-register ./src/cli/index.ts introspect:pg --out ./dev/introspect-pg --connectionString=postgresql://postgres@localhost:5432/introspect",
-    "drop": "node -r esbuild-register ./src/cli/index.ts drop --out ./dev/migrations-pg",
+    "drop": "node -r esbuild-register ./src/cli/index.ts drop",
     "up:pg": "node -r esbuild-register ./src/cli/index.ts up:pg --out ./dev/migrations-pg",
     "up:mysql": "node -r esbuild-register ./src/cli/index.ts up:mysql --out ./dev/migrations-mysql",
     "check:equedi": "node -r esbuild-register ./src/cli/index.ts check --out ./dev/equedi --dialect pg",
@@ -31,6 +34,7 @@
     "sim:sqlite": "node -r esbuild-register ./dev/sqlite/index.ts",
     "test": "ava test --timeout=60s",
     "build": "rm -rf ./dist && tsx build.ts && tsc -p tsconfig.cli-types.json",
+    "build:dev": "rm -rf ./dist && tsx build.dev.ts && tsc -p tsconfig.cli-types.json && chmod +x ./dist/index.cjs",
     "pack": "build && package",
     "tsc": "tsc -p tsconfig.build.json",
     "pub": "cp package.json readme.md dist/ && cd dist && npm publish"
@@ -58,6 +62,8 @@
     "zod": "^3.20.2"
   },
   "devDependencies": {
+    "@libsql/client": "^0.1.6",
+    "@types/better-sqlite3": "^7.6.4",
     "@types/dockerode": "^3.3.14",
     "@types/glob": "^8.1.0",
     "@types/minimatch": "^5.1.2",
@@ -66,11 +72,12 @@
     "@typescript-eslint/eslint-plugin": "^5.46.1",
     "@typescript-eslint/parser": "^5.46.1",
     "ava": "^5.1.0",
+    "better-sqlite3": "^8.4.0",
     "dockerode": "^3.3.4",
     "dotenv": "^16.0.3",
-    "drizzle-kit": "^0.16.8",
-    "drizzle-orm": "0.25.1",
+    "drizzle-orm": "0.26.5-8235b73",
     "esbuild": "^0.17.19",
+    "esbuild-register": "^3.4.2",
     "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",

package/utils.js

@@ -337,9 +337,9 @@ function createSupportsColor(stream, options = {}) {
 var import_node_process, import_node_os, import_node_tty, env, flagForceColor, supportsColor, supports_color_default;
 var init_supports_color = __esm({
   "node_modules/.pnpm/chalk@5.2.0/node_modules/chalk/source/vendor/supports-color/index.js"() {
-    import_node_process = __toESM(require("process"), 1);
-    import_node_os = __toESM(require("os"), 1);
-    import_node_tty = __toESM(require("tty"), 1);
+    import_node_process = __toESM(require("node:process"), 1);
+    import_node_os = __toESM(require("node:os"), 1);
+    import_node_tty = __toESM(require("node:tty"), 1);
     ({ env } = import_node_process.default);
     if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false") || hasFlag("color=never")) {
       flagForceColor = 0;
@@ -12825,9 +12825,8 @@ var schemaSquashedV4 = objectType({
 }).strict();
 var MySqlSquasher = {
   squashIdx: (idx) => {
-    var _a, _b, _c;
     index.parse(idx);
-    return `${idx.name};${idx.columns.join(",")};${idx.isUnique};${(_a = idx.using) != null ? _a : ""};${(_b = idx.algorithm) != null ? _b : ""};${(_c = idx.lock) != null ? _c : ""}`;
+    return `${idx.name};${idx.columns.join(",")};${idx.isUnique};${idx.using ?? ""};${idx.algorithm ?? ""};${idx.lock ?? ""}`;
   },
   unsquashIdx: (input) => {
     const [name, columnsString, isUnique, using, algorithm, lock] = input.split(";");
@@ -12849,8 +12848,7 @@ var MySqlSquasher = {
     return { name: splitted[0], columns: splitted[1].split(",") };
   },
   squashFK: (fk4) => {
-    var _a, _b;
-    return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${(_a = fk4.onUpdate) != null ? _a : ""};${(_b = fk4.onDelete) != null ? _b : ""}`;
+    return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${fk4.onUpdate ?? ""};${fk4.onDelete ?? ""}`;
   },
   unsquashFK: (input) => {
     const [
@@ -13077,8 +13075,7 @@ var PgSquasher = {
     return result;
   },
   squashFK: (fk4) => {
-    var _a, _b;
-    return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${(_a = fk4.onUpdate) != null ? _a : ""};${(_b = fk4.onDelete) != null ? _b : ""}`;
+    return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${fk4.onUpdate ?? ""};${fk4.onDelete ?? ""}`;
   },
   squashPK: (pk) => {
     return `${pk.columns.join(",")}`;
@@ -13242,9 +13239,8 @@ var schemaSquashed2 = objectType({
 }).strict();
 var SQLiteSquasher = {
   squashIdx: (idx) => {
-    var _a;
     index3.parse(idx);
-    return `${idx.name};${idx.columns.join(",")};${idx.isUnique};${(_a = idx.where) != null ? _a : ""}`;
+    return `${idx.name};${idx.columns.join(",")};${idx.isUnique};${idx.where ?? ""}`;
   },
   unsquashIdx: (input) => {
     const [name, columnsString, isUnique, where] = input.split(";");
@@ -13252,13 +13248,12 @@ var SQLiteSquasher = {
       name,
       columns: columnsString.split(","),
       isUnique: isUnique === "true",
-      where: where != null ? where : void 0
+      where: where ?? void 0
     });
     return result;
   },
   squashFK: (fk4) => {
-    var _a, _b;
-    return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${(_a = fk4.onUpdate) != null ? _a : ""};${(_b = fk4.onDelete) != null ? _b : ""}`;
+    return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${fk4.onUpdate ?? ""};${fk4.onDelete ?? ""}`;
   },
   unsquashFK: (input) => {
     const [
@@ -13333,7 +13328,6 @@ function diffForRenamedColumn(t1, t2) {
   return alternationsInColumn(diffed);
 }
 function applyJsonDiff(json1, json2) {
-  var _a, _b, _c;
   json1 = JSON.parse(JSON.stringify(json1));
   json2 = JSON.parse(JSON.stringify(json2));
   const rawDiff = (0, import_json_diff.diff)(json1, json2);
@@ -13344,9 +13338,9 @@ function applyJsonDiff(json1, json2) {
   }, {});
   if (!difference)
     return {};
-  difference.tables = (_a = difference.tables) != null ? _a : {};
-  difference.enums = (_b = difference.enums) != null ? _b : {};
-  difference.schemas = (_c = difference.schemas) != null ? _c : {};
+  difference.tables = difference.tables ?? {};
+  difference.enums = difference.enums ?? {};
+  difference.schemas = difference.schemas ?? {};
   const tableEntries = Object.entries(difference.tables);
   const addedTables = tableEntries.filter((it) => it[0].includes("__added")).map((it) => it[1]);
   const deletedTables = tableEntries.filter((it) => it[0].includes("__deleted")).map((it) => it[1]);
@@ -13384,8 +13378,7 @@ function applyJsonDiff(json1, json2) {
   };
 }
 var findAlternationsInTable = (table4, tableSchema) => {
-  var _a;
-  const columns = (_a = table4.columns) != null ? _a : {};
+  const columns = table4.columns ?? {};
   let schema4 = {
     type: "none",
     value: tableSchema
@@ -13672,9 +13665,9 @@ var SQLiteCreateTableConvertor = class extends Convertor {
       const primaryKeyStatement = column4.primaryKey ? " PRIMARY KEY" : "";
       const notNullStatement = column4.notNull ? " NOT NULL" : "";
       const defaultStatement = column4.default !== void 0 ? ` DEFAULT ${column4.default}` : "";
-      const autoincrementStatement = column4.autoincrement ? " AUTOINCREMENT" : "";
+      const autoincrementStatement = column4.autoincrement ? " AUTO_INCREMENT" : "";
       statement += "\n	";
-      statement += `\`${column4.name}\` ${column4.type}${primaryKeyStatement}${autoincrementStatement}${defaultStatement}${notNullStatement}`;
+      statement += `\`${column4.name}\` ${column4.type}${autoincrementStatement}${primaryKeyStatement}${defaultStatement}${notNullStatement}`;
       statement += ",";
     }
     compositePKs.forEach((it) => {
@@ -14264,6 +14257,36 @@ var SqliteAlterTableAlterColumnSetNotNullConvertor = class extends Convertor {
 */`;
   }
 };
+var SqliteAlterTableAlterColumnSetAutoincrementConvertor = class extends Convertor {
+  can(statement, dialect3) {
+    return statement.type === "alter_table_alter_column_set_autoincrement" && dialect3 === "sqlite";
+  }
+  convert(statement) {
+    return `/*
+ SQLite does not support "Set autoincrement to a column" out of the box, we do not generate automatic migration for that, so it has to be done manually
+ Please refer to: https://www.techonthenet.com/sqlite/tables/alter_table.php
+                  https://www.sqlite.org/lang_altertable.html
+                  https://stackoverflow.com/questions/2083543/modify-a-columns-type-in-sqlite3
+
+ Due to that we don't generate migration automatically and it has to be done manually
+*/`;
+  }
+};
+var SqliteAlterTableAlterColumnDropAutoincrementConvertor = class extends Convertor {
+  can(statement, dialect3) {
+    return statement.type === "alter_table_alter_column_drop_autoincrement" && dialect3 === "sqlite";
+  }
+  convert(statement) {
+    return `/*
+ SQLite does not support "Drop autoincrement from a column" out of the box, we do not generate automatic migration for that, so it has to be done manually
+ Please refer to: https://www.techonthenet.com/sqlite/tables/alter_table.php
+                  https://www.sqlite.org/lang_altertable.html
+                  https://stackoverflow.com/questions/2083543/modify-a-columns-type-in-sqlite3
+
+ Due to that we don't generate migration automatically and it has to be done manually
+*/`;
+  }
+};
 var PgAlterTableAlterColumnDropNotNullConvertor = class extends Convertor {
   can(statement, dialect3) {
     return statement.type === "alter_table_alter_column_drop_notnull" && dialect3 === "pg";
@@ -14672,6 +14695,8 @@ convertors.push(new SqliteAlterTableAlterColumnSetNotNullConvertor());
 convertors.push(new SqliteAlterTableAlterColumnDropNotNullConvertor());
 convertors.push(new SqliteAlterTableAlterColumnSetDefaultConvertor());
 convertors.push(new SqliteAlterTableAlterColumnDropDefaultConvertor());
+convertors.push(new SqliteAlterTableAlterColumnSetAutoincrementConvertor());
+convertors.push(new SqliteAlterTableAlterColumnDropAutoincrementConvertor());
 convertors.push(new SqliteAlterTableCreateCompositePrimaryKeyConvertor());
 convertors.push(new SqliteAlterTableDeleteCompositePrimaryKeyConvertor());
 convertors.push(new SqliteAlterTableAlterCompositePrimaryKeyConvertor());
@@ -14690,7 +14715,6 @@ var fromJson = (statements, dialect3) => {
     });
     const convertor = filtered.length === 1 ? filtered[0] : void 0;
     if (!convertor) {
-      console.log("no convertor:", statement.type, dialect3);
       return "";
     }
     return convertor.convert(statement);
@@ -15414,7 +15438,7 @@ var diffResultScheme = objectType({
   deletedSchemas: stringType().array()
 }).strict();
 var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesResolver, columnsResolver, prevFull, curFull) => {
-  var _a, _b, _c, _d;
+  var _a, _b;
   const diffResult = applyJsonDiff(json1, json2);
   if (Object.keys(diffResult).length === 0) {
     return { statements: [], sqlStatements: [], _meta: void 0 };
@@ -15654,7 +15678,11 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
   }).flat();
   const jsonReferencesForAllAlteredTables = allAltered.map((it) => {
     const schema4 = valueFromSelfOrPatchedNew(it.schema);
-    const forAdded = dialect3 !== "sqlite" ? prepareCreateReferencesJson(it.name, schema4, it.addedForeignKeys) : [];
+    const forAdded = prepareCreateReferencesJson(
+      it.name,
+      schema4,
+      it.addedForeignKeys
+    );
     const forAltered = prepareDropReferencesJson(
       it.name,
       schema4,
@@ -15674,12 +15702,12 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
   const jsonDroppedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
     (t) => t.type === "delete_reference"
   );
-  const createEnums = (_b = (_a = typedResult.addedEnums) == null ? void 0 : _a.map((it) => {
+  const createEnums = ((_a = typedResult.addedEnums) == null ? void 0 : _a.map((it) => {
     return prepareCreateEnumJson(it.name, it.values);
-  })) != null ? _b : [];
-  const jsonAlterEnumsWithAddedValues = (_d = (_c = typedResult.alteredEnums) == null ? void 0 : _c.map((it) => {
+  })) ?? [];
+  const jsonAlterEnumsWithAddedValues = ((_b = typedResult.alteredEnums) == null ? void 0 : _b.map((it) => {
     return prepareAddValuesToEnumJson(it.name, it.addedValues);
-  }).flat()) != null ? _d : [];
+  }).flat()) ?? [];
   if (dialect3 === "mysql") {
     createdSchemas.push(...renamedSchemas.map((it) => it.to));
     deletedSchemas.push(...renamedSchemas.map((it) => it.from));
@@ -15923,7 +15951,6 @@ var validateWithReport = (snapshots, dialect3) => {
   const { validator, version } = validatorForDialect(dialect3);
   const result = snapshots.reduce(
     (accum, it) => {
-      var _a;
       const raw = JSON.parse((0, import_fs.readFileSync)(`./${it}`).toString());
       accum.rawMap[it] = raw;
       if (raw["version"] && Number(raw["version"]) > version) {
@@ -15944,7 +15971,7 @@ var validateWithReport = (snapshots, dialect3) => {
         accum.nonLatest.push(it);
         return accum;
       }
-      const idEntry = (_a = accum.idsMap[snapshot["prevId"]]) != null ? _a : {
+      const idEntry = accum.idsMap[snapshot["prevId"]] ?? {
         parent: it,
         snapshots: []
       };
@@ -16039,7 +16066,7 @@ var kloudMeta = () => {
   };
 };
 var statementsForDiffs = async (in1, in2) => {
-  const left = pgSchema.parse(in1 != null ? in1 : dryPg);
+  const left = pgSchema.parse(in1 ?? dryPg);
   const right = pgSchema.parse(in2);
   const lsquashed = squashPgScheme(left);
   const rsquashed = squashPgScheme(right);