code-gen: fix deletedAt check with Date in the future (#483)

Closes #482
compasjs · Nov 7, 2020 · d2d8d51 · d2d8d51
1 parent 82d830f
commit d2d8d51
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/packages/code-gen/src/generator/sql/where-type.js b/packages/code-gen/src/generator/sql/where-type.js
@@ -127,7 +127,7 @@ export function getWherePartial(context, type) {
     if (field.variant === "includeNotNull") {
       str += `
         if ((where.${field.name} ?? false) === false) {
-          strings.push(\` AND $\{tableName}"${field.key}" IS NULL \`);
+          strings.push(\` AND ($\{tableName}"${field.key}" IS NULL OR $\{tableName}"${field.key}" > now()) \`);
           values.push(undefined);
         }
       `;

diff --git a/packages/code-gen/test/sql.test.js b/packages/code-gen/test/sql.test.js
@@ -187,6 +187,21 @@ test("code-gen/e2e/sql", async (t) => {
     }
   });
 
+  t.test("deletedAt in the future", async (t) => {
+    const future = new Date();
+    future.setUTCDate(future.getUTCDate() + 1);
+    const [user] = await client.queries.userInsert(sql, {
+      nickName: "Foo",
+      email: "[email protected]",
+      authKey: uuid(),
+      deletedAt: future,
+    });
+    const [selectUser] = await client.queries.userSelect(sql, { id: user.id });
+
+    t.ok(selectUser);
+    t.deepEqual(selectUser.deletedAt, future);
+  });
+
   t.test("destroy test db", async (t) => {
     await cleanupTestPostgresDatabase(sql);
     t.ok(true);

diff --git a/packages/store/src/generated/query-partials.js b/packages/store/src/generated/query-partials.js