drizzle-kit 0.27.1-4d56096 → 0.27.1-93aad0e

package/api.js

@@ -7756,7 +7756,8 @@ var init_pgSchema = __esm({
       to: stringType().array().optional(),
       using: stringType().optional(),
       withCheck: stringType().optional(),
-      on: stringType().optional()
+      on: stringType().optional(),
+      schema: stringType().optional()
     }).strict();
     policySquashed = objectType({
       name: stringType(),
@@ -8091,6 +8092,16 @@ var init_pgSchema = __esm({
       squashPolicyPush: (policy4) => {
         return `${policy4.name}--${policy4.as}--${policy4.for}--${policy4.to?.join(",")}--${policy4.on}`;
       },
+      unsquashPolicyPush: (policy4) => {
+        const splitted = policy4.split("--");
+        return {
+          name: splitted[0],
+          as: splitted[1],
+          for: splitted[2],
+          to: splitted[3].split(","),
+          on: splitted[4] !== "undefined" ? splitted[4] : void 0
+        };
+      },
       squashPK: (pk) => {
         return `${pk.columns.join(",")};${pk.name}`;
       },
@@ -12053,9 +12064,9 @@ var init_sqlgenerator = __esm({
       can(statement, dialect4) {
         return statement.type === "alter_policy" && dialect4 === "postgresql";
       }
-      convert(statement) {
-        const newPolicy = PgSquasher.unsquashPolicy(statement.newData);
-        const oldPolicy = PgSquasher.unsquashPolicy(statement.oldData);
+      convert(statement, _dialect, action) {
+        const newPolicy = action === "push" ? PgSquasher.unsquashPolicyPush(statement.newData) : PgSquasher.unsquashPolicy(statement.newData);
+        const oldPolicy = action === "push" ? PgSquasher.unsquashPolicyPush(statement.oldData) : PgSquasher.unsquashPolicy(statement.oldData);
         const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
         const usingPart = newPolicy.using ? ` USING (${newPolicy.using})` : oldPolicy.using ? ` USING (${oldPolicy.using})` : "";
         const withCheckPart = newPolicy.withCheck ? ` WITH CHECK (${newPolicy.withCheck})` : oldPolicy.withCheck ? ` WITH CHECK  (${oldPolicy.withCheck})` : "";
@@ -12775,7 +12786,7 @@ WITH ${withCheckOption} CHECK OPTION` : "";
       can(statement, dialect4) {
         return statement.type === "drop_table" && dialect4 === "postgresql";
       }
-      convert(statement) {
+      convert(statement, _d5, action) {
         const { tableName, schema: schema4, policies } = statement;
         const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
         const dropPolicyConvertor = new PgDropPolicyConvertor();
@@ -12783,7 +12794,7 @@ WITH ${withCheckOption} CHECK OPTION` : "";
           return dropPolicyConvertor.convert({
             type: "drop_policy",
             tableName,
-            data: PgSquasher.unsquashPolicy(p),
+            data: action === "push" ? PgSquasher.unsquashPolicyPush(p) : PgSquasher.unsquashPolicy(p),
             schema: schema4
           });
         }) ?? [];
@@ -16770,8 +16781,10 @@ var init_snapshotsDiffer = __esm({
         const { renamed, created: created2, deleted: deleted2 } = await policyResolver2({
           tableName: entry.name,
           schema: entry.schema,
-          deleted: entry.policies.deleted.map(PgSquasher.unsquashPolicy),
-          created: entry.policies.added.map(PgSquasher.unsquashPolicy)
+          deleted: entry.policies.deleted.map(
+            action === "push" ? PgSquasher.unsquashPolicyPush : PgSquasher.unsquashPolicy
+          ),
+          created: entry.policies.added.map(action === "push" ? PgSquasher.unsquashPolicyPush : PgSquasher.unsquashPolicy)
         });
         if (created2.length > 0) {
           policyCreates.push({
@@ -16811,7 +16824,7 @@ var init_snapshotsDiffer = __esm({
             (policyKey, policy4) => {
               const rens = policyRenamesDict[`${tableValue.schema || "public"}.${tableValue.name}`] || [];
               const newName = columnChangeFor(policyKey, rens);
-              const unsquashedPolicy = PgSquasher.unsquashPolicy(policy4);
+              const unsquashedPolicy = action === "push" ? PgSquasher.unsquashPolicyPush(policy4) : PgSquasher.unsquashPolicy(policy4);
               unsquashedPolicy.name = newName;
               policy4 = PgSquasher.squashPolicy(unsquashedPolicy);
               return newName;
@@ -16825,8 +16838,12 @@ var init_snapshotsDiffer = __esm({
       const indPolicyCreates = [];
       const indPolicyDeletes = [];
       const { renamed: indPolicyRenames, created, deleted } = await indPolicyResolver2({
-        deleted: indPolicyRes.deleted.map((t) => PgSquasher.unsquashPolicy(t.values)),
-        created: indPolicyRes.added.map((t) => PgSquasher.unsquashPolicy(t.values))
+        deleted: indPolicyRes.deleted.map(
+          (t) => action === "push" ? PgSquasher.unsquashPolicyPush(t.values) : PgSquasher.unsquashPolicy(t.values)
+        ),
+        created: indPolicyRes.added.map(
+          (t) => action === "push" ? PgSquasher.unsquashPolicyPush(t.values) : PgSquasher.unsquashPolicy(t.values)
+        )
       });
       if (created.length > 0) {
         indPolicyCreates.push({
@@ -17101,9 +17118,9 @@ var init_snapshotsDiffer = __esm({
         );
       }
       typedResult.alteredPolicies.forEach(({ values }) => {
-        const policy4 = PgSquasher.unsquashPolicy(values);
-        const newPolicy = PgSquasher.unsquashPolicy(json22.policies[policy4.name].values);
-        const oldPolicy = PgSquasher.unsquashPolicy(json1.policies[policy4.name].values);
+        const policy4 = action === "push" ? PgSquasher.unsquashPolicyPush(values) : PgSquasher.unsquashPolicy(values);
+        const newPolicy = action === "push" ? PgSquasher.unsquashPolicyPush(json22.policies[policy4.name].values) : PgSquasher.unsquashPolicy(json22.policies[policy4.name].values);
+        const oldPolicy = action === "push" ? PgSquasher.unsquashPolicyPush(json22.policies[policy4.name].values) : PgSquasher.unsquashPolicy(json1.policies[policy4.name].values);
         if (newPolicy.as !== oldPolicy.as) {
           jsonDropIndPoliciesStatements.push(
             ...prepareDropIndPolicyJsons(
@@ -17162,8 +17179,8 @@ var init_snapshotsDiffer = __esm({
       }
       alteredTables.forEach((it) => {
         Object.keys(it.alteredPolicies).forEach((policyName) => {
-          const newPolicy = PgSquasher.unsquashPolicy(it.alteredPolicies[policyName].__new);
-          const oldPolicy = PgSquasher.unsquashPolicy(it.alteredPolicies[policyName].__old);
+          const newPolicy = action === "push" ? PgSquasher.unsquashPolicyPush(it.alteredPolicies[policyName].__new) : PgSquasher.unsquashPolicy(it.alteredPolicies[policyName].__new);
+          const oldPolicy = action === "push" ? PgSquasher.unsquashPolicyPush(it.alteredPolicies[policyName].__old) : PgSquasher.unsquashPolicy(it.alteredPolicies[policyName].__old);
           if (newPolicy.as !== oldPolicy.as) {
             jsonDropPoliciesStatements.push(
               ...prepareDropPolicyJsons(
@@ -17217,7 +17234,8 @@ var init_snapshotsDiffer = __esm({
           if (policiesInPreviousState.length > 0 && policiesInCurrentState.length === 0 && !table4.isRLSEnabled) {
             jsonDisableRLSStatements.push({ type: "disable_rls", tableName: table4.name, schema: table4.schema });
           }
-          if (table4.isRLSEnabled !== tableInPreviousState.isRLSEnabled) {
+          const wasRlsEnabled = tableInPreviousState ? tableInPreviousState.isRLSEnabled : false;
+          if (table4.isRLSEnabled !== wasRlsEnabled) {
             if (table4.isRLSEnabled) {
               jsonEnableRLSStatements.push({ type: "enable_rls", tableName: table4.name, schema: table4.schema });
             } else if (!table4.isRLSEnabled && policiesInCurrentState.length === 0) {
@@ -17344,7 +17362,11 @@ var init_snapshotsDiffer = __esm({
       });
       jsonCreatePoliciesStatements.push(...[].concat(
         ...createdTables.map(
-          (it) => prepareCreatePolicyJsons(it.name, it.schema, Object.values(it.policies).map(PgSquasher.unsquashPolicy))
+          (it) => prepareCreatePolicyJsons(
+            it.name,
+            it.schema,
+            Object.values(it.policies).map(action === "push" ? PgSquasher.unsquashPolicyPush : PgSquasher.unsquashPolicy)
+          )
         )
       ));
       const createViews = [];
@@ -17559,7 +17581,7 @@ var init_snapshotsDiffer = __esm({
         }
         return true;
       });
-      const sqlStatements = fromJson(filteredEnumsJsonStatements, "postgresql");
+      const sqlStatements = fromJson(filteredEnumsJsonStatements, "postgresql", action);
       const uniqueSqlStatements = [];
       sqlStatements.forEach((ss) => {
         if (!uniqueSqlStatements.includes(ss)) {
@@ -28824,6 +28846,7 @@ ${withStyle.errorWarning(
         } else {
           policiesToReturn[policy4.name] = {
             ...mappedPolicy,
+            schema: tableConfig.schema ?? "public",
             on: `"${tableConfig.schema ?? "public"}"."${tableConfig.name}"`
           };
         }
@@ -29032,9 +29055,10 @@ ${withStyle.errorWarning(
       while (end > start && str[end - 1] === char3) --end;
       return start > 0 || end < str.length ? str.substring(start, end) : str.toString();
     };
-    fromDatabase = async (db, tablesFilter = () => true, schemaFilters, entities, progressCallback) => {
+    fromDatabase = async (db, tablesFilter = () => true, schemaFilters, entities, progressCallback, tsSchema) => {
       const result = {};
       const views = {};
+      const policies = {};
       const internals = { tables: {} };
       const where = schemaFilters.map((t) => `n.nspname = '${t}'`).join(" or ");
       const allTables = await db.query(
@@ -29160,7 +29184,8 @@ WHERE
           }
         }
       }
-      const wherePolicies = schemaFilters.map((t) => `schemaname = '${t}'`).join(" or ");
+      const schemasForLinkedPoliciesInSchema = Object.values(tsSchema?.policies ?? {}).map((it) => it.schema);
+      const wherePolicies = [...schemaFilters, ...schemasForLinkedPoliciesInSchema].map((t) => `schemaname = '${t}'`).join(" or ");
       const policiesByTable = {};
       const allPolicies = await db.query(`SELECT schemaname, tablename, policyname as name, permissive as "as", roles as to, cmd as for, qual as using, with_check as "withCheck" FROM pg_policies${wherePolicies === "" ? "" : ` WHERE ${wherePolicies}`};`);
       for (const dbPolicy of allPolicies) {
@@ -29176,6 +29201,15 @@ WHERE
             [dbPolicy.name]: { ...rest, to: parsedTo, withCheck: parsedWithCheck, using: parsedUsing }
           };
         }
+        if (tsSchema?.policies[dbPolicy.name]) {
+          policies[dbPolicy.name] = {
+            ...rest,
+            to: parsedTo,
+            withCheck: parsedWithCheck,
+            using: parsedUsing,
+            on: tsSchema?.policies[dbPolicy.name].on
+          };
+        }
       }
       if (progressCallback) {
         progressCallback(
@@ -29768,7 +29802,7 @@ WHERE
         schemas: schemasObject,
         sequences: sequencesToReturn,
         roles: rolesToReturn,
-        policies: {},
+        policies,
         views,
         _meta: {
           schemas: {},
@@ -30212,7 +30246,7 @@ var init_blob = __esm({
         return "blob";
       }
       mapFromDriverValue(value) {
-        return BigInt(Buffer.isBuffer(value) ? value.toString() : String.fromCodePoint(...value));
+        return BigInt(value.toString());
       }
       mapToDriverValue(value) {
         return Buffer.from(value.toString());
@@ -30237,7 +30271,7 @@ var init_blob = __esm({
         return "blob";
       }
       mapFromDriverValue(value) {
-        return JSON.parse(Buffer.isBuffer(value) ? value.toString() : String.fromCodePoint(...value));
+        return JSON.parse(value.toString());
       }
       mapToDriverValue(value) {
         return Buffer.from(JSON.stringify(value));
@@ -34057,25 +34091,6 @@ 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"() {
@@ -34698,7 +34713,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);
+  return new MySqlDecimalBuilder(name2, config.precision, config.scale);
 }
 var _a259, _b182, MySqlDecimalBuilder, _a260, _b183, MySqlDecimal;
 var init_decimal = __esm({
@@ -34708,11 +34723,10 @@ var init_decimal = __esm({
     init_utils2();
     init_common4();
     MySqlDecimalBuilder = class extends (_b182 = MySqlColumnBuilderWithAutoIncrement, _a259 = entityKind, _b182) {
-      constructor(name2, config) {
+      constructor(name2, precision, scale) {
         super(name2, "string", "MySqlDecimal");
-        this.config.precision = config?.precision;
-        this.config.scale = config?.scale;
-        this.config.unsigned = config?.unsigned;
+        this.config.precision = precision;
+        this.config.scale = scale;
       }
       /** @internal */
       build(table4) {
@@ -34728,19 +34742,15 @@ 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) {
-          type += `decimal(${this.precision},${this.scale})`;
+          return `decimal(${this.precision},${this.scale})`;
         } else if (this.precision === void 0) {
-          type += "decimal";
+          return "decimal";
         } else {
-          type += `decimal(${this.precision})`;
+          return `decimal(${this.precision})`;
         }
-        type = type === "decimal(10,0)" || type === "decimal(10)" ? "decimal" : type;
-        return this.unsigned ? `${type} unsigned` : type;
       }
     };
     __publicField(MySqlDecimal, _a260, "MySqlDecimal");
@@ -34764,7 +34774,6 @@ 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) {
@@ -34777,18 +34786,15 @@ 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) {
-          type += `double(${this.precision},${this.scale})`;
+          return `double(${this.precision},${this.scale})`;
         } else if (this.precision === void 0) {
-          type += "double";
+          return "double";
         } else {
-          type += `double(${this.precision})`;
+          return `double(${this.precision})`;
         }
-        return this.unsigned ? `${type} unsigned` : type;
       }
     };
     __publicField(MySqlDouble, _a262, "MySqlDouble");
@@ -34838,23 +34844,18 @@ var init_enum2 = __esm({
 });
 
 // ../drizzle-orm/dist/mysql-core/columns/float.js
-function float(a, b) {
-  const { name: name2, config } = getColumnNameAndConfig(a, b);
-  return new MySqlFloatBuilder(name2, config);
+function float(name2) {
+  return new MySqlFloatBuilder(name2 ?? "");
 }
 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, config) {
+      constructor(name2) {
         super(name2, "number", "MySqlFloat");
-        this.config.precision = config?.precision;
-        this.config.scale = config?.scale;
-        this.config.unsigned = config?.unsigned;
       }
       /** @internal */
       build(table4) {
@@ -34863,22 +34864,8 @@ 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() {
-        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;
+        return "float";
       }
     };
     __publicField(MySqlFloat, _a266, "MySqlFloat");
@@ -38870,8 +38857,8 @@ ${withStyle.errorWarning(
             changedType = columnType.replace("bigint unsigned", "serial");
           }
         }
-        if (columnType.includes("decimal(10,0)")) {
-          changedType = columnType.replace("decimal(10,0)", "decimal");
+        if (columnType.startsWith("tinyint")) {
+          changedType = "tinyint";
         }
         let onUpdate = void 0;
         if (columnType.startsWith("timestamp") && typeof columnExtra !== "undefined" && columnExtra.includes("on update CURRENT_TIMESTAMP")) {
@@ -39393,7 +39380,6 @@ var init_utils9 = __esm({
     "use strict";
     import_hanji7 = __toESM(require_hanji());
     init_lib();
-    init_getTablesFilterByExtensions();
     init_global();
     init_schemaValidator();
     init_serializer();
@@ -39916,7 +39902,7 @@ init_mjs();
 init_global();
 init_pgSerializer();
 init_views();
-var pgPushIntrospect = async (db, filters, schemaFilters, entities) => {
+var pgPushIntrospect = async (db, filters, schemaFilters, entities, tsSchema) => {
   const matchers = filters.map((it) => {
     return new Minimatch(it);
   });
@@ -39944,7 +39930,7 @@ var pgPushIntrospect = async (db, filters, schemaFilters, entities) => {
   );
   const res = await (0, import_hanji3.renderWithTask)(
     progress,
-    fromDatabase(db, filter2, schemaFilters, entities)
+    fromDatabase(db, filter2, schemaFilters, entities, void 0, tsSchema)
   );
   const schema4 = { id: originUUID, prevId: "", ...res };
   const { internal, ...schemaWithoutInternals } = schema4;
@@ -40112,7 +40098,7 @@ var pgSuggestions = async (db, statements) => {
         }
       }
     }
-    const stmnt = fromJson([statement], "postgresql");
+    const stmnt = fromJson([statement], "postgresql", "push");
     if (typeof stmnt !== "undefined") {
       statementsToExecute.push(...stmnt);
     }
@@ -40350,7 +40336,6 @@ var sqlitePushIntrospect = async (db, filters) => {
 
 // src/api.ts
 init_sqlitePushUtils();
-init_getTablesFilterByExtensions();
 init_global();
 init_migrationPreparator();
 init_mysqlSchema();
@@ -40404,12 +40389,9 @@ var generateMigration = async (prev, cur) => {
   );
   return sqlStatements;
 };
-var pushSchema = async (imports, drizzleInstance, schemaFilters, tablesFilter, extensionsFilters) => {
+var pushSchema = async (imports, drizzleInstance, schemaFilters) => {
   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));
@@ -40419,7 +40401,7 @@ var pushSchema = async (imports, drizzleInstance, schemaFilters, tablesFilter, e
   const cur = generateDrizzleJson(imports);
   const { schema: prev } = await pgPushIntrospect(
     db,
-    filters,
+    [],
     schemaFilters ?? ["public"],
     void 0
   );