Updates

package-shared/functions/dsql/db-schema-to-type.ts

@@ -60,12 +60,19 @@ export default function dbSchemaToType(params?: Params): string[] | undefined {
         } as DSQL_TableSchemaType;
     });
 
+    const defDbName = (
+        datasquirelSchema.dbName ||
+        datasquirelSchema.dbFullName?.replace(/datasquirel_user_\d+_/, "")
+    )
+        .toUpperCase()
+        .replace(/ /g, "_");
+
     const schemas = dbTablesSchemas
         .map((table) =>
             generateTypeDefinition({
                 paradigm: "TypeScript",
                 table,
-                typeDefName: `DSQL_DATASQUIREL_${table.tableName.toUpperCase()}`,
+                typeDefName: `DSQL_${defDbName}_${table.tableName.toUpperCase()}`,
                 allValuesOptional: true,
                 addExport: true,
             })