@atscript/db-postgres 0.1.138 → 0.1.139

package/dist/index.cjs

@@ -858,25 +858,21 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	/** Live columns of `tableName`, read through `exec` (the recreate's own connection, or the pool). */
 	async _readColumns(exec, tableName) {
 		const schema = this._schema;
-		const rows = await exec.all(`SELECT c.column_name, c.data_type, c.udt_name, c.character_maximum_length, c.numeric_precision, c.numeric_scale, c.is_nullable, c.column_default, c.is_identity,
-              format_type(a.atttypid, a.atttypmod) AS formatted_type
+		return (await exec.all(`SELECT c.column_name, c.data_type, c.udt_name, c.character_maximum_length, c.numeric_precision, c.numeric_scale, c.is_nullable, c.column_default, c.is_identity,
+              format_type(a.atttypid, a.atttypmod) AS formatted_type,
+              EXISTS (
+                SELECT 1 FROM pg_index i
+                WHERE i.indrelid = a.attrelid AND i.indisprimary AND a.attnum = ANY (i.indkey)
+              ) AS is_pk
        FROM information_schema.columns c
        JOIN pg_attribute a ON a.attname = c.column_name
          AND a.attrelid = (SELECT oid FROM pg_class WHERE relname = $1 AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = COALESCE($2, 'public')))
        WHERE c.table_name = $1 AND c.table_schema = COALESCE($2, 'public')
-       ORDER BY c.ordinal_position`, [tableName, schema]);
-		const pkRows = await exec.all(`SELECT kcu.column_name
-       FROM information_schema.table_constraints tc
-       JOIN information_schema.key_column_usage kcu
-         ON tc.constraint_name = kcu.constraint_name AND tc.table_schema = kcu.table_schema
-       WHERE tc.table_name = $1 AND tc.table_schema = COALESCE($2, 'public')
-         AND tc.constraint_type = 'PRIMARY KEY'`, [tableName, schema]);
-		const pkSet = new Set(pkRows.map((r) => r.column_name));
-		return rows.map((r) => ({
+       ORDER BY c.ordinal_position`, [tableName, schema])).map((r) => ({
 			name: r.column_name,
 			type: normalizePgType(r.data_type, r.character_maximum_length, r.numeric_precision, r.numeric_scale, r.udt_name, r.formatted_type),
 			notnull: r.is_nullable === "NO",
-			pk: pkSet.has(r.column_name),
+			pk: r.is_pk,
 			dflt_value: normalizePgDefault(r.column_default, r.is_identity)
 		}));
 	}
