fix(databricks-jdbc-driver): Return NULL as NULL instead of false for boolean (#6791)

paveltiunov · web-flow · commit 7eb02f569464 · 2023-07-06T22:35:02.000-04:00
diff --git a/packages/cubejs-jdbc-driver/package.json b/packages/cubejs-jdbc-driver/package.json
@@ -31,7 +31,7 @@
     "sqlstring": "^2.3.0"
   },
   "optionalDependencies": {
-    "@cubejs-backend/jdbc": "^0.7.6",
+    "@cubejs-backend/jdbc": "^0.7.6-1",
     "java": "^0.12.1"
   },
   "license": "Apache-2.0",
diff --git a/packages/cubejs-testing-drivers/fixtures/_schemas.json b/packages/cubejs-testing-drivers/fixtures/_schemas.json
@@ -211,6 +211,11 @@
           "name": "profit",
           "sql": "profit",
           "type": "number"
+        },
+        {
+          "name": "returning",
+          "sql": "returning",
+          "type": "boolean"
         }
       ],
       "measures": [
diff --git a/packages/cubejs-testing-drivers/fixtures/athena.json b/packages/cubejs-testing-drivers/fixtures/athena.json
@@ -99,6 +99,7 @@
     "querying ECommerce: total sales, total profit by month + order (date) + total -- doesn't work with the BigQuery",
     "querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",
     "querying BigECommerce: partitioned pre-agg",
-    "querying BigECommerce: null sum"
+    "querying BigECommerce: null sum",
+    "querying BigECommerce: null boolean"
   ]
 }
diff --git a/packages/cubejs-testing-drivers/fixtures/bigquery.json b/packages/cubejs-testing-drivers/fixtures/bigquery.json
@@ -115,6 +115,7 @@
     "querying ECommerce: partitioned pre-agg",
     "querying ECommerce: partitioned pre-agg higher granularity",
     "querying BigECommerce: partitioned pre-agg",
-    "querying BigECommerce: null sum"
+    "querying BigECommerce: null sum",
+    "querying BigECommerce: null boolean"
   ]
 }
diff --git a/packages/cubejs-testing-drivers/fixtures/clickhouse.json b/packages/cubejs-testing-drivers/fixtures/clickhouse.json
@@ -118,6 +118,7 @@
     "querying ECommerce: partitioned pre-agg",
     "querying ECommerce: partitioned pre-agg higher granularity",
     "querying BigECommerce: partitioned pre-agg",
-    "querying BigECommerce: null sum"
+    "querying BigECommerce: null sum",
+    "querying BigECommerce: null boolean"
   ]
 }
diff --git a/packages/cubejs-testing-drivers/fixtures/mssql.json b/packages/cubejs-testing-drivers/fixtures/mssql.json
@@ -107,6 +107,7 @@
     "querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- rounding in athena",
     "querying ECommerce: total sales, total profit by month + order (date) + total -- doesn't work with the BigQuery",
     "querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",
-    "querying BigECommerce: null sum"
+    "querying BigECommerce: null sum",
+    "querying BigECommerce: null boolean"
   ]
 }
diff --git a/packages/cubejs-testing-drivers/fixtures/mysql.json b/packages/cubejs-testing-drivers/fixtures/mysql.json
@@ -102,6 +102,7 @@
     "querying ECommerce: partitioned pre-agg",
     "querying ECommerce: partitioned pre-agg higher granularity",
     "querying BigECommerce: partitioned pre-agg",
-    "querying BigECommerce: null sum"
+    "querying BigECommerce: null sum",
+    "querying BigECommerce: null boolean"
   ]
 }
diff --git a/packages/cubejs-testing-drivers/fixtures/postgres.json b/packages/cubejs-testing-drivers/fixtures/postgres.json
@@ -98,6 +98,7 @@
     "querying ECommerce: partitioned pre-agg",
     "querying ECommerce: partitioned pre-agg higher granularity",
     "querying BigECommerce: partitioned pre-agg",
-    "querying BigECommerce: null sum"
+    "querying BigECommerce: null sum",
+    "querying BigECommerce: null boolean"
   ]
 }
diff --git a/packages/cubejs-testing-drivers/fixtures/snowflake.json b/packages/cubejs-testing-drivers/fixtures/snowflake.json
@@ -110,6 +110,7 @@
     "querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- rounding in athena",
     "querying ECommerce: total sales, total profit by month + order (date) + total -- doesn't work with the BigQuery",
     "querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",
-    "querying BigECommerce: null sum"
+    "querying BigECommerce: null sum",
+    "querying BigECommerce: null boolean"
   ]
 }
diff --git a/packages/cubejs-testing-drivers/src/dataset.ts b/packages/cubejs-testing-drivers/src/dataset.ts
diff --git a/packages/cubejs-testing-drivers/src/tests/testQueries.ts b/packages/cubejs-testing-drivers/src/tests/testQueries.ts
@@ -1373,5 +1373,19 @@ export function testQueries(type: string): void {
       });
       expect(response.rawData()).toMatchSnapshot();
     });
+
+    execute('querying BigECommerce: null boolean', async () => {
+      const response = await client.load({
+        dimensions: [
+          'BigECommerce.returning',
+        ],
+        filters: [{
+          member: 'BigECommerce.id',
+          operator: 'equals',
+          values: ['8958']
+        }]
+      });
+      expect(response.rawData()).toMatchSnapshot();
+    });
   });
 }
