@supabase/pg-delta 1.0.0-alpha.2 → 1.0.0-alpha.21

package/dist/core/objects/schema/schema.diff.js

@@ -1,5 +1,5 @@
 import { diffObjects } from "../base.diff.js";
-import { diffPrivileges, groupPrivilegesByGrantable, } from "../base.privilege-diff.js";
+import { diffPrivileges, emitObjectPrivilegeChanges, } from "../base.privilege-diff.js";
 import { AlterSchemaChangeOwner } from "./changes/schema.alter.js";
 import { CreateCommentOnSchema, DropCommentOnSchema, } from "./changes/schema.comment.js";
 import { CreateSchema } from "./changes/schema.create.js";
@@ -29,47 +29,18 @@ export function diffSchemas(ctx, main, branch) {
         // needed to reach the final desired state.
         // Note: Schemas don't have a schema property, so we pass empty string
         const effectiveDefaults = ctx.defaultPrivilegeState.getEffectiveDefaults(ctx.currentUser, "schema", "");
+        const creatorFilteredDefaults = sc.owner !== ctx.currentUser
+            ? effectiveDefaults.filter((p) => p.grantee !== ctx.currentUser)
+            : effectiveDefaults;
         const desiredPrivileges = sc.privileges;
         // Filter out owner privileges - owner always has ALL privileges implicitly
         // and shouldn't be compared. Use the schema owner as the reference.
-        const privilegeResults = diffPrivileges(effectiveDefaults, desiredPrivileges, sc.owner, ctx.mainRoles);
-        // Generate grant changes
-        for (const [grantee, result] of privilegeResults) {
-            if (result.grants.length > 0) {
-                const grantGroups = groupPrivilegesByGrantable(result.grants);
-                for (const [grantable, list] of grantGroups) {
-                    void grantable;
-                    changes.push(new GrantSchemaPrivileges({
-                        schema: sc,
-                        grantee,
-                        privileges: list,
-                        version: ctx.version,
-                    }));
-                }
-            }
-            // Generate revoke changes
-            if (result.revokes.length > 0) {
-                const revokeGroups = groupPrivilegesByGrantable(result.revokes);
-                for (const [grantable, list] of revokeGroups) {
-                    void grantable;
-                    changes.push(new RevokeSchemaPrivileges({
-                        schema: sc,
-                        grantee,
-                        privileges: list,
-                        version: ctx.version,
-                    }));
-                }
-            }
-            // Generate revoke grant option changes
-            if (result.revokeGrantOption.length > 0) {
-                changes.push(new RevokeGrantOptionSchemaPrivileges({
-                    schema: sc,
-                    grantee,
-                    privilegeNames: result.revokeGrantOption,
-                    version: ctx.version,
-                }));
-            }
-        }
+        const privilegeResults = diffPrivileges(creatorFilteredDefaults, desiredPrivileges, sc.owner);
+        changes.push(...emitObjectPrivilegeChanges(privilegeResults, sc, sc, "schema", {
+            Grant: GrantSchemaPrivileges,
+            Revoke: RevokeSchemaPrivileges,
+            RevokeGrantOption: RevokeGrantOptionSchemaPrivileges,
+        }, ctx.version));
     }
     for (const schemaId of dropped) {
         changes.push(new DropSchema({ schema: main[schemaId] }));
@@ -96,44 +67,12 @@ export function diffSchemas(ctx, main, branch) {
         // PRIVILEGES
         // Filter out owner privileges - owner always has ALL privileges implicitly
         // and shouldn't be compared. Use branch owner as the reference.
-        const privilegeResults = diffPrivileges(mainSchema.privileges, branchSchema.privileges, branchSchema.owner, ctx.mainRoles);
-        for (const [grantee, result] of privilegeResults) {
-            // Generate grant changes
-            if (result.grants.length > 0) {
-                const grantGroups = groupPrivilegesByGrantable(result.grants);
-                for (const [grantable, list] of grantGroups) {
-                    void grantable;
-                    changes.push(new GrantSchemaPrivileges({
-                        schema: branchSchema,
-                        grantee,
-                        privileges: list,
-                        version: ctx.version,
-                    }));
-                }
-            }
-            // Generate revoke changes
-            if (result.revokes.length > 0) {
-                const revokeGroups = groupPrivilegesByGrantable(result.revokes);
-                for (const [grantable, list] of revokeGroups) {
-                    void grantable;
-                    changes.push(new RevokeSchemaPrivileges({
-                        schema: mainSchema,
-                        grantee,
-                        privileges: list,
-                        version: ctx.version,
-                    }));
-                }
-            }
-            // Generate revoke grant option changes
-            if (result.revokeGrantOption.length > 0) {
-                changes.push(new RevokeGrantOptionSchemaPrivileges({
-                    schema: mainSchema,
-                    grantee,
-                    privilegeNames: result.revokeGrantOption,
-                    version: ctx.version,
-                }));
-            }
-        }
+        const privilegeResults = diffPrivileges(mainSchema.privileges, branchSchema.privileges, branchSchema.owner);
+        changes.push(...emitObjectPrivilegeChanges(privilegeResults, branchSchema, mainSchema, "schema", {
+            Grant: GrantSchemaPrivileges,
+            Revoke: RevokeSchemaPrivileges,
+            RevokeGrantOption: RevokeGrantOptionSchemaPrivileges,
+        }, ctx.version));
         // Note: Schema renaming would also use ALTER SCHEMA ... RENAME TO ...
         // But since our Schema model uses 'schema' as the identity field,
         // a name change would be handled as drop + create by diffObjects()

package/dist/core/objects/schema/schema.model.js

@@ -70,7 +70,7 @@ export async function extractSchemas(pool) {
             )
             order by x.grantee, x.privilege_type
           )
-          from lateral aclexplode(nspacl) as x(grantor, grantee, privilege_type, is_grantable)
+          from lateral aclexplode(COALESCE(nspacl, acldefault('n', nspowner))) as x(grantor, grantee, privilege_type, is_grantable)
         ), '[]'
       ) as privileges
     from

