@saltcorn/postgres 1.3.0-beta.9 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/postgres",
-  "version": "1.3.0-beta.9",
+  "version": "1.3.0",
   "description": "Postgres structures for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "scripts": {
@@ -12,7 +12,7 @@
   "license": "MIT",
   "main": "index.js",
   "dependencies": {
-    "@saltcorn/db-common": "1.3.0-beta.9",
+    "@saltcorn/db-common": "1.3.0",
     "pg": "^8.13.1",
     "pg-copy-streams": "^6.0.6",
     "replacestream": "4.0.3"

package/postgres.js

@@ -234,7 +234,7 @@ const insert = async (tbl, obj, opts = Object.create(null)) => {
       valPosList.push(
         `coalesce((select max(_version) from "${schema}"."${sqlsanitize(
           tbl
-        )}" where id=$${valList.length}), 0)+1`
+        )}" where "${v.pk_name || "id"}"=$${valList.length}), 0)+1`
       );
     } else {
       valList.push(v);
@@ -418,15 +418,31 @@ const add_index = async (table_name, field_name) => {
  * @param {string} field_name - list of columns (members of constraint)
  * @returns {Promise<void>} no result
  */
-const add_fts_index = async (table_name, field_expression, language) => {
+const add_fts_index = async (
+  table_name,
+  field_expression,
+  language,
+  disable_fts
+) => {
   // TBD check that there are no problems with lenght of constraint name
-  const sql = `create index "${sqlsanitize(
-    table_name
-  )}_fts_index" on "${getTenantSchema()}"."${sqlsanitize(
-    table_name
-  )}" USING GIN (to_tsvector('${
-    language || "english"
-  }', ${field_expression}));`;
+  //CREATE INDEX ON public.test_table USING gist
+  // ((name || (cars ->> 'values') || surname) gist_trgm_ops);
+  let sql;
+  if (disable_fts) {
+    await getMyClient().query("CREATE EXTENSION IF NOT EXISTS pg_trgm;");
+    sql = `create index "${sqlsanitize(
+      table_name
+    )}_fts_index" on "${getTenantSchema()}"."${sqlsanitize(
+      table_name
+    )}" USING gist ((${field_expression}) gist_trgm_ops);`;
+  } else
+    sql = `create index "${sqlsanitize(
+      table_name
+    )}_fts_index" on "${getTenantSchema()}"."${sqlsanitize(
+      table_name
+    )}" USING GIN (to_tsvector('${
+      language || "english"
+    }', ${field_expression}));`;
   sql_log(sql);
   await getMyClient().query(sql);
 };