sql: fix sequence dependencies for IDENTITY columns in pg_depend

Release note (bug fix): pg_class.pg_depend now contains entries with
deptype='i' (internal) for identity columns that own sequences.
These previously had deptype='a' (auto).

Author: rafiss

pkg/sql/logictest/testdata/logic_test/orms

@@ -435,3 +435,71 @@ and traint.conparentid = 0 ORDER BY traint.conrelid, traint.conname
 ----
 public  b    public  a    false  b_a_id_fkey  {"(a_id,id)"}  false
 public  src  public  dst  false  src_d_fkey   {"(d,a)"}      false
+
+# Test for issue #108439: EFCore introspection query for IDENTITY columns
+# needs pg_depend entries with deptype 'i'.
+
+statement ok
+CREATE TABLE efcore_identity_test (
+  id INT8 NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+  CONSTRAINT pk_testtable PRIMARY KEY (id ASC)
+)
+
+query TTTTTTTBTTTTTTTBTTIIIIBI colnames
+SELECT
+  nspname,
+  cls.relname,
+  typ.typname,
+  basetyp.typname AS basetypname,
+  attname,
+  description,
+  collname,
+  attisdropped,
+  attidentity::TEXT,
+  attgenerated::TEXT,
+  ''::text as attcompression,
+  format_type(typ.oid, atttypmod) AS formatted_typname,
+  format_type(basetyp.oid, typ.typtypmod) AS formatted_basetypname,
+  CASE
+    WHEN pg_proc.proname = 'array_recv' THEN 'a'
+    ELSE typ.typtype
+  END AS typtype,
+  CASE WHEN pg_proc.proname='array_recv' THEN elemtyp.typname END AS elemtypname,
+  NOT (attnotnull OR typ.typnotnull) AS nullable,
+  CASE
+    WHEN atthasdef THEN (SELECT pg_get_expr(adbin, cls.oid) FROM pg_attrdef WHERE adrelid = cls.oid AND adnum = attr.attnum)
+  END AS default,
+  -- Sequence options for identity columns
+  format_type(seqtypid, 0) AS seqtype, seqstart, seqmin, seqmax, seqincrement, seqcycle, seqcache
+FROM pg_class AS cls
+JOIN pg_namespace AS ns ON ns.oid = cls.relnamespace
+LEFT JOIN pg_attribute AS attr ON attrelid = cls.oid
+LEFT JOIN pg_type AS typ ON attr.atttypid = typ.oid
+LEFT JOIN pg_proc ON pg_proc.oid = typ.typreceive
+LEFT JOIN pg_type AS elemtyp ON (elemtyp.oid = typ.typelem)
+LEFT JOIN pg_type AS basetyp ON (basetyp.oid = typ.typbasetype)
+LEFT JOIN pg_description AS des ON des.objoid = cls.oid AND des.objsubid = attnum
+LEFT JOIN pg_collation as coll ON coll.oid = attr.attcollation
+-- Bring in identity sequences the depend on this column.
+LEFT JOIN pg_depend AS dep ON dep.refobjid = cls.oid AND dep.refobjsubid = attr.attnum AND dep.deptype = 'i'
+LEFT JOIN pg_sequence AS seq ON seq.seqrelid = dep.objid
+WHERE
+  cls.relkind IN ('r', 'v', 'm', 'f') AND
+  nspname NOT IN ('pg_catalog', 'information_schema', 'crdb_internal') AND
+  attnum > 0 AND
+  cls.relname = 'efcore_identity_test' AND
+  NOT EXISTS (
+    SELECT 1 FROM pg_depend WHERE
+      classid=(
+        SELECT cls.oid
+        FROM pg_class AS cls
+        JOIN pg_namespace AS ns ON ns.oid = cls.relnamespace
+        WHERE relname='pg_class' AND ns.nspname='pg_catalog'
+      ) AND
+      objid=cls.oid AND
+      deptype IN ('e', 'x')
+  )
+ORDER BY attnum;
+----
+nspname  relname               typname  basetypname  attname  description  collname  attisdropped  attidentity  attgenerated  attcompression  formatted_typname  formatted_basetypname  typtype  elemtypname  nullable  default                                                  seqtype  seqstart  seqmin  seqmax               seqincrement  seqcycle  seqcache
+public   efcore_identity_test  int8     NULL         id       NULL         NULL      false         d            ·             ·               bigint             NULL                   b        NULL         false     nextval('public.efcore_identity_test_id_seq'::REGCLASS)  bigint   1         1       9223372036854775807  1             false     1

pkg/sql/logictest/testdata/logic_test/pg_catalog

@@ -1740,8 +1740,8 @@ FROM pg_catalog.pg_depend
 ORDER BY objid, refobjid, refobjsubid
 ----
 classid     objid       objsubid  refclassid  refobjid    refobjsubid  deptype
-4294967082  111         0         4294967082  110         14           a
-4294967082  112         0         4294967082  110         15           a
+4294967082  111         0         4294967082  110         14           i
+4294967082  112         0         4294967082  110         15           i
 4294967036  842401391   0         4294967082  110         1            n
 4294967036  842401391   0         4294967082  110         2            n
 4294967036  842401391   0         4294967082  110         3            n
