@technicity/data-service-generator 0.23.0-next.4 → 0.23.0-next.6

package/dist/generation/generate.js

@@ -1645,7 +1645,7 @@ function getRelationManyToOneFieldName(x) {
     return changeCase.camelCase(x.foreignKey.replace(new RegExp(x.referencedKey + "$", "i"), ""));
 }
 // TODO: not sure if this logic is correct
-async function getJunctionTables() {
+const getJunctionTables = (0, memoize_1.default)(async function getJunctionTables() {
     const tables = await getTableNames();
     return (await Promise.all(tables.map(async (table) => {
         const relations = await getRelationsManyToOne(table);
@@ -1660,7 +1660,7 @@ async function getJunctionTables() {
         }
         return null;
     }))).filter(isNotNullOrUndefined_1.isNotNullOrUndefined);
-}
+}, () => getCtx().runId);
 // `from` relations
 // https://stackoverflow.com/a/54732547
 const getRelationsManyToOne = (0, memoize_1.default)(async function getRelationsManyToOne(table) {
@@ -1690,7 +1690,8 @@ const getRelationsManyToOne = (0, memoize_1.default)(async function getRelations
        FROM information_schema.key_column_usage kcu
        JOIN information_schema.referential_constraints rc ON kcu.constraint_name = rc.constraint_name AND kcu.table_schema = rc.constraint_schema
        JOIN information_schema.constraint_column_usage ccu ON rc.unique_constraint_name = ccu.constraint_name AND rc.unique_constraint_schema = ccu.table_schema
-       WHERE kcu.table_schema = 'public' AND kcu.table_name = $1`, [table]);
+       WHERE kcu.table_schema = 'public' AND kcu.table_name = $1
+       ORDER BY ccu.table_name, ccu.column_name`, [table]);
     }
     else {
         throw new Error("Unsupported dialect: " + dialect);
@@ -1704,7 +1705,7 @@ const getRelationsManyToOne = (0, memoize_1.default)(async function getRelations
             nullable: tableMeta.find((m) => m.Field === v.t1Field)?.Null === "YES"
         };
     })));
-    return _.sortBy((x) => x.referencedTable, xs);
+    return _.sortBy([(x) => x.referencedTable, (x) => x.referencedKey, (x) => x.foreignKey], xs);
 }, (table) => getCtx().runId + ":" + table);
 // `to` relations
 const getRelationsOneToMany = (0, memoize_1.default)(async function getRelationsOneToMany(table) {
@@ -1733,7 +1734,8 @@ const getRelationsOneToMany = (0, memoize_1.default)(async function getRelations
        FROM information_schema.key_column_usage kcu
        JOIN information_schema.referential_constraints rc ON kcu.constraint_name = rc.constraint_name AND kcu.table_schema = rc.constraint_schema
        JOIN information_schema.constraint_column_usage ccu ON rc.unique_constraint_name = ccu.constraint_name AND rc.unique_constraint_schema = ccu.table_schema
-       WHERE kcu.table_schema = 'public' AND ccu.table_name = $1`, [table]);
+       WHERE kcu.table_schema = 'public' AND ccu.table_name = $1
+       ORDER BY kcu.table_name, kcu.column_name`, [table]);
     }
     else {
         throw new Error("Unsupported dialect: " + dialect);
@@ -1747,7 +1749,7 @@ const getRelationsOneToMany = (0, memoize_1.default)(async function getRelations
             nullable: false
         };
     })));
-    return _.sortBy((x) => x.referencedKey, _.sortBy((x) => x.referencedTable, xs));
+    return _.sortBy([(x) => x.referencedTable, (x) => x.referencedKey, (x) => x.foreignKey], xs);
 }, (table) => getCtx().runId + ":" + table);
 async function getPrimaryColumn(table) {
     const tableMeta = await getTableMeta(table);
@@ -1786,27 +1788,27 @@ async function getUuidColumn(table) {
         nullable: column.Null === "YES"
     };
 }
