@magnet-cms/adapter-db-drizzle 1.0.2 → 2.0.0

package/dist/index.cjs

@@ -3,13 +3,13 @@
 require('reflect-metadata');
 var common = require('@magnet-cms/common');
 var common$1 = require('@nestjs/common');
+var crypto = require('crypto');
 var utils = require('@magnet-cms/utils');
 var drizzleOrm = require('drizzle-orm');
 var pgCore = require('drizzle-orm/pg-core');
 var nodePostgres = require('drizzle-orm/node-postgres');
 var promises = require('fs/promises');
 var path = require('path');
-var crypto = require('crypto');
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -10997,8 +10997,11 @@ function generateSchema(schemaClass) {
   });
   const columns = {
     // Primary key - always UUID
-    // Type assertion needed due to drizzle-orm type system seeing SQL types as incompatible
-    id: pgCore.uuid("id").primaryKey().default(drizzleOrm.sql`gen_random_uuid()`)
+    // $defaultFn generates UUIDs in JS (works on all dialects: PostgreSQL, MySQL, SQLite)
+    // Note: SQL .default(gen_random_uuid()) is intentionally omitted because it conflicts
+    // with $defaultFn when using pg-core types on non-PostgreSQL drivers.
+    // The createTableFromConfig() method adds dialect-appropriate SQL DEFAULT for direct inserts.
+    id: pgCore.uuid("id").primaryKey().$defaultFn(() => crypto.randomUUID())
   };
   if (hasI18n || hasVersioning || hasIntlProps) {
     const docOptions = {
@@ -11014,8 +11017,8 @@ function generateSchema(schemaClass) {
       columns[columnName] = column;
     }
   });
