@opengis/fastify-table 2.0.45 → 2.0.47

package/dist/server/plugins/table/funcs/getSelect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getSelect.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelect.ts"],"names":[],"mappings":"AAYA,wBAA8B,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAmB,gBAkCvE"}
+{"version":3,"file":"getSelect.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/table/funcs/getSelect.ts"],"names":[],"mappings":"AAYA,wBAA8B,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,MAAmB,gBA6BvE"}

package/dist/server/plugins/table/funcs/getSelect.js

@@ -11,20 +11,17 @@ export default async function getSelect(name, pg = pgClients.client) {
     if (loadCls[name] && !config.local)
         return loadCls[name];
     const clsDataGIT = await getTemplate(["cls", "select"], name);
-    const { type } = !clsDataGIT && pg.pk?.["admin.user_cls"]
+    const { type } = pg.pk?.["admin.user_cls"]
         ? await pg
             .query("select type from admin.user_cls where parent is null and name=$1 union all select type from admin.cls where parent is null and name=$1 limit 1", [name])
             .then((el) => el.rows?.[0] || {})
         : {};
-    const q = !clsDataGIT && type && ["sql", "json"].includes(type)
-        ? sqls[type]
-        : undefined;
-    const clsDataDB = q
+    const clsDataDB = sqls[type || ""]
         ? await pg
-            .query(q, [name])
+            .query(sqls[type || ""], [name])
             .then((el) => el.rows?.find((item) => item?.data)?.data)
         : undefined;
-    const clsData = clsDataGIT || clsDataDB;
+    const clsData = clsDataDB ?? clsDataGIT;
     if (!clsData)
         return null;
     //  console.log(clsData);

package/dist/server/routes/table/controllers/suggest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAsDA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,gBA8U7C"}
+{"version":3,"file":"suggest.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/controllers/suggest.ts"],"names":[],"mappings":"AAsDA,wBAA8B,OAAO,CAAC,GAAG,EAAE,GAAG,gBAgV7C"}

package/dist/server/routes/table/controllers/suggest.js

@@ -199,7 +199,7 @@ export default async function suggest(req) {
             ? `unnest(${filterColumn})`
             : filterColumn} from ${(loadTable?.table || query.token).replace(/'/g, "''")})`
         : "true";
-    const sqlSuggest = `with c(id,text) as ( ${meta.original.replace(/{{parent}}/gi, parent)} where ${where} order by 2) select * from c where ${filter} limit ${Math.min(query.limit || meta.limit || limit, limit)}`.replace(/{{uid}}/g, user?.uid || "0");
+    const sqlSuggest = `with c(id,text) as ( ${meta.original.replace(/{{parent}}/gi, parent)} where ${where} ${meta.original.includes("order by") ? "" : "order by 2"}) select * from c where ${filter} limit ${Math.min(query.limit || meta.limit || limit, limit)}`.replace(/{{uid}}/g, user?.uid || "0");
     if (query.sql && (config.local || user?.user_type?.includes?.("admin"))) {
         return sqlSuggest;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "2.0.45",
+  "version": "2.0.47",
   "type": "module",
   "description": "core-plugins",
   "keywords": [