package/dist/core/objects/sequence/changes/sequence.alter.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { Sequence } from "../sequence.model.ts";
 import { AlterSequenceChange } from "./sequence.base.ts";
 /**
@@ -35,7 +36,7 @@ export declare class AlterSequenceSetOwnedBy extends AlterSequenceChange {
     });
     get creates(): never[];
     get requires(): (`column:${string}.${string}.${string}` | `sequence:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * ALTER SEQUENCE ... set options ...
@@ -51,7 +52,7 @@ export declare class AlterSequenceSetOptions extends AlterSequenceChange {
     });
     get creates(): never[];
     get requires(): `sequence:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * Replace a sequence by dropping and recreating it.

package/dist/core/objects/sequence/changes/sequence.alter.js

@@ -25,7 +25,7 @@ export class AlterSequenceSetOwnedBy extends AlterSequenceChange {
                 : []),
         ];
     }
-    serialize() {
+    serialize(_options) {
         const head = [
             "ALTER SEQUENCE",
             `${this.sequence.schema}.${this.sequence.name}`,
@@ -60,7 +60,7 @@ export class AlterSequenceSetOptions extends AlterSequenceChange {
         return [this.sequence.stableId];
     }
     // Note: default max computation moved to diff when building options
-    serialize() {
+    serialize(_options) {
         const parts = [
             "ALTER SEQUENCE",
             `${this.sequence.schema}.${this.sequence.name}`,

package/dist/core/objects/sequence/changes/sequence.comment.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { Sequence } from "../sequence.model.ts";
 import { CreateSequenceChange, DropSequenceChange } from "./sequence.base.ts";
 export type CommentSequence = CreateCommentOnSequence | DropCommentOnSequence;
@@ -9,7 +10,7 @@ export declare class CreateCommentOnSequence extends CreateSequenceChange {
     });
     get creates(): `comment:${string}`[];
     get requires(): `sequence:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 export declare class DropCommentOnSequence extends DropSequenceChange {
     readonly sequence: Sequence;
@@ -19,5 +20,5 @@ export declare class DropCommentOnSequence extends DropSequenceChange {
     });
     get drops(): `comment:${string}`[];
     get requires(): (`comment:${string}` | `sequence:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/sequence/changes/sequence.comment.js

@@ -14,7 +14,7 @@ export class CreateCommentOnSequence extends CreateSequenceChange {
     get requires() {
         return [this.sequence.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "COMMENT ON SEQUENCE",
             `${this.sequence.schema}.${this.sequence.name}`,
@@ -37,7 +37,7 @@ export class DropCommentOnSequence extends DropSequenceChange {
     get requires() {
         return [stableId.comment(this.sequence.stableId), this.sequence.stableId];
     }
-    serialize() {
+    serialize(_options) {
         return [
             "COMMENT ON SEQUENCE",
             `${this.sequence.schema}.${this.sequence.name}`,

package/dist/core/objects/sequence/changes/sequence.create.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { Sequence } from "../sequence.model.ts";
 import { CreateSequenceChange } from "./sequence.base.ts";
 /**
@@ -21,5 +22,5 @@ export declare class CreateSequence extends CreateSequenceChange {
     });
     get creates(): `sequence:${string}`[];
     get requires(): string[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/sequence/changes/sequence.create.js

@@ -38,7 +38,7 @@ export class CreateSequence extends CreateSequenceChange {
         }
         return Array.from(dependencies);
     }
-    serialize() {
+    serialize(_options) {
         const parts = ["CREATE SEQUENCE"];
         // Add schema and name
         parts.push(`${this.sequence.schema}.${this.sequence.name}`);

package/dist/core/objects/sequence/changes/sequence.drop.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { Sequence } from "../sequence.model.ts";
 import { DropSequenceChange } from "./sequence.base.ts";
 /**
@@ -18,5 +19,5 @@ export declare class DropSequence extends DropSequenceChange {
     });
     get drops(): `sequence:${string}`[];
     get requires(): `sequence:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/sequence/changes/sequence.drop.js

@@ -22,10 +22,18 @@ export class DropSequence extends DropSequenceChange {
     get requires() {
         return [this.sequence.stableId];
     }
-    serialize() {
-        return [
+    serialize(_options) {
+        const parts = [
             "DROP SEQUENCE",
             `${this.sequence.schema}.${this.sequence.name}`,
-        ].join(" ");
+        ];
+        // Owned sequences still need CASCADE here because DROP runs in the earlier
+        // phase and later ALTER TABLE statements will re-establish the desired default.
+        if (this.sequence.owned_by_schema &&
+            this.sequence.owned_by_table &&
+            this.sequence.owned_by_column) {
+            parts.push("CASCADE");
+        }
+        return parts.join(" ");
     }
 }

package/dist/core/objects/sequence/changes/sequence.privilege.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { Sequence } from "../sequence.model.ts";
 import { AlterSequenceChange } from "./sequence.base.ts";
 export type SequencePrivilege = GrantSequencePrivileges | RevokeSequencePrivileges | RevokeGrantOptionSequencePrivileges;
@@ -36,7 +37,7 @@ export declare class GrantSequencePrivileges extends AlterSequenceChange {
     });
     get creates(): `acl:${string}::grantee:${string}`[];
     get requires(): (`role:${string}` | `sequence:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * Revoke privileges on a sequence.
@@ -75,7 +76,7 @@ export declare class RevokeSequencePrivileges extends AlterSequenceChange {
     });
     get drops(): `acl:${string}::grantee:${string}`[];
     get requires(): (`acl:${string}::grantee:${string}` | `role:${string}` | `sequence:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 /**
  * Revoke grant option for privileges on a sequence.
@@ -97,5 +98,5 @@ export declare class RevokeGrantOptionSequencePrivileges extends AlterSequenceCh
         version?: number;
     });
     get requires(): (`acl:${string}::grantee:${string}` | `role:${string}` | `sequence:${string}`)[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }

package/dist/core/objects/sequence/changes/sequence.privilege.js

@@ -35,7 +35,7 @@ export class GrantSequencePrivileges extends AlterSequenceChange {
     get requires() {
         return [this.sequence.stableId, stableId.role(this.grantee)];
     }
-    serialize() {
+    serialize(_options) {
         const hasGrantable = this.privileges.some((p) => p.grantable);
         const hasBase = this.privileges.some((p) => !p.grantable);
         if (hasGrantable && hasBase) {
@@ -91,7 +91,7 @@ export class RevokeSequencePrivileges extends AlterSequenceChange {
             stableId.role(this.grantee),
         ];
     }
-    serialize() {
+    serialize(_options) {
         const kindPrefix = getObjectKindPrefix("SEQUENCE");
         const list = this.privileges.map((p) => p.privilege);
         const privSql = formatObjectPrivilegeList("SEQUENCE", list, this.version);
@@ -126,7 +126,7 @@ export class RevokeGrantOptionSequencePrivileges extends AlterSequenceChange {
             stableId.role(this.grantee),
         ];
     }
-    serialize() {
+    serialize(_options) {
         const kindPrefix = getObjectKindPrefix("SEQUENCE");
         const privSql = formatObjectPrivilegeList("SEQUENCE", this.privilegeNames, this.version);
         const sequenceName = `${this.sequence.schema}.${this.sequence.name}`;

package/dist/core/objects/sequence/changes/sequence.types.d.ts

@@ -3,4 +3,5 @@ import type { CommentSequence } from "./sequence.comment.ts";
 import type { CreateSequence } from "./sequence.create.ts";
 import type { DropSequence } from "./sequence.drop.ts";
 import type { SequencePrivilege } from "./sequence.privilege.ts";
+/** Union of all sequence-related change variants (`objectType: "sequence"`). @category Change Types */
 export type SequenceChange = AlterSequence | CommentSequence | CreateSequence | DropSequence | SequencePrivilege;