@@ -969,31 +965,31 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		const conn = await this.driver.getConnection();
 		try {
 			await conn.exec("BEGIN");
-			const fkRefs = await conn.all(`SELECT tc.constraint_name, tc.table_name, tc.table_schema,
-                kcu.column_name, kcur.column_name AS ref_column_name,
-                rc.delete_rule, rc.update_rule
-         FROM information_schema.referential_constraints rc
-         JOIN information_schema.table_constraints tc
-           ON rc.constraint_name = tc.constraint_name AND rc.constraint_schema = tc.constraint_schema
-         JOIN information_schema.key_column_usage kcu
-           ON kcu.constraint_name = tc.constraint_name AND kcu.table_schema = tc.table_schema
-         JOIN information_schema.key_column_usage kcur
-           ON kcur.constraint_name = rc.unique_constraint_name AND kcur.table_schema = rc.unique_constraint_schema
-              AND kcur.ordinal_position = kcu.position_in_unique_constraint
-         WHERE rc.unique_constraint_schema = COALESCE($1, 'public')
-           AND rc.unique_constraint_name IN (
-             SELECT constraint_name FROM information_schema.table_constraints
-             WHERE table_name = $2 AND table_schema = COALESCE($1, 'public')
-               AND constraint_type IN ('PRIMARY KEY', 'UNIQUE')
-           )
-         ORDER BY tc.table_schema, tc.table_name, tc.constraint_name, kcu.ordinal_position`, [schema, this._table.tableName]);
-			const fkByName = /* @__PURE__ */ new Map();
+			const fkRefs = await conn.all(`SELECT c.conname AS constraint_name, cl.relname AS table_name, n.nspname AS table_schema,
+                a.attname AS column_name, ra.attname AS ref_column_name,
+                CASE c.confdeltype WHEN 'c' THEN 'CASCADE' WHEN 'n' THEN 'SET NULL' WHEN 'd' THEN 'SET DEFAULT'
+                  WHEN 'r' THEN 'RESTRICT' ELSE 'NO ACTION' END AS delete_rule,
+                CASE c.confupdtype WHEN 'c' THEN 'CASCADE' WHEN 'n' THEN 'SET NULL' WHEN 'd' THEN 'SET DEFAULT'
+                  WHEN 'r' THEN 'RESTRICT' ELSE 'NO ACTION' END AS update_rule
+         FROM pg_constraint c
+         JOIN pg_class cl ON cl.oid = c.conrelid
+         JOIN pg_namespace n ON n.oid = cl.relnamespace
+         JOIN pg_class rcl ON rcl.oid = c.confrelid
+         JOIN pg_namespace rn ON rn.oid = rcl.relnamespace
+         CROSS JOIN LATERAL unnest(c.conkey, c.confkey) WITH ORDINALITY AS k(attnum, refattnum, ord)
+         JOIN pg_attribute a ON a.attrelid = c.conrelid AND a.attnum = k.attnum
+         JOIN pg_attribute ra ON ra.attrelid = c.confrelid AND ra.attnum = k.refattnum
+         WHERE c.contype = 'f' AND rcl.relname = $2 AND rn.nspname = COALESCE($1, 'public')
+         ORDER BY n.nspname, cl.relname, c.conname, k.ord`, [schema, this._table.tableName]);
+			const inboundFks = /* @__PURE__ */ new Map();
 			const ownSchema = schema ?? "public";
 			for (const fk of fkRefs) {
 				if (fk.table_schema === ownSchema && fk.table_name === this._table.tableName) continue;
-				let entry = fkByName.get(fk.constraint_name);
+				const key = `${fk.table_schema}.${fk.table_name}.${fk.constraint_name}`;
+				let entry = inboundFks.get(key);
 				if (!entry) {
 					entry = {
+						name: fk.constraint_name,
 						schema: fk.table_schema,
 						table: fk.table_name,
 						cols: [],
@@ -1001,13 +997,13 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 						onDelete: fk.delete_rule,
 						onUpdate: fk.update_rule
 					};
-					fkByName.set(fk.constraint_name, entry);
+					inboundFks.set(key, entry);
 				}
 				entry.cols.push(fk.column_name);
 				entry.refCols.push(fk.ref_column_name);
 			}
-			for (const [name, fk] of fkByName) {
-				const ddl = `ALTER TABLE ${qi(fk.schema)}.${qi(fk.table)} DROP CONSTRAINT IF EXISTS ${qi(name)}`;
+			for (const fk of inboundFks.values()) {
+				const ddl = `ALTER TABLE ${qi(fk.schema)}.${qi(fk.table)} DROP CONSTRAINT IF EXISTS ${qi(fk.name)}`;
 				this._log(ddl);
 				await conn.exec(ddl);
 			}
@@ -1041,10 +1037,10 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 			await conn.exec(`ALTER TABLE ${quoteTableName(tempName)} RENAME TO ${qi(this._table.tableName)}`);
 			await this._renameTempConstraints(conn, baseTempName);
 			const resolvedTable = this.resolveTableName();
-			for (const [name, fk] of fkByName) {
+			for (const fk of inboundFks.values()) {
 				const localCols = fk.cols.map((c) => qi(c)).join(", ");
 				const refCols = fk.refCols.map((c) => qi(c)).join(", ");
-				let ddl = `ALTER TABLE ${qi(fk.schema)}.${qi(fk.table)} ADD CONSTRAINT ${qi(name)} FOREIGN KEY (${localCols}) REFERENCES ${quoteTableName(resolvedTable)} (${refCols})`;
+				let ddl = `ALTER TABLE ${qi(fk.schema)}.${qi(fk.table)} ADD CONSTRAINT ${qi(fk.name)} FOREIGN KEY (${localCols}) REFERENCES ${quoteTableName(resolvedTable)} (${refCols})`;
 				if (fk.onDelete !== "NO ACTION") ddl += ` ON DELETE ${fk.onDelete}`;
 				if (fk.onUpdate !== "NO ACTION") ddl += ` ON UPDATE ${fk.onUpdate}`;
 				this._log(ddl);
@@ -1293,12 +1289,14 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	/** Queries information_schema for existing FK constraints. */
 	async _getExistingFkConstraints() {
-		const rows = await this._exec().all(`SELECT kcu.constraint_name, kcu.column_name
-       FROM information_schema.table_constraints tc
-       JOIN information_schema.key_column_usage kcu
-         ON tc.constraint_name = kcu.constraint_name AND tc.table_schema = kcu.table_schema
-       WHERE tc.table_name = $1 AND tc.table_schema = COALESCE($2, 'public')
-         AND tc.constraint_type = 'FOREIGN KEY'`, [this._table.tableName, this._schema]);
+		const rows = await this._exec().all(`SELECT c.conname AS constraint_name, a.attname AS column_name
+       FROM pg_constraint c
+       JOIN pg_class cl ON cl.oid = c.conrelid
+       JOIN pg_namespace n ON n.oid = cl.relnamespace
+       CROSS JOIN LATERAL unnest(c.conkey) WITH ORDINALITY AS k(attnum, ord)
+       JOIN pg_attribute a ON a.attrelid = c.conrelid AND a.attnum = k.attnum
+       WHERE c.contype = 'f' AND cl.relname = $1 AND n.nspname = COALESCE($2, 'public')
+       ORDER BY c.conname, k.ord`, [this._table.tableName, this._schema]);
 		const byName = /* @__PURE__ */ new Map();
 		for (const row of rows) {
 			let cols = byName.get(row.constraint_name);

package/dist/index.mjs

@@ -857,25 +857,21 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	/** Live columns of `tableName`, read through `exec` (the recreate's own connection, or the pool). */
 	async _readColumns(exec, tableName) {
 		const schema = this._schema;
-		const rows = await exec.all(`SELECT c.column_name, c.data_type, c.udt_name, c.character_maximum_length, c.numeric_precision, c.numeric_scale, c.is_nullable, c.column_default, c.is_identity,
-              format_type(a.atttypid, a.atttypmod) AS formatted_type
+		return (await exec.all(`SELECT c.column_name, c.data_type, c.udt_name, c.character_maximum_length, c.numeric_precision, c.numeric_scale, c.is_nullable, c.column_default, c.is_identity,
+              format_type(a.atttypid, a.atttypmod) AS formatted_type,
+              EXISTS (
+                SELECT 1 FROM pg_index i
+                WHERE i.indrelid = a.attrelid AND i.indisprimary AND a.attnum = ANY (i.indkey)
+              ) AS is_pk
        FROM information_schema.columns c
        JOIN pg_attribute a ON a.attname = c.column_name
          AND a.attrelid = (SELECT oid FROM pg_class WHERE relname = $1 AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = COALESCE($2, 'public')))
        WHERE c.table_name = $1 AND c.table_schema = COALESCE($2, 'public')
-       ORDER BY c.ordinal_position`, [tableName, schema]);
-		const pkRows = await exec.all(`SELECT kcu.column_name
-       FROM information_schema.table_constraints tc
-       JOIN information_schema.key_column_usage kcu
-         ON tc.constraint_name = kcu.constraint_name AND tc.table_schema = kcu.table_schema
-       WHERE tc.table_name = $1 AND tc.table_schema = COALESCE($2, 'public')
-         AND tc.constraint_type = 'PRIMARY KEY'`, [tableName, schema]);
-		const pkSet = new Set(pkRows.map((r) => r.column_name));
-		return rows.map((r) => ({
+       ORDER BY c.ordinal_position`, [tableName, schema])).map((r) => ({
 			name: r.column_name,
 			type: normalizePgType(r.data_type, r.character_maximum_length, r.numeric_precision, r.numeric_scale, r.udt_name, r.formatted_type),
 			notnull: r.is_nullable === "NO",
-			pk: pkSet.has(r.column_name),
+			pk: r.is_pk,
 			dflt_value: normalizePgDefault(r.column_default, r.is_identity)
 		}));
 	}
@@ -968,31 +964,31 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		const conn = await this.driver.getConnection();
 		try {
 			await conn.exec("BEGIN");
-			const fkRefs = await conn.all(`SELECT tc.constraint_name, tc.table_name, tc.table_schema,
-                kcu.column_name, kcur.column_name AS ref_column_name,
-                rc.delete_rule, rc.update_rule
-         FROM information_schema.referential_constraints rc
-         JOIN information_schema.table_constraints tc
-           ON rc.constraint_name = tc.constraint_name AND rc.constraint_schema = tc.constraint_schema
-         JOIN information_schema.key_column_usage kcu
-           ON kcu.constraint_name = tc.constraint_name AND kcu.table_schema = tc.table_schema
-         JOIN information_schema.key_column_usage kcur
-           ON kcur.constraint_name = rc.unique_constraint_name AND kcur.table_schema = rc.unique_constraint_schema
-              AND kcur.ordinal_position = kcu.position_in_unique_constraint
-         WHERE rc.unique_constraint_schema = COALESCE($1, 'public')
-           AND rc.unique_constraint_name IN (
-             SELECT constraint_name FROM information_schema.table_constraints
-             WHERE table_name = $2 AND table_schema = COALESCE($1, 'public')
-               AND constraint_type IN ('PRIMARY KEY', 'UNIQUE')
-           )
-         ORDER BY tc.table_schema, tc.table_name, tc.constraint_name, kcu.ordinal_position`, [schema, this._table.tableName]);
-			const fkByName = /* @__PURE__ */ new Map();
+			const fkRefs = await conn.all(`SELECT c.conname AS constraint_name, cl.relname AS table_name, n.nspname AS table_schema,
+                a.attname AS column_name, ra.attname AS ref_column_name,
+                CASE c.confdeltype WHEN 'c' THEN 'CASCADE' WHEN 'n' THEN 'SET NULL' WHEN 'd' THEN 'SET DEFAULT'
+                  WHEN 'r' THEN 'RESTRICT' ELSE 'NO ACTION' END AS delete_rule,
+                CASE c.confupdtype WHEN 'c' THEN 'CASCADE' WHEN 'n' THEN 'SET NULL' WHEN 'd' THEN 'SET DEFAULT'
+                  WHEN 'r' THEN 'RESTRICT' ELSE 'NO ACTION' END AS update_rule
+         FROM pg_constraint c
+         JOIN pg_class cl ON cl.oid = c.conrelid
+         JOIN pg_namespace n ON n.oid = cl.relnamespace
+         JOIN pg_class rcl ON rcl.oid = c.confrelid
+         JOIN pg_namespace rn ON rn.oid = rcl.relnamespace
+         CROSS JOIN LATERAL unnest(c.conkey, c.confkey) WITH ORDINALITY AS k(attnum, refattnum, ord)
+         JOIN pg_attribute a ON a.attrelid = c.conrelid AND a.attnum = k.attnum
+         JOIN pg_attribute ra ON ra.attrelid = c.confrelid AND ra.attnum = k.refattnum
+         WHERE c.contype = 'f' AND rcl.relname = $2 AND rn.nspname = COALESCE($1, 'public')
+         ORDER BY n.nspname, cl.relname, c.conname, k.ord`, [schema, this._table.tableName]);
+			const inboundFks = /* @__PURE__ */ new Map();
 			const ownSchema = schema ?? "public";
 			for (const fk of fkRefs) {
 				if (fk.table_schema === ownSchema && fk.table_name === this._table.tableName) continue;
-				let entry = fkByName.get(fk.constraint_name);
+				const key = `${fk.table_schema}.${fk.table_name}.${fk.constraint_name}`;
+				let entry = inboundFks.get(key);
 				if (!entry) {
 					entry = {
+						name: fk.constraint_name,
 						schema: fk.table_schema,
 						table: fk.table_name,
 						cols: [],
@@ -1000,13 +996,13 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 						onDelete: fk.delete_rule,
 						onUpdate: fk.update_rule
 					};
-					fkByName.set(fk.constraint_name, entry);
+					inboundFks.set(key, entry);
 				}
 				entry.cols.push(fk.column_name);
 				entry.refCols.push(fk.ref_column_name);
 			}
-			for (const [name, fk] of fkByName) {
-				const ddl = `ALTER TABLE ${qi(fk.schema)}.${qi(fk.table)} DROP CONSTRAINT IF EXISTS ${qi(name)}`;
+			for (const fk of inboundFks.values()) {
+				const ddl = `ALTER TABLE ${qi(fk.schema)}.${qi(fk.table)} DROP CONSTRAINT IF EXISTS ${qi(fk.name)}`;
 				this._log(ddl);
 				await conn.exec(ddl);
 			}
@@ -1040,10 +1036,10 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 			await conn.exec(`ALTER TABLE ${quoteTableName(tempName)} RENAME TO ${qi(this._table.tableName)}`);
 			await this._renameTempConstraints(conn, baseTempName);
 			const resolvedTable = this.resolveTableName();
-			for (const [name, fk] of fkByName) {
+			for (const fk of inboundFks.values()) {
 				const localCols = fk.cols.map((c) => qi(c)).join(", ");
 				const refCols = fk.refCols.map((c) => qi(c)).join(", ");
-				let ddl = `ALTER TABLE ${qi(fk.schema)}.${qi(fk.table)} ADD CONSTRAINT ${qi(name)} FOREIGN KEY (${localCols}) REFERENCES ${quoteTableName(resolvedTable)} (${refCols})`;
+				let ddl = `ALTER TABLE ${qi(fk.schema)}.${qi(fk.table)} ADD CONSTRAINT ${qi(fk.name)} FOREIGN KEY (${localCols}) REFERENCES ${quoteTableName(resolvedTable)} (${refCols})`;
 				if (fk.onDelete !== "NO ACTION") ddl += ` ON DELETE ${fk.onDelete}`;
 				if (fk.onUpdate !== "NO ACTION") ddl += ` ON UPDATE ${fk.onUpdate}`;
 				this._log(ddl);
@@ -1292,12 +1288,14 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	}
 	/** Queries information_schema for existing FK constraints. */
 	async _getExistingFkConstraints() {
-		const rows = await this._exec().all(`SELECT kcu.constraint_name, kcu.column_name
-       FROM information_schema.table_constraints tc
-       JOIN information_schema.key_column_usage kcu
-         ON tc.constraint_name = kcu.constraint_name AND tc.table_schema = kcu.table_schema
-       WHERE tc.table_name = $1 AND tc.table_schema = COALESCE($2, 'public')
-         AND tc.constraint_type = 'FOREIGN KEY'`, [this._table.tableName, this._schema]);
+		const rows = await this._exec().all(`SELECT c.conname AS constraint_name, a.attname AS column_name
+       FROM pg_constraint c
+       JOIN pg_class cl ON cl.oid = c.conrelid
+       JOIN pg_namespace n ON n.oid = cl.relnamespace
+       CROSS JOIN LATERAL unnest(c.conkey) WITH ORDINALITY AS k(attnum, ord)
+       JOIN pg_attribute a ON a.attrelid = c.conrelid AND a.attnum = k.attnum
+       WHERE c.contype = 'f' AND cl.relname = $1 AND n.nspname = COALESCE($2, 'public')
+       ORDER BY c.conname, k.ord`, [this._table.tableName, this._schema]);
 		const byName = /* @__PURE__ */ new Map();
 		for (const row of rows) {
 			let cols = byName.get(row.constraint_name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-postgres",
-  "version": "0.1.138",
+  "version": "0.1.139",
   "description": "PostgreSQL adapter for @atscript/db with pg (node-postgres) driver support.",
   "keywords": [
     "atscript",
@@ -55,8 +55,8 @@
     "@atscript/typescript": "^0.1.92",
     "@uniqu/core": "^0.1.11",
     "pg": ">=8.0.0",
-    "@atscript/db": "^0.1.138",
-    "@atscript/db-sql-tools": "^0.1.138"
+    "@atscript/db": "^0.1.139",
+    "@atscript/db-sql-tools": "^0.1.139"
   },
   "peerDependenciesMeta": {
     "pg": {