Merge pull request #5 from CNAG-Biomedical-Informatics/codex/fetch-column-value-types-for-queries

Improve query builder by using column types

Author: IvoLeist

.gitignore

@@ -23,6 +23,6 @@ dist-ssr
 *.sln
 *.sw?
 
-# Rendered HTML
+# rendered html files
 README.html
 README_files

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "sql.js-httpvfs-playground",
+  "name": "cnag-bmi-sql.js-httpvfs-playground",
   "private": true,
   "author": {
-    "name": "Nishad Thalhath"
+    "name": "Ivo Christopher Leist"
   },
   "version": "0.1.6",
   "type": "module",

public/db/.gitignore

@@ -0,0 +1 @@
+tcga.db

public/db/tcga.db

@@ -71,12 +71,22 @@
     return "string";
   }
 
-  function updateInstructs(data) {
+  async function getColumnTypes(table) {
+    const { result } = await queryDb(dbUrl, `PRAGMA table_info('${table}')`);
+    const types = {};
+    result.forEach((col) => {
+      types[col.name] = col.type || "";
+    });
+    return types;
+  }
+
+  async function updateInstructs(data, table = activeTable) {
     if (Array.isArray(data) && data.length > 0) {
+      const colTypes = await getColumnTypes(table);
       ptInstructs = Object.keys(data[0]).map((key) => ({
         key,
         title: key,
-        valueType: inferColValsType(data[0][key]),
+        valueType: colTypes[key] || inferColValsType(data[0][key]),
         ...(key.includes("URL") ? { parseAs: "unsafe-html" } : {}),
       }));
     }
@@ -186,39 +196,47 @@
     console.log(
       `Running query on table: ${activeTable}, column: ${selectedColumn}, search value: ${searchValue}`
     );
-    const escaped = searchValue.replace(/'/g, "''");
-    sqlQuery = `SELECT * FROM "${activeTable}" WHERE "${selectedColumn}" LIKE '%${escaped}%' LIMIT 20;`;
+    const col = ptInstructs.find((c) => c.key === selectedColumn);
+    const isNumber = col && /int|real|num|float/i.test(col.valueType);
+    let clause;
+    if (isNumber && !isNaN(searchValue)) {
+      clause = `"${selectedColumn}" = ${Number(searchValue)}`;
+    } else {
+      const escaped = searchValue.replace(/'/g, "''");
+      clause = `"${selectedColumn}" LIKE '%${escaped}%'`;
+    }
+    sqlQuery = `SELECT * FROM "${activeTable}" WHERE ${clause};`;
     runQuery(dbUrl, sqlQuery);
   }
 
   async function runQuery(url = dbUrl, query = sqlQuery) {
     result = null;
     querying = true;
     error = false;
-    let queryData = pTime(() => queryDb(url, query))();
-    await queryData
-      .then((data) => {
-        result = data.result;
-        updateInstructs(result);
-        timeTaken = queryData.time;
-        bytesRead = data.bytesRead;
-        totalRequests = data.stats.totalRequests;
-        totalBytes = data.stats.totalBytes;
-        querying = false;
-        error = false;
-        jsonFile = new Blob([JSON.stringify(result, null, 2)], {
-          type: "application/json",
-        });
-      })
-      .catch((queryError) => {
-        error = true;
-        errorMessage = queryError.message;
-        console.log("Query Error message: ", errorMessage);
-        console.log(queryError);
-        querying = false;
-        updateInstructs([]);
-        jsonFile = null;
+    try {
+      let queryData = pTime(() => queryDb(url, query));
+      const data = await queryData();
+
+      result = data.result;
+      await updateInstructs(result, activeTable);
+      timeTaken = queryData.time;
+      bytesRead = data.bytesRead;
+      totalRequests = data.stats.totalRequests;
+      totalBytes = data.stats.totalBytes;
+      error = false;
+      jsonFile = new Blob([JSON.stringify(result, null, 2)], {
+        type: "application/json",
       });
+    } catch (queryError) {
+      error = true;
+      errorMessage = queryError.message;
+      console.log("Query Error message: ", errorMessage);
+      console.log(queryError);
+      await updateInstructs([], activeTable);
+      jsonFile = null;
+    } finally {
+      querying = false;
+    }
   }
 </script>