db-model-router 1.0.11 → 1.0.13

package/src/cli/generate-migration.js

@@ -131,16 +131,16 @@ function autoIncrementType(adapter) {
   switch (adapter) {
     case "postgres":
     case "cockroachdb":
-      return "SERIAL";
+      return "BIGSERIAL";
     case "mssql":
-      return "INT IDENTITY(1,1)";
+      return "BIGINT IDENTITY(1,1)";
     case "oracle":
-      return "NUMBER GENERATED BY DEFAULT AS IDENTITY";
+      return "NUMBER(19) GENERATED BY DEFAULT AS IDENTITY";
     case "sqlite3":
       return "INTEGER";
     default:
       // mysql, mariadb
-      return "INT AUTO_INCREMENT";
+      return "BIGINT AUTO_INCREMENT";
   }
 }
 
@@ -354,9 +354,17 @@ function generateCreateTableSQL(tableName, tableDef, adapter) {
 
   // Unique constraints (excluding PK which is already PRIMARY KEY)
   if (tableDef.unique && tableDef.unique.length > 0) {
-    const uniqueCols = tableDef.unique.filter((c) => c !== pk);
-    for (const col of uniqueCols) {
-      lines.push(`  UNIQUE (${quoteIdent(col, adapter)})`);
+    // Support both flat arrays (wrapped as one composite group) and array-of-arrays
+    const uniqueGroups = Array.isArray(tableDef.unique[0])
+      ? tableDef.unique
+      : [tableDef.unique];
+    for (const group of uniqueGroups) {
+      const cols = group.filter((c) => c !== pk);
+      if (cols.length > 0) {
+        lines.push(
+          `  UNIQUE (${cols.map((c) => quoteIdent(c, adapter)).join(", ")})`,
+        );
+      }
     }
   }
 
@@ -412,12 +420,16 @@ function defaultBoolean(adapter) {
  * Generate a MongoDB migration JS file for a single table (collection).
  */
 function generateMongoDBMigration(tableName, tableDef) {
-  const uniqueCols = (tableDef.unique || []).filter((c) => c !== tableDef.pk);
-  const indexLines = uniqueCols
-    .map(
-      (col) =>
-        `  await db.collection("${tableName}").createIndex({ ${col}: 1 }, { unique: true });`,
-    )
+  const uniqueGroups = Array.isArray((tableDef.unique || [])[0])
+    ? tableDef.unique || []
+    : [tableDef.unique || []];
+  const indexLines = uniqueGroups
+    .flatMap((group) => {
+      const cols = group.filter((c) => c !== tableDef.pk);
+      if (cols.length === 0) return [];
+      const indexObj = cols.map((c) => `${c}: 1`).join(", ");
+      return `  await db.collection("${tableName}").createIndex({ ${indexObj} }, { unique: true });`;
+    })
     .join("\n");
 
   return `"use strict";

package/src/cli/generate-route.js

@@ -42,11 +42,15 @@ export default router;
  * Generate a parent route file that includes its own CRUD and mounts child routes.
  * e.g., routes/orders/index.js mounts order_items under /:order_id/items
  *
+ * When the parent is itself a child (intermediate node), its own CRUD is scoped
+ * by the parentForeignKey so it filters on params from the ancestor router.
+ *
  * @param {string} tableName - Parent table name
  * @param {Array<{child, foreignKey}>} children - Child relationships for this parent
+ * @param {string} [parentForeignKey] - If set, own CRUD is scoped by this FK from an ancestor
  * @returns {string}
  */
-function generateParentRouteFile(tableName, children) {
+function generateParentRouteFile(tableName, children, parentForeignKey) {
   const varName = safeVarName(tableName);
   let code = `import dbModelRouter from "db-model-router";
 import express from "express";
@@ -71,9 +75,12 @@ const { route } = dbModelRouter;
     code += `router.use("/:${child.foreignKey}/${child.child}", ${childVar}Route);\n`;
   }
 
+  const scope = parentForeignKey
+    ? `, { ${parentForeignKey}: "params.${parentForeignKey}" }`
+    : "";
   code += `
 // CRUD routes for ${tableName}
-router.use("/", route(${varName}));
+router.use("/", route(${varName}${scope}));
 
 export default router;
 `;
@@ -372,7 +379,7 @@ function columnToFaker(col, rule) {
 /**
  * Generate a child route test file that tests the nested parent/:fk/child endpoints.
  */
-function generateChildTestFile(childTable, parentTable, fkColumn, pk) {
+function generateChildTestFile(childTable, parentTable, fkColumn, pk, modelsRelPath = "../models/") {
   const childVar = safeVarName(childTable);
   return `import assert from "assert";
 import express from "express";
@@ -381,7 +388,7 @@ import dbModelRouter from "db-model-router";
 
 const { route } = dbModelRouter;
 
-import ${childVar} from "../models/${childTable}.js";
+import ${childVar} from "${modelsRelPath}${childTable}.js";
 
 function createApp() {
   const app = express();

package/src/cli/init/generators.js

@@ -900,108 +900,6 @@ const DOCKER_DB_MAP = {
   },
 };
 
-/**
- * CloudBeaver JDBC driver IDs and URL templates per database.
- */
-const CLOUDBEAVER_DB_MAP = {
-  mysql: {
-    provider: "mysql",
-    driver: "mysql8",
-    urlTemplate: (host, port, dbName) =>
-      `jdbc:mysql://${host}:${port}/${dbName}`,
-  },
-  mariadb: {
-    provider: "mysql",
-    driver: "mariaDB",
-    urlTemplate: (host, port, dbName) =>
-      `jdbc:mariadb://${host}:${port}/${dbName}`,
-  },
-  postgres: {
-    provider: "postgresql",
-    driver: "postgres-jdbc",
-    urlTemplate: (host, port, dbName) =>
-      `jdbc:postgresql://${host}:${port}/${dbName}`,
-  },
-  cockroachdb: {
-    provider: "postgresql",
-    driver: "postgres-jdbc",
-    urlTemplate: (host, port, dbName) =>
-      `jdbc:postgresql://${host}:${port}/${dbName}`,
-  },
-  mssql: {
-    provider: "sqlserver",
-    driver: "mssql_jdbc_ms_new",
-    urlTemplate: (host, port, dbName) =>
-      `jdbc:sqlserver://${host}:${port};databaseName=${dbName};trustServerCertificate=true`,
-  },
-  oracle: {
-    provider: "oracle",
-    driver: "oracle_thin",
-    urlTemplate: (host, port, dbName) =>
-      `jdbc:oracle:thin:@${host}:${port}/${dbName}`,
-  },
-  mongodb: {
-    provider: "mongodb",
-    driver: "mongodb",
-    urlTemplate: (host, port, dbName) => `mongodb://${host}:${port}/${dbName}`,
-  },
-};
-
-/**
- * Generate CloudBeaver data-sources.json for auto-connecting to the project database.
- * @param {import('./types').InitAnswers} answers
- * @param {object} secrets
- * @returns {string|null}
- */
-function generateCloudBeaverDataSources(answers, secrets) {
-  const cbDb = CLOUDBEAVER_DB_MAP[answers.database];
-  if (!cbDb) return null;
-
-  const dbConfig = DOCKER_DB_MAP[answers.database];
-  if (!dbConfig) return null;
-
-  const host = answers.database; // service name in docker-compose
-  const port = dbConfig.port.split(":")[1];
-  const dbName = "my_app";
-
-  // Determine user/pass based on adapter
-  let user = "root";
-  let pass = secrets.dbPass;
-  if (answers.database === "postgres" || answers.database === "cockroachdb")
-    user = "postgres";
-  if (answers.database === "mssql") user = "sa";
-  if (answers.database === "oracle") user = "system";
-  if (answers.database === "mongodb") user = "root";
-
-  const connId = `${answers.database}-project-db`;
-  const url = cbDb.urlTemplate(host, port, dbName);
-
-  const config = {
-    folders: {},
-    connections: {
-      [connId]: {
-        provider: cbDb.provider,
-        driver: cbDb.driver,
-        name: `${answers.database} - my_app`,
-        "save-password": true,
-        configuration: {
-          host: host,
-          port: port,
-          database: dbName,
-          url: url,
-          configurationType: "MANUAL",
-          type: "dev",
-          auth: "native",
-          userName: user,
-          userPassword: pass,
-        },
-      },
-    },
-  };
-
-  return JSON.stringify(config, null, 2) + "\n";
-}
-
 /**
  * Generate docker-compose.yml content.
  * @param {import('./types').InitAnswers} answers
@@ -1057,27 +955,6 @@ function generateDockerCompose(answers, secrets) {
     services["redis"] = redisService;
   }
 
-  // --- CloudBeaver service (for SQL/MongoDB databases) ---
-  const hasCbSupport = !!CLOUDBEAVER_DB_MAP[answers.database];
-  if (hasCbSupport) {
-    services["cloudbeaver"] = {
-      container_name: "cloudbeaver",
-      image: "dbeaver/cloudbeaver:latest",
-      ports: ["8978:8978"],
-      restart: "unless-stopped",
-      environment: {
-        CB_SERVER_NAME: "CloudBeaver",
-        CB_ADMIN_NAME: "cbadmin",
-        CB_ADMIN_PASSWORD: secrets.dbPass,
-      },
-      volumes: [
-        "./data/cloudbeaver:/opt/cloudbeaver/workspace",
-        "./.cloudbeaver/data-sources.json:/opt/cloudbeaver/workspace/GlobalConfiguration/.dbeaver/data-sources.json:ro",
-      ],
-      depends_on: [answers.database],
-    };
-  }
-
   // --- Loki + Grafana (when logger + loki are enabled) ---
   if (answers.loki) {
     services["loki"] = {
@@ -1225,7 +1102,6 @@ function generateGitignore() {
 .env
 *.db
 data/
-.cloudbeaver/
 `;
 }
 
@@ -1713,7 +1589,6 @@ module.exports = {
   generateDockerignore,
   generateGrafanaDatasources,
   generateDockerCompose,
-  generateCloudBeaverDataSources,
   generateSessionJs,
   generateMigrateModule,
   generateAddMigrationModule,

package/src/cli/init.js

@@ -17,7 +17,6 @@ const {
   generateDockerignore,
   generateGrafanaDatasources,
   generateDockerCompose,
-  generateCloudBeaverDataSources,
   generateSessionJs,
   generateMigrateModule,
   generateAddMigrationModule,
@@ -124,18 +123,6 @@ function generateFiles(answers, outputDir) {
       files.push("docker-compose.yml");
   }
 
-  // CloudBeaver data-sources.json (auto-connect config)
-  const cbDataSources = generateCloudBeaverDataSources(answers, secrets);
-  if (cbDataSources !== null) {
-    const cbDir = ".cloudbeaver";
-    if (!fs.existsSync(cbDir)) {
-      fs.mkdirSync(cbDir, { recursive: true });
-    }
-    const cbPath = path.join(cbDir, "data-sources.json");
-    if (safeWriteFile(cbPath, cbDataSources))
-      files.push(".cloudbeaver/data-sources.json");
-  }
-
   // Grafana datasource provisioning (when loki is enabled)
   if (answers.loki) {
     const grafanaDir = ".grafana";

package/src/schema/schema-validator.js

@@ -165,18 +165,35 @@ function validateTables(tables, errors) {
           message: `unique must be an array in table "${tableName}"`,
         });
       } else {
-        for (let i = 0; i < tableDef.unique.length; i++) {
-          const entry = tableDef.unique[i];
-          if (typeof entry !== "string") {
+        // Support both flat arrays and array-of-arrays
+        const groups = Array.isArray(tableDef.unique[0])
+          ? tableDef.unique
+          : [tableDef.unique];
+        for (let g = 0; g < groups.length; g++) {
+          const group = groups[g];
+          const groupPath = Array.isArray(tableDef.unique[0])
+            ? `${basePath}.unique[${g}]`
+            : `${basePath}.unique`;
+          if (!Array.isArray(group)) {
             errors.push({
-              path: `${basePath}.unique[${i}]`,
-              message: `unique entry must be a string in table "${tableName}"`,
-            });
-          } else if (entry !== pk && !columnNames.has(entry)) {
-            errors.push({
-              path: `${basePath}.unique[${i}]`,
-              message: `unique entry "${entry}" does not match any column or the primary key "${pk}" in table "${tableName}"`,
+              path: groupPath,
+              message: `unique constraint must be an array of column names in table "${tableName}"`,
             });
+            continue;
+          }
+          for (let i = 0; i < group.length; i++) {
+            const entry = group[i];
+            if (typeof entry !== "string") {
+              errors.push({
+                path: `${groupPath}[${i}]`,
+                message: `unique entry must be a string in table "${tableName}"`,
+              });
+            } else if (entry !== pk && !columnNames.has(entry)) {
+              errors.push({
+                path: `${groupPath}[${i}]`,
+                message: `unique entry "${entry}" does not match any column or the primary key "${pk}" in table "${tableName}"`,
+              });
+            }
           }
         }
       }