-  columns.createdAt = pgCore.timestamp("created_at").defaultNow().notNull();
-  columns.updatedAt = pgCore.timestamp("updated_at").defaultNow().notNull();
+  columns.createdAt = pgCore.timestamp("created_at").notNull();
+  columns.updatedAt = pgCore.timestamp("updated_at").notNull();
   const table = pgCore.pgTable(tableName, columns, (table2) => {
     const tableIndexes = {};
     const t = table2;
@@ -11065,7 +11068,9 @@ function generateColumn(columnName, options) {
     column = pgCore.text(snakeCaseName);
   }
   if (options.default !== void 0) {
-    column = column.default(options.default);
+    if (Array.isArray(options.default) && options.default.length === 0) ; else {
+      column = column.default(options.default);
+    }
   }
   return column;
 }
@@ -11089,8 +11094,8 @@ async function createNeonConnection(config) {
   } catch {
     throw new Error("@neondatabase/serverless is required for Neon driver. Install it with: bun add @neondatabase/serverless");
   }
-  const sql5 = neon.neon(config.connectionString);
-  const db = drizzleNeon.drizzle(sql5, {
+  const sql4 = neon.neon(config.connectionString);
+  const db = drizzleNeon.drizzle(sql4, {
     logger: config.debug
   });
   return {
@@ -11558,6 +11563,11 @@ var DrizzleQueryBuilder = class extends common.QueryBuilder {
 };
 
 // src/drizzle.model.ts
+function isSQLiteDriver(db) {
+  const d = db;
+  return typeof d.run === "function" && typeof d.execute !== "function";
+}
+__name(isSQLiteDriver, "isSQLiteDriver");
 function createModel(db, table, schemaClass) {
   return class DrizzleModelAdapter extends common.Model {
     static {
@@ -11621,8 +11631,9 @@ function createModel(db, table, schemaClass) {
         const insertData = {
           ...this._prepareData(data, true)
         };
+        this._applyDeclaredEmptyArrayDefaults(insertData);
         if ("documentId" in dynamicTable) {
-          insertData.documentId = insertData.documentId || drizzleOrm.sql`gen_random_uuid()`;
+          insertData.documentId = insertData.documentId || crypto.randomUUID();
           insertData.locale = insertData.locale || this.currentLocale || DEFAULT_LOCALE;
           insertData.status = insertData.status || DOCUMENT_STATUS.DRAFT;
         }
@@ -12009,14 +12020,29 @@ function createModel(db, table, schemaClass) {
     * For JSONB columns (arrays/objects), ensure values are properly formatted
     * @internal
     */
+    /**
+    * Fields declared with `default: []` omit a DB default (cross-dialect migration/runtime).
+    * Fill missing keys so inserts match Mongoose-style expectations.
+    */
+    _applyDeclaredEmptyArrayDefaults(row) {
+      const props = getDrizzlePropsMetadata(this._schemaClass);
+      for (const [propertyKey, options] of props) {
+        const key = String(propertyKey);
+        if (options.default !== void 0 && Array.isArray(options.default) && options.default.length === 0 && row[key] === void 0) {
+          row[key] = isSQLiteDriver(this._db) ? JSON.stringify([]) : [];
+        }
+      }
+    }
     _prepareData(data, isCreate = false) {
       const result = {};
-      if (isCreate && !data.createdAt) {
-        result.createdAt = /* @__PURE__ */ new Date();
+      const isSQLite = isSQLiteDriver(this._db);
+      if (isCreate) {
+        result.createdAt = data.createdAt instanceof Date ? data.createdAt : /* @__PURE__ */ new Date();
       }
+      result.updatedAt = data.updatedAt instanceof Date ? data.updatedAt : /* @__PURE__ */ new Date();
       for (const [key, value] of Object.entries(data)) {
         if (key === "id") continue;
-        if (key === "createdAt") continue;
+        if (key === "createdAt" || key === "updatedAt") continue;
         if (value === void 0) {
           continue;
         }
@@ -12024,6 +12050,10 @@ function createModel(db, table, schemaClass) {
           result[key] = null;
           continue;
         }
+        if (typeof value === "boolean" && isSQLite) {
+          result[key] = value ? 1 : 0;
+          continue;
+        }
         if (value instanceof Date) {
           result[key] = value;
           continue;
@@ -12042,7 +12072,7 @@ function createModel(db, table, schemaClass) {
             result[key] = value;
           }
         } else if (Array.isArray(value)) {
-          result[key] = value;
+          result[key] = isSQLite ? JSON.stringify(value) : value;
         } else if (value !== null && typeof value === "object") {
           result[key] = value;
         } else {
@@ -12102,13 +12132,13 @@ var AutoMigration = class {
       dangerous: diffResult.dangerous,
       warnings: diffResult.warnings,
       async up(db) {
-        for (const sql5 of upSQL) {
+        for (const sql4 of upSQL) {
           try {
-            await db.execute(sql5);
+            await db.execute(sql4);
           } catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
             const code = err && typeof err === "object" && "code" in err ? err.code : void 0;
-            if (code === "42P07" || msg.includes("already exists") || msg.includes("ER_TABLE_EXISTS") || msg.includes("duplicate table name")) {
+            if (code === "42P07" || code === "42710" || msg.includes("already exists") || msg.includes("ER_TABLE_EXISTS") || msg.includes("duplicate table name") || msg.includes("duplicate key value")) {
               logger.warn(`Skipping (object already exists): ${msg.slice(0, 80)}`);
               continue;
             }
@@ -12136,8 +12166,8 @@ var MigrationGenerator = class {
   generate(name, upSQL, downSQL, options = {}) {
     const timestamp3 = Date.now();
     const id = `${timestamp3}_${name}`;
-    const upStatements = upSQL.map((sql5) => `		await db.execute(\`${sql5}\`)`).join("\n");
-    const downStatements = downSQL.length > 0 ? downSQL.map((sql5) => `		await db.execute(\`${sql5}\`)`).join("\n") : "		// TODO: implement down migration";
+    const upStatements = upSQL.map((sql4) => `		await db.execute(\`${sql4}\`)`).join("\n");
+    const downStatements = downSQL.length > 0 ? downSQL.map((sql4) => `		await db.execute(\`${sql4}\`)`).join("\n") : "		// TODO: implement down migration";
     const dangerousField = options.dangerous ? "\n	dangerous: true," : "";
     const warningsField = options.warnings && options.warnings.length > 0 ? `
 	warnings: [
@@ -12484,6 +12514,12 @@ var MigrationRunner = class {
     };
   }
 };
+function sanitizeExecutableMigrationSql(dialect, statement) {
+  if (dialect !== "postgresql") return statement;
+  if (!statement.includes("$")) return statement;
+  return statement.replace(/"locale" = \$1/g, `"locale" = 'en'`).replace(/"status" = \$2/g, `"status" = 'draft'`);
+}
+__name(sanitizeExecutableMigrationSql, "sanitizeExecutableMigrationSql");
 var SNAPSHOT_FILENAME = ".schema_snapshot.json";
 var SchemaBridge = class {
   static {
@@ -12523,7 +12559,8 @@ var SchemaBridge = class {
   */
   async generateSQL(prev, cur, generateSQLFn, dialect = "postgresql") {
     const fn = generateSQLFn ?? await this.resolveGenerateSQLFn(dialect);
-    return fn(prev, cur);
+    const statements = await fn(prev, cur);
+    return statements.map((s) => sanitizeExecutableMigrationSql(dialect, s));
   }
   /**
   * Load a previously saved snapshot from disk.
@@ -12652,9 +12689,9 @@ var SchemaDiff = class {
   */
   detectDangerousOperations(sqlStatements) {
     const warnings = [];
-    for (const sql5 of sqlStatements) {
+    for (const sql4 of sqlStatements) {
       for (const { pattern, message } of DANGEROUS_PATTERNS) {
-        const match = sql5.match(pattern);
+        const match = sql4.match(pattern);
         if (match) {
           warnings.push(message(match[1] ?? match[0]));
         }
@@ -12708,14 +12745,27 @@ exports.DrizzleDatabaseAdapter = class _DrizzleDatabaseAdapter extends common.Da
   options = null;
   schemaRegistry = /* @__PURE__ */ new Map();
   tablesInitialized = false;
+  tablesInitPromise = null;
   /**
   * Automatically create tables for all registered schemas.
   * Called lazily when first model is accessed, or can be called explicitly.
+  * Uses a lock (Promise) to prevent concurrent execution from multiple forFeature() calls.
   */
   async ensureTablesCreated() {
     if (this.tablesInitialized || !this.db || this.schemaRegistry.size === 0) {
       return;
     }
+    if (this.tablesInitPromise) {
+      return this.tablesInitPromise;
+    }
+    this.tablesInitPromise = this._doEnsureTablesCreated();
+    try {
+      await this.tablesInitPromise;
+    } finally {
+      this.tablesInitPromise = null;
+    }
+  }
+  async _doEnsureTablesCreated() {
     await new Promise((resolve) => setTimeout(resolve, 200));
     const drizzleConfig = this.options;
     if (drizzleConfig?.migrations) {
@@ -12734,7 +12784,7 @@ exports.DrizzleDatabaseAdapter = class _DrizzleDatabaseAdapter extends common.Da
       ...config.migrations
     };
     const migrationDb = {
-      execute: /* @__PURE__ */ __name(async (sql5) => this.db.execute(sql5), "execute")
+      execute: /* @__PURE__ */ __name(async (sql4) => this.db.execute(sql4), "execute")
     };
     const bridge = new SchemaBridge();
     const diff = new SchemaDiff(bridge);
@@ -12764,13 +12814,20 @@ ${stack}` : ""}`);
     }
     const drizzleConfig = this.options;
     const dialect = drizzleConfig?.dialect ?? "postgresql";
-    try {
-      for (const [, { table }] of this.schemaRegistry.entries()) {
+    const logger2 = new common$1.Logger("DrizzleAdapter");
+    let hasErrors = false;
+    for (const [name, { table }] of this.schemaRegistry.entries()) {
+      try {
         const config = pgCore.getTableConfig(table);
         await this.createTableFromConfig(config, dialect);
+      } catch (error) {
+        hasErrors = true;
+        const msg = error instanceof Error ? error.message : String(error);
+        logger2.warn(`Error creating table for "${name}" automatically: ${msg}`);
       }
-    } catch (error) {
-      new common$1.Logger("DrizzleAdapter").warn("Error creating tables automatically:", JSON.stringify(error));
+    }
+    if (hasErrors) {
+      logger2.warn("Some tables could not be created. The application may not work correctly.");
     }
   }
   /**
@@ -12827,7 +12884,7 @@ ${stack}` : ""}`);
 				${columns.join(",\n				")}
 			)
 		`);
-    await this.db.execute(createTableSQL);
+    await this.execRawSQL(createTableSQL);
     const indexes = config.indexes;
     if (indexes) {
       for (const index2 of Object.values(indexes)) {
@@ -12846,13 +12903,27 @@ ${stack}` : ""}`);
 						CREATE ${uniqueKeyword} INDEX IF NOT EXISTS ${q(indexName)}
 						ON ${q(tableName)} (${columnsStr})
 					`);
-          await this.db.execute(createIndexSQL).catch(() => {
+          await this.execRawSQL(createIndexSQL).catch(() => {
           });
         }
       }
     }
   }
   /**
+  * Execute raw SQL across all supported dialects.
+  * PostgreSQL/MySQL use db.execute(), SQLite uses db.run().
+  */
+  async execRawSQL(rawSQL) {
+    const db = this.db;
+    if (typeof db.execute === "function") {
+      await db.execute(rawSQL);
+    } else if (typeof db.run === "function") {
+      db.run(rawSQL);
+    } else {
+      throw new Error("Database instance has no execute() or run() method");
+    }
+  }
+  /**
   * Map PostgreSQL SQL types to dialect-specific types.
   */
   mapSQLTypeForDialect(pgType, dialect) {
@@ -13562,4 +13633,5 @@ exports.getOrGenerateSchema = getOrGenerateSchema;
 exports.getRegisteredSchemas = getRegisteredSchemas;
 exports.isDraft = isDraft;
 exports.isPublished = isPublished;
+exports.sanitizeExecutableMigrationSql = sanitizeExecutableMigrationSql;
 exports.sqlGenerators = sql_generators_exports;

package/dist/index.d.cts

@@ -433,11 +433,14 @@ declare class DrizzleDatabaseAdapter extends DatabaseAdapter {
     private options;
     private schemaRegistry;
     private tablesInitialized;
+    private tablesInitPromise;
     /**
      * Automatically create tables for all registered schemas.
      * Called lazily when first model is accessed, or can be called explicitly.
+     * Uses a lock (Promise) to prevent concurrent execution from multiple forFeature() calls.
      */
     ensureTablesCreated(): Promise<void>;
+    private _doEnsureTablesCreated;
     /**
      * Run the auto-migration system when `config.migrations` is configured.
      */
@@ -455,6 +458,11 @@ declare class DrizzleDatabaseAdapter extends DatabaseAdapter {
      * Generate and execute CREATE TABLE IF NOT EXISTS statement from table config.
      */
     private createTableFromConfig;
+    /**
+     * Execute raw SQL across all supported dialects.
+     * PostgreSQL/MySQL use db.execute(), SQLite uses db.run().
+     */
+    private execRawSQL;
     /**
      * Map PostgreSQL SQL types to dialect-specific types.
      */
@@ -763,6 +771,11 @@ declare class MigrationRunner {
     }>;
 }
 
+/**
+ * drizzle-kit emits partial unique-index WHERE clauses with `$1`/`$2` placeholders,
+ * but Magnet runs DDL as plain strings without bound parameters.
+ */
+declare function sanitizeExecutableMigrationSql(dialect: MigrationDialect, statement: string): string;
 /**
  * Default filename for persisted schema snapshot (used by auto-migration).
  */
@@ -1056,4 +1069,4 @@ declare class AutoMigration {
     run(dialect: MigrationDialect, config: MigrationConfig, directory: string): Promise<void>;
 }
 
-export { Adapter, AutoMigration, type ColumnChange, DEFAULT_LOCALE, DEFAULT_MIGRATION_CONFIG, DOCUMENT_STATUS, DRIZZLE_CONFIG, DRIZZLE_DB, type DiffResult, type DocumentColumnOptions, type DocumentStatus, type DrizzleConfig, type DrizzleDB, DrizzleDatabaseAdapter, type DrizzleModuleOptions, DrizzleQueryBuilder, type GenerateJsonFn, type GenerateSQLFn, type GeneratedSchema, type IndexChange, InjectModel, LazyQueryBuilder, type Migration, MigrationChecksumError, type MigrationConfig, type MigrationDb, type MigrationDialect, MigrationError, type MigrationGenerateOptions, MigrationGenerator, MigrationHistory, type MigrationHistoryRecord, MigrationLock, MigrationLockError, type MigrationMode, type MigrationResult, MigrationRunner, Prop, type PropMetadata, SNAPSHOT_FILENAME, Schema, SchemaBridge, SchemaDiff, type SchemaDiffResult, type SchemaMetadata, type SnapshotJSON, type TableDefinition, applyDocumentColumns, clearSchemaRegistry, createNeonConnection, createNeonWebSocketConnection, generateSchema, getDrizzleModelToken, getDrizzlePropsMetadata, getDrizzleSchemaMetadata, getOrGenerateSchema, getRegisteredSchemas, isDraft, isPublished, index as sqlGenerators };
+export { Adapter, AutoMigration, type ColumnChange, DEFAULT_LOCALE, DEFAULT_MIGRATION_CONFIG, DOCUMENT_STATUS, DRIZZLE_CONFIG, DRIZZLE_DB, type DiffResult, type DocumentColumnOptions, type DocumentStatus, type DrizzleConfig, type DrizzleDB, DrizzleDatabaseAdapter, type DrizzleModuleOptions, DrizzleQueryBuilder, type GenerateJsonFn, type GenerateSQLFn, type GeneratedSchema, type IndexChange, InjectModel, LazyQueryBuilder, type Migration, MigrationChecksumError, type MigrationConfig, type MigrationDb, type MigrationDialect, MigrationError, type MigrationGenerateOptions, MigrationGenerator, MigrationHistory, type MigrationHistoryRecord, MigrationLock, MigrationLockError, type MigrationMode, type MigrationResult, MigrationRunner, Prop, type PropMetadata, SNAPSHOT_FILENAME, Schema, SchemaBridge, SchemaDiff, type SchemaDiffResult, type SchemaMetadata, type SnapshotJSON, type TableDefinition, applyDocumentColumns, clearSchemaRegistry, createNeonConnection, createNeonWebSocketConnection, generateSchema, getDrizzleModelToken, getDrizzlePropsMetadata, getDrizzleSchemaMetadata, getOrGenerateSchema, getRegisteredSchemas, isDraft, isPublished, sanitizeExecutableMigrationSql, index as sqlGenerators };

package/dist/index.d.ts

@@ -433,11 +433,14 @@ declare class DrizzleDatabaseAdapter extends DatabaseAdapter {
     private options;
     private schemaRegistry;
     private tablesInitialized;
+    private tablesInitPromise;
     /**
      * Automatically create tables for all registered schemas.
      * Called lazily when first model is accessed, or can be called explicitly.
+     * Uses a lock (Promise) to prevent concurrent execution from multiple forFeature() calls.
      */
     ensureTablesCreated(): Promise<void>;
+    private _doEnsureTablesCreated;
     /**
      * Run the auto-migration system when `config.migrations` is configured.
      */
@@ -455,6 +458,11 @@ declare class DrizzleDatabaseAdapter extends DatabaseAdapter {
      * Generate and execute CREATE TABLE IF NOT EXISTS statement from table config.
      */
     private createTableFromConfig;
+    /**
+     * Execute raw SQL across all supported dialects.
+     * PostgreSQL/MySQL use db.execute(), SQLite uses db.run().
+     */
+    private execRawSQL;
     /**
      * Map PostgreSQL SQL types to dialect-specific types.
      */
@@ -763,6 +771,11 @@ declare class MigrationRunner {
     }>;
 }
 
+/**
+ * drizzle-kit emits partial unique-index WHERE clauses with `$1`/`$2` placeholders,
+ * but Magnet runs DDL as plain strings without bound parameters.
+ */
+declare function sanitizeExecutableMigrationSql(dialect: MigrationDialect, statement: string): string;
 /**
  * Default filename for persisted schema snapshot (used by auto-migration).
  */
@@ -1056,4 +1069,4 @@ declare class AutoMigration {
     run(dialect: MigrationDialect, config: MigrationConfig, directory: string): Promise<void>;
 }
 
-export { Adapter, AutoMigration, type ColumnChange, DEFAULT_LOCALE, DEFAULT_MIGRATION_CONFIG, DOCUMENT_STATUS, DRIZZLE_CONFIG, DRIZZLE_DB, type DiffResult, type DocumentColumnOptions, type DocumentStatus, type DrizzleConfig, type DrizzleDB, DrizzleDatabaseAdapter, type DrizzleModuleOptions, DrizzleQueryBuilder, type GenerateJsonFn, type GenerateSQLFn, type GeneratedSchema, type IndexChange, InjectModel, LazyQueryBuilder, type Migration, MigrationChecksumError, type MigrationConfig, type MigrationDb, type MigrationDialect, MigrationError, type MigrationGenerateOptions, MigrationGenerator, MigrationHistory, type MigrationHistoryRecord, MigrationLock, MigrationLockError, type MigrationMode, type MigrationResult, MigrationRunner, Prop, type PropMetadata, SNAPSHOT_FILENAME, Schema, SchemaBridge, SchemaDiff, type SchemaDiffResult, type SchemaMetadata, type SnapshotJSON, type TableDefinition, applyDocumentColumns, clearSchemaRegistry, createNeonConnection, createNeonWebSocketConnection, generateSchema, getDrizzleModelToken, getDrizzlePropsMetadata, getDrizzleSchemaMetadata, getOrGenerateSchema, getRegisteredSchemas, isDraft, isPublished, index as sqlGenerators };
+export { Adapter, AutoMigration, type ColumnChange, DEFAULT_LOCALE, DEFAULT_MIGRATION_CONFIG, DOCUMENT_STATUS, DRIZZLE_CONFIG, DRIZZLE_DB, type DiffResult, type DocumentColumnOptions, type DocumentStatus, type DrizzleConfig, type DrizzleDB, DrizzleDatabaseAdapter, type DrizzleModuleOptions, DrizzleQueryBuilder, type GenerateJsonFn, type GenerateSQLFn, type GeneratedSchema, type IndexChange, InjectModel, LazyQueryBuilder, type Migration, MigrationChecksumError, type MigrationConfig, type MigrationDb, type MigrationDialect, MigrationError, type MigrationGenerateOptions, MigrationGenerator, MigrationHistory, type MigrationHistoryRecord, MigrationLock, MigrationLockError, type MigrationMode, type MigrationResult, MigrationRunner, Prop, type PropMetadata, SNAPSHOT_FILENAME, Schema, SchemaBridge, SchemaDiff, type SchemaDiffResult, type SchemaMetadata, type SnapshotJSON, type TableDefinition, applyDocumentColumns, clearSchemaRegistry, createNeonConnection, createNeonWebSocketConnection, generateSchema, getDrizzleModelToken, getDrizzlePropsMetadata, getDrizzleSchemaMetadata, getOrGenerateSchema, getRegisteredSchemas, isDraft, isPublished, sanitizeExecutableMigrationSql, index as sqlGenerators };

package/dist/index.js

@@ -2,13 +2,13 @@ import { __commonJS, __name, __require, __toESM, __export } from './chunk-AAIPPT
 import 'reflect-metadata';
 import { QueryBuilder, DatabaseAdapter, getModelToken, setDatabaseAdapter, getSchemaOptions, Model, DatabaseError, fromDrizzleError, DocumentNotFoundError } from '@magnet-cms/common';
 import { Logger, Module, Injectable, Inject } from '@nestjs/common';
+import { createHash, randomUUID } from 'node:crypto';
 import { toSnakeCase, toCamelCase, pluralize } from '@magnet-cms/utils';
 import { and, or, eq, desc, asc, sql, isNotNull, isNull, ilike, like, notInArray, inArray, lte, lt, gte, gt, ne } from 'drizzle-orm';
 import { getTableConfig, varchar, timestamp, uuid, pgTable, uniqueIndex, index, text, doublePrecision, boolean, jsonb } from 'drizzle-orm/pg-core';
 import { drizzle } from 'drizzle-orm/node-postgres';
 import { readdir, mkdir, writeFile, readFile } from 'node:fs/promises';
 import { join } from 'node:path';
-import { createHash } from 'node:crypto';
 
 // ../../../node_modules/postgres-array/index.js
 var require_postgres_array = __commonJS({
@@ -5346,8 +5346,11 @@ function generateSchema(schemaClass) {
   });
   const columns = {
     // Primary key - always UUID
-    // Type assertion needed due to drizzle-orm type system seeing SQL types as incompatible
-    id: uuid("id").primaryKey().default(sql`gen_random_uuid()`)
+    // $defaultFn generates UUIDs in JS (works on all dialects: PostgreSQL, MySQL, SQLite)
+    // Note: SQL .default(gen_random_uuid()) is intentionally omitted because it conflicts
+    // with $defaultFn when using pg-core types on non-PostgreSQL drivers.
+    // The createTableFromConfig() method adds dialect-appropriate SQL DEFAULT for direct inserts.
+    id: uuid("id").primaryKey().$defaultFn(() => randomUUID())
   };
   if (hasI18n || hasVersioning || hasIntlProps) {
     const docOptions = {
@@ -5363,8 +5366,8 @@ function generateSchema(schemaClass) {
       columns[columnName] = column;
     }
   });
-  columns.createdAt = timestamp("created_at").defaultNow().notNull();
-  columns.updatedAt = timestamp("updated_at").defaultNow().notNull();
+  columns.createdAt = timestamp("created_at").notNull();
+  columns.updatedAt = timestamp("updated_at").notNull();
   const table = pgTable(tableName, columns, (table2) => {
     const tableIndexes = {};
     const t = table2;
@@ -5414,7 +5417,9 @@ function generateColumn(columnName, options) {
     column = text(snakeCaseName);
   }
   if (options.default !== void 0) {
-    column = column.default(options.default);
+    if (Array.isArray(options.default) && options.default.length === 0) ; else {
+      column = column.default(options.default);
+    }
   }
   return column;
 }
@@ -5438,8 +5443,8 @@ async function createNeonConnection(config) {
   } catch {
     throw new Error("@neondatabase/serverless is required for Neon driver. Install it with: bun add @neondatabase/serverless");
   }
-  const sql5 = neon.neon(config.connectionString);
-  const db = drizzleNeon.drizzle(sql5, {
+  const sql4 = neon.neon(config.connectionString);
+  const db = drizzleNeon.drizzle(sql4, {
     logger: config.debug
   });
   return {
@@ -5907,6 +5912,11 @@ var DrizzleQueryBuilder = class extends QueryBuilder {
 };
 
 // src/drizzle.model.ts
+function isSQLiteDriver(db) {
+  const d = db;
+  return typeof d.run === "function" && typeof d.execute !== "function";
+}
+__name(isSQLiteDriver, "isSQLiteDriver");
 function createModel(db, table, schemaClass) {
   return class DrizzleModelAdapter extends Model {
     static {
@@ -5970,8 +5980,9 @@ function createModel(db, table, schemaClass) {
         const insertData = {
           ...this._prepareData(data, true)
         };
+        this._applyDeclaredEmptyArrayDefaults(insertData);
         if ("documentId" in dynamicTable) {
-          insertData.documentId = insertData.documentId || sql`gen_random_uuid()`;
+          insertData.documentId = insertData.documentId || randomUUID();
           insertData.locale = insertData.locale || this.currentLocale || DEFAULT_LOCALE;
           insertData.status = insertData.status || DOCUMENT_STATUS.DRAFT;
         }
@@ -6358,14 +6369,29 @@ function createModel(db, table, schemaClass) {
     * For JSONB columns (arrays/objects), ensure values are properly formatted
     * @internal
     */
+    /**
+    * Fields declared with `default: []` omit a DB default (cross-dialect migration/runtime).
+    * Fill missing keys so inserts match Mongoose-style expectations.
+    */
+    _applyDeclaredEmptyArrayDefaults(row) {
+      const props = getDrizzlePropsMetadata(this._schemaClass);
+      for (const [propertyKey, options] of props) {
+        const key = String(propertyKey);
+        if (options.default !== void 0 && Array.isArray(options.default) && options.default.length === 0 && row[key] === void 0) {
+          row[key] = isSQLiteDriver(this._db) ? JSON.stringify([]) : [];
+        }
+      }
+    }
     _prepareData(data, isCreate = false) {
       const result = {};
-      if (isCreate && !data.createdAt) {
-        result.createdAt = /* @__PURE__ */ new Date();
+      const isSQLite = isSQLiteDriver(this._db);
+      if (isCreate) {
+        result.createdAt = data.createdAt instanceof Date ? data.createdAt : /* @__PURE__ */ new Date();
       }
+      result.updatedAt = data.updatedAt instanceof Date ? data.updatedAt : /* @__PURE__ */ new Date();
       for (const [key, value] of Object.entries(data)) {
         if (key === "id") continue;
-        if (key === "createdAt") continue;
+        if (key === "createdAt" || key === "updatedAt") continue;
         if (value === void 0) {
           continue;
         }
@@ -6373,6 +6399,10 @@ function createModel(db, table, schemaClass) {
           result[key] = null;
           continue;
         }
+        if (typeof value === "boolean" && isSQLite) {
+          result[key] = value ? 1 : 0;
+          continue;
+        }
         if (value instanceof Date) {
           result[key] = value;
           continue;
@@ -6391,7 +6421,7 @@ function createModel(db, table, schemaClass) {
             result[key] = value;
           }
         } else if (Array.isArray(value)) {
-          result[key] = value;
+          result[key] = isSQLite ? JSON.stringify(value) : value;
         } else if (value !== null && typeof value === "object") {
           result[key] = value;
         } else {
@@ -6451,13 +6481,13 @@ var AutoMigration = class {
       dangerous: diffResult.dangerous,
       warnings: diffResult.warnings,
       async up(db) {
-        for (const sql5 of upSQL) {
+        for (const sql4 of upSQL) {
           try {
-            await db.execute(sql5);
+            await db.execute(sql4);
           } catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
             const code = err && typeof err === "object" && "code" in err ? err.code : void 0;
-            if (code === "42P07" || msg.includes("already exists") || msg.includes("ER_TABLE_EXISTS") || msg.includes("duplicate table name")) {
+            if (code === "42P07" || code === "42710" || msg.includes("already exists") || msg.includes("ER_TABLE_EXISTS") || msg.includes("duplicate table name") || msg.includes("duplicate key value")) {
               logger.warn(`Skipping (object already exists): ${msg.slice(0, 80)}`);
               continue;
             }
@@ -6485,8 +6515,8 @@ var MigrationGenerator = class {
   generate(name, upSQL, downSQL, options = {}) {
     const timestamp3 = Date.now();
     const id = `${timestamp3}_${name}`;
-    const upStatements = upSQL.map((sql5) => `		await db.execute(\`${sql5}\`)`).join("\n");
-    const downStatements = downSQL.length > 0 ? downSQL.map((sql5) => `		await db.execute(\`${sql5}\`)`).join("\n") : "		// TODO: implement down migration";
+    const upStatements = upSQL.map((sql4) => `		await db.execute(\`${sql4}\`)`).join("\n");
+    const downStatements = downSQL.length > 0 ? downSQL.map((sql4) => `		await db.execute(\`${sql4}\`)`).join("\n") : "		// TODO: implement down migration";
     const dangerousField = options.dangerous ? "\n	dangerous: true," : "";
     const warningsField = options.warnings && options.warnings.length > 0 ? `
 	warnings: [
@@ -6833,6 +6863,12 @@ var MigrationRunner = class {
     };
   }
 };
+function sanitizeExecutableMigrationSql(dialect, statement) {
+  if (dialect !== "postgresql") return statement;
+  if (!statement.includes("$")) return statement;
+  return statement.replace(/"locale" = \$1/g, `"locale" = 'en'`).replace(/"status" = \$2/g, `"status" = 'draft'`);
+}
+__name(sanitizeExecutableMigrationSql, "sanitizeExecutableMigrationSql");
 var SNAPSHOT_FILENAME = ".schema_snapshot.json";
 var SchemaBridge = class {
   static {
@@ -6872,7 +6908,8 @@ var SchemaBridge = class {
   */
   async generateSQL(prev, cur, generateSQLFn, dialect = "postgresql") {
     const fn = generateSQLFn ?? await this.resolveGenerateSQLFn(dialect);
-    return fn(prev, cur);
+    const statements = await fn(prev, cur);
+    return statements.map((s) => sanitizeExecutableMigrationSql(dialect, s));
   }
   /**
   * Load a previously saved snapshot from disk.
@@ -7001,9 +7038,9 @@ var SchemaDiff = class {
   */
   detectDangerousOperations(sqlStatements) {
     const warnings = [];
-    for (const sql5 of sqlStatements) {
+    for (const sql4 of sqlStatements) {
       for (const { pattern, message } of DANGEROUS_PATTERNS) {
-        const match = sql5.match(pattern);
+        const match = sql4.match(pattern);
         if (match) {
           warnings.push(message(match[1] ?? match[0]));
         }
@@ -7057,14 +7094,27 @@ var DrizzleDatabaseAdapter = class _DrizzleDatabaseAdapter extends DatabaseAdapt
   options = null;
   schemaRegistry = /* @__PURE__ */ new Map();
   tablesInitialized = false;
+  tablesInitPromise = null;
   /**
   * Automatically create tables for all registered schemas.
   * Called lazily when first model is accessed, or can be called explicitly.
+  * Uses a lock (Promise) to prevent concurrent execution from multiple forFeature() calls.
   */
   async ensureTablesCreated() {
     if (this.tablesInitialized || !this.db || this.schemaRegistry.size === 0) {
       return;
     }
+    if (this.tablesInitPromise) {
+      return this.tablesInitPromise;
+    }
+    this.tablesInitPromise = this._doEnsureTablesCreated();
+    try {
+      await this.tablesInitPromise;
+    } finally {
+      this.tablesInitPromise = null;
+    }
+  }
+  async _doEnsureTablesCreated() {
     await new Promise((resolve) => setTimeout(resolve, 200));
     const drizzleConfig = this.options;
     if (drizzleConfig?.migrations) {
@@ -7083,7 +7133,7 @@ var DrizzleDatabaseAdapter = class _DrizzleDatabaseAdapter extends DatabaseAdapt
       ...config.migrations
     };
     const migrationDb = {
-      execute: /* @__PURE__ */ __name(async (sql5) => this.db.execute(sql5), "execute")
+      execute: /* @__PURE__ */ __name(async (sql4) => this.db.execute(sql4), "execute")
     };
     const bridge = new SchemaBridge();
     const diff = new SchemaDiff(bridge);
@@ -7113,13 +7163,20 @@ ${stack}` : ""}`);
     }
     const drizzleConfig = this.options;
     const dialect = drizzleConfig?.dialect ?? "postgresql";
-    try {
-      for (const [, { table }] of this.schemaRegistry.entries()) {
+    const logger2 = new Logger("DrizzleAdapter");
+    let hasErrors = false;
+    for (const [name, { table }] of this.schemaRegistry.entries()) {
+      try {
         const config = getTableConfig(table);
         await this.createTableFromConfig(config, dialect);
+      } catch (error) {
+        hasErrors = true;
+        const msg = error instanceof Error ? error.message : String(error);
+        logger2.warn(`Error creating table for "${name}" automatically: ${msg}`);
       }
-    } catch (error) {
-      new Logger("DrizzleAdapter").warn("Error creating tables automatically:", JSON.stringify(error));
+    }
+    if (hasErrors) {
+      logger2.warn("Some tables could not be created. The application may not work correctly.");
     }
   }
   /**
@@ -7176,7 +7233,7 @@ ${stack}` : ""}`);
 				${columns.join(",\n				")}
 			)
 		`);
-    await this.db.execute(createTableSQL);
+    await this.execRawSQL(createTableSQL);
     const indexes = config.indexes;
     if (indexes) {
       for (const index2 of Object.values(indexes)) {
@@ -7195,13 +7252,27 @@ ${stack}` : ""}`);
 						CREATE ${uniqueKeyword} INDEX IF NOT EXISTS ${q(indexName)}
 						ON ${q(tableName)} (${columnsStr})
 					`);
-          await this.db.execute(createIndexSQL).catch(() => {
+          await this.execRawSQL(createIndexSQL).catch(() => {
           });
         }
       }
     }
   }
   /**
+  * Execute raw SQL across all supported dialects.
+  * PostgreSQL/MySQL use db.execute(), SQLite uses db.run().
+  */
+  async execRawSQL(rawSQL) {
+    const db = this.db;
+    if (typeof db.execute === "function") {
+      await db.execute(rawSQL);
+    } else if (typeof db.run === "function") {
+      db.run(rawSQL);
+    } else {
+      throw new Error("Database instance has no execute() or run() method");
+    }
+  }
+  /**
   * Map PostgreSQL SQL types to dialect-specific types.
   */
   mapSQLTypeForDialect(pgType, dialect) {
@@ -7860,4 +7931,4 @@ __name(dropIndex3, "dropIndex");
 // src/index.ts
 setDatabaseAdapter("drizzle");
 
-export { Adapter, AutoMigration, DEFAULT_LOCALE, DEFAULT_MIGRATION_CONFIG, DOCUMENT_STATUS, DRIZZLE_CONFIG, DRIZZLE_DB, DrizzleDatabaseAdapter, DrizzleQueryBuilder, InjectModel, LazyQueryBuilder, MigrationChecksumError, MigrationError, MigrationGenerator, MigrationHistory, MigrationLock, MigrationLockError, MigrationRunner, Prop, SNAPSHOT_FILENAME, Schema, SchemaBridge, SchemaDiff, applyDocumentColumns, clearSchemaRegistry, createNeonConnection, createNeonWebSocketConnection, generateSchema, getDrizzleModelToken, getDrizzlePropsMetadata, getDrizzleSchemaMetadata, getOrGenerateSchema, getRegisteredSchemas, isDraft, isPublished, sql_generators_exports as sqlGenerators };
+export { Adapter, AutoMigration, DEFAULT_LOCALE, DEFAULT_MIGRATION_CONFIG, DOCUMENT_STATUS, DRIZZLE_CONFIG, DRIZZLE_DB, DrizzleDatabaseAdapter, DrizzleQueryBuilder, InjectModel, LazyQueryBuilder, MigrationChecksumError, MigrationError, MigrationGenerator, MigrationHistory, MigrationLock, MigrationLockError, MigrationRunner, Prop, SNAPSHOT_FILENAME, Schema, SchemaBridge, SchemaDiff, applyDocumentColumns, clearSchemaRegistry, createNeonConnection, createNeonWebSocketConnection, generateSchema, getDrizzleModelToken, getDrizzlePropsMetadata, getDrizzleSchemaMetadata, getOrGenerateSchema, getRegisteredSchemas, isDraft, isPublished, sanitizeExecutableMigrationSql, sql_generators_exports as sqlGenerators };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magnet-cms/adapter-db-drizzle",
-  "version": "1.0.2",
+  "version": "2.0.0",
   "description": "Drizzle ORM database adapter for Magnet CMS - supports PostgreSQL, MySQL, and SQLite",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -42,8 +42,8 @@
     "reflect-metadata": "0.2.2"
   },
   "peerDependencies": {
-    "@magnet-cms/common": "^0.1.0",
-    "@magnet-cms/utils": "^0.1.0",
+    "@magnet-cms/common": "^0.2.0",
+    "@magnet-cms/utils": "^0.1.1",
     "@nestjs/common": "^11.1.12",
     "drizzle-orm": "^0.38.0",
     "reflect-metadata": "0.2.2"