diff --git a/packages/cubejs-testing-drivers/test/__snapshots__/databricks-jdbc-full.test.ts.snap b/packages/cubejs-testing-drivers/test/__snapshots__/databricks-jdbc-full.test.ts.snap
@@ -1997,6 +1997,14 @@ Array [
 ]
 `;
 
+exports[`Queries with the @cubejs-backend/databricks-jdbc-driver querying BigECommerce: null boolean 1`] = `
+Array [
+  Object {
+    "BigECommerce.returning": null,
+  },
+]
+`;
+
 exports[`Queries with the @cubejs-backend/databricks-jdbc-driver querying BigECommerce: null sum 1`] = `
 Array [
   Object {
diff --git a/yarn.lock b/yarn.lock
@@ -3886,10 +3886,10 @@
   resolved "https://registry.yarnpkg.com/@cubejs-backend/dotenv/-/dotenv-9.0.2.tgz#c3679091b702f0fd38de120c5a63943fcdc0dcbf"
   integrity sha512-yC1juhXEjM7K97KfXubDm7WGipd4Lpxe+AT8XeTRE9meRULrKlw0wtE2E8AQkGOfTBn+P1SCkePQ/BzIbOh1VA==
 
-"@cubejs-backend/jdbc@^0.7.6":
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/@cubejs-backend/jdbc/-/jdbc-0.7.6.tgz#b41ab040d3bf34db0e36979b6490ab76377408b6"
-  integrity sha512-Ngs1tlFsoxpsFcWSDK/WsQMX7F6erGw1MfbyphYWBJnTbZVsa3mkDObeHgzOSvCDhDYlFB4W0hDiJE+SR0loug==
+"@cubejs-backend/jdbc@^0.7.6-1":
+  version "0.7.6-1"
+  resolved "https://registry.yarnpkg.com/@cubejs-backend/jdbc/-/jdbc-0.7.6-1.tgz#b49af3a2b307492860e9c1fd4120543f6468f2e3"
+  integrity sha512-MbUmCtWDvPoGPItCJDAPAIat1dl8apZ9rS5RymBfaIHkJS9snEE7vS7opxtgAqMvsyWX+37FC+j6x5rNfFRrgw==
   dependencies:
     async "3.2.4"
     java "^0.12.2"

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@`
`99`	`99`	`"querying ECommerce: total sales, total profit by month + order (date) + total -- doesn't work with the BigQuery",`
`100`	`100`	`"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",`
`101`	`101`	`"querying BigECommerce: partitioned pre-agg",`
`102`		`- "querying BigECommerce: null sum"`
	`102`	`+ "querying BigECommerce: null sum",`
	`103`	`+ "querying BigECommerce: null boolean"`
`103`	`104`	`]`
`104`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@`
`115`	`115`	`"querying ECommerce: partitioned pre-agg",`
`116`	`116`	`"querying ECommerce: partitioned pre-agg higher granularity",`
`117`	`117`	`"querying BigECommerce: partitioned pre-agg",`
`118`		`- "querying BigECommerce: null sum"`
	`118`	`+ "querying BigECommerce: null sum",`
	`119`	`+ "querying BigECommerce: null boolean"`
`119`	`120`	`]`
`120`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@`
`118`	`118`	`"querying ECommerce: partitioned pre-agg",`
`119`	`119`	`"querying ECommerce: partitioned pre-agg higher granularity",`
`120`	`120`	`"querying BigECommerce: partitioned pre-agg",`
`121`		`- "querying BigECommerce: null sum"`
	`121`	`+ "querying BigECommerce: null sum",`
	`122`	`+ "querying BigECommerce: null boolean"`
`122`	`123`	`]`
`123`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@`
`107`	`107`	`"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- rounding in athena",`
`108`	`108`	`"querying ECommerce: total sales, total profit by month + order (date) + total -- doesn't work with the BigQuery",`
`109`	`109`	`"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",`
`110`		`- "querying BigECommerce: null sum"`
	`110`	`+ "querying BigECommerce: null sum",`
	`111`	`+ "querying BigECommerce: null boolean"`
`111`	`112`	`]`
`112`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@`
`102`	`102`	`"querying ECommerce: partitioned pre-agg",`
`103`	`103`	`"querying ECommerce: partitioned pre-agg higher granularity",`
`104`	`104`	`"querying BigECommerce: partitioned pre-agg",`
`105`		`- "querying BigECommerce: null sum"`
	`105`	`+ "querying BigECommerce: null sum",`
	`106`	`+ "querying BigECommerce: null boolean"`
`106`	`107`	`]`
`107`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@`
`98`	`98`	`"querying ECommerce: partitioned pre-agg",`
`99`	`99`	`"querying ECommerce: partitioned pre-agg higher granularity",`
`100`	`100`	`"querying BigECommerce: partitioned pre-agg",`
`101`		`- "querying BigECommerce: null sum"`
	`101`	`+ "querying BigECommerce: null sum",`
	`102`	`+ "querying BigECommerce: null boolean"`
`102`	`103`	`]`
`103`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@`
`110`	`110`	`"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- rounding in athena",`
`111`	`111`	`"querying ECommerce: total sales, total profit by month + order (date) + total -- doesn't work with the BigQuery",`
`112`	`112`	`"querying ECommerce: total quantity, avg discount, total sales, total profit by product + order + total -- noisy test",`
`113`		`- "querying BigECommerce: null sum"`
	`113`	`+ "querying BigECommerce: null sum",`
	`114`	`+ "querying BigECommerce: null boolean"`
`114`	`115`	`]`
`115`	`116`	`}`