@rebasepro/server-postgres 0.13.1-canary.gef9608c → 0.14.0

package/src/schema/generate-postgres-ddl-logic.ts

@@ -1,6 +1,21 @@
 import { CollectionConfig, NumberProperty, Property, ResolvedRelation, RelationProperty, SecurityOperation, SecurityRule, StringProperty, isPostgresCollectionConfig, DateProperty, ArrayProperty, MapProperty, ReferenceProperty, VectorProperty, BinaryProperty, isManyToMany, type ResolvedManyToMany, type ResolvedBelongsTo } from "@rebasepro/types";
 import { getEnumVarName, getTableName, resolveCollectionRelations, findRelation, securityRuleToConditions, policyToPostgres, getEffectiveSecurityRules, getInjectedSecurityRules, resolveJunctionSpecs, getJunctionSecurityRules, getJunctionCollectionConfig, resolveStringColumnLength, relationalCollections } from "@rebasepro/common";
-import { toSnakeCase, getPolicyNamesForRule, generateForeignKeyName, legacyForeignKeyName } from "@rebasepro/utils";
+import { toSnakeCase, getPolicyNamesForRule, generateForeignKeyName, legacyForeignKeyName, toPostgresIdentifier } from "@rebasepro/utils";
+import { AUTH_USERS_COLUMNS, authUsersColumnDefinition, authUsersColumnSql, isAuthCollection } from "./auth-users-columns";
+import {
+    buildSearchColumnSpec,
+    searchColumnDefinition,
+    fuzzyColumnDefinition,
+    searchIndexStatements,
+    searchHelperFunctions,
+    searchExtensionStatements,
+    searchColumnNames,
+    searchColumnStamps,
+    searchStampGuards,
+    searchIndexNames,
+    type SearchColumnSpec
+} from "./search-column";
+import { REBASE_SCHEMA } from "@rebasepro/types";
 
 // --- Helper Functions ---
 
@@ -180,6 +195,11 @@ export const getSqlColumnType = (propName: string, prop: Property, collection: C
             const mapProp = prop as MapProperty;
             return mapProp.columnType === "json" ? "JSON" : "JSONB";
         }
+        // `{ latitude, longitude }` — a document, like `map`. It used to fall to
+        // the `TEXT` default below while the Drizzle generator emitted no column
+        // at all, which is the divergence that made the type unpersistable.
+        case "geopoint":
+            return "JSONB";
         case "array": {
             const arrayProp = prop as ArrayProperty;
             let colType = arrayProp.columnType;
@@ -231,21 +251,162 @@ export const getSqlColumnType = (propName: string, prop: Property, collection: C
             return pkProp.type === "number" ? "INTEGER" : (pkProp.isUuid ? "UUID" : "TEXT");
         }
         default:
-            return "TEXT";
+            // A silent `TEXT` here is how the two generators drifted apart: the
+            // database got a column for `geopoint` and the Drizzle table did
+            // not, so the type looked supported and persisted nothing. Every
+            // member of `DataType` is handled above; anything else is a
+            // generator that has not been taught the type yet, and it should
+            // say so rather than invent a column.
+            throw new Error(
+                `No Postgres column type for property '${propName}' of type ` +
+                `'${(prop as Property).type}' in collection '${collection.slug}'. ` +
+                "Add a case to `getSqlColumnType` (and to `getDrizzleColumn`, which must agree)."
+            );
     }
 };
 
