@saltcorn/postgres 1.5.0-beta.4 → 1.5.0-beta.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/postgres.js +6 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@saltcorn/postgres",
|
|
3
|
-
"version": "1.5.0-beta.
|
|
3
|
+
"version": "1.5.0-beta.5",
|
|
4
4
|
"description": "Postgres structures for Saltcorn, open-source no-code platform",
|
|
5
5
|
"homepage": "https://saltcorn.com",
|
|
6
6
|
"scripts": {
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
"license": "MIT",
|
|
13
13
|
"main": "index.js",
|
|
14
14
|
"dependencies": {
|
|
15
|
-
"@saltcorn/db-common": "1.5.0-beta.
|
|
15
|
+
"@saltcorn/db-common": "1.5.0-beta.5",
|
|
16
16
|
"@saltcorn/plain-date": "0.2.5",
|
|
17
17
|
"pg": "^8.13.1",
|
|
18
18
|
"pg-copy-streams": "^6.0.6",
|
package/postgres.js
CHANGED
|
@@ -166,9 +166,14 @@ WHERE c.oid = '"${opts?.schema || getTenantSchema()}"."${sqlsanitize(tbl)}"'::r
|
|
|
166
166
|
}
|
|
167
167
|
}
|
|
168
168
|
|
|
169
|
-
const
|
|
169
|
+
const core_sql = `FROM "${opts?.schema || getTenantSchema()}"."${sqlsanitize(
|
|
170
170
|
tbl
|
|
171
171
|
)}" ${where}`;
|
|
172
|
+
//https://pganalyze.com/blog/5mins-postgres-limited-count
|
|
173
|
+
const sql = opts?.limit
|
|
174
|
+
? `SELECT count(*) AS count FROM (
|
|
175
|
+
SELECT 1 ${core_sql} limit ${+opts?.limit}) limited_count`
|
|
176
|
+
: `SELECT COUNT(*) ${core_sql}`;
|
|
172
177
|
sql_log(sql, values);
|
|
173
178
|
const tq = await getMyClient(opts).query(sql, values);
|
|
174
179
|
|