triangle-utils 1.4.184 → 1.4.185

package/dist/src/UtilsRDS.js

@@ -96,8 +96,13 @@ export class UtilsRDS {
             console.log(sql);
         }
         const pool = is_read ? this.reader_pool : this.cluster_pool;
-        const response = await pool.query(sql);
-        const items = response.rows.map(item => Object.fromEntries(response.fields.map(field => [field.name, convert_postgres_output(item, field)])
+        const response = await pool.query(sql)
+            .then(response => Array.isArray(response) ? response.at(-1) : response);
+        if (response === undefined) {
+            return [];
+        }
+        const rows = response.rows;
+        const items = 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)));
         if (!Array.isArray(items)) {
             if (is_verbose) {

package/dist/src/f.js

@@ -83,5 +83,10 @@ 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.scan("federal_census_counties", { max_num_items: 1 })
+await utils.rds.exec(`SELECT sv.voter_id FROM state_voters as sv
+INNER JOIN states as s ON ST_CONTAINS(s.geom, sv.address_residence_geom) AND s.state_id = 'WA'
+WHERE
+sv.state_id = 'WA'
+ORDER BY random()
+LIMIT 1000`)
     .then(console.log);

package/package.json

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

package/src/UtilsRDS.ts

@@ -1,4 +1,4 @@
-import { FieldDef, Pool } from "pg"
+import { FieldDef, Pool, QueryResult } from "pg"
 import wkx from "wkx"
 
 function convert_postgres_input(input : string | boolean | number | any[] | Record<string, any> | undefined) : string {
@@ -109,8 +109,13 @@ export class UtilsRDS {
             console.log(sql)
         }
         const pool = is_read ? this.reader_pool : this.cluster_pool
-        const response = await pool.query(sql)
-        const items = response.rows.map(item => Object.fromEntries(
+        const response : QueryResult<any> | undefined = await pool.query(sql)
+            .then(response => Array.isArray(response) ? response.at(-1) : response)
+        if (response === undefined) {
+            return []
+        }
+        const rows = response.rows
+        const items = rows.map((item : any) => Object.fromEntries(
             response.fields.map(field => [field.name, convert_postgres_output(item, field)])
                 .filter(([attribute_name, attribute_value]) => attribute_value !== null && attribute_value !== undefined)
         ))

package/src/f.ts

@@ -107,5 +107,10 @@ const utils = new TriangleUtils(config)
 //     .then(response => console.log(response))
 
 
-await utils.rds.scan("federal_census_counties", { max_num_items : 1 })
+await utils.rds.exec(`SELECT sv.voter_id FROM state_voters as sv
+INNER JOIN states as s ON ST_CONTAINS(s.geom, sv.address_residence_geom) AND s.state_id = 'WA'
+WHERE
+sv.state_id = 'WA'
+ORDER BY random()
+LIMIT 1000`)
     .then(console.log)