drizzle-kit 0.27.1 → 0.27.2

package/api.d.mts

@@ -782,10 +782,12 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
             using: zod.ZodOptional<zod.ZodString>;
             withCheck: zod.ZodOptional<zod.ZodString>;
             on: zod.ZodOptional<zod.ZodString>;
+            schema: zod.ZodOptional<zod.ZodString>;
         }, "strict", zod.ZodTypeAny, {
             name: string;
             using?: string | undefined;
             as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+            schema?: string | undefined;
             for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
             to?: string[] | undefined;
             withCheck?: string | undefined;
@@ -794,6 +796,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
             name: string;
             using?: string | undefined;
             as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+            schema?: string | undefined;
             for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
             to?: string[] | undefined;
             withCheck?: string | undefined;
@@ -881,6 +884,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
             name: string;
             using?: string | undefined;
             as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+            schema?: string | undefined;
             for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
             to?: string[] | undefined;
             withCheck?: string | undefined;
@@ -958,6 +962,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
             name: string;
             using?: string | undefined;
             as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+            schema?: string | undefined;
             for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
             to?: string[] | undefined;
             withCheck?: string | undefined;
@@ -1328,10 +1333,12 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
         using: zod.ZodOptional<zod.ZodString>;
         withCheck: zod.ZodOptional<zod.ZodString>;
         on: zod.ZodOptional<zod.ZodString>;
+        schema: zod.ZodOptional<zod.ZodString>;
     }, "strict", zod.ZodTypeAny, {
         name: string;
         using?: string | undefined;
         as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+        schema?: string | undefined;
         for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
         to?: string[] | undefined;
         withCheck?: string | undefined;
@@ -1340,6 +1347,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
         name: string;
         using?: string | undefined;
         as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+        schema?: string | undefined;
         for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
         to?: string[] | undefined;
         withCheck?: string | undefined;
@@ -1485,6 +1493,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
             name: string;
             using?: string | undefined;
             as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+            schema?: string | undefined;
             for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
             to?: string[] | undefined;
             withCheck?: string | undefined;
@@ -1570,6 +1579,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
         name: string;
         using?: string | undefined;
         as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+        schema?: string | undefined;
         for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
         to?: string[] | undefined;
         withCheck?: string | undefined;
@@ -1673,6 +1683,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
             name: string;
             using?: string | undefined;
             as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+            schema?: string | undefined;
             for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
             to?: string[] | undefined;
             withCheck?: string | undefined;
@@ -1768,6 +1779,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
         name: string;
         using?: string | undefined;
         as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+        schema?: string | undefined;
         for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
         to?: string[] | undefined;
         withCheck?: string | undefined;
@@ -2363,6 +2375,7 @@ declare const upPgSnapshot: (snapshot: Record<string, unknown>) => {
         }>;
         policies: Record<string, {
             name: string;
+            schema?: string | undefined;
             as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
             for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
             to?: string[] | undefined;
@@ -2378,6 +2391,7 @@ declare const upPgSnapshot: (snapshot: Record<string, unknown>) => {
     }>;
     policies: Record<string, {
         name: string;
+        schema?: string | undefined;
         as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
         for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
         to?: string[] | undefined;

package/api.d.ts

@@ -782,10 +782,12 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
             using: zod.ZodOptional<zod.ZodString>;
             withCheck: zod.ZodOptional<zod.ZodString>;
             on: zod.ZodOptional<zod.ZodString>;
+            schema: zod.ZodOptional<zod.ZodString>;
         }, "strict", zod.ZodTypeAny, {
             name: string;
             using?: string | undefined;
             as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+            schema?: string | undefined;
             for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
             to?: string[] | undefined;
             withCheck?: string | undefined;
@@ -794,6 +796,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
             name: string;
             using?: string | undefined;
             as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+            schema?: string | undefined;
             for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
             to?: string[] | undefined;
             withCheck?: string | undefined;
@@ -881,6 +884,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
             name: string;
             using?: string | undefined;
             as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+            schema?: string | undefined;
             for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
             to?: string[] | undefined;
             withCheck?: string | undefined;
@@ -958,6 +962,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
             name: string;
             using?: string | undefined;
             as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+            schema?: string | undefined;
             for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
             to?: string[] | undefined;
             withCheck?: string | undefined;
@@ -1328,10 +1333,12 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
         using: zod.ZodOptional<zod.ZodString>;
         withCheck: zod.ZodOptional<zod.ZodString>;
         on: zod.ZodOptional<zod.ZodString>;
+        schema: zod.ZodOptional<zod.ZodString>;
     }, "strict", zod.ZodTypeAny, {
         name: string;
         using?: string | undefined;
         as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+        schema?: string | undefined;
         for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
         to?: string[] | undefined;
         withCheck?: string | undefined;
@@ -1340,6 +1347,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
         name: string;
         using?: string | undefined;
         as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+        schema?: string | undefined;
         for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
         to?: string[] | undefined;
         withCheck?: string | undefined;
@@ -1485,6 +1493,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
             name: string;
             using?: string | undefined;
             as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+            schema?: string | undefined;
             for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
             to?: string[] | undefined;
             withCheck?: string | undefined;
@@ -1570,6 +1579,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
         name: string;
         using?: string | undefined;
         as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+        schema?: string | undefined;
         for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
         to?: string[] | undefined;
         withCheck?: string | undefined;
@@ -1673,6 +1683,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
             name: string;
             using?: string | undefined;
             as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+            schema?: string | undefined;
             for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
             to?: string[] | undefined;
             withCheck?: string | undefined;
@@ -1768,6 +1779,7 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
         name: string;
         using?: string | undefined;
         as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
+        schema?: string | undefined;
         for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
         to?: string[] | undefined;
         withCheck?: string | undefined;
@@ -2363,6 +2375,7 @@ declare const upPgSnapshot: (snapshot: Record<string, unknown>) => {
         }>;
         policies: Record<string, {
             name: string;
+            schema?: string | undefined;
             as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
             for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
             to?: string[] | undefined;
@@ -2378,6 +2391,7 @@ declare const upPgSnapshot: (snapshot: Record<string, unknown>) => {
     }>;
     policies: Record<string, {
         name: string;
+        schema?: string | undefined;
         as?: "PERMISSIVE" | "RESTRICTIVE" | undefined;
         for?: "ALL" | "SELECT" | "INSERT" | "UPDATE" | "DELETE" | undefined;
         to?: string[] | undefined;

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: {},
@@ -39868,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);
   });
@@ -39896,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;
@@ -40064,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);
     }

