drizzle-kit 0.22.0-72736ba → 0.22.0-a8a3158

package/utils-studio.js

@@ -4848,7 +4848,7 @@ var init_lib = __esm({
 });
 
 // src/serializer/mysqlSchema.ts
-var index, fk, column, tableV3, compositePK, uniqueConstraint, tableV4, table, kitInternals, dialect, schemaHash, schemaInternalV3, schemaInternalV4, schemaInternalV5, schemaInternal, schemaV3, schemaV4, schemaV5, schema, tableSquashedV4, tableSquashed, schemaSquashed, schemaSquashedV4, mysqlSchema, mysqlSchemaV5, backwardCompatibleMysqlSchema, dryMySql;
+var index, fk, column, tableV3, compositePK, uniqueConstraint, tableV4, table, kitInternals, dialect, schemaHash, schemaInternalV3, schemaInternalV4, schemaInternalV5, schemaInternal, schemaV3, schemaV4, schemaV5, schema, tableSquashedV4, tableSquashed, schemaSquashed, schemaSquashedV4, mysqlSchema, mysqlSchemaV5, mysqlSchemaSquashed, backwardCompatibleMysqlSchema, dryMySql;
 var init_mysqlSchema = __esm({
   "src/serializer/mysqlSchema.ts"() {
     "use strict";
@@ -4990,6 +4990,7 @@ var init_mysqlSchema = __esm({
     }).strict();
     mysqlSchema = schema;
     mysqlSchemaV5 = schemaV5;
+    mysqlSchemaSquashed = schemaSquashed;
     backwardCompatibleMysqlSchema = unionType([mysqlSchemaV5, schema]);
     dryMySql = mysqlSchema.parse({
       version: "5",
@@ -5337,7 +5338,7 @@ var init_pgSchema = __esm({
 });
 
 // src/serializer/sqliteSchema.ts
-var index3, fk3, compositePK3, column3, tableV33, uniqueConstraint3, table3, dialect2, schemaHash3, schemaInternalV32, schemaInternalV42, schemaInternalV52, latestVersion, schemaInternal2, schemaV32, schemaV42, schemaV52, schema2, tableSquashed3, schemaSquashed2, drySQLite, sqliteSchemaV5, backwardCompatibleSqliteSchema;
+var index3, fk3, compositePK3, column3, tableV33, uniqueConstraint3, table3, dialect2, schemaHash3, schemaInternalV32, schemaInternalV42, schemaInternalV52, latestVersion, schemaInternal2, schemaV32, schemaV42, schemaV52, schema2, tableSquashed3, schemaSquashed2, drySQLite, sqliteSchemaV5, sqliteSchema, SQLiteSchemaSquashed, backwardCompatibleSqliteSchema;
 var init_sqliteSchema = __esm({
   "src/serializer/sqliteSchema.ts"() {
     "use strict";
@@ -5457,6 +5458,8 @@ var init_sqliteSchema = __esm({
       }
     });
     sqliteSchemaV5 = schemaV52;
+    sqliteSchema = schema2;
+    SQLiteSchemaSquashed = schemaSquashed2;
     backwardCompatibleSqliteSchema = unionType([sqliteSchemaV5, schema2]);
   }
 });
@@ -5530,10 +5533,100 @@ var init_serializer = __esm({
   }
 });
 
+// src/schemaValidator.ts
+var dialect3, commonSquashedSchema, commonSchema;
+var init_schemaValidator = __esm({
+  "src/schemaValidator.ts"() {
+    "use strict";
+    init_lib();
+    init_mysqlSchema();
+    init_pgSchema();
+    init_sqliteSchema();
+    dialect3 = enumType(["postgresql", "mysql", "sqlite"]);
+    commonSquashedSchema = unionType([
+      pgSchemaSquashed,
+      mysqlSchemaSquashed,
+      SQLiteSchemaSquashed
+    ]);
+    commonSchema = unionType([
+      pgSchema2,
+      mysqlSchema,
+      sqliteSchema
+    ]);
+  }
+});
+
+// src/cli/validations/common.ts
+var sqliteDriversLiterals, sqliteDriver, postgresDriver, mysqlDriver, driver, configCommonSchema, casing, introspectParams, configIntrospectCliSchema, configGenerateSchema, configPushSchema;
+var init_common = __esm({
+  "src/cli/validations/common.ts"() {
+    "use strict";
+    init_outputs();
+    init_lib();
+    init_schemaValidator();
+    sqliteDriversLiterals = [
+      literalType("turso"),
+      literalType("d1-http"),
+      literalType("expo")
+    ];
+    sqliteDriver = unionType(sqliteDriversLiterals);
+    postgresDriver = literalType("aws-data-api");
+    mysqlDriver = literalType("mysql2");
+    driver = unionType([sqliteDriver, postgresDriver, mysqlDriver]);
+    configCommonSchema = objectType({
+      dialect: dialect3,
+      schema: unionType([stringType(), stringType().array()]).optional(),
+      out: stringType().optional(),
+      breakpoints: booleanType().optional().default(true),
+      driver: driver.optional(),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"])
+    });
+    casing = unionType([literalType("camel"), literalType("preserve")]).default(
+      "preserve"
+    );
+    introspectParams = objectType({
+      schema: unionType([stringType(), stringType().array()]).optional(),
+      out: stringType().optional().default("./drizzle"),
+      breakpoints: booleanType().default(true),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
+      introspect: objectType({
+        casing
+      }).default({ casing: "camel" })
+    });
+    configIntrospectCliSchema = objectType({
+      schema: unionType([stringType(), stringType().array()]).optional(),
+      out: stringType().optional().default("./drizzle"),
+      breakpoints: booleanType().default(true),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
+      introspectCasing: unionType([literalType("camel"), literalType("preserve")]).default(
+        "camel"
+      )
+    });
+    configGenerateSchema = objectType({
+      schema: unionType([stringType(), stringType().array()]),
+      out: stringType().optional().default("./drizzle"),
+      breakpoints: booleanType().default(true)
+    });
+    configPushSchema = objectType({
+      dialect: dialect3,
+      schema: unionType([stringType(), stringType().array()]),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
+      verbose: booleanType().default(false),
+      strict: booleanType().default(false),
+      out: stringType().optional()
+    });
+  }
+});
+
 // src/cli/validations/outputs.ts
 var init_outputs = __esm({
   "src/cli/validations/outputs.ts"() {
     "use strict";
+    init_common();
   }
 });
 
@@ -5579,7 +5672,7 @@ function mapSqlToSqliteType(sqlType) {
     return "numeric";
   }
 }
-var import_drizzle_orm, import_sqlite_core2, dialect3, fromDatabase;
+var import_drizzle_orm, import_sqlite_core2, dialect4, fromDatabase;
 var init_sqliteSerializer = __esm({
   "src/serializer/sqliteSerializer.ts"() {
     "use strict";
@@ -5587,7 +5680,7 @@ var init_sqliteSerializer = __esm({
     import_sqlite_core2 = require("drizzle-orm/sqlite-core");
     init_serializer();
     init_outputs();
-    dialect3 = new import_sqlite_core2.SQLiteSyncDialect();
+    dialect4 = new import_sqlite_core2.SQLiteSyncDialect();
     fromDatabase = async (db, tablesFilter = (table4) => true, progressCallback) => {
       const result = {};
       const columns = await db.query(
@@ -6019,7 +6112,7 @@ var init_vector = __esm({
 });
 
 // src/serializer/pgSerializer.ts
-var import_pg_core2, import_pg_core3, import_drizzle_orm2, dialect4, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
+var import_pg_core2, import_pg_core3, import_drizzle_orm2, dialect5, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
     "use strict";
@@ -6029,7 +6122,7 @@ var init_pgSerializer = __esm({
     init_serializer();
     init_outputs();
     init_vector();
-    dialect4 = new import_pg_core2.PgDialect();
+    dialect5 = new import_pg_core2.PgDialect();
     trimChar = (str, char) => {
       let start = 0;
       let end = str.length;
@@ -6292,7 +6385,7 @@ var init_pgSerializer = __esm({
                 name: columnName,
                 type: (
                   // filter vectors, but in future we should filter any extension that was installed by user
-                  columnAdditionalDT === "USER-DEFINED" && enumType3 !== "vector" ? enumType3 : columnTypeMapped
+                  columnAdditionalDT === "USER-DEFINED" && !["vector", "geometry"].includes(enumType3) ? enumType3 : columnTypeMapped
                 ),
                 typeSchema: enumsToReturn[`${tableSchema}.${enumType3}`] !== void 0 ? enumsToReturn[`${tableSchema}.${enumType3}`].schema : void 0,
                 primaryKey: primaryKey.length === 1 && cprimaryKey.length < 2,

package/utils-studio.mjs

@@ -4849,7 +4849,7 @@ var init_lib = __esm({
 });
 
 // src/serializer/mysqlSchema.ts
-var index, fk, column, tableV3, compositePK, uniqueConstraint, tableV4, table, kitInternals, dialect, schemaHash, schemaInternalV3, schemaInternalV4, schemaInternalV5, schemaInternal, schemaV3, schemaV4, schemaV5, schema, tableSquashedV4, tableSquashed, schemaSquashed, schemaSquashedV4, mysqlSchema, mysqlSchemaV5, backwardCompatibleMysqlSchema, dryMySql;
+var index, fk, column, tableV3, compositePK, uniqueConstraint, tableV4, table, kitInternals, dialect, schemaHash, schemaInternalV3, schemaInternalV4, schemaInternalV5, schemaInternal, schemaV3, schemaV4, schemaV5, schema, tableSquashedV4, tableSquashed, schemaSquashed, schemaSquashedV4, mysqlSchema, mysqlSchemaV5, mysqlSchemaSquashed, backwardCompatibleMysqlSchema, dryMySql;
 var init_mysqlSchema = __esm({
   "src/serializer/mysqlSchema.ts"() {
     "use strict";
@@ -4991,6 +4991,7 @@ var init_mysqlSchema = __esm({
     }).strict();
     mysqlSchema = schema;
     mysqlSchemaV5 = schemaV5;
+    mysqlSchemaSquashed = schemaSquashed;
     backwardCompatibleMysqlSchema = unionType([mysqlSchemaV5, schema]);
     dryMySql = mysqlSchema.parse({
       version: "5",
@@ -5338,7 +5339,7 @@ var init_pgSchema = __esm({
 });
 
 // src/serializer/sqliteSchema.ts
-var index3, fk3, compositePK3, column3, tableV33, uniqueConstraint3, table3, dialect2, schemaHash3, schemaInternalV32, schemaInternalV42, schemaInternalV52, latestVersion, schemaInternal2, schemaV32, schemaV42, schemaV52, schema2, tableSquashed3, schemaSquashed2, drySQLite, sqliteSchemaV5, backwardCompatibleSqliteSchema;
+var index3, fk3, compositePK3, column3, tableV33, uniqueConstraint3, table3, dialect2, schemaHash3, schemaInternalV32, schemaInternalV42, schemaInternalV52, latestVersion, schemaInternal2, schemaV32, schemaV42, schemaV52, schema2, tableSquashed3, schemaSquashed2, drySQLite, sqliteSchemaV5, sqliteSchema, SQLiteSchemaSquashed, backwardCompatibleSqliteSchema;
 var init_sqliteSchema = __esm({
   "src/serializer/sqliteSchema.ts"() {
     "use strict";
@@ -5458,6 +5459,8 @@ var init_sqliteSchema = __esm({
       }
     });
     sqliteSchemaV5 = schemaV52;
+    sqliteSchema = schema2;
+    SQLiteSchemaSquashed = schemaSquashed2;
     backwardCompatibleSqliteSchema = unionType([sqliteSchemaV5, schema2]);
   }
 });
@@ -5530,10 +5533,100 @@ var init_serializer = __esm({
   }
 });
 
+// src/schemaValidator.ts
+var dialect3, commonSquashedSchema, commonSchema;
+var init_schemaValidator = __esm({
+  "src/schemaValidator.ts"() {
+    "use strict";
+    init_lib();
+    init_mysqlSchema();
+    init_pgSchema();
+    init_sqliteSchema();
+    dialect3 = enumType(["postgresql", "mysql", "sqlite"]);
+    commonSquashedSchema = unionType([
+      pgSchemaSquashed,
+      mysqlSchemaSquashed,
+      SQLiteSchemaSquashed
+    ]);
+    commonSchema = unionType([
+      pgSchema2,
+      mysqlSchema,
+      sqliteSchema
+    ]);
+  }
+});
+
+// src/cli/validations/common.ts
+var sqliteDriversLiterals, sqliteDriver, postgresDriver, mysqlDriver, driver, configCommonSchema, casing, introspectParams, configIntrospectCliSchema, configGenerateSchema, configPushSchema;
+var init_common = __esm({
+  "src/cli/validations/common.ts"() {
+    "use strict";
+    init_outputs();
+    init_lib();
+    init_schemaValidator();
+    sqliteDriversLiterals = [
+      literalType("turso"),
+      literalType("d1-http"),
+      literalType("expo")
+    ];
+    sqliteDriver = unionType(sqliteDriversLiterals);
+    postgresDriver = literalType("aws-data-api");
+    mysqlDriver = literalType("mysql2");
+    driver = unionType([sqliteDriver, postgresDriver, mysqlDriver]);
+    configCommonSchema = objectType({
+      dialect: dialect3,
+      schema: unionType([stringType(), stringType().array()]).optional(),
+      out: stringType().optional(),
+      breakpoints: booleanType().optional().default(true),
+      driver: driver.optional(),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"])
+    });
+    casing = unionType([literalType("camel"), literalType("preserve")]).default(
+      "preserve"
+    );
+    introspectParams = objectType({
+      schema: unionType([stringType(), stringType().array()]).optional(),
+      out: stringType().optional().default("./drizzle"),
+      breakpoints: booleanType().default(true),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
+      introspect: objectType({
+        casing
+      }).default({ casing: "camel" })
+    });
+    configIntrospectCliSchema = objectType({
+      schema: unionType([stringType(), stringType().array()]).optional(),
+      out: stringType().optional().default("./drizzle"),
+      breakpoints: booleanType().default(true),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
+      introspectCasing: unionType([literalType("camel"), literalType("preserve")]).default(
+        "camel"
+      )
+    });
+    configGenerateSchema = objectType({
+      schema: unionType([stringType(), stringType().array()]),
+      out: stringType().optional().default("./drizzle"),
+      breakpoints: booleanType().default(true)
+    });
+    configPushSchema = objectType({
+      dialect: dialect3,
+      schema: unionType([stringType(), stringType().array()]),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
+      verbose: booleanType().default(false),
+      strict: booleanType().default(false),
+      out: stringType().optional()
+    });
+  }
+});
+
 // src/cli/validations/outputs.ts
 var init_outputs = __esm({
   "src/cli/validations/outputs.ts"() {
     "use strict";
+    init_common();
   }
 });
 
@@ -5586,13 +5679,13 @@ function mapSqlToSqliteType(sqlType) {
     return "numeric";
   }
 }
-var dialect3, fromDatabase;
+var dialect4, fromDatabase;
 var init_sqliteSerializer = __esm({
   "src/serializer/sqliteSerializer.ts"() {
     "use strict";
     init_serializer();
     init_outputs();
-    dialect3 = new SQLiteSyncDialect();
+    dialect4 = new SQLiteSyncDialect();
     fromDatabase = async (db, tablesFilter = (table4) => true, progressCallback) => {
       const result = {};
       const columns = await db.query(
@@ -6031,14 +6124,14 @@ import {
 } from "drizzle-orm/pg-core";
 import { getTableConfig as getTableConfig2 } from "drizzle-orm/pg-core";
 import { is as is2, SQL as SQL2, getTableName as getTableName2 } from "drizzle-orm";
-var dialect4, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
+var dialect5, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
     "use strict";
     init_serializer();
     init_outputs();
     init_vector();
-    dialect4 = new PgDialect();
+    dialect5 = new PgDialect();
     trimChar = (str, char) => {
       let start = 0;
       let end = str.length;
@@ -6301,7 +6394,7 @@ var init_pgSerializer = __esm({
                 name: columnName,
                 type: (
                   // filter vectors, but in future we should filter any extension that was installed by user
-                  columnAdditionalDT === "USER-DEFINED" && enumType3 !== "vector" ? enumType3 : columnTypeMapped
+                  columnAdditionalDT === "USER-DEFINED" && !["vector", "geometry"].includes(enumType3) ? enumType3 : columnTypeMapped
                 ),
                 typeSchema: enumsToReturn[`${tableSchema}.${enumType3}`] !== void 0 ? enumsToReturn[`${tableSchema}.${enumType3}`].schema : void 0,
                 primaryKey: primaryKey.length === 1 && cprimaryKey.length < 2,