fix not null

Simon Hoß · Simon Hoß · commit bb5f60f6f5a9 · 2019-06-21T18:21:01.000+02:00
diff --git a/lib/query/compiler.js b/lib/query/compiler.js
@@ -107,15 +107,12 @@ class DynamoDBQueryCompiler extends QueryCompiler {
             }
             else if (whereItem.type === "whereNull") {
                 scanParam.ExpressionAttributeValues[`:column_${columnCount}`] = null;
-                let functionName = "attribute_not_exists";
                 if (whereItem.not) {
-                    filterExpression += `(#column_${columnCount} <> :column_${columnCount}`;
-                    functionName = "attribute_exists";
+                    filterExpression += `(#column_${columnCount} <> :column_${columnCount} and attribute_exists(#column_${columnCount}))`;
                 }
                 else {
-                    filterExpression += `(#column_${columnCount} = :column_${columnCount}`;
+                    filterExpression += `(#column_${columnCount} = :column_${columnCount} or attribute_not_exists(#column_${columnCount}))`;
                 }
-                filterExpression += ` or ${functionName}(#column_${columnCount}))`;
             }
             else if (whereItem.type === "whereBetween") {
                 scanParam.ExpressionAttributeValues[`:column_${columnCount}`] =
diff --git a/src/query/compiler.ts b/src/query/compiler.ts
@@ -119,15 +119,11 @@ export class DynamoDBQueryCompiler extends (QueryCompiler as any) {
       } else if (whereItem.type === "whereNull") {
         scanParam.ExpressionAttributeValues[`:column_${columnCount}`] = null;
 
-        let functionName = "attribute_not_exists";
         if (whereItem.not) {
-          filterExpression += `(#column_${columnCount} <> :column_${columnCount}`;
-          functionName = "attribute_exists";
+          filterExpression += `(#column_${columnCount} <> :column_${columnCount} and attribute_exists(#column_${columnCount}))`;
         } else {
-          filterExpression += `(#column_${columnCount} = :column_${columnCount}`;
+          filterExpression += `(#column_${columnCount} = :column_${columnCount} or attribute_not_exists(#column_${columnCount}))`;
         }
-
-        filterExpression += ` or ${functionName}(#column_${columnCount}))`;
       } else if (whereItem.type === "whereBetween") {
         scanParam.ExpressionAttributeValues[`:column_${columnCount}`] =
           whereItem.value[0];
diff --git a/test/select.spec.ts b/test/select.spec.ts
@@ -96,7 +96,7 @@ describe("when select", () => {
           },
           ProjectionExpression: "#project_0, #project_1",
           FilterExpression:
-            "(#column_0 <> :column_0 or attribute_exists(#column_0))",
+            "(#column_0 <> :column_0 and attribute_exists(#column_0))",
           TableName: "test_test_table"
         },
         expect.anything()

Original file line number	Diff line number	Diff line change
`@@ -107,15 +107,12 @@ class DynamoDBQueryCompiler extends QueryCompiler {`
`107`	`107`	`}`
`108`	`108`	`else if (whereItem.type === "whereNull") {`
`109`	`109`	scanParam.ExpressionAttributeValues[`:column_${columnCount}`] = null;
`110`		`- let functionName = "attribute_not_exists";`
`111`	`110`	`if (whereItem.not) {`
`112`		- filterExpression += `(#column_${columnCount} <> :column_${columnCount}`;
`113`		`- functionName = "attribute_exists";`
	`111`	+ filterExpression += `(#column_${columnCount} <> :column_${columnCount} and attribute_exists(#column_${columnCount}))`;
`114`	`112`	`}`
`115`	`113`	`else {`
`116`		- filterExpression += `(#column_${columnCount} = :column_${columnCount}`;
	`114`	+ filterExpression += `(#column_${columnCount} = :column_${columnCount} or attribute_not_exists(#column_${columnCount}))`;
`117`	`115`	`}`
`118`		- filterExpression += ` or ${functionName}(#column_${columnCount}))`;
`119`	`116`	`}`
`120`	`117`	`else if (whereItem.type === "whereBetween") {`
`121`	`118`	scanParam.ExpressionAttributeValues[`:column_${columnCount}`] =