package/api.mjs

@@ -7761,7 +7761,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(),
@@ -8096,6 +8097,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}`;
       },
@@ -12058,9 +12069,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})` : "";
@@ -12780,7 +12791,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();
@@ -12788,7 +12799,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
           });
         }) ?? [];
@@ -16775,8 +16786,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({
@@ -16816,7 +16829,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;
@@ -16830,8 +16843,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({
@@ -17106,9 +17123,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(
@@ -17167,8 +17184,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(
@@ -17222,7 +17239,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) {
@@ -17349,7 +17367,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 = [];
@@ -17564,7 +17586,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)) {
@@ -28829,6 +28851,7 @@ ${withStyle.errorWarning(
         } else {
           policiesToReturn[policy4.name] = {
             ...mappedPolicy,
+            schema: tableConfig.schema ?? "public",
             on: `"${tableConfig.schema ?? "public"}"."${tableConfig.name}"`
           };
         }
@@ -29037,9 +29060,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(
@@ -29165,7 +29189,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) {
@@ -29181,6 +29206,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(
@@ -29773,7 +29807,7 @@ WHERE
         schemas: schemasObject,
         sequences: sequencesToReturn,
         roles: rolesToReturn,
-        policies: {},
+        policies,
         views,
         _meta: {
           schemas: {},
@@ -39859,7 +39893,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);
   });
@@ -39887,7 +39921,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;
@@ -40055,7 +40089,7 @@ var pgSuggestions = async (db, statements) => {
         }
       }
     }
-    const stmnt = fromJson([statement], "postgresql");
+    const stmnt = fromJson([statement], "postgresql", "push");
     if (typeof stmnt !== "undefined") {
       statementsToExecute.push(...stmnt);
     }

package/bin.cjs

@@ -6044,7 +6044,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(),
@@ -6381,6 +6382,16 @@ var init_pgSchema = __esm({
         var _a;
         return `${policy4.name}--${policy4.as}--${policy4.for}--${(_a = policy4.to) == null ? void 0 : _a.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}`;
       },
@@ -19590,6 +19601,7 @@ ${withStyle.errorWarning(
         } else {
           policiesToReturn[policy4.name] = {
             ...mappedPolicy,
+            schema: tableConfig.schema ?? "public",
             on: `"${tableConfig.schema ?? "public"}"."${tableConfig.name}"`
           };
         }
@@ -19800,9 +19812,10 @@ ${withStyle.errorWarning(
         --end;
       return start > 0 || end < str.length ? str.substring(start, end) : str.toString();
     };
-    fromDatabase2 = async (db, tablesFilter = () => true, schemaFilters, entities, progressCallback) => {
+    fromDatabase2 = async (db, tablesFilter = () => true, schemaFilters, entities, progressCallback, tsSchema) => {
       const result = {};
       const views = {};
+      const policies = {};
       const internals = { tables: {} };
       const where = schemaFilters.map((t2) => `n.nspname = '${t2}'`).join(" or ");
       const allTables = await db.query(
@@ -19932,7 +19945,8 @@ WHERE
           }
         }
       }
-      const wherePolicies = schemaFilters.map((t2) => `schemaname = '${t2}'`).join(" or ");
+      const schemasForLinkedPoliciesInSchema = Object.values((tsSchema == null ? void 0 : tsSchema.policies) ?? {}).map((it) => it.schema);
+      const wherePolicies = [...schemaFilters, ...schemasForLinkedPoliciesInSchema].map((t2) => `schemaname = '${t2}'`).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) {
@@ -19948,6 +19962,15 @@ WHERE
             [dbPolicy.name]: { ...rest, to: parsedTo, withCheck: parsedWithCheck, using: parsedUsing }
           };
         }
+        if (tsSchema == null ? void 0 : tsSchema.policies[dbPolicy.name]) {
+          policies[dbPolicy.name] = {
+            ...rest,
+            to: parsedTo,
+            withCheck: parsedWithCheck,
+            using: parsedUsing,
+            on: tsSchema == null ? void 0 : tsSchema.policies[dbPolicy.name].on
+          };
+        }
       }
       if (progressCallback) {
         progressCallback(
@@ -20545,7 +20568,7 @@ WHERE
         schemas: schemasObject,
         sequences: sequencesToReturn,
         roles: rolesToReturn,
-        policies: {},
+        policies,
         views,
         _meta: {
           schemas: {},
@@ -21488,7 +21511,7 @@ ${filenames.join("\n")}
 });
 
 // src/migrationPreparator.ts
-var import_crypto, import_fs4, prepareMySqlDbPushSnapshot, prepareSQLiteDbPushSnapshot, preparePgDbPushSnapshot, prepareMySqlMigrationSnapshot, prepareSqliteMigrationSnapshot, fillPgSnapshot, preparePgMigrationSnapshot, preparePrevSnapshot;
+var import_crypto, import_fs4, prepareMySqlDbPushSnapshot, prepareSQLiteDbPushSnapshot, prepareMySqlMigrationSnapshot, prepareSqliteMigrationSnapshot, fillPgSnapshot, preparePgMigrationSnapshot, preparePrevSnapshot;
 var init_migrationPreparator = __esm({
   "src/migrationPreparator.ts"() {
     "use strict";
@@ -21520,14 +21543,6 @@ var init_migrationPreparator = __esm({
       };
       return { prev, cur: result };
     };
-    preparePgDbPushSnapshot = async (prev, schemaPath, casing2, schemaFilter = ["public"]) => {
-      const serialized = await serializePg(schemaPath, casing2, schemaFilter);
-      const id = (0, import_crypto.randomUUID)();
-      const idPrev = prev.id;
-      const { version: version3, dialect: dialect4, ...rest } = serialized;
-      const result = { version: version3, dialect: dialect4, id, prevId: idPrev, ...rest };
-      return { prev, cur: result };
-    };
     prepareMySqlMigrationSnapshot = async (migrationFolders, schemaPath, casing2) => {
       const prevSnapshot = mysqlSchema.parse(
         preparePrevSnapshot(migrationFolders, dryMySql)
@@ -24729,9 +24744,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})` : "";
@@ -25458,7 +25473,7 @@ WITH ${withCheckOption} CHECK OPTION` : "";
       can(statement, dialect4) {
         return statement.type === "drop_table" && dialect4 === "postgresql";
       }
-      convert(statement) {
+      convert(statement, _d, action) {
         const { tableName, schema: schema5, policies } = statement;
         const tableNameWithSchema = schema5 ? `"${schema5}"."${tableName}"` : `"${tableName}"`;
         const dropPolicyConvertor = new PgDropPolicyConvertor();
@@ -25466,7 +25481,7 @@ WITH ${withCheckOption} CHECK OPTION` : "";
           return dropPolicyConvertor.convert({
             type: "drop_policy",
             tableName,
-            data: PgSquasher.unsquashPolicy(p2),
+            data: action === "push" ? PgSquasher.unsquashPolicyPush(p2) : PgSquasher.unsquashPolicy(p2),
             schema: schema5
           });
         })) ?? [];
@@ -29434,8 +29449,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({
@@ -29475,7 +29492,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;
@@ -29489,8 +29506,12 @@ var init_snapshotsDiffer = __esm({
       const indPolicyCreates = [];
       const indPolicyDeletes = [];
       const { renamed: indPolicyRenames, created, deleted } = await indPolicyResolver2({
-        deleted: indPolicyRes.deleted.map((t2) => PgSquasher.unsquashPolicy(t2.values)),
-        created: indPolicyRes.added.map((t2) => PgSquasher.unsquashPolicy(t2.values))
+        deleted: indPolicyRes.deleted.map(
+          (t2) => action === "push" ? PgSquasher.unsquashPolicyPush(t2.values) : PgSquasher.unsquashPolicy(t2.values)
+        ),
+        created: indPolicyRes.added.map(
+          (t2) => action === "push" ? PgSquasher.unsquashPolicyPush(t2.values) : PgSquasher.unsquashPolicy(t2.values)
+        )
       });
       if (created.length > 0) {
         indPolicyCreates.push({
@@ -29766,9 +29787,9 @@ var init_snapshotsDiffer = __esm({
         );
       }
       typedResult.alteredPolicies.forEach(({ values }) => {
-        const policy4 = PgSquasher.unsquashPolicy(values);
-        const newPolicy = PgSquasher.unsquashPolicy(json2.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(json2.policies[policy4.name].values) : PgSquasher.unsquashPolicy(json2.policies[policy4.name].values);
+        const oldPolicy = action === "push" ? PgSquasher.unsquashPolicyPush(json2.policies[policy4.name].values) : PgSquasher.unsquashPolicy(json1.policies[policy4.name].values);
         if (newPolicy.as !== oldPolicy.as) {
           jsonDropIndPoliciesStatements.push(
             ...prepareDropIndPolicyJsons(
@@ -29827,8 +29848,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(
@@ -29882,7 +29903,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) {
@@ -30009,7 +30031,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 = [];
@@ -30224,7 +30250,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)) {
@@ -33050,13 +33076,7 @@ var init_migrate = __esm({
         console.error(e2);
       }
     };
-    preparePgPush = async (schemaPath, snapshot, schemaFilter, casing2) => {
-      const { prev, cur } = await preparePgDbPushSnapshot(
-        snapshot,
-        schemaPath,
-        casing2,
-        schemaFilter
-      );
+    preparePgPush = async (cur, prev) => {
       const validatedPrev = pgSchema.parse(prev);
       const validatedCur = pgSchema.parse(cur);
       const squashedPrev = squashPgScheme(validatedPrev, "push");
@@ -58697,7 +58717,7 @@ var require_dist_cjs42 = __commonJS({
     var import_util_buffer_from = require_dist_cjs23();
     var import_util_utf8 = require_dist_cjs24();
     var import_buffer2 = require("buffer");
-    var import_crypto9 = require("crypto");
+    var import_crypto10 = require("crypto");
     var _Hash = class _Hash {
       constructor(algorithmIdentifier, secret) {
         this.algorithmIdentifier = algorithmIdentifier;
@@ -58711,7 +58731,7 @@ var require_dist_cjs42 = __commonJS({
         return Promise.resolve(this.hash.digest());
       }
       reset() {
-        this.hash = this.secret ? (0, import_crypto9.createHmac)(this.algorithmIdentifier, castSourceData(this.secret)) : (0, import_crypto9.createHash)(this.algorithmIdentifier);
+        this.hash = this.secret ? (0, import_crypto10.createHmac)(this.algorithmIdentifier, castSourceData(this.secret)) : (0, import_crypto10.createHash)(this.algorithmIdentifier);
       }
     };
     __name(_Hash, "Hash");
@@ -81253,7 +81273,7 @@ var init_pgPushUtils = __esm({
             }
           }
         }
-        const stmnt = fromJson([statement], "postgresql");
+        const stmnt = fromJson([statement], "postgresql", "push");
         if (typeof stmnt !== "undefined") {
           statementsToExecute.push(...stmnt);
         }
@@ -82407,7 +82427,7 @@ var init_pgIntrospect = __esm({
     init_global();
     init_pgSerializer();
     init_views();
-    pgPushIntrospect = async (db, filters, schemaFilters, entities) => {
+    pgPushIntrospect = async (db, filters, schemaFilters, entities, tsSchema) => {
       const matchers = filters.map((it) => {
         return new Minimatch(it);
       });
@@ -82436,7 +82456,7 @@ var init_pgIntrospect = __esm({
       );
       const res = await (0, import_hanji9.renderWithTask)(
         progress,
-        fromDatabase2(db, filter2, schemaFilters, entities)
+        fromDatabase2(db, filter2, schemaFilters, entities, void 0, tsSchema)
       );
       const schema5 = { id: originUUID, prevId: "", ...res };
       const { internal, ...schemaWithoutInternals } = schema5;
@@ -82912,12 +82932,14 @@ __export(push_exports, {
   pgPush: () => pgPush,
   sqlitePush: () => sqlitePush
 });
-var import_hanji11, mysqlPush, pgPush, sqlitePush, libSQLPush;
+var import_crypto9, import_hanji11, mysqlPush, pgPush, sqlitePush, libSQLPush;
 var init_push = __esm({
   "src/cli/commands/push.ts"() {
     "use strict";
     init_source();
+    import_crypto9 = require("crypto");
     import_hanji11 = __toESM(require_hanji());
+    init_serializer();
     init_sqlgenerator();
     init_selector_ui();
     init_outputs();
@@ -83030,9 +83052,13 @@ var init_push = __esm({
       const { preparePostgresDB: preparePostgresDB2 } = await Promise.resolve().then(() => (init_connections(), connections_exports));
       const { pgPushIntrospect: pgPushIntrospect2 } = await Promise.resolve().then(() => (init_pgIntrospect(), pgIntrospect_exports));
       const db = await preparePostgresDB2(credentials2);
-      const { schema: schema5 } = await pgPushIntrospect2(db, tablesFilter, schemasFilter, entities);
+      const serialized = await serializePg(schemaPath, casing2, schemasFilter);
+      const { schema: schema5 } = await pgPushIntrospect2(db, tablesFilter, schemasFilter, entities, serialized);
       const { preparePgPush: preparePgPush2 } = await Promise.resolve().then(() => (init_migrate(), migrate_exports));
-      const statements = await preparePgPush2(schemaPath, schema5, schemasFilter, casing2);
+      const statements = await preparePgPush2(
+        { id: (0, import_crypto9.randomUUID)(), prevId: schema5.id, ...serialized },
+        schema5
+      );
       try {
         if (statements.sqlStatements.length === 0) {
           (0, import_hanji11.render)(`[${source_default.blue("i")}] No changes detected`);
@@ -88963,7 +88989,7 @@ init_utils2();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.27.1";
+  const envVersion = "0.27.2";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.27.1",
+	"version": "0.27.2",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",

package/utils.js

@@ -5252,7 +5252,8 @@ var policy = objectType({
   to: stringType().array().optional(),
   using: stringType().optional(),
   withCheck: stringType().optional(),
-  on: stringType().optional()
+  on: stringType().optional(),
+  schema: stringType().optional()
 }).strict();
 var policySquashed = objectType({
   name: stringType(),

package/utils.mjs

@@ -5231,7 +5231,8 @@ var policy = objectType({
   to: stringType().array().optional(),
   using: stringType().optional(),
   withCheck: stringType().optional(),
-  on: stringType().optional()
+  on: stringType().optional(),
+  schema: stringType().optional()
 }).strict();
 var policySquashed = objectType({
   name: stringType(),