@opengis/fastify-table 2.1.11 → 2.1.12
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQL/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../server/plugins/table/funcs/getFilterSQL/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAuC5D,wBAA8B,YAAY,CAAC,EACzC,KAAK,EACL,MAAM,EACN,EAAqB,EACrB,MAAM,EACN,YAAY,EAAE,aAAa,EAC3B,UAAU,EACV,KAAK,EACL,MAAM,EACN,KAAK,EACL,GAAG,EACH,QAAQ,EACR,KAAK,GACN,EAAE;IACD,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,UAAU,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;;;;;;;;;;;;;;;;;;;;;;;;GAwRA"}
|
|
@@ -8,6 +8,7 @@ import getFilterQuery from "./util/getFilterQuery.js";
|
|
|
8
8
|
import { getTableColumnMeta } from "../../../../routes/table/controllers/suggest.js";
|
|
9
9
|
import getOptimizedQuery from "./util/getOptimizedQuery.js";
|
|
10
10
|
import getFilter from "../getFilter.js";
|
|
11
|
+
import getMeta from "../../../pg/funcs/getMeta.js";
|
|
11
12
|
const checkInline = {};
|
|
12
13
|
const defaultTable = "crm.extra_data";
|
|
13
14
|
function getExtraQuery(mainColumns, schema, table, pk) {
|
|
@@ -129,22 +130,30 @@ export default async function getFilterSQL({ table, filter, pg = pgClients.clien
|
|
|
129
130
|
});
|
|
130
131
|
}
|
|
131
132
|
if (el.api?.split?.("/")?.[2] === "suggest" &&
|
|
132
|
-
el.api?.split?.("/")?.[3]?.split?.(":")?.length === 2
|
|
133
|
+
el.api?.split?.("/")?.[3]?.split?.(":")?.length === 2 &&
|
|
134
|
+
!el.api.includes("?") // skip /suggest/table:column?sel=selectName
|
|
135
|
+
) {
|
|
133
136
|
const [table, column] = el.api.split("/")[3].split(":");
|
|
134
137
|
const body = await getTemplate("table", table);
|
|
135
|
-
const {
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
138
|
+
const columns = await getMeta({ pg, table }).then((el) => el?.columns || []);
|
|
139
|
+
const { arr, original } = columns?.find((el) => el.name === column)
|
|
140
|
+
? (await getTableColumnMeta({
|
|
141
|
+
table: body?.table || table,
|
|
142
|
+
template: body ? table : undefined,
|
|
143
|
+
column: column?.split?.("?")?.shift?.(),
|
|
144
|
+
selectName: body?.columns?.find?.((el) => el.name === column)
|
|
145
|
+
?.data ||
|
|
146
|
+
body?.meta?.cls?.[column] ||
|
|
147
|
+
column?.split?.("?")?.pop?.(),
|
|
148
|
+
pg,
|
|
149
|
+
})) || {}
|
|
150
|
+
: {};
|
|
143
151
|
const arr1 = arr ||
|
|
144
152
|
(original && pg?.queryCache
|
|
145
153
|
? await pg
|
|
146
154
|
.queryCache(original, { table: body?.table || table })
|
|
147
|
-
.
|
|
155
|
+
.catch((err) => console.error("getFilterSQL error", err.toString()))
|
|
156
|
+
.then((el) => el?.rows || [])
|
|
148
157
|
: undefined);
|
|
149
158
|
Object.assign(el, {
|
|
150
159
|
optionsFromColumns: true,
|