drizzle-kit 0.27.0 → 0.27.1-4d56096

package/api.d.mts

@@ -1,9 +1,10 @@
 import { LibSQLDatabase } from 'drizzle-orm/libsql';
 import { MySql2Database } from 'drizzle-orm/mysql2';
 import { PgDatabase } from 'drizzle-orm/pg-core';
-import { C as CasingType } from './common-DYjgLS6u.mjs';
+import { C as CasingType, a as Config } from './index-BfiZoTqG.mjs';
 import * as zod from 'zod';
 import { TypeOf } from 'zod';
+import 'tls';
 
 declare const schema$1: zod.ZodObject<zod.objectUtil.extendShape<{
     version: zod.ZodLiteral<"5">;
@@ -2273,7 +2274,7 @@ type DrizzleSQLiteSnapshotJSON = SQLiteSchema;
 type DrizzleMySQLSnapshotJSON = MySqlSchema;
 declare const generateDrizzleJson: (imports: Record<string, unknown>, prevId?: string, schemaFilters?: string[], casing?: CasingType) => PgSchema;
 declare const generateMigration: (prev: DrizzleSnapshotJSON, cur: DrizzleSnapshotJSON) => Promise<string[]>;
-declare const pushSchema: (imports: Record<string, unknown>, drizzleInstance: PgDatabase<any>, schemaFilters?: string[]) => Promise<{
+declare const pushSchema: (imports: Record<string, unknown>, drizzleInstance: PgDatabase<any>, schemaFilters?: string[], tablesFilter?: string[], extensionsFilters?: Config["extensionsFilters"]) => Promise<{
     hasDataLoss: boolean;
     warnings: string[];
     statementsToExecute: string[];

package/api.d.ts

@@ -1,9 +1,10 @@
 import { LibSQLDatabase } from 'drizzle-orm/libsql';
 import { MySql2Database } from 'drizzle-orm/mysql2';
 import { PgDatabase } from 'drizzle-orm/pg-core';
-import { C as CasingType } from './common-DYjgLS6u.js';
+import { C as CasingType, a as Config } from './index-BfiZoTqG.js';
 import * as zod from 'zod';
 import { TypeOf } from 'zod';
+import 'tls';
 
 declare const schema$1: zod.ZodObject<zod.objectUtil.extendShape<{
     version: zod.ZodLiteral<"5">;
@@ -2273,7 +2274,7 @@ type DrizzleSQLiteSnapshotJSON = SQLiteSchema;
 type DrizzleMySQLSnapshotJSON = MySqlSchema;
 declare const generateDrizzleJson: (imports: Record<string, unknown>, prevId?: string, schemaFilters?: string[], casing?: CasingType) => PgSchema;
 declare const generateMigration: (prev: DrizzleSnapshotJSON, cur: DrizzleSnapshotJSON) => Promise<string[]>;
-declare const pushSchema: (imports: Record<string, unknown>, drizzleInstance: PgDatabase<any>, schemaFilters?: string[]) => Promise<{
+declare const pushSchema: (imports: Record<string, unknown>, drizzleInstance: PgDatabase<any>, schemaFilters?: string[], tablesFilter?: string[], extensionsFilters?: Config["extensionsFilters"]) => Promise<{
     hasDataLoss: boolean;
     warnings: string[];
     statementsToExecute: string[];

package/api.js

@@ -17520,6 +17520,7 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonCreatedCheckConstraints);
       jsonStatements.push(...jsonAlteredUniqueConstraints);
       jsonStatements.push(...jsonAlterEnumsWithDroppedValues);
+      jsonStatements.push(...createViews);
       jsonStatements.push(...jsonRenamePoliciesStatements);
       jsonStatements.push(...jsonDropPoliciesStatements);
       jsonStatements.push(...jsonCreatePoliciesStatements);
@@ -17528,7 +17529,6 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonDropIndPoliciesStatements);
       jsonStatements.push(...jsonCreateIndPoliciesStatements);
       jsonStatements.push(...jsonAlterIndPoliciesStatements);
-      jsonStatements.push(...createViews);
       jsonStatements.push(...dropEnums);
       jsonStatements.push(...dropSequences);
       jsonStatements.push(...dropSchemas);
@@ -30212,7 +30212,7 @@ var init_blob = __esm({
         return "blob";
       }
       mapFromDriverValue(value) {
-        return BigInt(value.toString());
+        return BigInt(Buffer.isBuffer(value) ? value.toString() : String.fromCodePoint(...value));
       }
       mapToDriverValue(value) {
         return Buffer.from(value.toString());
@@ -30237,7 +30237,7 @@ var init_blob = __esm({
         return "blob";
       }
       mapFromDriverValue(value) {
-        return JSON.parse(value.toString());
+        return JSON.parse(Buffer.isBuffer(value) ? value.toString() : String.fromCodePoint(...value));
       }
       mapToDriverValue(value) {
         return Buffer.from(JSON.stringify(value));
@@ -34057,6 +34057,25 @@ WHERE
   }
 });
 
+// src/extensions/getTablesFilterByExtensions.ts
+var getTablesFilterByExtensions;
+var init_getTablesFilterByExtensions = __esm({
+  "src/extensions/getTablesFilterByExtensions.ts"() {
+    "use strict";
+    getTablesFilterByExtensions = ({
+      extensionsFilters,
+      dialect: dialect4
+    }) => {
+      if (extensionsFilters) {
+        if (extensionsFilters.includes("postgis") && dialect4 === "postgresql") {
+          return ["!geography_columns", "!geometry_columns", "!spatial_ref_sys"];
+        }
+      }
+      return [];
+    };
+  }
+});
+
 // ../drizzle-orm/dist/mysql-core/alias.js
 var init_alias4 = __esm({
   "../drizzle-orm/dist/mysql-core/alias.js"() {
@@ -34679,7 +34698,7 @@ var init_datetime = __esm({
 // ../drizzle-orm/dist/mysql-core/columns/decimal.js
 function decimal(a, b = {}) {
   const { name: name2, config } = getColumnNameAndConfig(a, b);
-  return new MySqlDecimalBuilder(name2, config.precision, config.scale);
+  return new MySqlDecimalBuilder(name2, config);
 }
 var _a259, _b182, MySqlDecimalBuilder, _a260, _b183, MySqlDecimal;
 var init_decimal = __esm({
@@ -34689,10 +34708,11 @@ var init_decimal = __esm({
     init_utils2();
     init_common4();
     MySqlDecimalBuilder = class extends (_b182 = MySqlColumnBuilderWithAutoIncrement, _a259 = entityKind, _b182) {
-      constructor(name2, precision, scale) {
+      constructor(name2, config) {
         super(name2, "string", "MySqlDecimal");
-        this.config.precision = precision;
-        this.config.scale = scale;
+        this.config.precision = config?.precision;
+        this.config.scale = config?.scale;
+        this.config.unsigned = config?.unsigned;
       }
       /** @internal */
       build(table4) {
@@ -34708,15 +34728,19 @@ var init_decimal = __esm({
         super(...arguments);
         __publicField(this, "precision", this.config.precision);
         __publicField(this, "scale", this.config.scale);
+        __publicField(this, "unsigned", this.config.unsigned);
       }
       getSQLType() {
+        let type = "";
         if (this.precision !== void 0 && this.scale !== void 0) {
-          return `decimal(${this.precision},${this.scale})`;
+          type += `decimal(${this.precision},${this.scale})`;
         } else if (this.precision === void 0) {
-          return "decimal";
+          type += "decimal";
         } else {
-          return `decimal(${this.precision})`;
+          type += `decimal(${this.precision})`;
         }
+        type = type === "decimal(10,0)" || type === "decimal(10)" ? "decimal" : type;
+        return this.unsigned ? `${type} unsigned` : type;
       }
     };
     __publicField(MySqlDecimal, _a260, "MySqlDecimal");
@@ -34740,6 +34764,7 @@ var init_double = __esm({
         super(name2, "number", "MySqlDouble");
         this.config.precision = config?.precision;
         this.config.scale = config?.scale;
+        this.config.unsigned = config?.unsigned;
       }
       /** @internal */
       build(table4) {
@@ -34752,15 +34777,18 @@ var init_double = __esm({
         super(...arguments);
         __publicField(this, "precision", this.config.precision);
         __publicField(this, "scale", this.config.scale);
+        __publicField(this, "unsigned", this.config.unsigned);
       }
       getSQLType() {
+        let type = "";
         if (this.precision !== void 0 && this.scale !== void 0) {
-          return `double(${this.precision},${this.scale})`;
+          type += `double(${this.precision},${this.scale})`;
         } else if (this.precision === void 0) {
-          return "double";
+          type += "double";
         } else {
-          return `double(${this.precision})`;
+          type += `double(${this.precision})`;
         }
+        return this.unsigned ? `${type} unsigned` : type;
       }
     };
     __publicField(MySqlDouble, _a262, "MySqlDouble");
@@ -34810,18 +34838,23 @@ var init_enum2 = __esm({
 });
 
 // ../drizzle-orm/dist/mysql-core/columns/float.js
-function float(name2) {
-  return new MySqlFloatBuilder(name2 ?? "");
+function float(a, b) {
+  const { name: name2, config } = getColumnNameAndConfig(a, b);
+  return new MySqlFloatBuilder(name2, config);
 }
 var _a265, _b188, MySqlFloatBuilder, _a266, _b189, MySqlFloat;
 var init_float = __esm({
   "../drizzle-orm/dist/mysql-core/columns/float.js"() {
     "use strict";
     init_entity();
+    init_utils2();
     init_common4();
     MySqlFloatBuilder = class extends (_b188 = MySqlColumnBuilderWithAutoIncrement, _a265 = entityKind, _b188) {
-      constructor(name2) {
+      constructor(name2, config) {
         super(name2, "number", "MySqlFloat");
+        this.config.precision = config?.precision;
+        this.config.scale = config?.scale;
+        this.config.unsigned = config?.unsigned;
       }
       /** @internal */
       build(table4) {
@@ -34830,8 +34863,22 @@ var init_float = __esm({
     };
     __publicField(MySqlFloatBuilder, _a265, "MySqlFloatBuilder");
     MySqlFloat = class extends (_b189 = MySqlColumnWithAutoIncrement, _a266 = entityKind, _b189) {
+      constructor() {
+        super(...arguments);
+        __publicField(this, "precision", this.config.precision);
+        __publicField(this, "scale", this.config.scale);
+        __publicField(this, "unsigned", this.config.unsigned);
+      }
       getSQLType() {
-        return "float";
+        let type = "";
+        if (this.precision !== void 0 && this.scale !== void 0) {
+          type += `float(${this.precision},${this.scale})`;
+        } else if (this.precision === void 0) {
+          type += "float";
+        } else {
+          type += `float(${this.precision})`;
+        }
+        return this.unsigned ? `${type} unsigned` : type;
       }
     };
     __publicField(MySqlFloat, _a266, "MySqlFloat");
@@ -38823,8 +38870,8 @@ ${withStyle.errorWarning(
             changedType = columnType.replace("bigint unsigned", "serial");
           }
         }
-        if (columnType.startsWith("tinyint")) {
-          changedType = "tinyint";
+        if (columnType.includes("decimal(10,0)")) {
+          changedType = columnType.replace("decimal(10,0)", "decimal");
         }
         let onUpdate = void 0;
         if (columnType.startsWith("timestamp") && typeof columnExtra !== "undefined" && columnExtra.includes("on update CURRENT_TIMESTAMP")) {
@@ -39346,6 +39393,7 @@ var init_utils9 = __esm({
     "use strict";
     import_hanji7 = __toESM(require_hanji());
     init_lib();
+    init_getTablesFilterByExtensions();
     init_global();
     init_schemaValidator();
     init_serializer();
@@ -40302,6 +40350,7 @@ var sqlitePushIntrospect = async (db, filters) => {
 
 // src/api.ts
 init_sqlitePushUtils();
+init_getTablesFilterByExtensions();
 init_global();
 init_migrationPreparator();
 init_mysqlSchema();
@@ -40355,9 +40404,12 @@ var generateMigration = async (prev, cur) => {
   );
   return sqlStatements;
 };
-var pushSchema = async (imports, drizzleInstance, schemaFilters) => {
+var pushSchema = async (imports, drizzleInstance, schemaFilters, tablesFilter, extensionsFilters) => {
   const { applyPgSnapshotsDiff: applyPgSnapshotsDiff2 } = await Promise.resolve().then(() => (init_snapshotsDiffer(), snapshotsDiffer_exports));
   const { sql: sql2 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
+  const filters = (tablesFilter ?? []).concat(
+    getTablesFilterByExtensions({ extensionsFilters, dialect: "postgresql" })
+  );
   const db = {
     query: async (query, params) => {
       const res = await drizzleInstance.execute(sql2.raw(query));
@@ -40367,7 +40419,7 @@ var pushSchema = async (imports, drizzleInstance, schemaFilters) => {
   const cur = generateDrizzleJson(imports);
   const { schema: prev } = await pgPushIntrospect(
     db,
-    [],
+    filters,
     schemaFilters ?? ["public"],
     void 0
   );

package/api.mjs

@@ -17525,6 +17525,7 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonCreatedCheckConstraints);
       jsonStatements.push(...jsonAlteredUniqueConstraints);
       jsonStatements.push(...jsonAlterEnumsWithDroppedValues);
+      jsonStatements.push(...createViews);
       jsonStatements.push(...jsonRenamePoliciesStatements);
       jsonStatements.push(...jsonDropPoliciesStatements);
       jsonStatements.push(...jsonCreatePoliciesStatements);
@@ -17533,7 +17534,6 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonDropIndPoliciesStatements);
       jsonStatements.push(...jsonCreateIndPoliciesStatements);
       jsonStatements.push(...jsonAlterIndPoliciesStatements);
-      jsonStatements.push(...createViews);
       jsonStatements.push(...dropEnums);
       jsonStatements.push(...dropSequences);
       jsonStatements.push(...dropSchemas);
@@ -30217,7 +30217,7 @@ var init_blob = __esm({
         return "blob";
       }
       mapFromDriverValue(value) {
-        return BigInt(value.toString());
+        return BigInt(Buffer.isBuffer(value) ? value.toString() : String.fromCodePoint(...value));
       }
       mapToDriverValue(value) {
         return Buffer.from(value.toString());
@@ -30242,7 +30242,7 @@ var init_blob = __esm({
         return "blob";
       }
       mapFromDriverValue(value) {
-        return JSON.parse(value.toString());
+        return JSON.parse(Buffer.isBuffer(value) ? value.toString() : String.fromCodePoint(...value));
       }
       mapToDriverValue(value) {
         return Buffer.from(JSON.stringify(value));
@@ -34062,6 +34062,25 @@ WHERE
   }
 });
 
+// src/extensions/getTablesFilterByExtensions.ts
+var getTablesFilterByExtensions;
+var init_getTablesFilterByExtensions = __esm({
+  "src/extensions/getTablesFilterByExtensions.ts"() {
+    "use strict";
+    getTablesFilterByExtensions = ({
+      extensionsFilters,
+      dialect: dialect4
+    }) => {
+      if (extensionsFilters) {
+        if (extensionsFilters.includes("postgis") && dialect4 === "postgresql") {
+          return ["!geography_columns", "!geometry_columns", "!spatial_ref_sys"];
+        }
+      }
+      return [];
+    };
+  }
+});
+
 // ../drizzle-orm/dist/mysql-core/alias.js
 var init_alias4 = __esm({
   "../drizzle-orm/dist/mysql-core/alias.js"() {
@@ -34684,7 +34703,7 @@ var init_datetime = __esm({
 // ../drizzle-orm/dist/mysql-core/columns/decimal.js
 function decimal(a, b = {}) {
   const { name: name2, config } = getColumnNameAndConfig(a, b);
-  return new MySqlDecimalBuilder(name2, config.precision, config.scale);
+  return new MySqlDecimalBuilder(name2, config);
 }
 var _a259, _b182, MySqlDecimalBuilder, _a260, _b183, MySqlDecimal;
 var init_decimal = __esm({
@@ -34694,10 +34713,11 @@ var init_decimal = __esm({
     init_utils2();
     init_common4();
     MySqlDecimalBuilder = class extends (_b182 = MySqlColumnBuilderWithAutoIncrement, _a259 = entityKind, _b182) {
-      constructor(name2, precision, scale) {
+      constructor(name2, config) {
         super(name2, "string", "MySqlDecimal");
-        this.config.precision = precision;
-        this.config.scale = scale;
+        this.config.precision = config?.precision;
+        this.config.scale = config?.scale;
+        this.config.unsigned = config?.unsigned;
       }
       /** @internal */
       build(table4) {
@@ -34713,15 +34733,19 @@ var init_decimal = __esm({
         super(...arguments);
         __publicField(this, "precision", this.config.precision);
         __publicField(this, "scale", this.config.scale);
+        __publicField(this, "unsigned", this.config.unsigned);
       }
       getSQLType() {
+        let type = "";
         if (this.precision !== void 0 && this.scale !== void 0) {
-          return `decimal(${this.precision},${this.scale})`;
+          type += `decimal(${this.precision},${this.scale})`;
         } else if (this.precision === void 0) {
-          return "decimal";
+          type += "decimal";
         } else {
-          return `decimal(${this.precision})`;
+          type += `decimal(${this.precision})`;
         }
+        type = type === "decimal(10,0)" || type === "decimal(10)" ? "decimal" : type;
+        return this.unsigned ? `${type} unsigned` : type;
       }
     };
     __publicField(MySqlDecimal, _a260, "MySqlDecimal");
@@ -34745,6 +34769,7 @@ var init_double = __esm({
         super(name2, "number", "MySqlDouble");
         this.config.precision = config?.precision;
         this.config.scale = config?.scale;
+        this.config.unsigned = config?.unsigned;
       }
       /** @internal */
       build(table4) {
@@ -34757,15 +34782,18 @@ var init_double = __esm({
         super(...arguments);
         __publicField(this, "precision", this.config.precision);
         __publicField(this, "scale", this.config.scale);
+        __publicField(this, "unsigned", this.config.unsigned);
       }
       getSQLType() {
+        let type = "";
         if (this.precision !== void 0 && this.scale !== void 0) {
-          return `double(${this.precision},${this.scale})`;
+          type += `double(${this.precision},${this.scale})`;
         } else if (this.precision === void 0) {
-          return "double";
+          type += "double";
         } else {
-          return `double(${this.precision})`;
+          type += `double(${this.precision})`;
         }
+        return this.unsigned ? `${type} unsigned` : type;
       }
     };
     __publicField(MySqlDouble, _a262, "MySqlDouble");
@@ -34815,18 +34843,23 @@ var init_enum2 = __esm({
 });
 
 // ../drizzle-orm/dist/mysql-core/columns/float.js
-function float(name2) {
-  return new MySqlFloatBuilder(name2 ?? "");
+function float(a, b) {
+  const { name: name2, config } = getColumnNameAndConfig(a, b);
+  return new MySqlFloatBuilder(name2, config);
 }
 var _a265, _b188, MySqlFloatBuilder, _a266, _b189, MySqlFloat;
 var init_float = __esm({
   "../drizzle-orm/dist/mysql-core/columns/float.js"() {
     "use strict";
     init_entity();
+    init_utils2();
     init_common4();
     MySqlFloatBuilder = class extends (_b188 = MySqlColumnBuilderWithAutoIncrement, _a265 = entityKind, _b188) {
-      constructor(name2) {
+      constructor(name2, config) {
         super(name2, "number", "MySqlFloat");
+        this.config.precision = config?.precision;
+        this.config.scale = config?.scale;
+        this.config.unsigned = config?.unsigned;
       }
       /** @internal */
       build(table4) {
@@ -34835,8 +34868,22 @@ var init_float = __esm({
     };
     __publicField(MySqlFloatBuilder, _a265, "MySqlFloatBuilder");
     MySqlFloat = class extends (_b189 = MySqlColumnWithAutoIncrement, _a266 = entityKind, _b189) {
+      constructor() {
+        super(...arguments);
+        __publicField(this, "precision", this.config.precision);
+        __publicField(this, "scale", this.config.scale);
+        __publicField(this, "unsigned", this.config.unsigned);
+      }
       getSQLType() {
-        return "float";
+        let type = "";
+        if (this.precision !== void 0 && this.scale !== void 0) {
+          type += `float(${this.precision},${this.scale})`;
+        } else if (this.precision === void 0) {
+          type += "float";
+        } else {
+          type += `float(${this.precision})`;
+        }
+        return this.unsigned ? `${type} unsigned` : type;
       }
     };
     __publicField(MySqlFloat, _a266, "MySqlFloat");
@@ -38828,8 +38875,8 @@ ${withStyle.errorWarning(
             changedType = columnType.replace("bigint unsigned", "serial");
           }
         }
-        if (columnType.startsWith("tinyint")) {
-          changedType = "tinyint";
+        if (columnType.includes("decimal(10,0)")) {
+          changedType = columnType.replace("decimal(10,0)", "decimal");
         }
         let onUpdate = void 0;
         if (columnType.startsWith("timestamp") && typeof columnExtra !== "undefined" && columnExtra.includes("on update CURRENT_TIMESTAMP")) {
@@ -39351,6 +39398,7 @@ var init_utils9 = __esm({
     "use strict";
     import_hanji7 = __toESM(require_hanji());
     init_lib();
+    init_getTablesFilterByExtensions();
     init_global();
     init_schemaValidator();
     init_serializer();
@@ -40293,6 +40341,7 @@ var sqlitePushIntrospect = async (db, filters) => {
 
 // src/api.ts
 init_sqlitePushUtils();
+init_getTablesFilterByExtensions();
 init_global();
 init_migrationPreparator();
 init_mysqlSchema();
@@ -40346,9 +40395,12 @@ var generateMigration = async (prev, cur) => {
   );
   return sqlStatements;
 };
-var pushSchema = async (imports, drizzleInstance, schemaFilters) => {
+var pushSchema = async (imports, drizzleInstance, schemaFilters, tablesFilter, extensionsFilters) => {
   const { applyPgSnapshotsDiff: applyPgSnapshotsDiff2 } = await Promise.resolve().then(() => (init_snapshotsDiffer(), snapshotsDiffer_exports));
   const { sql: sql2 } = await Promise.resolve().then(() => (init_dist(), dist_exports));
+  const filters = (tablesFilter ?? []).concat(
+    getTablesFilterByExtensions({ extensionsFilters, dialect: "postgresql" })
+  );
   const db = {
     query: async (query, params) => {
       const res = await drizzleInstance.execute(sql2.raw(query));
@@ -40358,7 +40410,7 @@ var pushSchema = async (imports, drizzleInstance, schemaFilters) => {
   const cur = generateDrizzleJson(imports);
   const { schema: prev } = await pgPushIntrospect(
     db,
-    [],
+    filters,
     schemaFilters ?? ["public"],
     void 0
   );