Merge pull request #7 from evidence-dev/empty-query-fails

Empty query fails

Author: archiewood

package-lock.json

@@ -2,7 +2,7 @@
   "name": "sqltools-bigquery-driver",
   "displayName": "BigQuery Driver for SQLTools",
   "description": "Run Queries and Explore your BigQuery Database in VSCode",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "engines": {
     "vscode": "^1.42.0"
   },

package.json

@@ -96,8 +96,20 @@ export default class BigQueryDriver extends AbstractDriver<DriverLib, DriverOpti
 
     const [rows] = await bigquery.query(options);
     const standardizedRows = await standardizeResult(rows);
+    if (!Array.isArray(rows) || !rows.length) {
+      resultsAgg.push({
+        cols: ['No rows returned'],
+        connId: this.getId(),
+        messages: [{ date: new Date(), message: `Query executed successfully but no data was returned` }],
+        results: [],
+        // back to string
+        query: query[0],
+        requestId: opt.requestId,
+        resultId: generateId(),
+      })
+    } else { 
     resultsAgg.push({
-      cols: Object.keys(standardizedRows[0]),
+      cols: standardizedRows && standardizedRows.length && Object.keys(standardizedRows[0]),
       connId: this.getId(),
       messages: [{ date: new Date(), message: `Query executed successfully` }],
       results: standardizedRows,
@@ -106,7 +118,7 @@ export default class BigQueryDriver extends AbstractDriver<DriverLib, DriverOpti
       requestId: opt.requestId,
       resultId: generateId(),
     });
-
+  }
     return resultsAgg;
   }
 

sqltools-bigquery-driver-0.0.2.vsix renamed to sqltools-bigquery-driver-0.0.3.vsix

@@ -45,14 +45,6 @@ const fetchTablesAndViews = (
   type: ContextValue,
   tableType: string
 ): IBaseQueries['fetchTables'] => queryFactory`
--- check if there are any tables or views
-IF (
-  SELECT COUNT(*)
-  FROM ${p=>p.schema}.INFORMATION_SCHEMA.TABLES
-  WHERE table_type IN ${tableType}
-  ) > 0 
--- if there are, return them
-THEN
   SELECT 
     table_name AS label,
     table_name AS table,
@@ -61,10 +53,6 @@ THEN
   FROM ${p=>p.schema}.INFORMATION_SCHEMA.TABLES
     WHERE table_type IN ${tableType}
     ORDER BY table_name;
--- otherwise return null
-ELSE
-  SELECT NULL;
-END IF;
 `;
 
 const fetchTables: IBaseQueries['fetchTables'] = fetchTablesAndViews(ContextValue.TABLE,`('BASE TABLE', 'EXTERNAL')`);

src/ls/driver.ts

@@ -6,8 +6,8 @@ const standardizeResult = async (result: any[]): Promise<any[]> => {
 		for (const [key, value] of Object.entries(row)) {
 			if (typeof value === 'object') {
 				if (value) {
-					if (value.value) {
-						standardized[key] = value.value;
+					if (value['value']) {
+						standardized[key] = value['value'];
 					} else {
 						//This is a bigQuery specific workaround for https://github.com/evidence-dev/evidence/issues/792
 						try {