uql-orm 0.77.1 → 0.78.0

package/README.md

@@ -73,6 +73,6 @@ Release notes live in [CHANGELOG.md](https://github.com/rogerpadilla/uql/blob/ma
 
 ## ⭐ Like what we're doing? Give us a star
 
-It is how other people find the project.
+It will help other people find the project.
 
 [![Star UQL on GitHub](https://img.shields.io/github/stars/rogerpadilla/uql?style=flat&label=stars&color=3282b5)](https://github.com/rogerpadilla/uql)

package/dist/migrate/introspection/mssqlIntrospector.d.ts

@@ -49,5 +49,6 @@ type MsSqlColumnRow = {
     column_default: string | null;
     is_primary_key: number | null;
     is_unique: number | null;
+    generated_as: string | null;
 };
 export {};

package/dist/migrate/introspection/mssqlIntrospector.js

@@ -46,12 +46,14 @@ export class MsSqlSchemaIntrospector extends AbstractSqlSchemaIntrospector {
         c.is_identity as is_identity,
         d.definition as column_default,
         f.is_primary_key,
-        f.is_unique
+        f.is_unique,
+        CASE WHEN cc.is_persisted = 1 THEN cc.definition END as generated_as
       FROM sys.columns c
       JOIN sys.objects o ON o.object_id = c.object_id
       JOIN sys.schemas s ON s.schema_id = o.schema_id
       JOIN sys.types t ON t.user_type_id = c.user_type_id
       LEFT JOIN sys.default_constraints d ON d.object_id = c.default_object_id
+      LEFT JOIN sys.computed_columns cc ON cc.object_id = c.object_id AND cc.column_id = c.column_id
       OUTER APPLY (
         SELECT
           MAX(CAST(i.is_primary_key AS INT)) as is_primary_key,
@@ -135,6 +137,7 @@ export class MsSqlSchemaIntrospector extends AbstractSqlSchemaIntrospector {
                 length: widthOf(type, bytes),
                 precision: NUMERIC_TYPES.has(type) ? this.toNumber(row.numeric_precision) : undefined,
                 scale: NUMERIC_TYPES.has(type) ? this.toNumber(row.numeric_scale) : undefined,
+                generatedAs: row.generated_as ?? undefined,
             };
         });
     }

package/dist/migrate/introspection/mysqlIntrospector.d.ts

@@ -40,6 +40,7 @@ type MysqlColumnRow = {
     numeric_precision: number | bigint | null;
     numeric_scale: number | null;
     column_comment: string | null;
+    generated_as: string | null;
 };
 /**
  * MariaDB reads out of the same `information_schema` as MySQL, save for one column type it does not

package/dist/migrate/introspection/mysqlIntrospector.js

@@ -40,6 +40,7 @@ export class MysqlSchemaIntrospector extends AbstractSqlSchemaIntrospector {
         NUMERIC_SCALE as numeric_scale,
         COLUMN_KEY as column_key,
         EXTRA as extra,
+        CASE WHEN EXTRA LIKE '%STORED GENERATED%' THEN GENERATION_EXPRESSION END as generated_as,
         COLUMN_COMMENT as column_comment
       FROM information_schema.COLUMNS
       WHERE TABLE_SCHEMA = ${this.schemaExpr}
@@ -104,6 +105,7 @@ export class MysqlSchemaIntrospector extends AbstractSqlSchemaIntrospector {
             precision: this.toNumber(row.numeric_precision),
             scale: this.toNumber(row.numeric_scale),
             comment: row.column_comment || undefined,
+            generatedAs: row.generated_as ?? undefined,
         }));
     }
     async mapIndexesResult(_read, _tableName, results) {

package/dist/migrate/introspection/postgresIntrospector.d.ts

@@ -19,6 +19,9 @@ export declare class PostgresSchemaIntrospector extends AbstractSqlSchemaIntrosp
      * the live catalogue while `information_schema` answers from this statement's snapshot, so a table
      * another connection has just dropped is still listed here and the cast would raise on it. Whole
      * database scans meet that table every time something else is migrating.
+     *
+     * `attgenerated` rather than `is_generated`, which cannot part a stored generated column from the
+     * virtual one Postgres 18 added and uql never declares. CockroachDB states it too.
      */
     protected getColumnsQuery(_tableName: string): string;
     /**
@@ -116,5 +119,6 @@ type PostgresColumnRow = {
     numeric_precision: number | null;
     numeric_scale: number | null;
     column_comment: string | null;
+    generated_as: string | null;
 };
 export {};

package/dist/migrate/introspection/postgresIntrospector.js

@@ -42,6 +42,9 @@ export class PostgresSchemaIntrospector extends AbstractSqlSchemaIntrospector {
      * the live catalogue while `information_schema` answers from this statement's snapshot, so a table
      * another connection has just dropped is still listed here and the cast would raise on it. Whole
      * database scans meet that table every time something else is migrating.
+     *
+     * `attgenerated` rather than `is_generated`, which cannot part a stored generated column from the
+     * virtual one Postgres 18 added and uql never declares. CockroachDB states it too.
      */
     getColumnsQuery(_tableName) {
         return /*sql*/ `
@@ -56,6 +59,11 @@ export class PostgresSchemaIntrospector extends AbstractSqlSchemaIntrospector {
         c.numeric_scale,
         c.is_identity,
         c.identity_generation,
+        CASE WHEN (
+          SELECT a.attgenerated FROM pg_catalog.pg_attribute a
+          WHERE a.attrelid = to_regclass(quote_ident(c.table_schema) || '.' || quote_ident(c.table_name))
+            AND a.attname = c.column_name
+        ) = 's' THEN c.generation_expression END AS generated_as,
         EXISTS (
           SELECT 1 FROM information_schema.table_constraints tc
           JOIN information_schema.key_column_usage kcu USING (constraint_schema, constraint_name)
@@ -186,6 +194,7 @@ export class PostgresSchemaIntrospector extends AbstractSqlSchemaIntrospector {
             precision: row.numeric_precision ?? undefined,
             scale: row.numeric_scale ?? undefined,
             comment: row.column_comment ?? undefined,
+            generatedAs: row.generated_as ?? undefined,
         }));
     }
     async mapIndexesResult(_read, _tableName, results) {

package/dist/migrate/introspection/sqliteIntrospector.d.ts

@@ -35,11 +35,18 @@ export declare class SqliteSchemaIntrospector extends AbstractSqlSchemaIntrospec
     private getUniqueColumns;
     /** libSQL's `libsql_vector_idx(col, 'metric=...')`, read back from the statement that created it. */
     private getVectorIndex;
+    /** The statement that created the table, which is where SQLite keeps every expression it was given. */
+    private getTableDdl;
     private getIndexColumns;
     protected normalizeType(type: string): string;
     protected extractLength(type: string): number | undefined;
     protected parseDefaultValue(defaultValue: string | null): unknown;
 }
+/**
+ * The expression a generated column is computed from, read out of the `CREATE TABLE` itself: no PRAGMA
+ * reports one, and SQLite keeps the statement's text exactly as it was given.
+ */
+export declare function generatedExpression(ddl: string, column: string): string | undefined;
 type SqliteCountRow = {
     count: number | bigint;
 };
@@ -49,6 +56,8 @@ type SqliteColumnRow = {
     notnull: number;
     dflt_value: string | null;
     pk: number;
+    /** `PRAGMA table_xinfo`'s flag: 0 ordinary, 1 a hidden `VIRTUAL` table column, 2 virtual, 3 stored. Absent from `table_info`. */
+    hidden?: number;
 };
 type SqliteIndexRow = {
     seq: number;

package/dist/migrate/introspection/sqliteIntrospector.js

@@ -66,6 +66,7 @@ export class SqliteSchemaIntrospector extends AbstractSqlSchemaIntrospector {
         const uniqueColumns = await this.getUniqueColumns(read, tableName);
         // Only a sole `INTEGER PRIMARY KEY` is the rowid, which is what numbers itself.
         const soleKey = results.filter((row) => row.pk > 0).length === 1;
+        const ddl = results.some((row) => row.hidden === STORED_GENERATED) ? await this.getTableDdl(read, tableName) : '';
         return results.map((row) => ({
             name: row.name,
             type: this.normalizeType(row.type),
@@ -78,6 +79,7 @@ export class SqliteSchemaIntrospector extends AbstractSqlSchemaIntrospector {
             precision: undefined,
             scale: undefined,
             comment: undefined, // SQLite doesn't support column comments
+            generatedAs: row.hidden === STORED_GENERATED ? generatedExpression(ddl, row.name) : undefined,
         }));
     }
     async mapIndexesResult(read, _tableName, results) {
@@ -169,6 +171,12 @@ export class SqliteSchemaIntrospector extends AbstractSqlSchemaIntrospector {
         const distances = new Map([...this.dialect.vectorMetrics].map(([distance, { index }]) => [index, distance]));
         return { name: indexName, entries: [{ column }], unique: false, type: 'vector', distance: distances.get(metric) };
     }
+    /** The statement that created the table, which is where SQLite keeps every expression it was given. */
+    async getTableDdl(read, tableName) {
+        const [row] = await read(
+        /*sql*/ `SELECT sql FROM sqlite_master WHERE type = 'table' AND name = ?`, [tableName]);
+        return row.sql;
+    }
     getIndexColumns(read, indexName) {
         return read(/*sql*/ `PRAGMA index_info(${this.escapeId(indexName)})`);
     }
@@ -208,3 +216,72 @@ export class SqliteSchemaIntrospector extends AbstractSqlSchemaIntrospector {
         return defaultValue;
     }
 }
+/** `PRAGMA table_xinfo`'s `hidden` for a column the engine stores rather than recomputes on each read. */
+const STORED_GENERATED = 3;
+const GENERATED_AS = /\b(?:GENERATED\s+ALWAYS\s+)?AS\s*\(/i;
+/**
+ * The expression a generated column is computed from, read out of the `CREATE TABLE` itself: no PRAGMA
+ * reports one, and SQLite keeps the statement's text exactly as it was given.
+ */
+export function generatedExpression(ddl, column) {
+    const entry = tableEntries(ddl).find((it) => leadingIdentifier(it) === column);
+    if (entry === undefined) {
+        return undefined;
+    }
+    const at = GENERATED_AS.exec(entry);
+    return at === null ? undefined : parenthesized(entry.slice(at.index + at[0].length - 1));
+}
+/** A `CREATE TABLE` body split at each comma outside any parentheses or quotes: one entry per column or constraint. */
+function tableEntries(ddl) {
+    const body = ddl.slice(ddl.indexOf('(') + 1, ddl.lastIndexOf(')'));
+    const entries = [];
+    let start = 0;
+    scan(body, (char, index, depth) => {
+        if (char === ',' && depth === 0) {
+            entries.push(body.slice(start, index));
+            start = index + 1;
+        }
+    });
+    return [...entries, body.slice(start)];
+}
+/** What a leading `(` encloses, its own nesting and quoting respected. */
+function parenthesized(text) {
+    let end = text.length;
+    scan(text, (char, index, depth) => {
+        const closes = char === ')' && depth === 0;
+        if (closes) {
+            end = index;
+        }
+        return closes;
+    });
+    return text.slice(1, end).trim();
+}
+/**
+ * Walk SQL, reporting each character outside a string or a quoted identifier along with the nesting
+ * depth that follows it. A truthy `visit` stops the walk.
+ */
+function scan(sql, visit) {
+    let depth = 0;
+    let quote = '';
+    for (let index = 0; index < sql.length; index++) {
+        const char = sql[index];
+        if (quote !== '') {
+            quote = char === quote ? '' : quote;
+            continue;
+        }
+        if (char === '"' || char === "'" || char === '`') {
+            quote = char;
+            continue;
+        }
+        depth += char === '(' || char === '[' ? 1 : 0;
+        depth -= char === ')' || char === ']' ? 1 : 0;
+        if (visit(char, index, depth)) {
+            return;
+        }
+    }
+}
+/** The name a column definition opens with, however it was quoted. */
+function leadingIdentifier(entry) {
+    const [token = ''] = /^\s*(?:"[^"]*"|`[^`]*`|\[[^\]]*\]|[^\s(]+)/.exec(entry) ?? [];
+    return token.trim().replace(/^["`[]|["`\]]$/g, '');
+}

package/package.json

@@ -3,7 +3,7 @@
   "homepage": "https://uql-orm.dev",
   "description": "The JSON-native TypeScript ORM for Bun, Browsers, Edge, Deno, Node, Workers. Supports PostgreSQL, PGlite, MySQL, MariaDB, SQLite, CockroachDB, SQL Server, Turso, Neon, Cloudflare D1 and MongoDB. Queries are plain JSON, typed to the leaf.",
   "license": "MIT",
-  "version": "0.77.1",
+  "version": "0.78.0",
   "type": "module",
   "engines": {
     "node": ">=24"