@opengis/fastify-table 2.0.136 → 2.0.138

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.
Files changed (7) hide show
  1. package/dist/server/plugins/crud/funcs/dataUpdate.d.ts +1 -1
  2. package/dist/server/plugins/crud/funcs/dataUpdate.d.ts.map +1 -1
  3. package/dist/server/plugins/crud/funcs/dataUpdate.js +4 -3
  4. package/dist/server/plugins/table/funcs/getFilterSQL/index.d.ts +2 -1
  5. package/dist/server/plugins/table/funcs/getFilterSQL/index.d.ts.map +1 -1
  6. package/dist/server/plugins/table/funcs/getFilterSQL/index.js +5 -2
  7. package/package.json +1 -1
package/dist/server/plugins/crud/funcs/dataUpdate.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { ExtendedPG } from "../../../types/core.js";
2
- export default function dataUpdate({ table, tokenData, referer, id, data, pg: pg1, uid, }: {
2
+ export default function dataUpdate({ table: table1, tokenData, referer, id, data, pg: pg1, uid, }: {
3
3
  table: string;
4
4
  tokenData?: Record<string, any>;
5
5
  referer?: string;
package/dist/server/plugins/crud/funcs/dataUpdate.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dataUpdate.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/dataUpdate.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAepD,wBAA8B,UAAU,CAAC,EACvC,KAAK,EACL,SAAS,EACT,OAAO,EACP,EAAE,EACF,IAAI,EACJ,EAAE,EAAE,GAAG,EACP,GAAG,GACJ,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,gBAoPA"}
1
+ {"version":3,"file":"dataUpdate.d.ts","sourceRoot":"","sources":["../../../../../server/plugins/crud/funcs/dataUpdate.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAepD,wBAA8B,UAAU,CAAC,EACvC,KAAK,EAAE,MAAM,EACb,SAAS,EACT,OAAO,EACP,EAAE,EACF,IAAI,EACJ,EAAE,EAAE,GAAG,EACP,GAAG,GACJ,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,gBAsPA"}
package/dist/server/plugins/crud/funcs/dataUpdate.js CHANGED
@@ -19,8 +19,8 @@ function assignValue(key, i, srid = 4326, columnType = "text") {
19
19
  }
20
20
  return `"${key}"=$${i + 2}`;
21
21
  }
22
- export default async function dataUpdate({ table, tokenData, referer, id, data, pg: pg1, uid, }) {
23
- if (!data || !table || !id) {
22
+ export default async function dataUpdate({ table: table1, tokenData, referer, id, data, pg: pg1, uid, }) {
23
+ if (!data || !table1 || !id) {
24
24
  return null;
25
25
  }
26
26
  const pg = pg1 || getPG({ name: "client" });
@@ -35,7 +35,8 @@ export default async function dataUpdate({ table, tokenData, referer, id, data,
35
35
  pg.relkinds = pgClients[pg.options?.database || "client"]?.relkinds;
36
36
  pg.pk = pgClients[pg.options?.database || "client"]?.pk;
37
37
  }
38
- const { columns, pk } = await getMeta({ pg, table });
38
+ const { columns, pk } = await getMeta({ pg, table: table1 });
39
+ const table = pg.pk?.[table1] ? table1 : table1.replace(/"/g, "");
39
40
  if (!columns) {
40
41
  return null;
41
42
  }
package/dist/server/plugins/table/funcs/getFilterSQL/index.d.ts CHANGED
@@ -1,9 +1,10 @@
1
1
  import { type ExtendedPG } from "../../../../types/core.js";
2
- export default function getFilterSQL({ table, filter, pg, search, filterList, query, custom, state, uid, objectId, order, }: {
2
+ export default function getFilterSQL({ table, filter, pg, search, searchColumn: searchColumn1, filterList, query, custom, state, uid, objectId, order, }: {
3
3
  table: string | undefined;
4
4
  filter?: string;
5
5
  pg: ExtendedPG;
6
6
  search?: string;
7
+ searchColumn?: string;
7
8
  filterList?: any[];
8
9
  query?: string;
9
10
  custom?: string;
package/dist/server/plugins/table/funcs/getFilterSQL/index.d.ts.map CHANGED
@@ -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;AAsC5D,wBAA8B,YAAY,CAAC,EACzC,KAAK,EACL,MAAM,EACN,EAAqB,EACrB,MAAM,EACN,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,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;;;;;;;;;;;;;;;;;;;;;;;;GAmPA"}
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;AAsC5D,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;;;;;;;;;;;;;;;;;;;;;;;;GAsPA"}
package/dist/server/plugins/table/funcs/getFilterSQL/index.js CHANGED
@@ -20,7 +20,7 @@ function getExtraQuery(mainColumns, schema, table, pk) {
20
20
  extraColumns,
21
21
  };
22
22
  }
23
- export default async function getFilterSQL({ table, filter, pg = pgClients.client, search, filterList, query, custom, state, uid, objectId, order, }) {
23
+ export default async function getFilterSQL({ table, filter, pg = pgClients.client, search, searchColumn: searchColumn1, filterList, query, custom, state, uid, objectId, order, }) {
24
24
  if (!table)
25
25
  return { error: "param table is required", status: 400 };
26
26
  const body = await getTemplate("table", table);
@@ -79,7 +79,10 @@ export default async function getFilterSQL({ table, filter, pg = pgClients.clien
79
79
  ?.filter((el) => pg.pgType?.[el.dataTypeID] === "text")
80
80
  ?.map((el) => `"${el.name}"`)
81
81
  .join(",");
82
- const searchColumn = body?.search_column || body?.meta?.search || autoSearchColumn;
82
+ const searchColumn = searchColumn1 ||
83
+ body?.search_column ||
84
+ body?.meta?.search ||
85
+ autoSearchColumn;
83
86
  const fieldsList = (fieldsModel || fields)?.map((el) => el.name);
84
87
  try {
85
88
  const tableSQL = await getTableSql({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opengis/fastify-table",
3
- "version": "2.0.136",
3
+ "version": "2.0.138",
4
4
  "type": "module",
5
5
  "description": "core-plugins",
6
6
  "keywords": [