fix(code-gen): fix empty where xxIn behaviour in the sql generator (#722

) For some reason we skipped over empty `xxIn` arrays in the where generator. Now we handle the empty case correctly.
compasjs · Feb 24, 2021 · c251c3c · c251c3c
1 parent 519300e
commit c251c3c
Show file tree

Hide file tree

Showing 7 changed files with 224 additions and 369 deletions.
diff --git a/packages/code-gen/src/generator/sql/where-type.js b/packages/code-gen/src/generator/sql/where-type.js
@@ -209,17 +209,16 @@ export function getWherePartial(context, type) {
             if (isQueryPart(where.${field.name})) {
               strings.push(\` AND $\{tableName}"${field.key}" = ANY(\`, ")");
               values.push(where.${field.name}, undefined);
-            } else if (Array.isArray(where.${field.name}) && where.${field.name}.length > 0) {
+            } else if (Array.isArray(where.${field.name})) {
               strings.push(\` AND $\{tableName}"${field.key}" = ANY(ARRAY[\`);
               for (let i = 0; i < where.${field.name}.length; ++i) {
                 values.push(where.${field.name}[i]);
-                if (i === where.${field.name}.length - 1) {
-                  strings.push("]::${fieldType}[])");
-                  values.push(undefined);
-                } else {
+                if (i !== where.${field.name}.length - 1) {
                   strings.push(", ");
                 }
               }
+              strings.push("]::${fieldType}[])");
+              values.push(undefined);
             }
           `;
           break;
@@ -228,17 +227,16 @@ export function getWherePartial(context, type) {
             if (isQueryPart(where.${field.name})) {
               strings.push(\` AND $\{tableName}"${field.key}" != ANY(\`, ")");
               values.push(where.${field.name}, undefined);
-            } else if (Array.isArray(where.${field.name}) && where.${field.name}.length > 0) {
+            } else if (Array.isArray(where.${field.name})) {
               strings.push(\` AND $\{tableName}"${field.key}" != ANY(ARRAY[\`);
               for (let i = 0; i < where.${field.name}.length; ++i) {
                 values.push(where.${field.name}[i]);
-                if (i === where.${field.name}.length - 1) {
-                  strings.push("]::${fieldType}[])");
-                  values.push(undefined);
-                } else {
+                if (i !== where.${field.name}.length - 1) {
                   strings.push(", ");
                 }
               }
+              strings.push("]::${fieldType}[])");
+              values.push(undefined);
             }
           `;
           break;

diff --git a/packages/code-gen/test/sql.test.js b/packages/code-gen/test/sql.test.js
@@ -206,6 +206,14 @@ test("code-gen/e2e/sql", async (t) => {
     t.equal(dbUser.email, "[email protected]");
   });
 
+  t.test("query filter with empty idIn", async (t) => {
+    const categories = await client.queries.categorySelect(sql, {
+      idIn: [],
+    });
+
+    t.equal(categories.length, 0);
+  });
+
   t.test("query same 'shortName' originally", async () => {
     await client
       .queryUser({

diff --git a/packages/store/src/generated/database/file.js b/packages/store/src/generated/database/file.js