sqlui 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9257bcf43bc98bcd5ed8a52d3b2643db1189d0d3b8c2c1444c5d949ff37ed03c
-  data.tar.gz: 6a96de39b01459a5b222a2781158523707fbd3e585400dd18a1b4469c55b4c9c
+  metadata.gz: a936a2e2476462ad9d92ed315bc02bee65b7c84171d5934e9728241f7a28ba1c
+  data.tar.gz: 2cf060fb96f672ebaf6b7fd9be602652e1a30841ded45c28415d7cc3dabc03e1
 SHA512:
-  metadata.gz: 32eb854b16a9b345456902379ec7cc8ba5e091562a62de90451f63d28146815a880315b0921303770233d036187d8b26f6164bf04e8dd935232bf3a6ef82e646
-  data.tar.gz: 0da14c2be2b04171df6ccef8dc4e4fb1c512440371d2394ae788ecc88994e032bf69633e683bab61e0cc4bc54ae367cb0ce6565cfc4b3f67559b90061ddbdaf9
+  metadata.gz: addfac3cd62b75320dfcd2a437dac79db358b69391782f008e49be816241c1dad40d641accd078735c46de1d855eaf162956cc2a16370c297a72175e8b0bb7a2
+  data.tar.gz: 2a215084e23ac9b7c11d44f325fc27c77a597d3c9ed6f5e1ded238aa7223d82936f6d475674cb777406d491f4699f2a782cafabaf7c36d24be83d72e3eb998e8

data/.version

@@ -1 +1 @@
-0.1.29
+0.1.30

data/app/server.rb

@@ -86,6 +86,7 @@ class Server < Sinatra::Base
 
         full_sql = params[:sql]
         sql = params[:sql]
+        variables = params[:variables] || {}
         if params[:selection]
           selection = params[:selection]
           if selection.include?('-')
@@ -106,6 +107,9 @@ class Server < Sinatra::Base
         end
 
         result = database.with_client do |client|
+          variables.each do |name, value|
+            client.query("SET @#{name} = #{value};")
+          end
           execute_query(client, sql)
         end
 

data/client/resources/sqlui.css

@@ -138,7 +138,7 @@ p {
     font-family: Helvetica, sans-serif;
     white-space: nowrap;
     overflow: hidden;
-    font-size: 18px;
+    font-size: 16px;
     color: #333;
 }
 

data/client/resources/sqlui.js

@@ -24369,7 +24369,8 @@
        method: 'POST',
        body: JSON.stringify({
          sql: sqlFetch.sql,
-         selection: sqlFetch.selection
+         selection: sqlFetch.selection,
+         variables: sqlFetch.variables
        }),
        signal: sqlFetch.fetchController.signal
      })
@@ -24413,6 +24414,16 @@
        });
    }
 
+   function parseSqlVariables (params) {
+     return Object.fromEntries(
+       Array.from(params).filter(([key]) => {
+         return key.match(/^_.+/)
+       }).map(([key, value]) => {
+         return [key.replace(/^_/, ''), value]
+       })
+     )
+   }
+
    function maybeFetchResult (internal) {
      const url = new URL(window.location);
      const params = url.searchParams;
@@ -24420,6 +24431,7 @@
      const file = params.get('file');
      const selection = params.get('selection');
      const hasSqluiReferrer = document.referrer && new URL(document.referrer).origin === url.origin;
+     const variables = parseSqlVariables(params);
 
      // Only allow auto-run if coming from another SQLUI page. The idea here is to let the app link to URLs with run=true
      // but not other apps. This allows meta/shift-clicking to run a query.
@@ -24440,8 +24452,9 @@
        const selectionMatches = selection === existingRequest.selection;
        const sqlMatches = params.has('sql') && sql === existingRequest.sql;
        const fileMatches = params.has('file') && file === existingRequest.file;
+       const variablesMatch = JSON.stringify(variables) === JSON.stringify(existingRequest.variables);
        const queryMatches = sqlMatches || fileMatches;
-       if (selectionMatches && queryMatches) {
+       if (selectionMatches && queryMatches && variablesMatch) {
          displaySqlFetch(existingRequest);
          if (params.has('selection')) {
            focus();
@@ -24453,7 +24466,7 @@
 
      clearResult();
 
-     const sqlFetch = buildSqlFetch(sql, file, selection);
+     const sqlFetch = buildSqlFetch(sql, file, variables, selection);
      if (params.has('sql') || params.has('file')) {
        setValue(sqlFetch.sql);
        if (run) {
@@ -24466,7 +24479,7 @@
      }
    }
 
-   function buildSqlFetch (sql, file, selection) {
+   function buildSqlFetch (sql, file, variables, selection) {
      const sqlFetch = {
        fetchController: new AbortController(),
        state: 'pending',
@@ -24475,7 +24488,8 @@
        finished: null,
        sql,
        file,
-       selection
+       selection,
+       variables
      };
 
      if (file) {
@@ -24531,7 +24545,7 @@
      }
 
      clearResultBox();
-     displaySqlFetchResultStatus('result-status', fetch.result);
+     displaySqlFetchResultStatus('result-status', fetch);
 
      const tableElement = document.createElement('table');
      tableElement.id = 'result-table';
@@ -24647,7 +24661,7 @@
        throw new Error(`unexpected fetch sql request status: ${fetch.status}`)
      }
      clearGraphBox();
-     displaySqlFetchResultStatus('graph-status', fetch.result);
+     displaySqlFetchResultStatus('graph-status', fetch);
 
      if (!fetch.result.rows) {
        return
@@ -24686,13 +24700,15 @@
      chart.draw(dataTable, options);
    }
 
-   function displaySqlFetchResultStatus (statusElementId, result) {
+   function displaySqlFetchResultStatus (statusElementId, sqlFetch) {
+     const result = sqlFetch.result;
      const statusElement = document.getElementById(statusElementId);
+     const elapsed = Math.round(100 * (window.performance.now() - sqlFetch.startedAt) / 1000.0) / 100;
 
      if (result.total_rows === 1) {
-       statusElement.innerText = `${result.total_rows} row`;
+       statusElement.innerText = `${result.total_rows} row (${elapsed}s)`;
      } else {
-       statusElement.innerText = `${result.total_rows} rows`;
+       statusElement.innerText = `${result.total_rows} rows (${elapsed}s)`;
      }
 
      if (result.total_rows > result.rows.length) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlui
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
 platform: ruby
 authors:
 - Nick Dower