+/**
+ * Everything a `search` block needs, as a file Rebase applies itself.
+ *
+ * Search is the one part of the schema Atlas does not own. Two independent
+ * reasons, and either alone would be enough:
+ *
+ * 1. Its free tier refuses to *parse* a desired-state file that so much as
+ *    contains a function — "functions and procedures are available to
+ *    logged-in users only". A generated `tsvector` column cannot avoid one:
+ *    `unaccent` is STABLE and jsonb flattening needs a set-returning function,
+ *    so both have to be wrapped in an IMMUTABLE helper to be legal in a
+ *    generated column at all.
+ * 2. Even with the file accepted, Atlas *wipes* the dev database it diffs
+ *    against, so a helper seeded there beforehand is gone by the time the plan
+ *    is analysed. There is no hook to reinstate it.
+ *
+ * So the column, its index and its helpers are excluded from Atlas's view
+ * (`searchExcludePatterns`) and applied from here — the same arrangement the
+ * RLS policies already use, and for the same underlying reason.
+ *
+ * Ordered as it must run: extensions, then helpers, then the column whose
+ * expression calls them, then the index over that column. Every statement is
+ * `IF NOT EXISTS` / `OR REPLACE`, because this is replayed on every push and
+ * appended to migrations that run against databases at any stage of their
+ * life. Empty when nothing opted in — the caller writes no file then.
+ *
+ * The leading half — extensions and helpers, without the table-shaped
+ * statements — is available on its own as {@link searchPrerequisiteStatements},
+ * for the dev database Atlas analyses plans against. That database has none of
+ * the project's tables, so it wants the functions and nothing else.
+ */
+export const searchPrerequisiteStatements = (allCollections: CollectionConfig[]): string[] => {
+    const specs = relationalCollections(allCollections)
+        .map(c => buildSearchColumnSpec(c))
+        .filter((s): s is SearchColumnSpec => s !== undefined);
+    if (specs.length === 0) return [];
+    return [
+        ...new Set(specs.flatMap(searchExtensionStatements)),
+        ...new Set(specs.flatMap(searchHelperFunctions))
+    ];
+};
+
+export const generatePostgresSearchDdl = (allCollections: CollectionConfig[]): string => {
+    const collections = relationalCollections(allCollections);
+    const specs = collections
+        .map(c => buildSearchColumnSpec(c))
+        .filter((s): s is SearchColumnSpec => s !== undefined);
+    if (specs.length === 0) return "";
+
+    const extensions = Array.from(new Set(specs.flatMap(searchExtensionStatements)));
+    const helpers = Array.from(new Set(specs.flatMap(searchHelperFunctions)));
+
+    let ddl = "-- This file is auto-generated by the Rebase DDL generator. Do not edit manually.\n";
+    ddl += "--\n";
+    ddl += "-- Full-text search for the collections declaring a `search` block.\n";
+    ddl += "-- Applied by Rebase, not by Atlas — see generatePostgresSearchDdl.\n\n";
+
+    extensions.forEach(s => { ddl += `${s}\n`; });
+    if (extensions.length > 0) ddl += "\n";
+    helpers.forEach(s => { ddl += `${s}\n\n`; });
+
+    for (const collection of collections) {
+        const spec = buildSearchColumnSpec(collection);
+        if (!spec) continue;
+        const schema = isPostgresCollectionConfig(collection) && collection.schema ? collection.schema : "public";
+        const table = `"${schema}"."${getTableName(collection)}"`;
+
+        // ADD COLUMN IF NOT EXISTS rather than the inline definition the
+        // CREATE TABLE would use: by the time this runs the table exists,
+        // whether Atlas just created it or it has been live for a year.
+        // Refuse before altering anything if the column in the database was
+        // generated from a different `search` block: `ADD COLUMN IF NOT EXISTS`
+        // is a no-op against an existing column, so without this the file would
+        // report success and leave the old expression in place — and then stamp
+        // it as current.
+        searchStampGuards(spec).forEach(s => { ddl += `${s}\n`; });
+        ddl += `ALTER TABLE ${table} ADD COLUMN IF NOT EXISTS ${searchColumnDefinition(spec)};\n`;
+        const fuzzyDef = fuzzyColumnDefinition(spec);
+        if (fuzzyDef) ddl += `ALTER TABLE ${table} ADD COLUMN IF NOT EXISTS ${fuzzyDef};\n`;
+        // The fingerprint of the expression each column was built from — the
+        // only record of *which* block a generated column came from, and what
+        // the guard above and the boot-time ensure both compare against.
+        searchColumnStamps(spec).forEach(s => { ddl += `${s.sql}\n`; });
+        searchIndexStatements(spec).forEach(s => { ddl += `${s}\n`; });
+        ddl += "\n";
+    }
+
+    return ddl;
+};
+
+/**
+ * Glob patterns telling Atlas to leave the search column and its index alone.
+ *
+ * Without these, a desired state that omits search reads to Atlas as an
+ * instruction to drop the column — taking the index and the whole search
+ * feature with it on the next push.
+ *
+ * Fully qualified, `schema.table.object`, matching the include list. The
+ * two-part form is what Atlas wants when the connection URL scopes it to one
+ * schema and is *silently ignored* otherwise: it reads `posts.search_vector`
+ * as a table named `search_vector` in a schema named `posts`, matches nothing,
+ * and reports no error for the pattern that never fired.
+ */
+export const searchExcludePatterns = (allCollections: CollectionConfig[]): string[] => {
+    const patterns: string[] = [];
+    for (const collection of relationalCollections(allCollections)) {
+        const spec = buildSearchColumnSpec(collection);
+        if (!spec) continue;
+        const schema = isPostgresCollectionConfig(collection) && collection.schema ? collection.schema : "public";
+        const table = getTableName(collection);
+        for (const name of searchColumnNames(collection)) {
+            patterns.push(`${schema}.${table}.${name}`);
+        }
+        for (const index of searchIndexNames(spec)) {
+            patterns.push(`${schema}.${table}.${index}`);
+        }
+    }
+    return patterns;
+};
+
 export const generatePostgresDdl = async (
     allCollections: CollectionConfig[],
-    options: { includePolicies?: boolean } = { includePolicies: true }
+    options: { includePolicies?: boolean; includeSearch?: boolean } = {
+        includePolicies: true,
+        includeSearch: true
+    }
 ): Promise<string> => {
     // Only the collections this engine stores. See `relationalCollections`.
     const collections = relationalCollections(allCollections);
     let ddl = "-- This file is auto-generated by the Rebase DDL generator. Do not edit manually.\n\n";
 
-    // 1. Create custom schemas
+    // 1. Create custom schemas.
+    //
+    // `rebase` is unconditional and load-bearing. The RLS helper functions live
+    // in it, so the migration preamble creates it — which puts it in Atlas's
+    // replayed state, and anything in that state but absent from this desired
+    // schema gets a `DROP SCHEMA … CASCADE` planned against it. That would take
+    // the auth tables. It used to appear here only when some collection
+    // happened to declare `schema: "rebase"`; the scaffold's users collection
+    // does, which is why nobody hit it, but nothing guaranteed it.
     const uniqueSchemas = Array.from(new Set([
-        "auth",
+        REBASE_SCHEMA,
         ...collections.map(c => isPostgresCollectionConfig(c) ? c.schema : undefined).filter(Boolean)
     ]));
     uniqueSchemas.forEach(schema => {
@@ -253,6 +414,32 @@ export const generatePostgresDdl = async (
     });
     if (uniqueSchemas.length > 0) ddl += "\n";
 
+    // 1b. Search support, for collections that opted in.
+    //
+    // Extensions and helper functions come before every CREATE TABLE because a
+    // generated column's expression is resolved at creation time: a table whose
+    // search column calls `rebase_search_text` cannot be created before that
+    // function exists. Both are `IF NOT EXISTS` / `OR REPLACE`, so a file
+    // replayed against a live database is a no-op here.
+    const searchSpecs = collections
+        .map(c => buildSearchColumnSpec(c))
+        .filter((s): s is SearchColumnSpec => s !== undefined);
+
+    if (searchSpecs.length > 0) {
+        if (options.includeSearch === false) {
+            // Everything search-related lives in `search.sql` — see
+            // `generatePostgresSearchDdl` for why Atlas is not shown any of it.
+            ddl += "-- Full-text search support lives in `search.sql`, applied separately.\n\n";
+        } else {
+            const extensions = Array.from(new Set(searchSpecs.flatMap(searchExtensionStatements)));
+            const helpers = Array.from(new Set(searchSpecs.flatMap(searchHelperFunctions)));
+            ddl += "-- Full-text search support (collections declaring a `search` block)\n";
+            extensions.forEach(s => { ddl += `${s}\n`; });
+            if (extensions.length > 0) ddl += "\n";
+            helpers.forEach(s => { ddl += `${s}\n\n`; });
+        }
+    }
+
     // 2. Generate Enums
     //
     // The enum type name is derived from table + column, so two collections
@@ -320,6 +507,9 @@ export const generatePostgresDdl = async (
 
     // 3. Generate tables
     const fkStatements: string[] = [];
+    // Indexes follow the tables for the same reason the FK constraints do: the
+    // table has to exist first.
+    const indexStatements: string[] = [];
     // Policies are emitted after every CREATE TABLE, like the FK constraints:
     // a policy may reference other tables (a junction's derived policies always
     // reference both endpoints; `policy.existsIn` references a join table), and
@@ -357,8 +547,8 @@ export const generatePostgresDdl = async (
             ddl += `  PRIMARY KEY ("${sourceColumn}", "${targetColumn}")\n`;
             ddl += `);\n\n`;
 
-            fkStatements.push(`ALTER TABLE "${schema}"."${baseTableName}" ADD CONSTRAINT "${baseTableName}_${sourceColumn}_fkey" FOREIGN KEY ("${sourceColumn}") REFERENCES "${sourceSchema}"."${sourceTable}" ("${sourceId}") ON DELETE ${onDelete.toUpperCase()};`);
-            fkStatements.push(`ALTER TABLE "${schema}"."${baseTableName}" ADD CONSTRAINT "${baseTableName}_${targetColumn}_fkey" FOREIGN KEY ("${targetColumn}") REFERENCES "${targetSchema}"."${targetTable}" ("${targetId}") ON DELETE ${onDelete.toUpperCase()};`);
+            fkStatements.push(`ALTER TABLE "${schema}"."${baseTableName}" ADD CONSTRAINT "${toPostgresIdentifier(`${baseTableName}_${sourceColumn}_fkey`)}" FOREIGN KEY ("${sourceColumn}") REFERENCES "${sourceSchema}"."${sourceTable}" ("${sourceId}") ON DELETE ${onDelete.toUpperCase()};`);
+            fkStatements.push(`ALTER TABLE "${schema}"."${baseTableName}" ADD CONSTRAINT "${toPostgresIdentifier(`${baseTableName}_${targetColumn}_fkey`)}" FOREIGN KEY ("${targetColumn}") REFERENCES "${targetSchema}"."${targetTable}" ("${targetId}") ON DELETE ${onDelete.toUpperCase()};`);
 
             if (options.includePolicies) {
                 // Junction tables are generated tables like any other: locked by
@@ -416,7 +606,7 @@ export const generatePostgresDdl = async (
                     if (required) colDef += " NOT NULL";
                     columns.push(colDef);
 
-                    fkStatements.push(`ALTER TABLE "${schema}"."${baseTableName}" ADD CONSTRAINT "${baseTableName}_${relInfo.localKey}_fkey" FOREIGN KEY ("${relInfo.localKey}") REFERENCES "${targetSchema}"."${targetTable}" ("${targetId}") ON DELETE ${onDeleteVal.toUpperCase()}${onUpdate};`);
+                    fkStatements.push(`ALTER TABLE "${schema}"."${baseTableName}" ADD CONSTRAINT "${toPostgresIdentifier(`${baseTableName}_${relInfo.localKey}_fkey`)}" FOREIGN KEY ("${relInfo.localKey}") REFERENCES "${targetSchema}"."${targetTable}" ("${targetId}") ON DELETE ${onDeleteVal.toUpperCase()}${onUpdate};`);
                 } else if (prop.type === "reference") {
                     const refProp = prop as ReferenceProperty;
                     const targetCollection = collections.find(c => c.slug === refProp.path || getTableName(c) === refProp.path);
@@ -438,10 +628,27 @@ export const generatePostgresDdl = async (
                         if (required) colDef += " NOT NULL";
                         columns.push(colDef);
 
-                        fkStatements.push(`ALTER TABLE "${schema}"."${baseTableName}" ADD CONSTRAINT "${baseTableName}_${colName}_fkey" FOREIGN KEY ("${colName}") REFERENCES "${targetSchema}"."${targetTable}" ("${targetId}") ON DELETE ${onDelete.toUpperCase()};`);
+                        fkStatements.push(`ALTER TABLE "${schema}"."${baseTableName}" ADD CONSTRAINT "${toPostgresIdentifier(`${baseTableName}_${colName}_fkey`)}" FOREIGN KEY ("${colName}") REFERENCES "${targetSchema}"."${targetTable}" ("${targetId}") ON DELETE ${onDelete.toUpperCase()};`);
                     }
                 } else {
                     const colName = resolveColumnName(propName, prop);
+
+                    // On an auth collection, the columns auth reads and writes
+                    // are defined once, in `auth-users-columns`, and every
+                    // creator of this table emits that definition. Before this,
+                    // the desired state here was built from the collection file
+                    // alone — which knows nothing of `is_anonymous` or
+                    // `tokens_valid_after` — so `db push` and the runtime
+                    // disagreed about `email`'s nullability and about which
+                    // columns exist at all.
+                    const authDefinition = isAuthCollection(collection)
+                        ? authUsersColumnDefinition(colName)
+                        : undefined;
+                    if (authDefinition && !isIdProperty(propName, prop, collection)) {
+                        columns.push(`  "${colName}" ${authDefinition}`);
+                        return;
+                    }
+
                     const colType = getSqlColumnType(propName, prop, collection, collections);
                     let colDef = `  "${colName}" ${colType}`;
 
@@ -478,6 +685,40 @@ export const generatePostgresDdl = async (
                 }
             });
 
+            // ── Auth columns the collection file never mentions ──────────────
+            // `db push` is declarative: Atlas diffs the database against exactly
+            // what is emitted here and drops anything else. The scaffold's users
+            // collection describes 12 columns while auth needs 14, so
+            // `is_anonymous` and `tokens_valid_after` — created at boot by
+            // `ensureAuthTablesExist` — read as unmanaged drift, and a push run
+            // after the server had started once planned to DROP them. The
+            // destructive gate catches it, which makes it a data-loss prompt on
+            // the auth table rather than silent damage; either way the desired
+            // state was wrong. Emit the full contract so the two agree.
+            if (isAuthCollection(collection)) {
+                const declared = new Set(
+                    Object.entries(collection.properties ?? {})
+                        .map(([name, prop]) => resolveColumnName(name, prop))
+                );
+                for (const spec of AUTH_USERS_COLUMNS) {
+                    if (declared.has(spec.column)) continue;
+                    columns.push(`  "${spec.column}" ${authUsersColumnSql(spec)}`);
+                }
+            }
+
+            // ── The opt-in search column ─────────────────────────────────────
+            // Last, so it reads as what it is: derived from the columns above
+            // it. Postgres recomputes it on every write of a source column and
+            // rejects any attempt to write it directly, which is the property
+            // that makes it impossible for the index to drift from the row.
+            const searchSpec = options.includeSearch === false ? undefined : buildSearchColumnSpec(collection);
+            if (searchSpec) {
+                columns.push(`  ${searchColumnDefinition(searchSpec)}`);
+                const fuzzyDef = fuzzyColumnDefinition(searchSpec);
+                if (fuzzyDef) columns.push(`  ${fuzzyDef}`);
+                indexStatements.push(...searchIndexStatements(searchSpec));
+            }
+
             // Backwards compatibility: add default id primary key if missing
             const hasPk = columns.some(c => c.includes("PRIMARY KEY"));
             if (!hasPk) {
@@ -511,6 +752,11 @@ export const generatePostgresDdl = async (
         ddl += fkStatements.join("\n") + "\n\n";
     }
 
+    if (indexStatements.length > 0) {
+        ddl += "-- Indexes\n";
+        ddl += indexStatements.join("\n") + "\n\n";
+    }
+
     if (policyStatements.length > 0) {
         ddl += "-- Row Level Security Policies\n";
         ddl += policyStatements.join("");
@@ -577,10 +823,31 @@ const schemaOfCollection = (collection: CollectionConfig): string =>
 
 const bareTableName = (name: string): string => (name.includes(".") ? name.split(".").pop()! : name);
 
+/**
+ * Truncate a derived identifier the way Postgres does: to 63 bytes, silently.
+ *
+ * This is not cosmetic, and not really a naming choice at all — it is agreeing
+ * with the name the database ALREADY stored. `ADD CONSTRAINT` on a longer name
+ * succeeds and records the truncated form, so the untruncated name this used to
+ * derive matched nothing in the catalogue. Boot-ensure compares its planned
+ * constraints against `readExistingSchema`, which reads catalogue names, so the
+ * comparison could never hit: every boot re-issued `ADD CONSTRAINT` for the same
+ * constraint, forever, and got "already exists" every time. Non-fatal (foreign
+ * keys are the one action allowed to fail) and therefore permanent — an error in
+ * the log on every restart of a project whose table and column names happened to
+ * be long.
+ *
+ * Byte length, not string length: NAMEDATALEN is 64 bytes, and a multi-byte
+ * character straddling the boundary would be cut mid-sequence by `slice(0, 63)`.
+ */
+// Moved to `@rebasepro/utils` so the search-column builder derives index names
+// under the same 63-byte rule this file derives constraint names under. Two
+// copies of a truncation rule is two rules the moment one of them is edited.
+
 const foreignKeyPlan = (
     args: Omit<ForeignKeyPlan, "constraintName" | "sql"> & { onDelete: string; onUpdate?: string }
 ): ForeignKeyPlan => {
-    const constraintName = `${args.table}_${args.column}_fkey`;
+    const constraintName = toPostgresIdentifier(`${args.table}_${args.column}_fkey`);
     const onUpdate = args.onUpdate ? ` ON UPDATE ${args.onUpdate.toUpperCase()}` : "";
     return {
         constraintName,

package/src/schema/generate-postgres-ddl.ts

@@ -3,15 +3,20 @@ import * as fs from "fs";
 import path from "path";
 import { pathToFileURL } from "url";
 import chokidar from "chokidar";
-import { generatePostgresDdl, generatePostgresPoliciesDdl } from "./generate-postgres-ddl-logic";
+import {
+    generatePostgresDdl,
+    generatePostgresPoliciesDdl,
+    generatePostgresSearchDdl
+} from "./generate-postgres-ddl-logic";
 import { CollectionConfig } from "@rebasepro/types";
-import { logger, loadCollectionsFromDirectory } from "@rebasepro/server";
+import { loadCollectionsFromDirectory } from "@rebasepro/server";
+import { out, outError } from "../cli-output";
 
 
 const runGeneration = async (collectionsFilePath?: string, outputPath?: string) => {
     try {
         if (!collectionsFilePath) {
-            logger.error("Error: No collections file path provided. Skipping schema generation.");
+            outError("Error: No collections file path provided. Skipping schema generation.");
             return;
         }
 
@@ -29,27 +34,46 @@ const runGeneration = async (collectionsFilePath?: string, outputPath?: string)
         // Sort collections by slug alphabetically to ensure deterministic DDL generation
         collections.sort((a, b) => a.slug.localeCompare(b.slug));
 
-        const ddlContent = await generatePostgresDdl(collections, { includePolicies: false });
+        // `schema.sql` is Atlas's desired state, and it carries neither the RLS
+        // policies nor the search apparatus: Atlas manages neither, and in the
+        // search case cannot. Both are written beside it and applied by the CLI
+        // in their own right.
+        const ddlContent = await generatePostgresDdl(collections, {
+            includePolicies: false,
+            includeSearch: false
+        });
         const policiesContent = generatePostgresPoliciesDdl(collections);
+        const searchContent = generatePostgresSearchDdl(collections);
 
         if (outputPath) {
             const outputDir = path.dirname(outputPath);
             await fsPromises.mkdir(outputDir, { recursive: true });
             await fsPromises.writeFile(outputPath, ddlContent);
-            logger.info(`✅ PostgreSQL DDL generated successfully at ${outputPath}`);
+            out(`✅ PostgreSQL DDL generated successfully at ${outputPath}`);
 
             const policiesPath = path.join(outputDir, "policies.sql");
             await fsPromises.writeFile(policiesPath, policiesContent);
-            logger.info(`✅ PostgreSQL Policies DDL generated successfully at ${policiesPath}`);
+            out(`✅ PostgreSQL Policies DDL generated successfully at ${policiesPath}`);
+
+            // Removed when the last `search` block goes: the CLI applies this
+            // file whenever it exists, and a stale one would keep re-creating
+            // functions for collections that no longer want them.
+            const searchPath = path.join(outputDir, "search.sql");
+            if (searchContent) {
+                await fsPromises.writeFile(searchPath, searchContent);
+                out(`✅ PostgreSQL search DDL generated successfully at ${searchPath}`);
+            } else if (fs.existsSync(searchPath)) {
+                await fsPromises.rm(searchPath);
+            }
         } else {
-            logger.info("✅ PostgreSQL DDL generated successfully.");
-            logger.info(String(ddlContent));
-            logger.info("\n✅ PostgreSQL Policies DDL generated successfully.");
-            logger.info(String(policiesContent));
+            out("✅ PostgreSQL DDL generated successfully.");
+            out(String(ddlContent));
+            out("\n✅ PostgreSQL Policies DDL generated successfully.");
+            out(String(policiesContent));
         }
 
     } catch (error) {
-        logger.error("Error generating DDL schema", { error: error });
+        outError(`Error generating DDL schema: ${error instanceof Error ? (error.stack ?? error.message) : String(error)}`);
     }
 };
 
@@ -63,7 +87,7 @@ const main = () => {
     const watch = process.argv.includes("--watch");
 
     if (!collectionsFilePath) {
-        logger.info("Usage: ts-node generate-postgres-ddl.ts <path-to-collections-file> [--output <path-to-output-file>] [--watch]");
+        out("Usage: ts-node generate-postgres-ddl.ts <path-to-collections-file> [--output <path-to-output-file>] [--watch]");
         return;
     }
 
@@ -71,14 +95,14 @@ const main = () => {
     const resolvedOutputPath = outputPath ? path.resolve(process.cwd(), outputPath) : undefined;
 
     if (watch) {
-        logger.info(`Watching for changes in ${resolvedPath}...`);
+        out(`Watching for changes in ${resolvedPath}...`);
         const watcher = chokidar.watch(resolvedPath, {
             persistent: true,
             ignoreInitial: false
         });
 
         watcher.on("all", (event, filePath) => {
-            logger.info(`[${event}] ${filePath}. Regenerating DDL schema...`);
+            out(`[${event}] ${filePath}. Regenerating DDL schema...`);
             runGeneration(resolvedPath, resolvedOutputPath);
         });
     } else {

package/src/schema/generated-schema-staleness.ts

@@ -1,5 +1,5 @@
 import { CollectionConfig } from "@rebasepro/types";
-import { getTableName, resolveCollectionRelations } from "@rebasepro/common";
+import { getTableName, resolveCollectionRelations, relationalCollections } from "@rebasepro/common";
 import { generateForeignKeyName, legacyForeignKeyName } from "@rebasepro/utils";
 
 /**
@@ -60,11 +60,13 @@ function tableBlock(source: string, table: string): string {
  * clear the finding and the check would be permanently red.
  */
 function declaresColumn(block: string, column: string): boolean {
-    // `categorie_id: integer("categorie_id")` — the Drizzle column shape. The key
-    // and the string argument agree in generated output, so requiring both is
-    // both precise and cheap.
-    const key = column.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    return new RegExp(`(^|[\\s,{])${key}\\s*:\\s*\\w+\\(\\s*["']${key}["']`, "m").test(block);
+    // `categorieId: integer("categorie_id")` — the Drizzle column shape. Only
+    // the string argument is the column; the key beside it is the *wire* name
+    // and no longer agrees with it (`authorId: integer("author_id")`). Matching
+    // both, as this did, made every camelCased key look like a column the
+    // generated file did not declare.
+    const literal = column.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    return new RegExp(`(^|[\\s,{])[\\w$"']+\\s*:\\s*\\w+\\(\\s*["']${literal}["']`, "m").test(block);
 }
 
 /**
@@ -111,7 +113,12 @@ export function findLegacyForeignKeyNames(
         found.push({ table, legacy, current, relation });
     };
 
-    for (const collection of collections) {
+    // Same rule as the generator whose output this reads: a collection that
+    // gets no table cannot have named a column in it. Inert in practice today —
+    // the finding also requires the generated file to declare the table — but
+    // the guard is what keeps that true when a non-SQL collection's slug happens
+    // to match a SQL one's table.
+    for (const collection of relationalCollections(collections)) {
         const sourceTable = getTableName(collection);
 
         for (const [name, relation] of Object.entries(resolveCollectionRelations(collection))) {

package/src/schema/introspect-db-inference.ts

@@ -15,7 +15,14 @@ export function inferPropertyFromData(
     pgDataType: string,
     currentPropType: string,
     sampleValues: unknown[],
-    isPk: boolean
+    isPk: boolean,
+    /**
+     * False when generating for a project without `@rebasepro/admin-types`, where
+     * `BaseProperty` declares no `admin` field and the block below would not
+     * compile. The type-level inferences (`propType`, `url`, `storage`) are
+     * unaffected — only the form-widget hints are dropped.
+     */
+    emitAdmin = true
 ): InferenceResult {
     const result: InferenceResult = {};
     const extraLines: string[] = [];
@@ -239,7 +246,7 @@ export function inferPropertyFromData(
         }
     }
 
-    if (adminOptions.length > 0) {
+    if (emitAdmin && adminOptions.length > 0) {
         extraLines.push(`            admin: {\n${adminOptions.map((o) => `                ${o}`).join(",\n")}\n            }`);
     }