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

package/dist/generation/generate.js

@@ -1800,32 +1800,6 @@ const getPgEnumDefinition = (0, memoize_1.default)(async function getPgEnumDefin
     const labels = rows.map((r) => String(r.enumlabel).replace(/'/g, "''"));
     return "enum('" + labels.join("', '") + "')";
 }, (udtName) => getCtx().runId + ":" + udtName);
-/** List enum type names in the public schema (for building CREATE TYPE DDL). */
-async function getPublicEnumTypeNames() {
-    const { dialect, query } = getCtx();
-    if (dialect !== "postgresql")
-        return [];
-    const rows = await query(`SELECT t.typname FROM pg_type t
-     JOIN pg_catalog.pg_namespace n ON t.typnamespace = n.oid
-     WHERE n.nspname = 'public' AND t.typtype = 'e'
-     ORDER BY t.typname`);
-    return rows.map((r) => String(r.typname));
-}
-const getPgCreateTypeEnumStatement = (0, memoize_1.default)(async function getPgCreateTypeEnumStatement(typname) {
-    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`, [typname]);
-    if (rows.length === 0)
-        return null;
-    const quoted = typname.replace(/"/g, '""');
-    const labels = rows.map((r) => "'" + String(r.enumlabel).replace(/'/g, "''") + "'");
-    return `CREATE TYPE "${quoted}" AS ENUM (${labels.join(", ")});`;
-}, (typname) => getCtx().runId + ":" + typname);
 const getTableMeta = (0, memoize_1.default)(async function getTableMeta(table) {
     const { dialect, query } = getCtx();
     if (dialect === "mysql") {
@@ -1864,7 +1838,7 @@ const getTableMeta = (0, memoize_1.default)(async function getTableMeta(table) {
         ];
         const enumDefs = await Promise.all(udtNames.map((udt) => getPgEnumDefinition(udt)));
         const enumMap = new Map(udtNames.map((udt, i) => [udt, enumDefs[i] ?? "varchar(255)"]));
-        return columns.map((c) => {
+        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)";
@@ -1887,6 +1861,7 @@ const getTableMeta = (0, memoize_1.default)(async function getTableMeta(table) {
                     : {})
             };
         });
+        return _.sortBy((c) => c.Field, cols);
     }
     throw new Error("Unsupported dialect: " + dialect);
 }, (table) => getCtx().runId + ":" + table);

package/package.json

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