rake-db 2.4.37 → 2.4.39

package/dist/index.d.ts

@@ -175,6 +175,7 @@ declare namespace RakeDbAst {
             columns: string[];
         } & ForeignKeyOptions)[];
         indexes?: Omit<SingleColumnIndexOptions, 'column' | 'expression'>[];
+        identity?: TableData.Identity;
     };
     type RenameTable = {
         type: 'renameTable';

package/dist/index.js

@@ -316,6 +316,9 @@ const columnToSql = (name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
   if (item.data.collate) {
     line.push(`COLLATE ${pqb.quote(item.data.collate)}`);
   }
+  if (item.data.identity) {
+    line.push(identityToSql(item.data.identity));
+  }
   if (item.data.isPrimaryKey && !hasMultiplePrimaryKeys) {
     line.push("PRIMARY KEY");
   } else if (!item.data.isNullable) {
@@ -352,6 +355,32 @@ const columnToSql = (name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
   }
   return line.join(" ");
 };
+const identityToSql = (identity) => {
+  const options = sequenceOptionsToSql(identity);
+  return `GENERATED ${identity.always ? "ALWAYS" : "BY DEFAULT"} AS IDENTITY${options ? ` (${options})` : ""}`;
+};
+const sequenceOptionsToSql = (item) => {
+  const line = [];
+  if (item.dataType)
+    line.push(`AS ${item.dataType}`);
+  if (item.incrementBy !== void 0)
+    line.push(`INCREMENT BY ${item.incrementBy}`);
+  if (item.min !== void 0)
+    line.push(`MINVALUE ${item.min}`);
+  if (item.max !== void 0)
+    line.push(`MAXVALUE ${item.max}`);
+  if (item.startWith !== void 0)
+    line.push(`START WITH ${item.startWith}`);
+  if (item.cache !== void 0)
+    line.push(`CACHE ${item.cache}`);
+  if (item.cycle)
+    line.push(`CYCLE`);
+  if (item.ownedBy) {
+    const [schema, table] = getSchemaAndTableFromName(item.ownedBy);
+    line.push(`OWNED BY ${quoteWithSchema({ schema, name: table })}`);
+  }
+  return line.join(" ");
+};
 const addColumnIndex = (indexes, name, item) => {
   if (item.data.indexes) {
     indexes.push(
@@ -1015,6 +1044,11 @@ const astToQueries = (ast, snakeCase) => {
           `ALTER COLUMN "${name}" TYPE ${type}${to.collate ? ` COLLATE ${pqb.quote(to.collate)}` : ""}${item.using ? ` USING ${pqb.getRaw(item.using, values)}` : ""}`
         );
       }
+      if (typeof from.identity !== typeof to.identity || !orchidCore.deepCompare(from.identity, to.identity)) {
+        alterTable.push(
+          `ALTER COLUMN "${name}" ${to.identity ? `ADD ${identityToSql(to.identity)}` : `DROP IDENTITY`}`
+        );
+      }
       if (from.default !== to.default) {
         const value = typeof to.default === "object" && to.default && orchidCore.isRaw(to.default) ? pqb.getRaw(to.default, values) : pqb.quote(to.default);
         const expr = value === void 0 ? "DROP DEFAULT" : `SET DEFAULT ${value}`;
@@ -1863,41 +1897,83 @@ WHERE ${filterSchema("n.nspname")}`
   async getColumns() {
     const { rows } = await this.db.query(
       `SELECT
-  table_schema "schemaName",
-  table_name "tableName",
-  column_name "name",
-  typname "type",
-  n.nspname "typeSchema",
-  data_type = 'ARRAY' "isArray",
-  character_maximum_length AS "maxChars",
-  numeric_precision AS "numericPrecision",
-  numeric_scale AS "numericScale",
-  datetime_precision AS "dateTimePrecision",
-  column_default "default",
-  is_nullable::boolean "isNullable",
-  collation_name AS "collation",
+  nc.nspname AS "schemaName",
+  c.relname AS "tableName",
+  a.attname AS "name",
+  COALESCE(et.typname, t.typname) AS "type",
+  tn.nspname AS "typeSchema",
+  et.typname IS NOT NULL AS "isArray",
+  information_schema._pg_char_max_length(
+    information_schema._pg_truetypid(a, t),
+    information_schema._pg_truetypmod(a, t)
+  ) AS "maxChars",
+  information_schema._pg_numeric_precision(
+    information_schema._pg_truetypid(a, t),
+    information_schema._pg_truetypmod(a, t)
+  ) AS "numericPrecision",
+  information_schema._pg_numeric_scale(
+    information_schema._pg_truetypid(a, t),
+    information_schema._pg_truetypmod(a, t)
+  ) AS "numericScale",
+  information_schema._pg_datetime_precision(
+    information_schema._pg_truetypid(a, t),
+    information_schema._pg_truetypmod(a, t)
+  ) AS "datetimePrecision",
+  CAST(
+    CASE WHEN a.attgenerated = ''
+      THEN pg_get_expr(ad.adbin, ad.adrelid)
+    END AS information_schema.character_data
+  ) AS "default",
+  NOT (a.attnotnull OR (t.typtype = 'd' AND t.typnotnull)) AS "isNullable",
+  co.collname AS "collation",
   NULLIF(a.attcompression, '') AS compression,
-  pgd.description AS "comment"
-FROM information_schema.columns c
-JOIN pg_catalog.pg_statio_all_tables st
-  ON c.table_schema = st.schemaname
- AND c.table_name = st.relname
+  pgd.description AS "comment",
+  (
+    CASE WHEN a.attidentity IN ('a', 'd') THEN (
+      json_build_object(
+        'always',
+        a.attidentity = 'a',
+        'start',
+        seq.seqstart,
+        'increment',
+        seq.seqincrement,
+        'min',
+        nullif(seq.seqmin, 1),
+        'max',
+        nullif(seq.seqmax, (
+          CASE COALESCE(et.typname, t.typname)
+            WHEN 'int2' THEN 32767
+            WHEN 'int4' THEN 2147483647
+            WHEN 'int8' THEN 9223372036854775807
+            ELSE NULL
+            END
+          )),
+        'cache',
+        seq.seqcache,
+        'cycle',
+        seq.seqcycle
+      )
+    ) END
+  ) "identity"
+FROM pg_attribute a
+LEFT JOIN pg_attrdef ad ON a.attrelid = ad.adrelid AND a.attnum = ad.adnum
+JOIN pg_class c ON a.attrelid = c.oid
+JOIN pg_namespace nc ON c.relnamespace = nc.oid
+JOIN pg_type t ON a.atttypid = t.oid
+LEFT JOIN pg_type et ON t.typelem = et.oid
+JOIN pg_namespace tn ON tn.oid = t.typnamespace
+LEFT JOIN (pg_collation co JOIN pg_namespace nco ON (co.collnamespace = nco.oid))
+  ON a.attcollation = co.oid AND (nco.nspname, co.collname) <> ('pg_catalog', 'default')
 LEFT JOIN pg_catalog.pg_description pgd
-  ON pgd.objoid = st.relid
- AND pgd.objsubid = c.ordinal_position
-JOIN pg_catalog.pg_attribute a
-  ON a.attrelid = st.relid
- AND a.attnum = c.ordinal_position
-JOIN pg_catalog.pg_type t
-  ON (
-       CASE WHEN data_type = 'ARRAY'
-         THEN typarray
-         ELSE oid
-       END
-     ) = atttypid
-JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace
-WHERE ${filterSchema("table_schema")}
-ORDER BY c.ordinal_position`
+  ON pgd.objoid = a.attrelid
+ AND pgd.objsubid = a.attnum
+LEFT JOIN (pg_depend dep JOIN pg_sequence seq ON (dep.classid = 'pg_class'::regclass AND dep.objid = seq.seqrelid AND dep.deptype = 'i'))
+  ON (dep.refclassid = 'pg_class'::regclass AND dep.refobjid = c.oid AND dep.refobjsubid = a.attnum)
+WHERE a.attnum > 0
+  AND NOT a.attisdropped
+  AND c.relkind IN ('r', 'v', 'f', 'p')
+  AND ${filterSchema("nc.nspname")}
+ORDER BY a.attnum`
     );
     return rows;
   }
@@ -2394,7 +2470,7 @@ const getColumnType = (type, isSerial) => {
   return type === "int2" ? "smallserial" : type === "int4" ? "serial" : "bigserial";
 };
 const pushTableAst = (ctx, ast, data, domains, table, pendingTables, innerConstraints = data.constraints) => {
-  var _a;
+  var _a, _b;
   const { schemaName, name: tableName } = table;
   const key = `${schemaName}.${table.name}`;
   delete pendingTables[key];
@@ -2459,7 +2535,12 @@ const pushTableAst = (ctx, ast, data, domains, table, pendingTables, innerConstr
       isArray: item.isArray,
       isSerial
     }));
-    if (((_a = primaryKey == null ? void 0 : primaryKey.columns) == null ? void 0 : _a.length) === 1 && (primaryKey == null ? void 0 : primaryKey.columns[0]) === item.name) {
+    if (item.identity) {
+      column.data.identity = item.identity;
+      if (!item.identity.always)
+        (_a = column.data.identity) == null ? true : delete _a.always;
+    }
+    if (((_b = primaryKey == null ? void 0 : primaryKey.columns) == null ? void 0 : _b.length) === 1 && (primaryKey == null ? void 0 : primaryKey.columns[0]) === item.name) {
       column = column.primaryKey();
     }
     const indexes = tableIndexes.filter(
@@ -2775,7 +2856,11 @@ const pullDbStructure = async (options, config) => {
     return;
   const version = makeFileTimeStamp();
   await writeMigrationFile(config, version, "pull", result);
-  await saveMigratedVersion(adapter, version, config);
+  const silentQueries = Object.assign(adapter, {
+    silentQuery: adapter.query,
+    silentArrays: adapter.arrays
+  });
+  await saveMigratedVersion(silentQueries, version, config);
   const cache = {};
   for (const item of ast) {
     await ((_a = config == null ? void 0 : config.appCodeUpdater) == null ? void 0 : _a.call(config, {