dbgate-api-premium 6.5.1 → 6.5.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api-premium",
   "main": "src/index.js",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "homepage": "https://dbgate.org/",
   "repository": {
     "type": "git",
@@ -30,10 +30,10 @@
     "compare-versions": "^3.6.0",
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
-    "dbgate-datalib": "^6.5.1",
+    "dbgate-datalib": "^6.5.2",
     "dbgate-query-splitter": "^4.11.5",
-    "dbgate-sqltree": "^6.5.1",
-    "dbgate-tools": "^6.5.1",
+    "dbgate-sqltree": "^6.5.2",
+    "dbgate-tools": "^6.5.2",
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "diff2html": "^3.4.13",
@@ -85,7 +85,7 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
     "@types/lodash": "^4.14.149",
-    "dbgate-types": "^6.5.1",
+    "dbgate-types": "^6.5.2",
     "env-cmd": "^10.1.0",
     "jsdoc-to-markdown": "^9.0.5",
     "node-loader": "^1.0.2",

package/src/controllers/jsldata.js

@@ -313,19 +313,9 @@ module.exports = {
       return true;
     });
     processor.finalize();
-    return processor.charts;
-  },
-
-  detectChartColumns_meta: true,
-  async detectChartColumns({ jslid }) {
-    const datastore = new JsonLinesDatastore(getJslFileName(jslid));
-    const processor = new ChartProcessor();
-    processor.autoDetectCharts = false;
-    await datastore.enumRows(row => {
-      processor.addRow(row);
-      return true;
-    });
-    processor.finalize();
-    return processor.availableColumns;
+    return {
+      charts: processor.charts,
+      columns: processor.availableColumns,
+    };
   },
 };

package/src/controllers/sessions.js

@@ -146,7 +146,7 @@ module.exports = {
   },
 
   executeQuery_meta: true,
-  async executeQuery({ sesid, sql, autoCommit, limitRows, frontMatter }) {
+  async executeQuery({ sesid, sql, autoCommit, autoDetectCharts, limitRows, frontMatter }) {
     const session = this.opened.find(x => x.sesid == sesid);
     if (!session) {
       throw new Error('Invalid session');
@@ -154,7 +154,14 @@ module.exports = {
 
     logger.info({ sesid, sql }, 'Processing query');
     this.dispatchMessage(sesid, 'Query execution started');
-    session.subprocess.send({ msgtype: 'executeQuery', sql, autoCommit, limitRows, frontMatter });
+    session.subprocess.send({
+      msgtype: 'executeQuery',
+      sql,
+      autoCommit,
+      autoDetectCharts: autoDetectCharts || !!frontMatter?.['selected-chart'],
+      limitRows,
+      frontMatter,
+    });
 
     return { state: 'ok' };
   },

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '6.5.1',
-  buildTime: '2025-06-17T14:10:23.880Z'
+  version: '6.5.2',
+  buildTime: '2025-06-18T09:02:31.307Z'
 };

package/src/proc/sessionProcess.js

@@ -117,7 +117,7 @@ async function handleExecuteControlCommand({ command }) {
   }
 }
 
-async function handleExecuteQuery({ sql, autoCommit, limitRows, frontMatter }) {
+async function handleExecuteQuery({ sql, autoCommit, autoDetectCharts, limitRows, frontMatter }) {
   lastActivity = new Date().getTime();
 
   await waitConnected();
@@ -146,7 +146,16 @@ async function handleExecuteQuery({ sql, autoCommit, limitRows, frontMatter }) {
       ...driver.getQuerySplitterOptions('stream'),
       returnRichInfo: true,
     })) {
-      await handleQueryStream(dbhan, driver, queryStreamInfoHolder, sqlItem, undefined, limitRows, frontMatter);
+      await handleQueryStream(
+        dbhan,
+        driver,
+        queryStreamInfoHolder,
+        sqlItem,
+        undefined,
+        limitRows,
+        frontMatter,
+        autoDetectCharts
+      );
       // const handler = new StreamHandler(resultIndex);
       // const stream = await driver.stream(systemConnection, sqlItem, handler);
       // handler.stream = stream;

package/src/utility/handleQueryStream.js

@@ -14,13 +14,9 @@ class QueryStreamTableWriter {
     this.currentChangeIndex = 1;
     this.initializedFile = false;
     this.sesid = sesid;
-    // if (isProApp()) {
-    //   this.chartProcessor = new ChartProcessor();
-    // }
-    this.chartProcessor = new ChartProcessor();
   }
 
-  initializeFromQuery(structure, resultIndex, chartDefinition) {
+  initializeFromQuery(structure, resultIndex, chartDefinition, autoDetectCharts = false) {
     this.jslid = crypto.randomUUID();
     this.currentFile = path.join(jsldir(), `${this.jslid}.jsonl`);
     fs.writeFileSync(
@@ -34,8 +30,8 @@ class QueryStreamTableWriter {
     this.writeCurrentStats(false, false);
     this.resultIndex = resultIndex;
     this.initializedFile = true;
-    if (isProApp() && chartDefinition) {
-      this.chartProcessor = new ChartProcessor([chartDefinition]);
+    if (isProApp() && (chartDefinition || autoDetectCharts)) {
+      this.chartProcessor = chartDefinition ? new ChartProcessor([chartDefinition]) : new ChartProcessor();
     }
     process.send({ msgtype: 'recordset', jslid: this.jslid, resultIndex, sesid: this.sesid });
   }
@@ -138,12 +134,14 @@ class StreamHandler {
     startLine,
     sesid = undefined,
     limitRows = undefined,
-    frontMatter = undefined
+    frontMatter = undefined,
+    autoDetectCharts = false
   ) {
     this.recordset = this.recordset.bind(this);
     this.startLine = startLine;
     this.sesid = sesid;
     this.frontMatter = frontMatter;
+    this.autoDetectCharts = autoDetectCharts;
     this.limitRows = limitRows;
     this.rowsLimitOverflow = false;
     this.row = this.row.bind(this);
@@ -177,7 +175,8 @@ class StreamHandler {
     this.currentWriter.initializeFromQuery(
       Array.isArray(columns) ? { columns } : columns,
       this.queryStreamInfoHolder.resultIndex,
-      this.frontMatter?.[`chart-${this.queryStreamInfoHolder.resultIndex + 1}`]
+      this.frontMatter?.[`chart-${this.queryStreamInfoHolder.resultIndex + 1}`],
+      this.autoDetectCharts
     );
     this.queryStreamInfoHolder.resultIndex += 1;
     this.rowCounter = 0;
@@ -252,7 +251,8 @@ function handleQueryStream(
   sqlItem,
   sesid = undefined,
   limitRows = undefined,
-  frontMatter = undefined
+  frontMatter = undefined,
+  autoDetectCharts = false
 ) {
   return new Promise((resolve, reject) => {
     const start = sqlItem.trimStart || sqlItem.start;
@@ -262,7 +262,8 @@ function handleQueryStream(
       start && start.line,
       sesid,
       limitRows,
-      frontMatter
+      frontMatter,
+      autoDetectCharts
     );
     driver.stream(dbhan, sqlItem.text, handler);
   });