-const getPgEnumDefinition = (0, memoize_1.default)(async function getPgEnumDefinition(udtName) {
+const getPgEnumDefinition = (0, memoize_1.default)(async function getPgEnumDefinition(udtSchema, udtName) {
     const { dialect, query } = getCtx();
     if (dialect !== "postgresql")
         return null;
     const rows = await query(`SELECT e.enumlabel FROM pg_enum e
      JOIN pg_type t ON e.enumtypid = t.oid
      JOIN pg_catalog.pg_namespace n ON t.typnamespace = n.oid
-     WHERE t.typname = $1 AND n.nspname = 'public'
-     ORDER BY e.enumsortorder`, [udtName]);
+     WHERE t.typname = $2 AND n.nspname = $1
+     ORDER BY e.enumsortorder`, [udtSchema, udtName]);
     if (rows.length === 0)
         return null;
     const labels = rows.map((r) => String(r.enumlabel).replace(/'/g, "''"));
     return "enum('" + labels.join("', '") + "')";
-}, (udtName) => getCtx().runId + ":" + udtName);
+}, (udtSchema, udtName) => getCtx().runId + ":" + udtSchema + ":" + udtName);
 const getTableMeta = (0, memoize_1.default)(async function getTableMeta(table) {
     const { dialect, query } = getCtx();
     if (dialect === "mysql") {
         return query("DESCRIBE ??", [table]).then((xs) => _.sortBy((x) => x.Field, xs));
     }
     if (dialect === "postgresql") {
-        const columns = await query(`SELECT column_name AS "Field", data_type, udt_name, character_maximum_length AS char_max, is_nullable, column_default AS "Default"
+        const columns = await query(`SELECT column_name AS "Field", data_type, udt_schema, udt_name, character_maximum_length AS char_max, is_nullable, column_default AS "Default"
        FROM information_schema.columns
        WHERE table_schema = 'public' AND table_name = $1
        ORDER BY ordinal_position`, [table]);
@@ -1831,17 +1833,26 @@ const getTableMeta = (0, memoize_1.default)(async function getTableMeta(table) {
             if (!keyMap.has(k.col) || k.key_type === "PRI")
                 keyMap.set(k.col, k.key_type);
         }
-        const udtNames = [
-            ...new Set(columns
-                .filter((c) => c.data_type === "USER-DEFINED" && c.udt_name != null)
-                .map((c) => c.udt_name))
+        const udtKeys = [
+            ...new Map(columns
+                .filter((c) => c.data_type === "USER-DEFINED" &&
+                c.udt_schema != null &&
+                c.udt_name != null)
+                .map((c) => [`${c.udt_schema}.${c.udt_name}`, c])).keys()
         ];
-        const enumDefs = await Promise.all(udtNames.map((udt) => getPgEnumDefinition(udt)));
-        const enumMap = new Map(udtNames.map((udt, i) => [udt, enumDefs[i] ?? "varchar(255)"]));
+        const udtPairs = udtKeys.map((k) => {
+            const [s, n] = k.split(".", 2);
+            return [s, n];
+        });
+        const enumDefs = await Promise.all(udtPairs.map(([schema, name]) => getPgEnumDefinition(schema, name)));
+        const enumMap = new Map(udtKeys.map((k, i) => [k, enumDefs[i] ?? "varchar(255)"]));
         const cols = columns.map((c) => {
             let type;
-            if (c.data_type === "USER-DEFINED" && c.udt_name != null) {
-                type = enumMap.get(c.udt_name) ?? "character varying(255)";
+            if (c.data_type === "USER-DEFINED" &&
+                c.udt_schema != null &&
+                c.udt_name != null) {
+                const enumKey = `${c.udt_schema}.${c.udt_name}`;
+                type = enumMap.get(enumKey) ?? "character varying(255)";
             }
             else {
                 type = c.data_type;
@@ -1855,8 +1866,13 @@ const getTableMeta = (0, memoize_1.default)(async function getTableMeta(table) {
                 Type: type,
                 Null: c.is_nullable === "YES" ? "YES" : "NO",
                 Key: keyMap.get(c.Field) ?? "",
-                Default: c.Default ?? "",
-                ...(c.data_type === "USER-DEFINED" && c.udt_name != null
+                // Preserve `null` when there is no default so that
+                // required-field detection (via `hasDefault`) works
+                // consistently with the MySQL `DESCRIBE` output.
+                Default: c.Default,
+                ...(c.data_type === "USER-DEFINED" &&
+                    c.udt_schema != null &&
+                    c.udt_name != null
                     ? { PgType: c.udt_name }
                     : {})
             };
@@ -2077,18 +2093,18 @@ function getPropertyFormat(sqlType) {
     }
     return undefined;
 }
-async function getTableNames() {
+const getTableNames = (0, memoize_1.default)(async function getTableNames() {
     const { dialect, query } = getCtx();
     if (dialect === "mysql") {
         return query("SHOW TABLES").then((xs) => xs.flatMap((x) => Object.values(x)).sort());
     }
     if (dialect === "postgresql") {
         return query(`SELECT table_name FROM information_schema.tables
-       WHERE table_schema = 'public' AND table_type = 'BASE TABLE'
-       ORDER BY table_name`).then((rows) => rows.map((r) => r.table_name));
+         WHERE table_schema = 'public' AND table_type = 'BASE TABLE'
+         ORDER BY table_name`).then((rows) => rows.map((r) => r.table_name));
     }
     throw new Error("Unsupported dialect: " + dialect);
-}
+}, () => getCtx().runId);
 function getMysql2sqliteSrc() {
     return `#!/usr/bin/awk -f
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.23.0-next.4",
+  "version": "0.23.0-next.6",
   "main": "./dist/index.js",
   "files": [
     "dist"