prostgles-server 3.0.129 → 3.0.131

package/lib/TableConfig/getColumnDefinitionQuery.ts

@@ -1,8 +1,9 @@
-import { asName, isObject, pickKeys } from "prostgles-types"; 
+import { asName, pickKeys } from "prostgles-types"; 
 import { DB } from "../Prostgles";
 import { asValue } from "../PubSubManager/PubSubManager";
 import { VALIDATE_SCHEMA_FUNCNAME } from "../JSONBValidation/validate_jsonb_schema_sql";
 import { BaseColumnTypes, ColumnConfig } from "./TableConfig";
+import pgPromise from "pg-promise";
 
 type Args = {
   column: string; 
@@ -14,7 +15,8 @@ type Args = {
 /**
  * Column create statement for a given config
  */
-export const getColumnDefinitionQuery = async ({ colConf, column, db, table }: Args): Promise<string> => {
+export const getColumnDefinitionQuery = async ({ colConf: colConfRaw, column, db, table }: Args): Promise<string | undefined> => {
+  const colConf = typeof colConfRaw === "string"? { sqlDefinition: colConfRaw } : colConfRaw;
   const colNameEsc = asName(column);
   const getColTypeDef = (colConf: BaseColumnTypes, pgType: "TEXT" | "JSONB") => {
     const { nullable, defaultValue } = colConf;
@@ -22,23 +24,21 @@ export const getColumnDefinitionQuery = async ({ colConf, column, db, table }: A
   }
 
   const jsonbSchema =
-    isObject(colConf) ? (
       ("jsonbSchema" in colConf && colConf.jsonbSchema) ? { jsonbSchema: colConf.jsonbSchema, jsonbSchemaType: undefined } :
         ("jsonbSchemaType" in colConf && colConf.jsonbSchemaType) ? { jsonbSchema: undefined, jsonbSchemaType: colConf.jsonbSchemaType } :
-          undefined
-    ) :
-      undefined;
+          undefined; 
+  
 
-  if (isObject(colConf) && "references" in colConf && colConf.references) {
+  if ("references" in colConf && colConf.references) {
 
     const { tableName: lookupTable, columnName: lookupCol = "id" } = colConf.references;
     return ` ${colNameEsc} ${getColTypeDef(colConf.references, "TEXT")} REFERENCES ${lookupTable} (${lookupCol}) `;
 
-  } else if (typeof colConf === "string" || "sqlDefinition" in colConf && colConf.sqlDefinition) {
+  } else if ("sqlDefinition" in colConf && colConf.sqlDefinition) {
 
-    return ` ${colNameEsc} ${typeof colConf === "string" ? colConf : colConf.sqlDefinition} `;
+    return ` ${colNameEsc} ${colConf.sqlDefinition} `;
 
-  } else if (isObject(colConf) && "isText" in colConf && colConf.isText) {
+  } else if ("isText" in colConf && colConf.isText) {
     let checks = "";
     const colChecks: string[] = [];
     if (colConf.lowerCased) {
@@ -78,7 +78,7 @@ export const getColumnDefinitionQuery = async ({ colConf, column, db, table }: A
     const namePreffix = 'prostgles_jsonb_' as const;
     const { val: nameEnding } = await db.one("SELECT MD5( ${table} || ${column}  || ${schema}) as val", { table: table, column, schema: jsonbSchemaStr });
     const constraintName = namePreffix + nameEnding;
-    const colConstraints = await getColConstraints(db, table, column);
+    const colConstraints = await getColConstraints({ db, table, column });
     const existingNonMatchingConstraints = colConstraints.filter(c => c.name.startsWith(namePreffix) && c.name !== constraintName);
     for await (const oldCons of existingNonMatchingConstraints) {
       await db.any(`ALTER TABLE ${asName(table)} DROP CONSTRAINT ${asName(oldCons.name)};`);
@@ -93,7 +93,8 @@ export const getColumnDefinitionQuery = async ({ colConf, column, db, table }: A
     return ` ${colNameEsc} ${type} ${colConf.nullable ? "" : "NOT NULL"} ${"defaultValue" in colConf ? ` DEFAULT ${asValue(colConf.defaultValue)}` : ""} CHECK(${checks})`;
 
   } else {
-    throw "Unknown column config: " + JSON.stringify(colConf);
+    return undefined;
+    // throw "Unknown column config: " + JSON.stringify(colConf);
   }
 }
 
@@ -105,7 +106,13 @@ export type ColConstraint = {
   definition: string;
   schema: string;
 }
-export const getColConstraints = (db: DB, table?: string, column?: string, types?: ColConstraint["type"][]): Promise<ColConstraint[]> => {
+type ColConstraintsArgs = {
+  db: DB | pgPromise.ITask<{}>;
+  table?: string;
+  column?: string;
+  types?: ColConstraint["type"][];
+}
+export const getColConstraintsQuery = ({ column, table, types }: Omit<ColConstraintsArgs, "db">) => {
   let query = `
     SELECT *
     FROM (             
@@ -129,5 +136,27 @@ export const getColConstraints = (db: DB, table?: string, column?: string, types
   if (table) query += `\nAND "table" = ${asValue(table)}`;
   if (column) query += `\nAND cols @> ARRAY[${asValue(column)}]`;
   if (types?.length) query += `\nAND type IN (${types.map(v => asValue(v)).join(", ")})`;
-  return db.manyOrNone(query);
+  return query;
+}
+export const getColConstraints = ({ db, column, table, types }: ColConstraintsArgs ): Promise<ColConstraint[]>  => {
+  
+  return db.manyOrNone(getColConstraintsQuery({ column, table, types }));
+}
+export type ColumnMinimalInfo = { 
+  table_name: string;
+  table_schema: string;
+  column_name: string;
+  column_default: string | null;
+  udt_name: string;
+  nullable: boolean; 
+};
+export const getTableColumns = ({ db, tableName }: { db: DB; tableName: string;}): Promise<ColumnMinimalInfo[]> => {
+  return db.manyOrNone(`
+    SELECT table_name, 
+      table_schema, column_name, 
+      column_default, udt_name,
+      is_nullable = 'YES' as nullable
+    FROM information_schema.columns
+    WHERE table_name = $1
+  `, [tableName]);
 }

package/lib/TableConfig/getConstraintDefinitionQueries.d.ts

@@ -0,0 +1,8 @@
+import { TableConfig } from "./TableConfig";
+type Args = {
+    tableName: string;
+    tableConf: TableConfig[string];
+};
+export declare const getConstraintDefinitionQueries: ({ tableConf, tableName }: Args) => string[] | undefined;
+export {};
+//# sourceMappingURL=getConstraintDefinitionQueries.d.ts.map

package/lib/TableConfig/getConstraintDefinitionQueries.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getConstraintDefinitionQueries.d.ts","sourceRoot":"","sources":["getConstraintDefinitionQueries.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,KAAK,IAAI,GAAG;IACV,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAE/B,CAAC;AAEF,eAAO,MAAM,8BAA8B,6BAA8B,IAAI,KAAG,MAAM,EAAE,GAAG,SA2B1F,CAAA"}

package/lib/TableConfig/getConstraintDefinitionQueries.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConstraintDefinitionQueries = void 0;
+const prostgles_types_1 = require("prostgles-types");
+const getConstraintDefinitionQueries = ({ tableConf, tableName }) => {
+    if ("constraints" in tableConf && tableConf.constraints) {
+        const { constraints } = tableConf;
+        if (!constraints) {
+            return undefined;
+        }
+        const queries = [];
+        if (Array.isArray(constraints)) {
+            return constraints.map(c => `ALTER TABLE ${(0, prostgles_types_1.asName)(tableName)} ADD ${c}`);
+        }
+        else {
+            const constraintNames = (0, prostgles_types_1.getKeys)(tableConf.constraints);
+            constraintNames.map(constraintName => {
+                const _cnstr = constraints[constraintName];
+                const constraintDef = typeof _cnstr === "string" ? _cnstr : `${_cnstr.type} (${_cnstr.content})`;
+                /** Drop constraints with the same name */
+                // const existingConstraint = constraints.some(c => c.conname === constraintName);
+                // if(existingConstraint){
+                //   if(canDrop) queries.push(`ALTER TABLE ${asName(tableName)} DROP CONSTRAINT ${asName(constraintName)};`);
+                // }
+                queries.push(`ALTER TABLE ${(0, prostgles_types_1.asName)(tableName)} ADD CONSTRAINT ${(0, prostgles_types_1.asName)(constraintName)} ${constraintDef} ;`);
+            });
+            return queries;
+        }
+    }
+};
+exports.getConstraintDefinitionQueries = getConstraintDefinitionQueries;

package/lib/TableConfig/getConstraintDefinitionQueries.ts

@@ -0,0 +1,37 @@
+import { asName, getKeys } from "prostgles-types";
+import { TableConfig } from "./TableConfig";
+
+type Args = {
+  tableName: string;
+  tableConf: TableConfig[string]
+  // tableConf: BaseTableDefinition<LANG_IDS> & (TableDefinition<LANG_IDS> | LookupTableDefinition<LANG_IDS>)
+};
+
+export const getConstraintDefinitionQueries = ({ tableConf, tableName }: Args): string[] | undefined => {
+
+  if ("constraints" in tableConf && tableConf.constraints) {
+    const { constraints } = tableConf;
+    if(!constraints){
+      return undefined;
+    }
+    const queries: string[] = [];
+    if(Array.isArray(constraints)){
+      return constraints.map(c => `ALTER TABLE ${asName(tableName)} ADD ${c}`);
+    } else {
+      const constraintNames = getKeys(tableConf.constraints);
+      constraintNames.map(constraintName => {
+        const _cnstr = constraints[constraintName];
+        const constraintDef = typeof _cnstr === "string"? _cnstr : `${_cnstr.type} (${_cnstr.content})`;
+        
+        /** Drop constraints with the same name */
+        // const existingConstraint = constraints.some(c => c.conname === constraintName);
+        // if(existingConstraint){
+        //   if(canDrop) queries.push(`ALTER TABLE ${asName(tableName)} DROP CONSTRAINT ${asName(constraintName)};`);
+        // }
+        
+        queries.push(`ALTER TABLE ${asName(tableName)} ADD CONSTRAINT ${asName(constraintName)} ${constraintDef} ;`);
+      });
+      return queries;
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "3.0.129",
+  "version": "3.0.131",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/tests/client/PID.txt

@@ -1 +1 @@
-85239
+34106

package/tests/server/package-lock.json

@@ -21,7 +21,7 @@
     },
     "../..": {
       "name": "prostgles-server",
-      "version": "3.0.128",
+      "version": "3.0.130",
       "license": "MIT",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.272.0",