sqlite-hub 0.9.0 → 0.9.3

package/server/services/storage/appStateStore.js

@@ -100,8 +100,11 @@ function normalizeMediaTaggingConfigRecord(config = {}) {
   };
 }
 
-function isChartCompatibleQueryType(queryType) {
-  return String(queryType ?? "").trim().toLowerCase() === "select";
+function isChartCompatibleQuery(queryType, rawSql = "") {
+  return (
+    String(queryType ?? "").trim().toLowerCase() === "select" ||
+    detectQueryType(rawSql) === "select"
+  );
 }
 
 class AppStateStore {
@@ -752,7 +755,7 @@ class AppStateStore {
       previewSql: buildSqlPreview(row.raw_sql ?? row.rawSql),
       lastRun,
       chartsEligible:
-        isChartCompatibleQueryType(queryType) &&
+        isChartCompatibleQuery(queryType, row.raw_sql ?? row.rawSql) &&
         (!lastRun || String(lastRun.status ?? "").trim().toLowerCase() !== "error"),
     };
   }
@@ -1252,12 +1255,12 @@ class AppStateStore {
             LIMIT 1
           )
         WHERE q.database_key = ?
-          AND q.query_type = 'select'
           AND COALESCE(latest.status, 'success') != 'error'
         ORDER BY q.last_used_at DESC, q.id DESC
       `)
       .all(normalizedDatabaseKey)
-      .map((row) => this.decorateQueryHistoryRow(row));
+      .map((row) => this.decorateQueryHistoryRow(row))
+      .filter((item) => item.chartsEligible);
   }
 
   getQueryHistoryItemById(historyId) {
@@ -1367,7 +1370,7 @@ class AppStateStore {
   getChartQueryHistoryItemForDatabase(historyId, databaseKey) {
     const item = this.getQueryHistoryItemForDatabase(historyId, databaseKey);
 
-    if (!isChartCompatibleQueryType(item.queryType)) {
+    if (!isChartCompatibleQuery(item.queryType, item.rawSql)) {
       throw new ValidationError("Only SELECT queries can be opened in Charts.");
     }
 

package/server/services/storage/queryHistoryChartUtils.js

@@ -53,7 +53,23 @@ function normalizeRequiredColumn(value, label) {
 }
 
 function normalizeSortDirection(value, fallback = "asc") {
-  return String(value ?? "").trim().toLowerCase() === "desc" ? "desc" : fallback;
+  const normalized = String(value ?? "").trim().toLowerCase();
+
+  if (normalized === "asc" || normalized === "desc") {
+    return normalized;
+  }
+
+  return fallback;
+}
+
+function normalizeBarSortBy(value, fallback = "x") {
+  const normalized = String(value ?? "").trim().toLowerCase();
+
+  if (normalized === "x" || normalized === "y") {
+    return normalized;
+  }
+
+  return fallback;
 }
 
 function normalizeChartConfig(chartType, config = {}) {
@@ -67,7 +83,8 @@ function normalizeChartConfig(chartType, config = {}) {
         y_column: normalizeRequiredColumn(source.y_column, "Bar chart y column"),
         show_legend: normalizeBooleanFlag(source.show_legend, true),
         show_labels: normalizeBooleanFlag(source.show_labels, false),
-        sort_direction: normalizeSortDirection(source.sort_direction, "asc"),
+        sort_by: normalizeBarSortBy(source.sort_by, "y"),
+        sort_direction: normalizeSortDirection(source.sort_direction, "desc"),
       };
     case "line":
       return {

package/server/services/storage/queryHistoryUtils.js

@@ -37,11 +37,174 @@ function getLeadingKeywords(sql = "", limit = 3) {
   return matches.slice(0, limit).map((token) => token.toLowerCase());
 }
 
+function readWordAt(value = "", index = 0) {
+  const match = String(value).slice(index).match(/^[A-Za-z]+/);
+  return match ? match[0].toLowerCase() : "";
+}
+
+function skipWhitespace(value = "", index = 0) {
+  let cursor = index;
+
+  while (cursor < value.length && /\s/.test(value[cursor])) {
+    cursor += 1;
+  }
+
+  return cursor;
+}
+
+function advanceQuotedSql(value = "", index = 0) {
+  const quote = value[index];
+  const closingQuote = quote === "[" ? "]" : quote;
+  let cursor = index + 1;
+
+  while (cursor < value.length) {
+    if (value[cursor] === closingQuote) {
+      if ((quote === "'" || quote === '"') && value[cursor + 1] === closingQuote) {
+        cursor += 2;
+        continue;
+      }
+
+      return cursor + 1;
+    }
+
+    cursor += 1;
+  }
+
+  return value.length;
+}
+
+function isSqlWordBoundary(value = "", index = 0) {
+  return index < 0 || index >= value.length || !/[A-Za-z0-9_]/.test(value[index]);
+}
+
+function findTopLevelWord(value = "", word = "", startIndex = 0) {
+  const normalizedWord = String(word).toLowerCase();
+  let cursor = startIndex;
+  let depth = 0;
+
+  while (cursor < value.length) {
+    const char = value[cursor];
+
+    if (char === "'" || char === '"' || char === "`" || char === "[") {
+      cursor = advanceQuotedSql(value, cursor);
+      continue;
+    }
+
+    if (char === "(") {
+      depth += 1;
+      cursor += 1;
+      continue;
+    }
+
+    if (char === ")") {
+      depth = Math.max(0, depth - 1);
+      cursor += 1;
+      continue;
+    }
+
+    if (
+      depth === 0 &&
+      value.slice(cursor, cursor + normalizedWord.length).toLowerCase() === normalizedWord &&
+      isSqlWordBoundary(value, cursor - 1) &&
+      isSqlWordBoundary(value, cursor + normalizedWord.length)
+    ) {
+      return cursor;
+    }
+
+    cursor += 1;
+  }
+
+  return -1;
+}
+
+function findMatchingParen(value = "", openIndex = 0) {
+  let cursor = openIndex;
+  let depth = 0;
+
+  while (cursor < value.length) {
+    const char = value[cursor];
+
+    if (char === "'" || char === '"' || char === "`" || char === "[") {
+      cursor = advanceQuotedSql(value, cursor);
+      continue;
+    }
+
+    if (char === "(") {
+      depth += 1;
+    } else if (char === ")") {
+      depth -= 1;
+
+      if (depth === 0) {
+        return cursor;
+      }
+    }
+
+    cursor += 1;
+  }
+
+  return -1;
+}
+
+function resolveCteStatementKeyword(sql = "") {
+  const stripped = stripBlockComments(stripLineComments(sql)).trim();
+  let cursor = skipWhitespace(stripped, 0);
+
+  if (readWordAt(stripped, cursor) !== "with") {
+    return "";
+  }
+
+  cursor += 4;
+  cursor = skipWhitespace(stripped, cursor);
+
+  if (readWordAt(stripped, cursor) === "recursive") {
+    cursor += "recursive".length;
+  }
+
+  while (cursor < stripped.length) {
+    const asIndex = findTopLevelWord(stripped, "as", cursor);
+
+    if (asIndex < 0) {
+      return "with";
+    }
+
+    cursor = skipWhitespace(stripped, asIndex + 2);
+
+    if (readWordAt(stripped, cursor) === "not") {
+      cursor = skipWhitespace(stripped, cursor + 3);
+    }
+
+    if (readWordAt(stripped, cursor) === "materialized") {
+      cursor = skipWhitespace(stripped, cursor + "materialized".length);
+    }
+
+    if (stripped[cursor] !== "(") {
+      return "with";
+    }
+
+    const closeIndex = findMatchingParen(stripped, cursor);
+
+    if (closeIndex < 0) {
+      return "with";
+    }
+
+    cursor = skipWhitespace(stripped, closeIndex + 1);
+
+    if (stripped[cursor] === ",") {
+      cursor = skipWhitespace(stripped, cursor + 1);
+      continue;
+    }
+
+    return readWordAt(stripped, cursor) || "with";
+  }
+
+  return "with";
+}
+
 function resolveEffectiveKeyword(sql = "") {
-  const [firstKeyword, secondKeyword, thirdKeyword] = getLeadingKeywords(sql, 3);
+  const [firstKeyword, secondKeyword] = getLeadingKeywords(sql, 3);
 
   if (firstKeyword === "with") {
-    return secondKeyword === "recursive" ? thirdKeyword ?? "with" : secondKeyword ?? "with";
+    return resolveCteStatementKeyword(sql);
   }
 
   if (firstKeyword === "explain") {

package/shortkeys.md

@@ -0,0 +1,5 @@
+# Meddia Tagging
+
+## tagging queue
+
+`shift + enter` triggers tagged & next