@@ -1776,6 +1776,19 @@ WHERE seq.oid           = dep.objid
 attname  nspname  relname
 a        public   t_with_pk_seq_a_seq
 
+# Test for issue #108439: IDENTITY columns should have deptype 'i' dependencies.
+query TTT colnames
+SELECT seq_cls.relname AS sequence_name, attr.attname AS column_name, dep.deptype
+FROM pg_depend dep
+JOIN pg_class seq_cls ON seq_cls.oid = dep.objid
+JOIN pg_attribute attr ON attr.attrelid = dep.refobjid AND attr.attnum = dep.refobjsubid
+WHERE dep.refobjid = 't_with_pk_seq'::regclass
+  AND dep.deptype = 'i'
+ORDER BY dep.deptype
+----
+sequence_name        column_name  deptype
+t_with_pk_seq_a_seq  a            i
+
 # Some entries in pg_depend are dependency links from the pg_constraint system
 # table to the pg_class system table. Other entries are links to pg_class when it is
 # a table-view dependency.

pkg/sql/logictest/testdata/logic_test/sequences

@@ -1091,7 +1091,7 @@ FROM   pg_class AS seqclass
               AND attrib.attrelid = dep.refobjid
 WHERE seqclass.relkind = 'S';
 ----
-owned_seq owner owner_col
+owned_seq  owner  owner_col
 
 # Sequence owner can be removed
 

pkg/sql/pg_catalog.go

@@ -1674,32 +1674,17 @@ https://www.postgresql.org/docs/9.5/catalog-pg-depend.html`,
 		}
 		pgProcDesc, err := vt.getVirtualTableDesc(&pgProcTableName, p)
 		if err != nil {
-			return errors.New("could not find pg_catalog.pg_rewrite")
+			return errors.New("could not find pg_catalog.pg_proc")
 		}
 		h := makeOidHasher()
+		pgConstraintTableOid := tableOid(pgConstraintsDesc.GetID())
+		pgClassTableOid := tableOid(pgClassDesc.GetID())
+		pgRewriteTableOid := tableOid(pgRewriteDesc.GetID())
+
 		opts := forEachTableDescOptions{virtualOpts: hideVirtual} /*virtual tables have no constraints*/
 		err = forEachTableDesc(ctx, p, dbContext, opts, func(
 			ctx context.Context, descCtx tableDescContext) error {
 			db, sc, table, tableLookup := descCtx.database, descCtx.schema, descCtx.table, descCtx.tableLookup
-			pgConstraintTableOid := tableOid(pgConstraintsDesc.GetID())
-			pgClassTableOid := tableOid(pgClassDesc.GetID())
-			pgRewriteTableOid := tableOid(pgRewriteDesc.GetID())
-			if table.IsSequence() &&
-				!table.GetSequenceOpts().SequenceOwner.Equal(descpb.TableDescriptor_SequenceOpts_SequenceOwner{}) {
-				refObjID := tableOid(table.GetSequenceOpts().SequenceOwner.OwnerTableID)
-				refObjSubID := tree.NewDInt(tree.DInt(table.GetSequenceOpts().SequenceOwner.OwnerColumnID))
-				objID := tableOid(table.GetID())
-				return addRow(
-					pgClassTableOid, // classid
-					objID,           // objid
-					zeroVal,         // objsubid
-					pgClassTableOid, // refclassid
-					refObjID,        // refobjid
-					refObjSubID,     // refobjsubid
-					depTypeAuto,     // deptype
-				)
-			}
-
 			// In the case of table/view relationship, In PostgreSQL pg_depend.objid refers to
 			// pg_rewrite.oid, then pg_rewrite ev_class refers to the dependent object.
 			reportViewDependency := func(dep *descpb.TableDescriptor_Reference) error {
@@ -1757,6 +1742,36 @@ https://www.postgresql.org/docs/9.5/catalog-pg-depend.html`,
 					return err
 				}
 			}
+
+			// Add dependencies for columns that use sequences. This creates pg_depend
+			// entries with deptype 'a' (auto) for regular sequences and 'i'
+			// (internal) for IDENTITY columns.
+			if table.IsTable() {
+				for _, column := range table.AllColumns() {
+					for i := 0; i < column.NumOwnsSequences(); i++ {
+						seqID := column.GetOwnsSequenceID(i)
+						seqObjID := tableOid(seqID)
+						tableObjID := tableOid(table.GetID())
+						columnSubID := tree.NewDInt(tree.DInt(column.GetPGAttributeNum()))
+						depType := depTypeAuto
+						if column.IsGeneratedAsIdentity() {
+							depType = depTypeInternal
+						}
+
+						if err := addRow(
+							pgClassTableOid, // classid
+							seqObjID,        // objid
+							zeroVal,         // objsubid
+							pgClassTableOid, // refclassid
+							tableObjID,      // refobjid
+							columnSubID,     // refobjsubid
+							depType,         // deptype
+						); err != nil {
+							return err
+						}
+					}
+				}
+			}
 			return nil
 		})
 		if err != nil {