triangle-utils 1.4.125 → 1.4.127

package/dist/src/UtilsRDS.d.ts

@@ -1,11 +1,12 @@
 import { Client } from "pg";
 export declare class UtilsRDS {
     private readonly postgres;
+    private is_connected;
     private readonly rds_data;
     private readonly rds_cluster_arn;
     private readonly rds_secret_arn;
     constructor(region: string, rds_cluster_arn: string, rds_secret_arn: string, rds_host: string, rds_username: string, rds_password: string);
-    connect(): Promise<Client>;
+    connect(): Promise<Client | undefined>;
     disconnect(): Promise<void>;
     query(sql: string, options?: {
         is_verbose?: boolean;

package/dist/src/UtilsRDS.js

@@ -5,7 +5,7 @@ function convert_rds_input(input) {
         return "NULL";
     }
     else if (typeof input === "string") {
-        return "'" + input + "'";
+        return "'" + input.replace("'", "''") + "'";
     }
     else if (typeof input === "number") {
         return input.toString();
@@ -22,10 +22,12 @@ function convert_rds_input(input) {
 }
 export class UtilsRDS {
     postgres;
+    is_connected;
     rds_data;
     rds_cluster_arn;
     rds_secret_arn;
     constructor(region, rds_cluster_arn, rds_secret_arn, rds_host, rds_username, rds_password) {
+        this.is_connected = false;
         this.postgres = new Client({
             host: rds_host,
             user: rds_username,
@@ -41,6 +43,9 @@ export class UtilsRDS {
             this.rds_secret_arn = rds_secret_arn;
     }
     async connect() {
+        if (this.is_connected) {
+            return;
+        }
         return await this.postgres.connect();
     }
     async disconnect() {
@@ -51,15 +56,13 @@ export class UtilsRDS {
         if (is_verbose) {
             console.log(sql);
         }
-        const response_connect = await this.connect();
-        if (is_verbose) {
-            console.log(response_connect);
+        if (!this.is_connected) {
+            const response_connect = await this.connect();
+            if (is_verbose) {
+                console.log(response_connect);
+            }
         }
         const response = await this.postgres.query(sql);
-        const response_disconnect = await this.disconnect();
-        if (is_verbose) {
-            console.log(response_disconnect);
-        }
         return response.rows;
     }
     async exec(sql, options = {}) {
@@ -106,6 +109,7 @@ export class UtilsRDS {
         }
         catch (error) {
             console.log(error.stack);
+            console.log(sql);
             return;
         }
     }
@@ -121,6 +125,7 @@ export class UtilsRDS {
         }
         catch (error) {
             console.log(error.stack);
+            console.log(sql);
             return;
         }
     }
@@ -133,6 +138,7 @@ export class UtilsRDS {
         }
         catch (error) {
             console.log(error.stack);
+            console.log(sql);
             return;
         }
     }
@@ -148,6 +154,7 @@ export class UtilsRDS {
         }
         catch (error) {
             console.log(error.stack);
+            console.log(sql);
             return;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.4.125",
+    "version": "1.4.127",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {

package/src/UtilsRDS.ts

@@ -5,7 +5,7 @@ function convert_rds_input(input : string | boolean | number | Record<string, an
     if (input === undefined) {
         return "NULL"
     } else if (typeof input === "string") {
-        return "'" + input + "'"
+        return "'" + input.replace("'", "''") + "'"
     } else if (typeof input === "number") {
         return input.toString()
     } else if (typeof input === "boolean") {
@@ -21,6 +21,7 @@ function convert_rds_input(input : string | boolean | number | Record<string, an
 export class UtilsRDS {
 
     private readonly postgres : Client
+    private is_connected : boolean
     private readonly rds_data : RDSData
     private readonly rds_cluster_arn : string
     private readonly rds_secret_arn : string
@@ -33,6 +34,7 @@ export class UtilsRDS {
         rds_username : string,
         rds_password : string
     ) {
+        this.is_connected = false
         this.postgres = new Client({
             host : rds_host,
             user : rds_username,
@@ -49,6 +51,9 @@ export class UtilsRDS {
     }
 
     async connect() {
+        if (this.is_connected) {
+            return
+        }
         return await this.postgres.connect()
     }
 
@@ -66,15 +71,13 @@ export class UtilsRDS {
         if (is_verbose) {
             console.log(sql)
         }
-        const response_connect = await this.connect()
-        if (is_verbose) {
-            console.log(response_connect)
+        if (!this.is_connected) {
+            const response_connect = await this.connect()
+            if (is_verbose) {
+                console.log(response_connect)
+            }
         }
         const response = await this.postgres.query(sql)
-        const response_disconnect = await this.disconnect()
-        if (is_verbose) {
-            console.log(response_disconnect)
-        }
         return response.rows
     }
 
@@ -149,6 +152,7 @@ export class UtilsRDS {
             return items
         } catch (error : any) {
             console.log(error.stack)
+            console.log(sql)
             return
         }
     }
@@ -170,6 +174,7 @@ export class UtilsRDS {
             return items
         } catch (error : any) {
             console.log(error.stack)
+            console.log(sql)
             return
         }
     }
@@ -188,6 +193,7 @@ export class UtilsRDS {
             return items
         } catch (error : any) {
             console.log(error.stack)
+            console.log(sql)
             return
         }
     }
@@ -209,6 +215,7 @@ export class UtilsRDS {
             return items
         } catch (error : any) {
             console.log(error.stack)
+            console.log(sql)
             return
         }
     }