@oino-ts/db-postgresql 0.0.16 → 0.0.17

package/README.md

@@ -59,20 +59,8 @@
  
  ## RESTfull
  OINO maps HTTP methods GET/POST/PUT/DELETE to SQL operations SELECT/INSERT/UPDATE/DELETE. The GET/POST requests can be made without URL ID to get all rows or insert new ones and others target a single row using URL ID. 
- 
- ### HTTP GET
- ```
- Request and response:
- > curl.exe -X GET http://localhost:3001/orderdetails/11077:77
- [
-   {"_OINOID_":"11077:77","OrderID":11077,"ProductID":77,"UnitPrice":13,"Quantity":2,"Discount":0}
- ]
-
- SQL:
- SELECT "OrderID","ProductID","UnitPrice","Quantity","Discount" FROM [OrderDetails] WHERE ("OrderID"=11077 AND "ProductID"=77);
- ```
 
- ### HTTP POST 
+ For example HTTP POST 
  ```
  Request and response:
  > curl.exe -X POST http://localhost:3001/orderdetails -H "Content-Type: application/json" --data '[{\"OrderID\":11077,\"ProductID\":99,\"UnitPrice\":19,\"Quantity\":1,\"Discount\":0}]'
@@ -82,31 +70,12 @@
  INSERT INTO [OrderDetails] ("OrderID","ProductID","UnitPrice","Quantity","Discount") VALUES (11077,99,19,1,0);
  ```
 
- ### HTTP PUT
- ```
- Request and response:
- > curl.exe -X PUT http://localhost:3001/orderdetails/11077:99 -H "Content-Type: application/json" --data '[{\"UnitPrice\":20}]'
- {"success":true,"statusCode":200,"statusMessage":"OK","messages":[]}
-
- SQL:
- UPDATE [OrderDetails] SET "UnitPrice"=20 WHERE ("OrderID"=11077 AND "ProductID"=99);
- ```
- 
- ### HTTP DELETE
- ```
- Request and response:
- > curl.exe -X DELETE http://localhost:3001/orderdetails/11077:99
- {"success":true,"statusCode":200,"statusMessage":"OK","messages":[]}
 
- SQL:
- DELETE FROM [OrderDetails] WHERE ("OrderID"=11077 AND "ProductID"=99);
- ```
-  
  ## Universal Serialization
  OINO handles serialization of data to JSON/CSV/etc. and back based on the data model. It knows what columns exist, what is their data type and how to convert each to JSON/CSV and back. This allows also partial data to be sent, i.e. you can send only columns that need updating or even send extra columns and have them ignored.
 
  ### Features
- - Files can be sent to BLOB fields using BASE64 encoding.
+ - Files can be sent to BLOB fields using BASE64 or MIME multipart encoding.
  - Datetimes are (optionally) normalized to ISO 8601 format.
  - Extended JSON-encoding
    - Unquoted literal `undefined` can be used to represent non-existent values (leaving property out works too but preserving structure might be easier e.g. when translating data).
@@ -135,7 +104,7 @@
  To support tables with multipart primary keys OINO generates a composite key `_OINOID_` that is included in the result and can be used as the REST ID. For example in the example above table `OrderDetails` has two primary keys `OrderID` and `ProductID` making the `_OINOID_` of form `11077:99`. 
 
  ## Power Of SQL
- Since OINO is just generating SQL, WHERE-conditions can be defined with [`OINOSqlFilter`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlFilter.html) and order with [`OINOSqlOrder`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlOrder.html) that are passed as HTTP request parameters. No more API development where you make unique API endpoints for each filter that fetch all data with original API and filter in backend code. Every API can be filtered when and as needed without unnessecary data tranfer and utilizing SQL indexing when available.
+ Since OINO is just generating SQL, WHERE-conditions can be defined with [`OINOSqlFilter`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlFilter.html), order with [`OINOSqlOrder`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlOrder.html) and limits/paging with [`OINOSqlOrder`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlLimit.html) that are passed as HTTP request parameters. No more API development where you make unique API endpoints for each filter that fetch all data with original API and filter in backend code. Every API can be filtered when and as needed without unnessecary data tranfer and utilizing SQL indexing when available.
 
  ## Swagger Support
  Swagger is great as long as the definitions are updated and with OINO you can automatically get a Swagger definition including a data model schema.
