sqlui 0.1.19 → 0.1.20

data/client/resources/sqlui.js

@@ -4150,7 +4150,7 @@ var sqlui = (function (exports) {
      return name
    }
 
-   function getSelection(root) {
+   function getSelection$1(root) {
        let target;
        // Browsers differ on whether shadow roots have a getSelection
        // method. If it exists, use that, otherwise, call it on the
@@ -6773,7 +6773,7 @@ var sqlui = (function (exports) {
                        this.dom.blur();
                        this.dom.focus({ preventScroll: true });
                    }
-                   let rawSel = getSelection(this.view.root);
+                   let rawSel = getSelection$1(this.view.root);
                    if (!rawSel) ;
                    else if (main.empty) {
                        // Work around https://bugzilla.mozilla.org/show_bug.cgi?id=1612076
@@ -6822,7 +6822,7 @@ var sqlui = (function (exports) {
            if (this.compositionDeco.size)
                return;
            let cursor = this.view.state.selection.main;
-           let sel = getSelection(this.view.root);
+           let sel = getSelection$1(this.view.root);
            if (!sel || !cursor.empty || !cursor.assoc || !sel.modify)
                return;
            let line = LineView.find(this, cursor.head);
@@ -7763,7 +7763,7 @@ var sqlui = (function (exports) {
            return false;
        // On boundary clicks, check whether the coordinates are inside the
        // selection's client rectangles
-       let sel = getSelection(view.root);
+       let sel = getSelection$1(view.root);
        if (!sel || sel.rangeCount == 0)
            return true;
        let rects = sel.getRangeAt(0).getClientRects();
@@ -9998,7 +9998,7 @@ var sqlui = (function (exports) {
            // https://github.com/codemirror/dev/issues/414
            let range = browser.safari && view.root.nodeType == 11 &&
                deepActiveElement(this.dom.ownerDocument) == this.dom &&
-               safariSelectionRangeHack(this.view) || getSelection(view.root);
+               safariSelectionRangeHack(this.view) || getSelection$1(view.root);
            if (!range || this.selectionRange.eq(range))
                return false;
            let local = hasSelection(this.dom, range);
@@ -23850,7 +23850,7 @@ var sqlui = (function (exports) {
 
    /* global google */
 
-   function init (parent, onSubmit) {
+   function init (parent, onSubmit, onShiftSubmit) {
      const fixedHeightEditor = EditorView.theme({
        '.cm-scroller': { height: '200px', overflow: 'auto', resize: 'vertical' }
      });
@@ -23858,7 +23858,7 @@ var sqlui = (function (exports) {
        state: EditorState.create({
          extensions: [
            keymap.of([
-             { key: 'Ctrl-Enter', run: onSubmit, preventDefault: true },
+             { key: 'Ctrl-Enter', run: onSubmit, preventDefault: true, shift: onShiftSubmit },
              ...defaultKeymap
            ]),
            basicSetup,
@@ -23871,12 +23871,19 @@ var sqlui = (function (exports) {
      });
    }
 
-   function getCursor () {
-     return window.editorView.state.selection.main.head
+   function getSelection () {
+     return [window.editorView.state.selection.main.from, window.editorView.state.selection.main.to]
    }
 
-   function setCursor (cursor) {
-     window.editorView.dispatch({ selection: { anchor: Math.min(cursor, window.editorView.state.doc.length) } });
+   function setSelection (selection) {
+     window.editorView.dispatch(
+       {
+         selection: {
+           anchor: Math.min(selection[0], window.editorView.state.doc.length),
+           head: Math.min(selection[1], window.editorView.state.doc.length)
+         }
+       }
+     );
    }
 
    function focus () {
@@ -24067,7 +24074,9 @@ var sqlui = (function (exports) {
        headerElement.innerText = columnName;
        headerTrElement.appendChild(headerElement);
      });
-     headerTrElement.appendChild(document.createElement('th'));
+     if (columns.length > 0) {
+       headerTrElement.appendChild(document.createElement('th'));
+     }
      let highlight = false;
      rows.forEach(function (row) {
        const rowElement = document.createElement('tr');
@@ -24093,12 +24102,12 @@ var sqlui = (function (exports) {
 
      google.charts.load('current', { packages: ['corechart', 'line'] });
      google.charts.setOnLoadCallback(function () {
-       loadQueryOrGraphTab(loadGraphResult);
+       loadQueryOrGraphTab(loadGraphResult, queryErrorCallback('graph-status'));
      });
 
-     const cursor = getCursor();
+     const selection = getSelection();
      focus();
-     setCursor(cursor);
+     setSelection(selection);
    }
 
    function selectQueryTab () {
@@ -24106,11 +24115,23 @@ var sqlui = (function (exports) {
        selected.style.display = 'flex';
      });
 
-     const cursor = getCursor();
+     const selection = getSelection();
      focus();
-     setCursor(cursor);
+     setSelection(selection);
+
+     loadQueryOrGraphTab(loadQueryResult, queryErrorCallback('query-status'));
+   }
 
-     loadQueryOrGraphTab(loadQueryResult);
+   function queryErrorCallback (statusElementId) {
+     const statusElement = document.getElementById(statusElementId);
+     return function (message, error) {
+       if (error) {
+         console.log(`${message}\n${error}`);
+         statusElement.innerText = `error: ${message} (check console)`;
+       } else {
+         statusElement.innerText = `error: ${message}`;
+       }
+     }
    }
 
    function selectSavedTab () {
@@ -24157,9 +24178,21 @@ var sqlui = (function (exports) {
      window.savedLoaded = true;
    }
 
-   function submit () {
+   function submitAll () {
+     submit(null);
+   }
+
+   function submitCurrent () {
+     submit(getSelection());
+   }
+
+   function submit (selection) {
      const url = new URL(window.location);
-     url.searchParams.set('cursor', getCursor());
+     if (selection) {
+       url.searchParams.set('selection', selection.join(':'));
+     } else {
+       url.searchParams.delete('selection');
+     }
 
      let sql = getValue().trim();
      sql = sql === '' ? null : sql;
@@ -24218,7 +24251,7 @@ var sqlui = (function (exports) {
      }
    }
 
-   function fetchSql (sql, cursor, callback) {
+   function fetchSql (sql, selection, successCallback, errorCallback) {
      fetch('query', {
        headers: {
          Accept: 'application/json',
@@ -24227,40 +24260,69 @@ var sqlui = (function (exports) {
        method: 'POST',
        body: JSON.stringify({
          sql,
-         cursor
+         selection
        })
      })
-       .then((response) => response.json())
-       .then((result) => callback(result));
+       .then((response) => {
+         const contentType = response.headers.get('content-type');
+         if (contentType && contentType.indexOf('application/json') !== -1) {
+           response.json().then((result) => {
+             if (result?.query) {
+               successCallback(result);
+             } else if (result?.error) {
+               errorCallback(result.error, result.stacktrace);
+             } else if (result) {
+               errorCallback('failed to execute query', result.toString());
+             } else {
+               errorCallback('failed to execute query');
+             }
+           });
+         } else {
+           response.text().then((result) => {
+             errorCallback('failed to execute query', result);
+           });
+         }
+       })
+       .catch(function (error) {
+         errorCallback('failed to execute query', error.stack);
+       });
    }
 
-   function fetchFile (name, callback) {
+   function fetchFile (name, successCallback, errorCallback) {
      fetch(`query_file?file=${name}`, {
        headers: {
          Accept: 'application/json'
        },
        method: 'GET'
      })
-       .then((response) => response.json())
-       .then((result) => callback(result));
-   }
-
-   function fetchMetadata (callback) {
-     fetch('metadata', {
-       headers: {
-         Accept: 'application/json'
-       },
-       method: 'GET'
-     })
-       .then((response) => response.json())
-       .then((result) => callback(result));
+       .then((response) => {
+         const contentType = response.headers.get('content-type');
+         if (contentType && contentType.indexOf('application/json') !== -1) {
+           response.json().then((result) => {
+             if (result?.query) {
+               successCallback(result);
+             } else if (result?.error) {
+               errorCallback(result.error, result.stacktrace);
+             } else if (result) {
+               errorCallback('failed to load file  ', result.toString());
+             } else {
+               errorCallback('failed to load file');
+             }
+           });
+         } else {
+           errorCallback('failed to load file', response.toString());
+         }
+       })
+       .catch(function (error) {
+         errorCallback('failed to load file', error.stack);
+       });
    }
 
-   function loadQueryOrGraphTab (callback) {
+   function loadQueryOrGraphTab (callback, errorCallback) {
      const params = new URLSearchParams(window.location.search);
      const sql = params.get('sql');
      const file = params.get('file');
-     const cursor = params.has('cursor') ? params.get('cursor') : 0;
+     const selection = params.has('selection') ? params.get('selection') : null;
 
      if (params.has('sql') && window.result && sql === window.result.query) {
        callback();
@@ -24270,7 +24332,7 @@ var sqlui = (function (exports) {
        return
      }
 
-     if (params.has('file') && params.has('sql') && cursor === window.result.cursor) {
+     if (params.has('file') && params.has('sql') && selection === window.result.selection) {
        // TODO: show an error.
        throw new Error('You can only specify a file or sql, not both.')
      }
@@ -24279,24 +24341,21 @@ var sqlui = (function (exports) {
 
      if (params.has('sql')) {
        setValue(sql);
-       const cursor = params.has('cursor') ? params.get('cursor') : 0;
-       fetchSql(params.get('sql'), cursor, function (result) {
+       fetchSql(params.get('sql'), selection, function (result) {
          window.result = result;
          callback();
-       });
+       }, errorCallback);
      } else if (params.has('file')) {
        setValue('');
        fetchFile(file, function (result) {
          window.result = result;
-         if (window.result.query) {
-           setValue(result.query);
-         }
+         setValue(result.query);
          callback();
-       });
+       }, errorCallback);
      }
-     if (params.has('cursor')) {
+     if (params.has('selection')) {
        focus();
-       setCursor(cursor);
+       setSelection(params.get('selection').split(':'));
      }
    }
 
@@ -24308,9 +24367,9 @@ var sqlui = (function (exports) {
 
      setQueryStatus(window.result);
 
-     if (!window.result.rows) {
-       return
-     }
+     // if (!window.result.rows) {
+     //   return
+     // }
 
      const tableElement = document.createElement('table');
      const theadElement = document.createElement('thead');
@@ -24326,7 +24385,9 @@ var sqlui = (function (exports) {
        template.innerHTML = `<th class="cell">${column}</th>`;
        headerElement.appendChild(template.content.firstChild);
      });
-     headerElement.appendChild(document.createElement('th'));
+     if (window.result.columns.length > 0) {
+       headerElement.appendChild(document.createElement('th'));
+     }
      let highlight = false;
      window.result.rows.forEach(function (row) {
        const rowElement = document.createElement('tr');
@@ -24362,8 +24423,11 @@ var sqlui = (function (exports) {
 
      window.result.rows.forEach((row) => {
        const rowValues = row.map((value, index) => {
-         if (window.result.column_types[index] === 'date') {
+         if (window.result.column_types[index] === 'date' || window.result.column_types[index] === 'datetime') {
            return new Date(value)
+         } else if (window.result.column_types[index] === 'timeofday') {
+           // TODO: This should be hour, minute, second, milliseconds
+           return [0, 0, 0, 0]
          } else {
            return value
          }
@@ -24387,13 +24451,6 @@ var sqlui = (function (exports) {
 
    function setGraphStatus (result) {
      const statusElement = document.getElementById('graph-status');
-     if (!result.rows) {
-       // TODO use a popup
-       console.log('error parsing graph result');
-       console.log(JSON.stringify(result, null, 2));
-       statusElement.innerText = 'error, check console';
-       return
-     }
 
      if (result.total_rows === 1) {
        statusElement.innerText = `${result.total_rows} row`;
@@ -24408,13 +24465,6 @@ var sqlui = (function (exports) {
 
    function setQueryStatus (result) {
      const statusElement = document.getElementById('query-status');
-     if (!result.rows) {
-       // TODO use a popup
-       console.log('error parsing query result');
-       console.log(JSON.stringify(result, null, 2));
-       statusElement.innerText = 'error, check console';
-       return
-     }
 
      if (result.total_rows === 1) {
        statusElement.innerText = `${result.total_rows} row`;
@@ -24447,23 +24497,58 @@ var sqlui = (function (exports) {
    }
 
    window.onload = function () {
-     fetchMetadata(function (result) {
-       window.metadata = result;
-       if (!result.server) {
-         // TODO show error
-         throw new Error('unexpected metadata response')
-       }
-       document.getElementById('header').innerText = result.server;
-       const queryElement = document.getElementById('query');
+     fetch('metadata', {
+       headers: {
+         Accept: 'application/json'
+       },
+       method: 'GET'
+     })
+       .then((response) => {
+         const contentType = response.headers.get('content-type');
+         if (contentType && contentType.indexOf('application/json') !== -1) {
+           return response.json().then((result) => {
+             if (result.error) {
+               let error = `<pre>${result.error}`;
+               if (result.stacktrace) {
+                 error += '\n' + result.stacktrace + '</pre>';
+               }
+               document.getElementById('loading-box').innerHTML = error;
+             } else if (!result.server) {
+               document.getElementById('loading-box').innerHTML = `
+                <pre>
+                  error loading metadata, response:
+                  ${JSON.stringify(result)}
+                </pre>
+              `;
+             } else {
+               window.metadata = result;
+               document.getElementById('loading-box').style.display = 'none';
+               document.getElementById('main-box').style.display = 'flex';
+               document.getElementById('server-name').innerText = result.server;
+               const queryElement = document.getElementById('query');
 
-       init(queryElement, function () {
-         submit();
+               init(queryElement, submitCurrent, submitAll);
+               route();
+             }
+           })
+         } else {
+           console.log(response);
+           document.getElementById('loading-box').style.display = 'flex';
+           document.getElementById('main-box').style.display = 'none';
+           document.getElementById('loading-box').innerHTML = `<pre>${response}</pre>`;
+         }
+       })
+       .catch(function (error) {
+         console.log(error);
+         document.getElementById('loading-box').style.display = 'flex';
+         document.getElementById('main-box').style.display = 'none';
+         document.getElementById('loading-box').innerHTML = `<pre>${error.stack}</pre>`;
        });
-       route();
-     });
    };
 
    exports.selectTab = selectTab;
+   exports.submitAll = submitAll;
+   exports.submitCurrent = submitCurrent;
 
    return exports;
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqlui
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Nick Dower
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -158,10 +158,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".version"
+- app/args.rb
 - app/database_config.rb
+- app/database_metadata.rb
+- app/deep.rb
 - app/environment.rb
+- app/mysql_types.rb
 - app/server.rb
 - app/sql_parser.rb
+- app/sqlui.rb
 - app/sqlui_config.rb
 - app/views/databases.erb
 - bin/sqlui