Merge pull request #6563 from Budibase/bug/sev2/generate-select-statement-null-pointer-fix

Don't try to check externalType of related tables
2022-07-08 09:21:37 +01:00 · 2022-07-08 09:21:37 +01:00 · 2ab15119f4
parent f402e187e1 d51710532b
commit 2ab15119f4
1 changed files with 6 additions and 2 deletions
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@ -99,8 +99,12 @@ function generateSelectStatement(
    const fieldNames = field.split(/\./g)
    const tableName = fieldNames[0]
    const columnName = fieldNames[1]
-    if (columnName && knex.client.config.client === SqlClients.POSTGRES) {
-      const externalType = schema?.[columnName].externalType
+    if (
+      columnName &&
+      schema?.[columnName] &&
+      knex.client.config.client === SqlClients.POSTGRES
+    ) {
+      const externalType = schema[columnName].externalType
      if (externalType?.includes("money")) {
        return knex.raw(
          `"${tableName}"."${columnName}"::money::numeric as "${field}"`