@@ -179,8 +148,8 @@
  ### Batch updates
  Supporting batch updates similar to batch inserts is slightly bending the RESTfull principles but would still be a useful optional feature.
 
- ### Aggregation and limits
- Similar to filtering and ordering, aggregation and limits can be implemented as HTTP request parameters telling what column is aggregated or used for ordering or how many results to return.
+ ### Aggregation
+ Similar to filtering, ordering and limits, aggregation could be implemented as HTTP request parameters telling what column is aggregated or used for ordering or how many results to return.
 
  ### Streaming
  One core idea is to be efficient in not making unnecessary copies of the data and minimizing garbage collection debt. This can be taken further by implementing streaming, allowing large dataset to be written to HTTP response as SQL result rows are received.
@@ -222,4 +191,3 @@
  
  ## SQL Scripts
  The SQL scripts for creating the sample Northwind database are based on [Google Code archive](https://code.google.com/archive/p/northwindextended/downloads) and have been further customized to ensure they would have identical data (in the scope of the automated testing).
-

package/dist/cjs/OINODbPostgresql.js

@@ -273,22 +273,23 @@ class OINODbPostgresql extends db_1.OINODb {
     col.data_type, 
     col.character_maximum_length, 
     col.is_nullable, 
-    pk.primary_key,
+    con.constraint_type,
     col.numeric_precision,
     col.numeric_scale,
     col.column_default
 FROM information_schema.columns col
 LEFT JOIN LATERAL
-    (select kcu.column_name, 'YES' as primary_key
+    (select kcu.column_name, STRING_AGG(tco.constraint_type,',') as constraint_type
     from 
         information_schema.table_constraints tco,
         information_schema.key_column_usage kcu 	 
     where 
         kcu.constraint_name = tco.constraint_name
         and kcu.constraint_schema = tco.constraint_schema
-        and tco.table_name = col.table_name
-        and tco.constraint_type = 'PRIMARY KEY'
-    ) pk on col.column_name = pk.column_name
+		and tco.table_catalog = col.table_catalog
+		and tco.table_name = col.table_name
+        and (tco.constraint_type = 'PRIMARY KEY' OR tco.constraint_type = 'FOREIGN KEY')
+	group by kcu.column_name) con on col.column_name = con.column_name
 WHERE col.table_catalog = '${dbName}' AND col.table_name = '${tableName}'`;
         return sql;
     }
@@ -308,11 +309,13 @@ WHERE col.table_catalog = '${dbName}' AND col.table_name = '${tableName}'`;
             const field_name = row[0]?.toString() || "";
             const sql_type = row[1]?.toString() || "";
             const field_length = this._parseFieldLength(row[2]);
+            const constraints = row[4]?.toString() || "";
             const numeric_precision = this._parseFieldLength(row[5]);
             const numeric_scale = this._parseFieldLength(row[6]);
             const default_val = row[7]?.toString() || "";
             const field_params = {
-                isPrimaryKey: row[4] == "YES",
+                isPrimaryKey: constraints.indexOf('PRIMARY KEY') >= 0 || false,
+                isForeignKey: constraints.indexOf('FOREIGN KEY') >= 0 || false,
                 isNotNull: row[3] == "NO",
                 isAutoInc: default_val.startsWith("nextval(")
             };

package/dist/esm/OINODbPostgresql.js

@@ -270,22 +270,23 @@ export class OINODbPostgresql extends OINODb {
     col.data_type, 
     col.character_maximum_length, 
     col.is_nullable, 
-    pk.primary_key,
+    con.constraint_type,
     col.numeric_precision,
     col.numeric_scale,
     col.column_default
 FROM information_schema.columns col
 LEFT JOIN LATERAL
-    (select kcu.column_name, 'YES' as primary_key
+    (select kcu.column_name, STRING_AGG(tco.constraint_type,',') as constraint_type
     from 
         information_schema.table_constraints tco,
         information_schema.key_column_usage kcu 	 
     where 
         kcu.constraint_name = tco.constraint_name
         and kcu.constraint_schema = tco.constraint_schema
-        and tco.table_name = col.table_name
-        and tco.constraint_type = 'PRIMARY KEY'
-    ) pk on col.column_name = pk.column_name
+		and tco.table_catalog = col.table_catalog
+		and tco.table_name = col.table_name
+        and (tco.constraint_type = 'PRIMARY KEY' OR tco.constraint_type = 'FOREIGN KEY')
+	group by kcu.column_name) con on col.column_name = con.column_name
 WHERE col.table_catalog = '${dbName}' AND col.table_name = '${tableName}'`;
         return sql;
     }
@@ -305,11 +306,13 @@ WHERE col.table_catalog = '${dbName}' AND col.table_name = '${tableName}'`;
             const field_name = row[0]?.toString() || "";
             const sql_type = row[1]?.toString() || "";
             const field_length = this._parseFieldLength(row[2]);
+            const constraints = row[4]?.toString() || "";
             const numeric_precision = this._parseFieldLength(row[5]);
             const numeric_scale = this._parseFieldLength(row[6]);
             const default_val = row[7]?.toString() || "";
             const field_params = {
-                isPrimaryKey: row[4] == "YES",
+                isPrimaryKey: constraints.indexOf('PRIMARY KEY') >= 0 || false,
+                isForeignKey: constraints.indexOf('FOREIGN KEY') >= 0 || false,
                 isNotNull: row[3] == "NO",
                 isAutoInc: default_val.startsWith("nextval(")
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/db-postgresql",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "OINO TS package for using Postgresql databases.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -20,7 +20,7 @@
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "dependencies": {
-    "@oino-ts/db": "^0.0.16",
+    "@oino-ts/db": "^0.0.17",
     "pg": "^8.11.3"
   },
   "devDependencies": {

package/src/OINODbPostgresql.ts

@@ -290,22 +290,23 @@ export class OINODbPostgresql extends OINODb {
     col.data_type, 
     col.character_maximum_length, 
     col.is_nullable, 
-    pk.primary_key,
+    con.constraint_type,
     col.numeric_precision,
     col.numeric_scale,
     col.column_default
 FROM information_schema.columns col
 LEFT JOIN LATERAL
-    (select kcu.column_name, 'YES' as primary_key
+    (select kcu.column_name, STRING_AGG(tco.constraint_type,',') as constraint_type
     from 
         information_schema.table_constraints tco,
         information_schema.key_column_usage kcu 	 
     where 
         kcu.constraint_name = tco.constraint_name
         and kcu.constraint_schema = tco.constraint_schema
-        and tco.table_name = col.table_name
-        and tco.constraint_type = 'PRIMARY KEY'
-    ) pk on col.column_name = pk.column_name
+		and tco.table_catalog = col.table_catalog
+		and tco.table_name = col.table_name
+        and (tco.constraint_type = 'PRIMARY KEY' OR tco.constraint_type = 'FOREIGN KEY')
+	group by kcu.column_name) con on col.column_name = con.column_name
 WHERE col.table_catalog = '${dbName}' AND col.table_name = '${tableName}'`
         return sql
     }
@@ -327,11 +328,13 @@ WHERE col.table_catalog = '${dbName}' AND col.table_name = '${tableName}'`
             const field_name:string = row[0]?.toString() || ""
             const sql_type:string = row[1]?.toString() || ""
             const field_length:number = this._parseFieldLength(row[2])
+            const constraints = row[4]?.toString() || ""
             const numeric_precision:number = this._parseFieldLength(row[5])
             const numeric_scale:number = this._parseFieldLength(row[6])
             const default_val:string = row[7]?.toString() || ""
             const field_params:OINODbDataFieldParams = {
-                isPrimaryKey: row[4] == "YES",
+                isPrimaryKey: constraints.indexOf('PRIMARY KEY') >= 0 || false,
+                isForeignKey: constraints.indexOf('FOREIGN KEY') >= 0 || false,
                 isNotNull: row[3] == "NO",
                 isAutoInc: default_val.startsWith("nextval(")
             }