drizzle-kit 0.20.17-b4f119e → 0.20.17-c347d7b

package/payload.mjs

@@ -5906,8 +5906,8 @@ var init_serializer = __esm({
   "src/serializer/index.ts"() {
     "use strict";
     init_views();
-    sqlToStr = (sql2) => {
-      return sql2.toQuery({
+    sqlToStr = (sql) => {
+      return sql.toQuery({
         escapeName: () => {
           throw new Error("we don't support params for `sql` default values");
         },
@@ -5933,7 +5933,8 @@ var init_outputs = __esm({
       warning: (str) => `${source_default.white.bgGray(" Warning ")} ${str}`,
       errorWarning: (str) => `${source_default.red(`${source_default.white.bgRed(" Warning ")} ${str}`)}`,
       fullWarning: (str) => `${source_default.black.bgYellow("[Warning]")} ${source_default.bold(str)}`,
-      suggestion: (str) => `${source_default.white.bgGray(" Suggestion ")} ${str}`
+      suggestion: (str) => `${source_default.white.bgGray(" Suggestion ")} ${str}`,
+      info: (str) => `${source_default.grey(str)}`
     };
   }
 });
@@ -6138,7 +6139,7 @@ var init_cli = __esm({
       dialect: dialect3,
       schema: unionType([stringType(), stringType().array()]).optional(),
       tablesFilter: unionType([stringType(), stringType().array()]).optional(),
-      schemaFilters: unionType([stringType(), stringType().array()]).optional().default(["public"]),
+      schemaFilter: unionType([stringType(), stringType().array()]).optional().default(["public"]),
       driver: stringType().optional(),
       // pg
       connectionString: stringType().optional(),
@@ -6177,7 +6178,7 @@ var init_cli = __esm({
       authToken: stringType().optional(),
       introspectCasing: casing,
       breakpoints: booleanType().optional().default(true)
-    });
+    }).passthrough();
     configCheck = objectType({
       dialect: dialect3.optional(),
       out: stringType().optional()
@@ -6191,6 +6192,33 @@ var init_cli = __esm({
   }
 });
 
+// src/cli/validations/studio.ts
+var credentials, studioCliParams, studioConfig;
+var init_studio = __esm({
+  "src/cli/validations/studio.ts"() {
+    "use strict";
+    init_lib();
+    init_mysql();
+    init_sqlite();
+    init_schemaValidator();
+    init_pg();
+    credentials = intersectionType(
+      postgresCredentials,
+      mysqlCredentials,
+      sqliteCredentials
+    );
+    studioCliParams = objectType({
+      port: coerce.number().optional().default(4983),
+      host: stringType().optional().default("127.0.0.1"),
+      config: stringType().optional()
+    });
+    studioConfig = objectType({
+      dialect: dialect3,
+      schema: unionType([stringType(), stringType().array()])
+    });
+  }
+});
+
 // src/cli/commands/_es5.ts
 var es5_exports = {};
 __export(es5_exports, {
@@ -9220,13 +9248,13 @@ var require_node2 = __commonJS({
       }
       function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
         try {
-          var info3 = gen[key](arg);
-          var value = info3.value;
+          var info2 = gen[key](arg);
+          var value = info2.value;
         } catch (error2) {
           reject(error2);
           return;
         }
-        if (info3.done) {
+        if (info2.done) {
           resolve(value);
         } else {
           Promise.resolve(value).then(_next, _throw);
@@ -11811,7 +11839,7 @@ var require_node2 = __commonJS({
 });
 
 // src/cli/commands/utils.ts
-var import_hanji2, assertES5, safeRegister;
+var import_hanji2, assertES5, safeRegister, migrateCliParams, migrateConfig;
 var init_utils2 = __esm({
   "src/cli/commands/utils.ts"() {
     "use strict";
@@ -11823,8 +11851,11 @@ var init_utils2 = __esm({
     init_pg();
     init_sqlite();
     init_common();
+    init_schemaValidator();
     init_cli();
     init_outputs();
+    init_studio();
+    init_lib();
     assertES5 = async (unregister) => {
       try {
         init_es5();
@@ -11866,6 +11897,17 @@ var init_utils2 = __esm({
       await assertES5(res.unregister);
       return res;
     };
+    migrateCliParams = objectType({
+      config: stringType().optional()
+    });
+    migrateConfig = objectType({
+      dialect: dialect3,
+      out: stringType().optional().default("drizzle"),
+      migrations: objectType({
+        table: stringType().optional(),
+        schema: stringType().optional()
+      }).optional()
+    });
   }
 });
 
@@ -15722,7 +15764,7 @@ var init_snapshotsDiffer = __esm({
       const jsonTableAlternations = alteredTables.map((it) => {
         return preparePgAlterColumns(it.name, it.schema, it.altered, json2);
       }).flat();
-      const jsonCreateIndexesForAllAlteredTables = alteredTables.map((it) => {
+      const jsonCreateIndexesFoAlteredTables = alteredTables.map((it) => {
         return prepareCreateIndexesJson(
           it.name,
           it.schema,
@@ -15751,14 +15793,21 @@ var init_snapshotsDiffer = __esm({
           },
           {}
         );
-        jsonCreateIndexesForAllAlteredTables.push(
+        jsonCreateIndexesFoAlteredTables.push(
           ...prepareCreateIndexesJson(it.name, it.schema, createdIndexes || {})
         );
         jsonDropIndexesForAllAlteredTables.push(
           ...prepareDropIndexesJson(it.name, it.schema, droppedIndexes || {})
         );
       });
-      const jsonReferencesForAllAlteredTables = alteredTables.map((it) => {
+      const jsonCreateReferencesForCreatedTables = createdTables.map((it) => {
+        return prepareCreateReferencesJson(
+          it.name,
+          it.schema,
+          it.foreignKeys
+        );
+      }).flat();
+      const jsonReferencesForAlteredTables = alteredTables.map((it) => {
         const forAdded = prepareCreateReferencesJson(
           it.name,
           it.schema,
@@ -15776,10 +15825,10 @@ var init_snapshotsDiffer = __esm({
         );
         return [...forAdded, ...forAltered, ...alteredFKs];
       }).flat();
-      const jsonCreatedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
+      const jsonCreatedReferencesForAlteredTables = jsonReferencesForAlteredTables.filter(
         (t) => t.type === "create_reference"
       );
-      const jsonDroppedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
+      const jsonDroppedReferencesForAlteredTables = jsonReferencesForAlteredTables.filter(
         (t) => t.type === "delete_reference"
       );
       const createEnums = createdEnums.map((it) => {
@@ -15806,7 +15855,7 @@ var init_snapshotsDiffer = __esm({
       const dropSchemas = prepareDeleteSchemasJson(
         deletedSchemas.map((it) => it.name)
       );
-      const jsonPgCreateTables = createdTables.map((it) => {
+      const createTables = createdTables.map((it) => {
         return preparePgCreateTableJson(it, curFull);
       });
       jsonStatements.push(...createSchemas);
@@ -15815,7 +15864,7 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...moveEnums);
       jsonStatements.push(...renameEnums);
       jsonStatements.push(...jsonAlterEnumsWithAddedValues);
-      jsonStatements.push(...jsonPgCreateTables);
+      jsonStatements.push(...createTables);
       jsonStatements.push(...jsonDropTables);
       jsonStatements.push(...jsonSetTableSchemas);
       jsonStatements.push(...jsonRenameTables);
@@ -15826,9 +15875,10 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonTableAlternations);
       jsonStatements.push(...jsonAddedCompositePKs);
       jsonStatements.push(...jsonAddColumnsStatemets);
+      jsonStatements.push(...jsonCreateReferencesForCreatedTables);
       jsonStatements.push(...jsonCreateIndexesForCreatedTables);
-      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonCreatedReferencesForAlteredTables);
+      jsonStatements.push(...jsonCreateIndexesFoAlteredTables);
       jsonStatements.push(...jsonDropColumnsStatemets);
       jsonStatements.push(...jsonAlteredCompositePKs);
       jsonStatements.push(...jsonAlteredUniqueConstraints);
@@ -16087,6 +16137,13 @@ var init_snapshotsDiffer = __esm({
           ...prepareDropIndexesJson(it.name, it.schema, droppedIndexes || {})
         );
       });
+      const jsonCreateReferencesForCreatedTables = createdTables.map((it) => {
+        return prepareCreateReferencesJson(
+          it.name,
+          it.schema,
+          it.foreignKeys
+        );
+      }).flat();
       const jsonReferencesForAllAlteredTables = alteredTables.map((it) => {
         const forAdded = prepareCreateReferencesJson(
           it.name,
@@ -16127,9 +16184,10 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonAddedUniqueConstraints);
       jsonStatements.push(...jsonDeletedUniqueConstraints);
       jsonStatements.push(...jsonAddColumnsStatemets);
+      jsonStatements.push(...jsonCreateReferencesForCreatedTables);
       jsonStatements.push(...jsonCreateIndexesForCreatedTables);
-      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonCreatedReferencesForAlteredTables);
+      jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
       jsonStatements.push(...jsonDropColumnsStatemets);
       jsonStatements.push(...jsonAlteredCompositePKs);
       jsonStatements.push(...jsonAddedUniqueConstraints);
@@ -17554,12 +17612,12 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
         const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${tableFrom}"` : `"${tableFrom}"`;
         const tableToNameWithSchema = schemaTo ? `"${schemaTo}"."${tableTo}"` : `"${tableTo}"`;
         const alterStatement = `ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${name}" FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableToNameWithSchema}(${toColumnsString})${onDeleteStatement}${onUpdateStatement}`;
-        let sql2 = "DO $$ BEGIN\n";
-        sql2 += " " + alterStatement + ";\n";
-        sql2 += "EXCEPTION\n";
-        sql2 += " WHEN duplicate_object THEN null;\n";
-        sql2 += "END $$;\n";
-        return sql2;
+        let sql = "DO $$ BEGIN\n";
+        sql += " " + alterStatement + ";\n";
+        sql += "EXCEPTION\n";
+        sql += " WHEN duplicate_object THEN null;\n";
+        sql += "END $$;\n";
+        return sql;
       }
     };
     SqliteCreateForeignKeyConvertor = class extends Convertor {
@@ -17605,7 +17663,7 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
         const newFk = PgSquasher.unsquashFK(statement.data);
         const oldFk = PgSquasher.unsquashFK(statement.oldFkey);
         const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${oldFk.tableFrom}"` : `"${oldFk.tableFrom}"`;
-        let sql2 = `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT "${oldFk.name}";
+        let sql = `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT "${oldFk.name}";
 `;
         const onDeleteStatement = newFk.onDelete ? ` ON DELETE ${newFk.onDelete}` : "";
         const onUpdateStatement = newFk.onUpdate ? ` ON UPDATE ${newFk.onUpdate}` : "";
@@ -17614,12 +17672,12 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
         const tableFromNameWithSchema = oldFk.schemaTo ? `"${oldFk.schemaTo}"."${oldFk.tableFrom}"` : `"${oldFk.tableFrom}"`;
         const tableToNameWithSchema = newFk.schemaTo ? `"${newFk.schemaTo}"."${newFk.tableFrom}"` : `"${newFk.tableFrom}"`;
         const alterStatement = `ALTER TABLE ${tableFromNameWithSchema} ADD CONSTRAINT "${newFk.name}" FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableToNameWithSchema}(${toColumnsString})${onDeleteStatement}${onUpdateStatement}`;
-        sql2 += "DO $$ BEGIN\n";
-        sql2 += " " + alterStatement + ";\n";
-        sql2 += "EXCEPTION\n";
-        sql2 += " WHEN duplicate_object THEN null;\n";
-        sql2 += "END $$;\n";
-        return sql2;
+        sql += "DO $$ BEGIN\n";
+        sql += " " + alterStatement + ";\n";
+        sql += "EXCEPTION\n";
+        sql += " WHEN duplicate_object THEN null;\n";
+        sql += "END $$;\n";
+        return sql;
       }
     };
     SqliteAlterForeignKeyConvertor = class extends Convertor {
@@ -17993,7 +18051,9 @@ function mapSqlToSqliteType(sqlType) {
     return "text";
   } else if (lowered.startsWith("blob")) {
     return "blob";
-  } else if (["real", "double", "double precision", "float"].some((it) => lowered.startsWith(it))) {
+  } else if (["real", "double", "double precision", "float"].some(
+    (it) => lowered.startsWith(it)
+  )) {
     return "real";
   } else {
     return "numeric";
@@ -18178,7 +18238,7 @@ The unique constraint ${source_default.underline.blue(
         `SELECT 
     m.name as "tableName", p.name as "columnName", p.type as "columnType", p."notnull" as "notNull", p.dflt_value as "defaultValue", p.pk as pk
     FROM sqlite_master AS m JOIN pragma_table_info(m.name) AS p
-    WHERE m.type = 'table' and m.tbl_name != 'sqlite_sequence' and m.tbl_name != 'sqlite_stat1' and m.tbl_name != '_litestream_seq' and m.tbl_name != '_litestream_lock' and m.tbl_name != 'libsql_wasm_func_table';
+    WHERE m.type = 'table' and m.tbl_name != 'sqlite_sequence' and m.tbl_name != 'sqlite_stat1' and m.tbl_name != '_litestream_seq' and m.tbl_name != '_litestream_lock' and m.tbl_name != 'libsql_wasm_func_table' and m.tbl_name != '__drizzle_migrations';
     `
       );
       const tablesWithSeq = [];
@@ -19677,6 +19737,9 @@ String.prototype.squashSpaces = function() {
 String.prototype.camelCase = function() {
   return camelCase(String(this));
 };
+String.prototype.capitalise = function() {
+  return this && this.length > 0 ? `${this[0].toUpperCase()}${this.slice(1)}` : String(this);
+};
 String.prototype.concatIf = function(it, condition) {
   return condition ? `${this}${it}` : String(this);
 };
@@ -19987,7 +20050,6 @@ var logSuggestionsAndReturn = async (connection, statements, json1, json2, meta)
 init_mysqlSerializer();
 init_global();
 init_migrate();
-import { sql } from "drizzle-orm";
 var generateDrizzleJson = (imports, prevId) => {
   const prepared = prepareFromExports(imports);
   const id = randomUUID();
@@ -20022,6 +20084,7 @@ var generateMigration = async (prev, cur) => {
 };
 var pushSchema = async (imports, drizzleInstance) => {
   const { applyPgSnapshotsDiff: applyPgSnapshotsDiff2 } = await Promise.resolve().then(() => (init_snapshotsDiffer(), snapshotsDiffer_exports));
+  const { sql } = await import("drizzle-orm");
   const db = {
     query: async (query, params) => {
       const res = await drizzleInstance.execute(sql.raw(query));
@@ -20083,6 +20146,7 @@ var generateSQLiteMigration = async (prev, cur) => {
 };
 var pushSQLiteSchema = async (imports, drizzleInstance) => {
   const { applySqliteSnapshotsDiff: applySqliteSnapshotsDiff2 } = await Promise.resolve().then(() => (init_snapshotsDiffer(), snapshotsDiffer_exports));
+  const { sql } = await import("drizzle-orm");
   const db = {
     query: async (query, params) => {
       const res = drizzleInstance.all(sql.raw(query));
@@ -20156,6 +20220,7 @@ var pushMySQLSchema = async (imports, drizzleInstance, databaseName) => {
   const { applyMysqlSnapshotsDiff: applyMysqlSnapshotsDiff2 } = await Promise.resolve().then(() => (init_snapshotsDiffer(), snapshotsDiffer_exports));
   const { logSuggestionsAndReturn: logSuggestionsAndReturn3 } = await Promise.resolve().then(() => (init_mysqlPushUtils(), mysqlPushUtils_exports));
   const { mysqlPushIntrospect: mysqlPushIntrospect2 } = await Promise.resolve().then(() => (init_mysqlIntrospect(), mysqlIntrospect_exports));
+  const { sql } = await import("drizzle-orm");
   const db = {
     query: async (query, params) => {
       const res = await drizzleInstance.execute(sql.raw(query));

package/serializer/studio.d.ts

@@ -14,12 +14,14 @@ type CustomDefault = {
 };
 export type Setup = {
     dialect: "postgresql" | "mysql" | "sqlite";
+    driver?: "aws-data-api";
     proxy: (params: ProxyParams) => Promise<any[] | any>;
     customDefaults: CustomDefault[];
 };
 export type ProxyParams = {
     sql: string;
     params: any[];
+    typings?: any[];
     mode: "array" | "object";
     method: "values" | "get" | "all" | "run" | "execute";
 };
@@ -47,5 +49,5 @@ export type Server = {
         cb: (err: Error | null, address: string) => void;
     }) => void;
 };
-export declare const prepareServer: ({ dialect, proxy, customDefaults }: Setup, app?: Hono) => Promise<Server>;
+export declare const prepareServer: ({ dialect, driver, proxy, customDefaults }: Setup, app?: Hono) => Promise<Server>;
 export {};

package/utils-studio.js

@@ -4927,7 +4927,9 @@ function mapSqlToSqliteType(sqlType) {
     return "text";
   } else if (lowered.startsWith("blob")) {
     return "blob";
-  } else if (["real", "double", "double precision", "float"].some((it) => lowered.startsWith(it))) {
+  } else if (["real", "double", "double precision", "float"].some(
+    (it) => lowered.startsWith(it)
+  )) {
     return "real";
   } else {
     return "numeric";
@@ -4948,7 +4950,7 @@ var init_sqliteSerializer = __esm({
         `SELECT 
     m.name as "tableName", p.name as "columnName", p.type as "columnType", p."notnull" as "notNull", p.dflt_value as "defaultValue", p.pk as pk
     FROM sqlite_master AS m JOIN pragma_table_info(m.name) AS p
-    WHERE m.type = 'table' and m.tbl_name != 'sqlite_sequence' and m.tbl_name != 'sqlite_stat1' and m.tbl_name != '_litestream_seq' and m.tbl_name != '_litestream_lock' and m.tbl_name != 'libsql_wasm_func_table';
+    WHERE m.type = 'table' and m.tbl_name != 'sqlite_sequence' and m.tbl_name != 'sqlite_stat1' and m.tbl_name != '_litestream_seq' and m.tbl_name != '_litestream_lock' and m.tbl_name != 'libsql_wasm_func_table' and m.tbl_name != '__drizzle_migrations';
     `
       );
       const tablesWithSeq = [];
@@ -6039,6 +6041,9 @@ String.prototype.squashSpaces = function() {
 String.prototype.camelCase = function() {
   return camelCase(String(this));
 };
+String.prototype.capitalise = function() {
+  return this && this.length > 0 ? `${this[0].toUpperCase()}${this.slice(1)}` : String(this);
+};
 String.prototype.concatIf = function(it, condition) {
   return condition ? `${this}${it}` : String(this);
 };

package/utils-studio.mjs

@@ -4934,7 +4934,9 @@ function mapSqlToSqliteType(sqlType) {
     return "text";
   } else if (lowered.startsWith("blob")) {
     return "blob";
-  } else if (["real", "double", "double precision", "float"].some((it) => lowered.startsWith(it))) {
+  } else if (["real", "double", "double precision", "float"].some(
+    (it) => lowered.startsWith(it)
+  )) {
     return "real";
   } else {
     return "numeric";
@@ -4953,7 +4955,7 @@ var init_sqliteSerializer = __esm({
         `SELECT 
     m.name as "tableName", p.name as "columnName", p.type as "columnType", p."notnull" as "notNull", p.dflt_value as "defaultValue", p.pk as pk
     FROM sqlite_master AS m JOIN pragma_table_info(m.name) AS p
-    WHERE m.type = 'table' and m.tbl_name != 'sqlite_sequence' and m.tbl_name != 'sqlite_stat1' and m.tbl_name != '_litestream_seq' and m.tbl_name != '_litestream_lock' and m.tbl_name != 'libsql_wasm_func_table';
+    WHERE m.type = 'table' and m.tbl_name != 'sqlite_sequence' and m.tbl_name != 'sqlite_stat1' and m.tbl_name != '_litestream_seq' and m.tbl_name != '_litestream_lock' and m.tbl_name != 'libsql_wasm_func_table' and m.tbl_name != '__drizzle_migrations';
     `
       );
       const tablesWithSeq = [];
@@ -6075,6 +6077,9 @@ String.prototype.squashSpaces = function() {
 String.prototype.camelCase = function() {
   return camelCase(String(this));
 };
+String.prototype.capitalise = function() {
+  return this && this.length > 0 ? `${this[0].toUpperCase()}${this.slice(1)}` : String(this);
+};
 String.prototype.concatIf = function(it, condition) {
   return condition ? `${this}${it}` : String(this);
 };