triangle-utils 1.4.179 → 1.4.181

package/dist/src/UtilsRDS.d.ts

@@ -3,10 +3,7 @@ export declare class UtilsRDS {
     private readonly rds_username;
     private readonly rds_password;
     private readonly pool;
-    constructor(region: string, rds_cluster_arn: string, rds_secret_arn: string, rds_host: string, rds_username: string, rds_password: string);
-    query(sql: string, options?: {
-        is_verbose?: boolean;
-    }): Promise<any[]>;
+    constructor(rds_host: string, rds_username: string, rds_password: string);
     exec(sql: string, options?: {
         is_verbose?: boolean;
     }): Promise<any[]>;

package/dist/src/UtilsRDS.js

@@ -1,4 +1,5 @@
 import { Pool } from "pg";
+import wkx from "wkx";
 function convert_postgres_input(input) {
     if (input === undefined) {
         return "NULL";
@@ -16,8 +17,8 @@ function convert_postgres_input(input) {
         return "ARRAY[" + input.map(a => convert_postgres_input(a)).join(", ") + "]";
     }
     else if (typeof input === "object") {
-        if (input.expression !== undefined) {
-            return input.expression;
+        if (input.wkt !== undefined) {
+            return "ST_GEOMFROMTEXT('" + input.wkt + "')";
         }
     }
     return "NULL";
@@ -50,6 +51,9 @@ function convert_postgres_output(output, field) {
     if (field.dataTypeID === 712048) {
         return JSON.parse(output[field.name]);
     }
+    if (field.dataTypeID === 110963) {
+        return { wkt: wkx.Geometry.parse(output[field.name]).toWkt() };
+    }
     return output[field.name];
 }
 export class UtilsRDS {
@@ -57,7 +61,7 @@ export class UtilsRDS {
     rds_username;
     rds_password;
     pool;
-    constructor(region, rds_cluster_arn, rds_secret_arn, rds_host, rds_username, rds_password) {
+    constructor(rds_host, rds_username, rds_password) {
         this.rds_host = rds_host;
         this.rds_username = rds_username;
         this.rds_password = rds_password;
@@ -72,21 +76,14 @@ export class UtilsRDS {
             }
         });
     }
-    async query(sql, options = {}) {
+    async exec(sql, options = {}) {
         const is_verbose = Boolean(options.is_verbose);
         if (is_verbose) {
             console.log(sql);
         }
         const response = await this.pool.query(sql);
-        return response.rows.map(item => Object.fromEntries(response.fields.map(field => [field.name, convert_postgres_output(item, field)])
+        const items = response.rows.map(item => Object.fromEntries(response.fields.map(field => [field.name, convert_postgres_output(item, field)])
             .filter(([attribute_name, attribute_value]) => attribute_value !== null && attribute_value !== undefined)));
-    }
-    async exec(sql, options = {}) {
-        const is_verbose = Boolean(options.is_verbose);
-        if (is_verbose) {
-            console.log(sql);
-        }
-        const items = await this.query(sql, options);
         if (!Array.isArray(items)) {
             if (is_verbose) {
                 console.log("Bad items:", items);

package/dist/src/f.js

@@ -83,5 +83,5 @@ const utils = new TriangleUtils(config);
 //     .then(response => console.log(response))
 // await utils.s3.get_download_url("s3://triangle-675045717295-us-east-1-an/tenant_documents/a3a9627f-a94d-4d47-a110-307a6f5563af/a146d789-da40-4e3c-a132-8b7110f3f7df.pdf", { name : "hye.pdf" })
 //     .then(response => console.log(response))
-await utils.rds.query("SELECT * FROM twitter_tweets LIMIT 10")
+await utils.rds.exec("SELECT * FROM tenants")
     .then(console.log);

package/dist/src/index.js

@@ -31,7 +31,7 @@ export class TriangleUtils extends UtilsMisc {
     constructor(config) {
         super(config);
         this.dynamodb = new UtilsDynamoDB(config.region);
-        this.rds = new UtilsRDS(config.region, config.rds_cluster_arn, config.rds_secret_arn, config.rds_host, config.rds_username, config.rds_password);
+        this.rds = new UtilsRDS(config.rds_host, config.rds_username, config.rds_password);
         this.s3 = new UtilsS3(config.region);
         this.s3vectors = new UtilsS3Vectors(config.region);
         this.bedrock = new UtilsBedrock(config.region);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "triangle-utils",
-    "version": "1.4.179",
+    "version": "1.4.181",
     "main": "dist/src/index.js",
     "types": "dist/src/index.d.ts",
     "directories": {
@@ -36,7 +36,8 @@
         "googleapis": "^170.0.0",
         "jsdom": "^29.0.1",
         "pg": "^8.23.0",
-        "scrapingbee": "^1.8.2"
+        "scrapingbee": "^1.8.2",
+        "wkx": "^0.5.0"
     },
     "devDependencies": {
         "@eslint/js": "^9.39.2",

package/src/UtilsRDS.ts

@@ -1,4 +1,5 @@
 import { FieldDef, Pool } from "pg"
+import wkx from "wkx"
 
 function convert_postgres_input(input : string | boolean | number | any[] | Record<string, any> | undefined) : string {
     if (input === undefined) {
@@ -12,8 +13,8 @@ function convert_postgres_input(input : string | boolean | number | any[] | Reco
     } else if (Array.isArray(input)) {
         return "ARRAY[" + input.map(a => convert_postgres_input(a)).join(", ") + "]"
     } else if (typeof input === "object") {
-        if (input.expression !== undefined) {
-            return input.expression
+        if (input.wkt !== undefined) {
+            return "ST_GEOMFROMTEXT('" + input.wkt + "')"
         }
     }
     return "NULL"
@@ -48,6 +49,9 @@ function convert_postgres_output(output : any, field : FieldDef) {
     if (field.dataTypeID === 712048) {
         return JSON.parse(output[field.name])
     }
+    if (field.dataTypeID === 110963) {
+        return { wkt : wkx.Geometry.parse(output[field.name]).toWkt() }
+    }
     return output[field.name]
 }
 
@@ -59,9 +63,6 @@ export class UtilsRDS {
     private readonly pool : Pool
 
     constructor(
-        region : string,
-        rds_cluster_arn : string,
-        rds_secret_arn : string,
         rds_host : string,
         rds_username : string,
         rds_password : string
@@ -81,7 +82,7 @@ export class UtilsRDS {
         })
     }
 
-    async query(
+    async exec(
         sql : string,
         options : {
             is_verbose? : boolean
@@ -92,23 +93,10 @@ export class UtilsRDS {
             console.log(sql)
         }
         const response = await this.pool.query(sql)
-        return response.rows.map(item => Object.fromEntries(
+        const items = response.rows.map(item => Object.fromEntries(
             response.fields.map(field => [field.name, convert_postgres_output(item, field)])
                 .filter(([attribute_name, attribute_value]) => attribute_value !== null && attribute_value !== undefined)
         ))
-    }
-
-    async exec(
-        sql : string,
-        options : {
-            is_verbose? : boolean
-        } = {}
-    ) {
-        const is_verbose = Boolean(options.is_verbose)
-        if (is_verbose) {
-            console.log(sql)
-        }
-        const items = await this.query(sql, options)
         if (!Array.isArray(items)) {
             if (is_verbose) {
                 console.log("Bad items:", items)

package/src/f.ts

@@ -107,5 +107,5 @@ const utils = new TriangleUtils(config)
 //     .then(response => console.log(response))
 
 
-await utils.rds.query("SELECT * FROM twitter_tweets LIMIT 10")
+await utils.rds.exec("SELECT * FROM tenants")
     .then(console.log)

package/src/index.ts

@@ -37,7 +37,7 @@ export class TriangleUtils extends UtilsMisc {
     constructor(config : GlobalConfig) {
         super(config)
         this.dynamodb = new UtilsDynamoDB(config.region)
-        this.rds = new UtilsRDS(config.region, config.rds_cluster_arn, config.rds_secret_arn, config.rds_host, config.rds_username, config.rds_password)
+        this.rds = new UtilsRDS(config.rds_host, config.rds_username, config.rds_password)
         this.s3 = new UtilsS3(config.region)
         this.s3vectors = new UtilsS3Vectors(config.region)
         this.bedrock = new UtilsBedrock(config.region)