package/dist/core/objects/sequence/sequence.diff.d.ts

@@ -1,8 +1,9 @@
-import type { DefaultPrivilegeState } from "../base.default-privileges.ts";
-import type { Role } from "../role/role.model.ts";
+import type { ObjectDiffContext } from "../diff-context.ts";
+import { AlterTableAlterColumnSetDefault } from "../table/changes/table.alter.ts";
 import type { Table } from "../table/table.model.ts";
 import type { SequenceChange } from "./changes/sequence.types.ts";
 import type { Sequence } from "./sequence.model.ts";
+type SequenceOrColumnSetDefaultChange = AlterTableAlterColumnSetDefault | SequenceChange;
 /**
  * Diff two sets of sequences from main and branch catalogs.
  *
@@ -12,9 +13,5 @@ import type { Sequence } from "./sequence.model.ts";
  * @param branchTables - The tables in the branch catalog (used to check if owning tables are being dropped).
  * @returns A list of changes to apply to main to make it match branch.
  */
-export declare function diffSequences(ctx: {
-    version: number;
-    currentUser: string;
-    defaultPrivilegeState: DefaultPrivilegeState;
-    mainRoles: Record<string, Role>;
-}, main: Record<string, Sequence>, branch: Record<string, Sequence>, branchTables?: Record<string, Table>): SequenceChange[];
+export declare function diffSequences(ctx: Pick<ObjectDiffContext, "version" | "currentUser" | "defaultPrivilegeState">, main: Record<string, Sequence>, branch: Record<string, Sequence>, branchTables?: Record<string, Table>): SequenceOrColumnSetDefaultChange[];
+export {};

package/dist/core/objects/sequence/sequence.diff.js

@@ -1,5 +1,6 @@
 import { diffObjects } from "../base.diff.js";
-import { diffPrivileges, groupPrivilegesByGrantable, } from "../base.privilege-diff.js";
+import { diffPrivileges, emitObjectPrivilegeChanges, } from "../base.privilege-diff.js";
+import { AlterTableAlterColumnSetDefault } from "../table/changes/table.alter.js";
 import { hasNonAlterableChanges } from "../utils.js";
 import { AlterSequenceSetOptions, AlterSequenceSetOwnedBy, } from "./changes/sequence.alter.js";
 import { CreateCommentOnSequence, DropCommentOnSequence, } from "./changes/sequence.comment.js";
@@ -43,61 +44,39 @@ export function diffSequences(ctx, main, branch, branchTables = {}) {
         // We compare default privileges against desired privileges to generate REVOKE/GRANT statements
         // needed to reach the final desired state.
         const effectiveDefaults = ctx.defaultPrivilegeState.getEffectiveDefaults(ctx.currentUser, "sequence", createdSeq.schema ?? "");
+        const creatorFilteredDefaults = createdSeq.owner !== ctx.currentUser
+            ? effectiveDefaults.filter((p) => p.grantee !== ctx.currentUser)
+            : effectiveDefaults;
         const desiredPrivileges = createdSeq.privileges;
         // Filter out owner privileges - owner always has ALL privileges implicitly
         // and shouldn't be compared. Use the sequence owner as the reference.
-        // Superuser privileges are filtered inside diffPrivileges.
-        const privilegeResults = diffPrivileges(effectiveDefaults, desiredPrivileges, createdSeq.owner, ctx.mainRoles);
-        // Generate grant changes
-        for (const [grantee, result] of privilegeResults) {
-            if (result.grants.length > 0) {
-                const grantGroups = groupPrivilegesByGrantable(result.grants);
-                for (const [grantable, list] of grantGroups) {
-                    void grantable;
-                    changes.push(new GrantSequencePrivileges({
-                        sequence: createdSeq,
-                        grantee,
-                        privileges: list,
-                        version: ctx.version,
-                    }));
-                }
-            }
-            // Generate revoke changes
-            if (result.revokes.length > 0) {
-                const revokeGroups = groupPrivilegesByGrantable(result.revokes);
-                for (const [grantable, list] of revokeGroups) {
-                    void grantable;
-                    changes.push(new RevokeSequencePrivileges({
-                        sequence: createdSeq,
-                        grantee,
-                        privileges: list,
-                        version: ctx.version,
-                    }));
-                }
-            }
-            // Generate revoke grant option changes
-            if (result.revokeGrantOption.length > 0) {
-                changes.push(new RevokeGrantOptionSequencePrivileges({
-                    sequence: createdSeq,
-                    grantee,
-                    privilegeNames: result.revokeGrantOption,
-                    version: ctx.version,
-                }));
-            }
-        }
+        const privilegeResults = diffPrivileges(creatorFilteredDefaults, desiredPrivileges, createdSeq.owner);
+        changes.push(...emitObjectPrivilegeChanges(privilegeResults, createdSeq, createdSeq, "sequence", {
+            Grant: GrantSequencePrivileges,
+            Revoke: RevokeSequencePrivileges,
+            RevokeGrantOption: RevokeGrantOptionSequencePrivileges,
+        }, ctx.version));
     }
     for (const sequenceId of dropped) {
         const sequence = main[sequenceId];
-        // Skip generating DROP SEQUENCE if the sequence is owned by a table that's being dropped.
-        // PostgreSQL automatically drops sequences owned by tables when the table is dropped,
-        // so generating DROP SEQUENCE would cause an error (sequence doesn't exist).
+        // Skip generating DROP SEQUENCE if the sequence is owned by a table/column that's being dropped.
+        // PostgreSQL automatically cascades owned sequences when the owning table OR the owning
+        // column is dropped (via OWNED BY). Emitting DROP SEQUENCE in those cases would either
+        // fail at apply time (sequence already gone) or — in the column-drop case — create an
+        // unbreakable DropSequence ↔ AlterTableDropColumn cycle in the drop-phase sort graph.
         if (sequence.owned_by_schema &&
             sequence.owned_by_table &&
             sequence.owned_by_column) {
             const ownedByTableId = `table:${sequence.owned_by_schema}.${sequence.owned_by_table}`;
-            // If the owning table doesn't exist in branch catalog, it's being dropped
-            // and will auto-drop this sequence, so skip generating DROP SEQUENCE
-            if (!(ownedByTableId in branchTables)) {
+            const ownedByTable = branchTables[ownedByTableId];
+            // Owning table is dropped → PG auto-drops the owned sequence.
+            if (!ownedByTable) {
+                continue;
+            }
+            // Owning column is dropped (table survives) → PG still auto-drops the owned
+            // sequence as part of the column drop, so we must not emit DROP SEQUENCE.
+            const ownedByColumnExists = ownedByTable.columns?.some((col) => col.name === sequence.owned_by_column);
+            if (!ownedByColumnExists) {
                 continue;
             }
         }
@@ -108,10 +87,7 @@ export function diffSequences(ctx, main, branch, branchTables = {}) {
         const branchSequence = branch[sequenceId];
         // Check if non-alterable properties have changed
         // These require dropping and recreating the sequence
-        const NON_ALTERABLE_FIELDS = [
-            "data_type",
-            "persistence",
-        ];
+        const NON_ALTERABLE_FIELDS = ["persistence"];
         const nonAlterablePropsChanged = hasNonAlterableChanges(mainSequence, branchSequence, NON_ALTERABLE_FIELDS);
         if (nonAlterablePropsChanged) {
             // Replace the entire sequence (drop + create)
@@ -120,6 +96,9 @@ export function diffSequences(ctx, main, branch, branchTables = {}) {
             if (branchSequence.owned_by_schema !== null &&
                 branchSequence.owned_by_table !== null &&
                 branchSequence.owned_by_column !== null) {
+                const ownedByTableId = `table:${branchSequence.owned_by_schema}.${branchSequence.owned_by_table}`;
+                const ownedByTable = branchTables[ownedByTableId];
+                const ownedByColumn = ownedByTable?.columns?.find((column) => column.name === branchSequence.owned_by_column);
                 changes.push(new AlterSequenceSetOwnedBy({
                     sequence: branchSequence,
                     ownedBy: {
@@ -128,6 +107,14 @@ export function diffSequences(ctx, main, branch, branchTables = {}) {
                         column: branchSequence.owned_by_column,
                     },
                 }));
+                // Replacing an owned sequence with DROP ... CASCADE removes the column's
+                // existing nextval(...) default, so restore it after ownership is reattached.
+                if (ownedByTable && ownedByColumn && ownedByColumn.default !== null) {
+                    changes.push(new AlterTableAlterColumnSetDefault({
+                        table: ownedByTable,
+                        column: ownedByColumn,
+                    }));
+                }
             }
             else if (mainSequence.owned_by_schema !== null ||
                 mainSequence.owned_by_table !== null ||
@@ -141,7 +128,8 @@ export function diffSequences(ctx, main, branch, branchTables = {}) {
         }
         else {
             // Only alterable properties changed - emit ALTER for options/owner
-            const optionsChanged = mainSequence.increment !== branchSequence.increment ||
+            const optionsChanged = mainSequence.data_type !== branchSequence.data_type ||
+                mainSequence.increment !== branchSequence.increment ||
                 mainSequence.minimum_value !== branchSequence.minimum_value ||
                 mainSequence.maximum_value !== branchSequence.maximum_value ||
                 mainSequence.start_value !== branchSequence.start_value ||
@@ -149,6 +137,16 @@ export function diffSequences(ctx, main, branch, branchTables = {}) {
                 mainSequence.cycle_option !== branchSequence.cycle_option;
             if (optionsChanged) {
                 const options = [];
+                // `AS <type>` must come before any MIN/MAX/RESTART clauses per the
+                // PG ALTER SEQUENCE grammar. Valid types are smallint, integer,
+                // bigint — the same set CREATE SEQUENCE accepts — so the universe
+                // of legal transitions is closed. PG enforces last_value range at
+                // apply time when shrinking; that's the desired behavior because
+                // the previous Drop+Create path silently reset last_value to 1
+                // (data-loss bug, see Sentry SUPABASE-API-7RS).
+                if (mainSequence.data_type !== branchSequence.data_type) {
+                    options.push("AS", branchSequence.data_type);
+                }
                 if (mainSequence.increment !== branchSequence.increment) {
                     options.push("INCREMENT BY", String(branchSequence.increment));
                 }
@@ -210,45 +208,12 @@ export function diffSequences(ctx, main, branch, branchTables = {}) {
             // PRIVILEGES
             // Filter out owner privileges - owner always has ALL privileges implicitly
             // and shouldn't be compared. Use branch owner as the reference.
-            // Superuser privileges are filtered inside diffPrivileges.
-            const privilegeResults = diffPrivileges(mainSequence.privileges, branchSequence.privileges, branchSequence.owner, ctx.mainRoles);
-            for (const [grantee, result] of privilegeResults) {
-                // Generate grant changes
-                if (result.grants.length > 0) {
-                    const grantGroups = groupPrivilegesByGrantable(result.grants);
-                    for (const [grantable, list] of grantGroups) {
-                        void grantable;
-                        changes.push(new GrantSequencePrivileges({
-                            sequence: branchSequence,
-                            grantee,
-                            privileges: list,
-                            version: ctx.version,
-                        }));
-                    }
-                }
-                // Generate revoke changes
-                if (result.revokes.length > 0) {
-                    const revokeGroups = groupPrivilegesByGrantable(result.revokes);
-                    for (const [grantable, list] of revokeGroups) {
-                        void grantable;
-                        changes.push(new RevokeSequencePrivileges({
-                            sequence: mainSequence,
-                            grantee,
-                            privileges: list,
-                            version: ctx.version,
-                        }));
-                    }
-                }
-                // Generate revoke grant option changes
-                if (result.revokeGrantOption.length > 0) {
-                    changes.push(new RevokeGrantOptionSequencePrivileges({
-                        sequence: mainSequence,
-                        grantee,
-                        privilegeNames: result.revokeGrantOption,
-                        version: ctx.version,
-                    }));
-                }
-            }
+            const privilegeResults = diffPrivileges(mainSequence.privileges, branchSequence.privileges, branchSequence.owner);
+            changes.push(...emitObjectPrivilegeChanges(privilegeResults, branchSequence, mainSequence, "sequence", {
+                Grant: GrantSequencePrivileges,
+                Revoke: RevokeSequencePrivileges,
+                RevokeGrantOption: RevokeGrantOptionSequencePrivileges,
+            }, ctx.version));
             // Note: Sequence renaming would also use ALTER SEQUENCE ... RENAME TO ...
             // But since our Sequence model uses 'name' as the identity field,
             // a name change would be handled as drop + create by diffObjects()

package/dist/core/objects/sequence/sequence.model.js

@@ -132,7 +132,7 @@ select
         )
         order by x.grantee, x.privilege_type
       )
-      from lateral aclexplode(c.relacl) as x(grantor, grantee, privilege_type, is_grantable)
+      from lateral aclexplode(COALESCE(c.relacl, acldefault('S', c.relowner))) as x(grantor, grantee, privilege_type, is_grantable)
     ), '[]'
   ) as privileges,
   c.relowner::regrole::text as owner

package/dist/core/objects/subscription/changes/subscription.alter.d.ts

@@ -1,3 +1,4 @@
+import type { SerializeOptions } from "../../../integrations/serialize/serialize.types.ts";
 import type { Subscription } from "../subscription.model.ts";
 import { type SubscriptionSettableOption } from "../utils.ts";
 import { AlterSubscriptionChange } from "./subscription.base.ts";
@@ -7,7 +8,7 @@ export declare class AlterSubscriptionSetConnection extends AlterSubscriptionCha
     constructor(props: {
         subscription: Subscription;
     });
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 export declare class AlterSubscriptionSetPublication extends AlterSubscriptionChange {
     readonly subscription: Subscription;
@@ -15,7 +16,7 @@ export declare class AlterSubscriptionSetPublication extends AlterSubscriptionCh
     constructor(props: {
         subscription: Subscription;
     });
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 export declare class AlterSubscriptionEnable extends AlterSubscriptionChange {
     readonly subscription: Subscription;
@@ -23,7 +24,7 @@ export declare class AlterSubscriptionEnable extends AlterSubscriptionChange {
     constructor(props: {
         subscription: Subscription;
     });
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 export declare class AlterSubscriptionDisable extends AlterSubscriptionChange {
     readonly subscription: Subscription;
@@ -31,7 +32,7 @@ export declare class AlterSubscriptionDisable extends AlterSubscriptionChange {
     constructor(props: {
         subscription: Subscription;
     });
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 export declare class AlterSubscriptionSetOptions extends AlterSubscriptionChange {
     readonly subscription: Subscription;
@@ -41,7 +42,7 @@ export declare class AlterSubscriptionSetOptions extends AlterSubscriptionChange
         subscription: Subscription;
         options: SubscriptionSettableOption[];
     });
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }
 export declare class AlterSubscriptionSetOwner extends AlterSubscriptionChange {
     readonly subscription: Subscription;
@@ -52,5 +53,5 @@ export declare class AlterSubscriptionSetOwner extends AlterSubscriptionChange {
         owner: string;
     });
     get requires(): `role:${string}`[];
-    serialize(): string;
+    serialize(_options?: SerializeOptions): string;
 }