Update README.md

- Pivot support implementation 
- Rename queries into inquiries
- Rename editor into workspace
- Change result set format
- New JSON format for inquiries
- Redesign panels

.github/workflows/config.grenrc.js

@@ -7,11 +7,11 @@ module.exports = {
   milestoneMatch: 'v{{tag_name}}',
   template: {
     issue: '- {{name}} [{{text}}]({{url}})',
-    changelogTitle: "## Release notes\n\n",
+    changelogTitle: "",
     release: "{{body}}",
   },
   groupBy: {
-    'Enhancements:': ["enhancement", "internal"],
-    'Bug fixes:': ["bug"]
+    'Enhancements': ["enhancement", "internal"],
+    'Bug fixes': ["bug"]
   }
 }

.github/workflows/main.yml

@@ -15,6 +15,10 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: 10.x
+
+    - name: Update npm
+      run: npm install -g npm@7
+
     - name: npm install and build
       run: |
         npm install

.github/workflows/test.yml

@@ -4,6 +4,9 @@ on:
   push:
     branches:
     - 'master'
+  pull_request:
+    branches:
+    - 'master'
 
 jobs:
   test:
@@ -21,11 +24,14 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y chromium-browser firefox
 
+    - name: Update npm
+      run: npm install -g npm@7
+
     - name: Install the project
       run: npm install
 
     - name: Run lint
-      run: npm run lint
+      run: npm run lint -- --no-fix
 
     - name: Run karma tests
       run: npm run test

README.md

@@ -7,14 +7,14 @@
 Sqliteviz is a single-page offline-first PWA for fully client-side visualisation of SQLite databases or CSV files.
 
 With sqliteviz you can:
-- run SQL queries against a SQLite database and create [Plotly][11] charts based on the result sets
+- run SQL queries against a SQLite database and create [Plotly][11] charts and pivot tables based on the result sets
 - import a CSV file into a SQLite database and visualize imported data
-- manage queries and chart settings and run them against different databases
-- import/export queries and chart settings to/from a JSON file
+- manage inquiries and run them against different databases
+- import/export inquiries to/from a JSON file
 - export a modified SQLite database
 - use it offline from your OS application menu like any other desktop app
 
-https://user-images.githubusercontent.com/24638357/117355518-fa332680-aeb2-11eb-8a69-fbcea4f7aeb0.mp4
+https://user-images.githubusercontent.com/24638357/128249848-f8fab0f5-9add-46e0-a9c1-dd5085a8623e.mp4
 
 ## Quickstart
 The latest release of sqliteviz is deployed on GitHub Pages at [lana-k.github.io/sqliteviz][6].
@@ -26,7 +26,7 @@ For user documentation, check out sqliteviz [Wiki][7].
 It's a kind of middleground between [Plotly Falcon][1] and [Redash][2].
 
 ## Components
-It is built on top of [react-chart-editor][3], [sql.js][4] and [Vue-Codemirror][8] in [Vue.js][5]. CSV parsing is performed with [Papa Parse][9].
+It is built on top of [react-chart-editor][3], [PivotTable.js][12], [sql.js][4] and [Vue-Codemirror][8] in [Vue.js][5]. CSV parsing is performed with [Papa Parse][9].
 
 [1]: https://github.com/plotly/falcon
 [2]: https://github.com/getredash/redash
@@ -39,3 +39,4 @@ It is built on top of [react-chart-editor][3], [sql.js][4] and [Vue-Codemirror][
 [9]: https://www.papaparse.com/
 [10]: https://github.com/lana-k/sqliteviz/wiki/Predefined-queries
 [11]: https://github.com/plotly/plotly.js
+[12]: https://github.com/nicolaskruchten/pivottable

lib/sql-js/Dockerfile

@@ -0,0 +1,9 @@
+FROM emscripten/emsdk:2.0.24
+
+WORKDIR /tmp/build
+
+COPY configure.py .
+RUN python3.8 configure.py
+
+COPY build.py .
+RUN python3.8 build.py

lib/sql-js/README.md

@@ -0,0 +1,73 @@
+# SQLite WebAssembly build
+
+This directory contains Docker-based build script, `make.sh`, that builds
+a custom version of [sql.js][1]. It allows sqliteviz to have more recent
+version of SQLite build with a number of useful extensions.
+
+`Makefile` from [sql.js][1] is rewritten as more comprehensible `configure.py`
+ and `build.py` Python scripts that run in `emscripten/emsdk` Docker container.
+
+## Extension
+
+SQLite [amalgamation][2] extensions included:
+
+1. [FTS5][4] -- virtual table module that provides full-text search
+   functionality
+
+SQLite [miscellaneous extensions][3] included:
+
+1. `generate_series` table-valued [series function][6] ([series.c][7])
+2. `transitive_closure` virtual table for
+   [Querying Tree Structures in SQLite][11] ([closure.c][8])
+3. `uuid`, `uuid_str` and `uuid_blob` RFC-4122 UUID functions ([uuid.c][9])
+4. `regexp` (hence `REGEXP` operator) and `regexpi` functions ([regexp.c][10])
+
+SQLite 3rd party extensions included:
+
+1. [pivot_vtab][5] -- a pivot virtual table
+
+To ease the step to have working clone locally, the build is committed into
+the repository.
+
+## Build method
+
+Basically it's extended amalgamation and `SQLITE_EXTRA_INIT` concisely
+described in [this message from SQLite Forum][12]:
+
+> Simply append it to the end of the amalgamation file. The real problem is
+> how you get the init function called. The easiest way (to me at any rate) is
+> to append a function (after the extensions you want to add are all appended)
+> that adds the init function for each extension to the auto extension list
+> for new connections, and set the pre-processor symbol SQLITE_EXTRA_INIT to
+> the name of this function. [...]
+>
+> An example `SQLITE_EXTRA_INIT` function looks like this:
+>
+> ```
+> int core_init(const char* dummy)
+> {
+>    int nErr = 0;
+>
+>    nErr += sqlite3_auto_extension((void*)sqlite3_autobusy_init);
+>    nErr += sqlite3_auto_extension((void*)sqlite3_ipaddress_init);
+>
+>    return nErr ? SQLITE_ERROR : SQLITE_OK;
+> }
+> ```
+>
+> so you would then define `SQLITE_EXTRA_INIT=core_init` when compiling the
+> amalgamation code and the extensions would thereafter be automatically
+> initialized on each connection.
+
+[1]:  https://github.com/sql-js/sql.js
+[2]:  https://sqlite.org/amalgamation.html
+[3]:  https://sqlite.org/src/dir?ci=trunk&name=ext/misc
+[4]:  https://sqlite.org/fts5.html
+[5]:  https://github.com/jakethaw/pivot_vtab
+[6]:  https://sqlite.org/series.html
+[7]:  https://sqlite.org/src/file/ext/misc/series.c
+[8]:  https://sqlite.org/src/file/ext/misc/closure.c
+[9]:  https://sqlite.org/src/file/ext/misc/uuid.c
+[10]: https://sqlite.org/src/file/ext/misc/regexp.c
+[11]: https://charlesleifer.com/blog/querying-tree-structures-in-sqlite-using-python-and-the-transitive-closure-extension/
+[12]: https://sqlite.org/forum/forumpost/6ad7d4f4bebe5e06?raw

lib/sql-js/build.py

@@ -0,0 +1,83 @@
+import logging
+import subprocess
+from pathlib import Path
+
+
+cflags = (
+    '-O2',
+    '-DSQLITE_OMIT_LOAD_EXTENSION',
+    '-DSQLITE_DISABLE_LFS',
+    '-DSQLITE_ENABLE_FTS3',
+    '-DSQLITE_ENABLE_FTS3_PARENTHESIS',
+    '-DSQLITE_ENABLE_FTS5',
+    '-DSQLITE_ENABLE_JSON1',
+    '-DSQLITE_THREADSAFE=0',
+    '-DSQLITE_ENABLE_NORMALIZE',
+    '-DSQLITE_EXTRA_INIT=extra_init',
+    '-DSQLITE_DEFAULT_MEMSTATUS=0',
+    '-DSQLITE_USE_ALLOCA',
+)
+emflags = (
+    # Base
+    '--memory-init-file', '0',
+    '-s', 'RESERVED_FUNCTION_POINTERS=64',
+    '-s', 'ALLOW_TABLE_GROWTH=1',
+    '-s', 'SINGLE_FILE=0',
+    # WASM
+    '-s', 'WASM=1',
+    '-s', 'ALLOW_MEMORY_GROWTH=1',
+    # Optimisation
+    '-s', 'INLINING_LIMIT=50',
+    '-O3',
+    '-flto',
+    '--closure', '1',
+    # sql.js
+    '-s', 'EXPORTED_FUNCTIONS=@src/sqljs/exported_functions.json',
+    '-s', 'EXPORTED_RUNTIME_METHODS=@src/sqljs/exported_runtime_methods.json',
+    '--pre-js', 'src/sqljs/api.js',
+)
+
+
+def build(src: Path, dst: Path):
+    out = Path('out')
+    out.mkdir()
+
+    logging.info('Building LLVM bitcode for sqlite3.c')
+    subprocess.check_call([
+        'emcc',
+        *cflags,
+        '-c', src / 'sqlite3.c',
+        '-o', out / 'sqlite3.bc',
+    ])
+    logging.info('Building LLVM bitcode for extension-functions.c')
+    subprocess.check_call([
+        'emcc',
+        *cflags,
+        '-c', src / 'extension-functions.c',
+        '-o', out / 'extension-functions.bc',
+    ])
+
+    logging.info('Building WASM from bitcode')
+    subprocess.check_call([
+        'emcc',
+        *emflags,
+        out / 'sqlite3.bc',
+        out / 'extension-functions.bc',
+        '-o', out / 'sql-wasm.js',
+    ])
+
+    logging.info('Post-processing build and copying to dist')
+    (out / 'sql-wasm.wasm').rename(dst / 'sql-wasm.wasm')
+    with (dst / 'sql-wasm.js').open('w') as f:
+        f.write((src / 'sqljs' / 'shell-pre.js').read_text())
+        f.write((out / 'sql-wasm.js').read_text())
+        f.write((src / 'sqljs' / 'shell-post.js').read_text())
+
+
+if __name__ == '__main__':
+    logging.basicConfig(level='INFO', format='%(asctime)s %(levelname)s %(name)s %(message)s')
+
+    src = Path('src')
+    dst = Path('dist')
+    dst.mkdir()
+    build(src, dst)

lib/sql-js/configure.py

@@ -0,0 +1,105 @@
+import logging
+import shutil
+import subprocess
+import sys
+import zipfile
+from io import BytesIO
+from pathlib import Path
+from urllib import request
+
+
+amalgamation_url = 'https://sqlite.org/2021/sqlite-amalgamation-3360000.zip'
+
+# Extension-functions
+# ===================
+# It breaks amalgamation if appended as other extension because it redefines
+# several functions, so build it separately. Note that sql.js registers these
+# extension functions by calling ``registerExtensionFunctions`` itself.
+contrib_functions_url = 'https://sqlite.org/contrib/download/extension-functions.c?get=25'
+
+extension_urls = (
+    # Miscellaneous extensions
+    # ========================
+    ('https://sqlite.org/src/raw/c6bd5d24?at=series.c', 'sqlite3_series_init'),
+    ('https://sqlite.org/src/raw/dbfd8543?at=closure.c', 'sqlite3_closure_init'),
+    ('https://sqlite.org/src/raw/5bb2264c?at=uuid.c', 'sqlite3_uuid_init'),
+    ('https://sqlite.org/src/raw/5853b0e5?at=regexp.c', 'sqlite3_regexp_init'),
+    # Third-party extension
+    # =====================
+    ('https://github.com/jakethaw/pivot_vtab/raw/08ab0797/pivot_vtab.c', 'sqlite3_pivotvtab_init'),
+)
+
+sqljs_url = 'https://github.com/sql-js/sql.js/archive/refs/tags/v1.5.0.zip'
+
+
+def _generate_extra_init_c_function(init_function_names):
+    auto_ext_calls = '\n'.join([
+        'nErr += sqlite3_auto_extension((void*){});'.format(init_fn)
+        for init_fn in init_function_names
+    ])
+    return '''
+        int extra_init(const char* dummy)
+        {
+            int nErr = 0;
+            %s
+            return nErr ? SQLITE_ERROR : SQLITE_OK;
+        }
+    ''' % auto_ext_calls
+
+
+def _get_amalgamation(tgt: Path):
+    logging.info('Downloading and extracting SQLite amalgamation %s', amalgamation_url)
+    archive = zipfile.ZipFile(BytesIO(request.urlopen(amalgamation_url).read()))
+    archive_root_dir = zipfile.Path(archive, archive.namelist()[0])
+    for zpath in archive_root_dir.iterdir():
+        with zpath.open() as fr, (tgt / zpath.name).open('wb') as fw:
+            shutil.copyfileobj(fr, fw)
+
+
+def _get_contrib_functions(tgt: Path):
+    request.urlretrieve(contrib_functions_url, tgt / 'extension-functions.c')
+
+
+def _get_extensions(tgt: Path):
+    init_functions = []
+    sqlite3_c = tgt / 'sqlite3.c'
+    with sqlite3_c.open('ab') as f:
+        for url, init_fn in extension_urls:
+            logging.info('Downloading and appending to amalgamation %s', url)
+            with request.urlopen(url) as resp:
+                shutil.copyfileobj(resp, f)
+            init_functions.append(init_fn)
+
+        logging.info('Appending SQLITE_EXTRA_INIT to amalgamation')
+        f.write(_generate_extra_init_c_function(init_functions).encode())
+
+
+def _get_sqljs(tgt: Path):
+    logging.info('Downloading and extracting sql.js %s', sqljs_url)
+    archive = zipfile.ZipFile(BytesIO(request.urlopen(sqljs_url).read()))
+    archive_root_dir = zipfile.Path(archive, archive.namelist()[0])
+    (tgt / 'sqljs').mkdir()
+    for zpath in (archive_root_dir / 'src').iterdir():
+        with zpath.open() as fr, (tgt / 'sqljs' / zpath.name).open('wb') as fw:
+            shutil.copyfileobj(fr, fw)
+
+
+def configure(tgt: Path):
+    _get_amalgamation(tgt)
+    _get_contrib_functions(tgt)
+    _get_extensions(tgt)
+    _get_sqljs(tgt)
+
+    subprocess.check_call(['emcc', '--version'])
+
+
+if __name__ == '__main__':
+    if sys.version_info < (3, 8):
+        print('Python 3.8 or higher is expected', file=sys.stderr)
+        sys.exit(1)
+
+    logging.basicConfig(level='INFO', format='%(asctime)s %(levelname)s %(name)s %(message)s')
+
+    src = Path('src')
+    src.mkdir()
+    configure(src)

lib/sql-js/dist/sql-wasm.js

@@ -0,0 +1,201 @@
+
+// We are modularizing this manually because the current modularize setting in Emscripten has some issues:
+// https://github.com/kripken/emscripten/issues/5820
+// In addition, When you use emcc's modularization, it still expects to export a global object called `Module`,
+// which is able to be used/called before the WASM is loaded.
+// The modularization below exports a promise that loads and resolves to the actual sql.js module.
+// That way, this module can't be used before the WASM is finished loading.
+
+// We are going to define a function that a user will call to start loading initializing our Sql.js library
+// However, that function might be called multiple times, and on subsequent calls, we don't actually want it to instantiate a new instance of the Module
+// Instead, we want to return the previously loaded module
+
+// TODO: Make this not declare a global if used in the browser
+var initSqlJsPromise = undefined;
+
+var initSqlJs = function (moduleConfig) {
+
+    if (initSqlJsPromise){
+      return initSqlJsPromise;
+    }
+    // If we're here, we've never called this function before
+    initSqlJsPromise = new Promise(function (resolveModule, reject) {
+
+        // We are modularizing this manually because the current modularize setting in Emscripten has some issues:
+        // https://github.com/kripken/emscripten/issues/5820
+
+        // The way to affect the loading of emcc compiled modules is to create a variable called `Module` and add
+        // properties to it, like `preRun`, `postRun`, etc
+        // We are using that to get notified when the WASM has finished loading.
+        // Only then will we return our promise
+
+        // If they passed in a moduleConfig object, use that
+        // Otherwise, initialize Module to the empty object
+        var Module = typeof moduleConfig !== 'undefined' ? moduleConfig : {};
+
+        // EMCC only allows for a single onAbort function (not an array of functions)
+        // So if the user defined their own onAbort function, we remember it and call it
+        var originalOnAbortFunction = Module['onAbort'];
+        Module['onAbort'] = function (errorThatCausedAbort) {
+            reject(new Error(errorThatCausedAbort));
+            if (originalOnAbortFunction){
+              originalOnAbortFunction(errorThatCausedAbort);
+            }
+        };
+
+        Module['postRun'] = Module['postRun'] || [];
+        Module['postRun'].push(function () {
+            // When Emscripted calls postRun, this promise resolves with the built Module
+            resolveModule(Module);
+        });
+
+        // There is a section of code in the emcc-generated code below that looks like this:
+        // (Note that this is lowercase `module`)
+        // if (typeof module !== 'undefined') {
+        //     module['exports'] = Module;
+        // }
+        // When that runs, it's going to overwrite our own modularization export efforts in shell-post.js!
+        // The only way to tell emcc not to emit it is to pass the MODULARIZE=1 or MODULARIZE_INSTANCE=1 flags,
+        // but that carries with it additional unnecessary baggage/bugs we don't want either.
+        // So, we have three options:
+        // 1) We undefine `module`
+        // 2) We remember what `module['exports']` was at the beginning of this function and we restore it later
+        // 3) We write a script to remove those lines of code as part of the Make process.
+        //
+        // Since those are the only lines of code that care about module, we will undefine it. It's the most straightforward
+        // of the options, and has the side effect of reducing emcc's efforts to modify the module if its output were to change in the future.
+        // That's a nice side effect since we're handling the modularization efforts ourselves
+        module = undefined;
+
+        // The emcc-generated code and shell-post.js code goes below,
+        // meaning that all of it runs inside of this promise. If anything throws an exception, our promise will abort
+
+var e;e||(e=typeof Module !== 'undefined' ? Module : {});null;
+e.onRuntimeInitialized=function(){function a(h,l){this.Ra=h;this.db=l;this.Qa=1;this.lb=[]}function b(h,l){this.db=l;l=ba(h)+1;this.eb=ca(l);if(null===this.eb)throw Error("Unable to allocate memory for the SQL string");k(h,n,this.eb,l);this.jb=this.eb;this.$a=this.pb=null}function c(h){this.filename="dbfile_"+(4294967295*Math.random()>>>0);if(null!=h){var l=this.filename,p=l?r("//"+l):"/";l=da(!0,!0);p=ea(p,(void 0!==l?l:438)&4095|32768,0);if(h){if("string"===typeof h){for(var q=Array(h.length),B=
+0,ha=h.length;B<ha;++B)q[B]=h.charCodeAt(B);h=q}fa(p,l|146);q=v(p,577);ka(q,h,0,h.length,0,void 0);la(q);fa(p,l)}}this.handleError(g(this.filename,d));this.db=x(d,"i32");ic(this.db);this.fb={};this.Xa={}}var d=y(4),f=e.cwrap,g=f("sqlite3_open","number",["string","number"]),m=f("sqlite3_close_v2","number",["number"]),t=f("sqlite3_exec","number",["number","string","number","number","number"]),w=f("sqlite3_changes","number",["number"]),u=f("sqlite3_prepare_v2","number",["number","string","number","number",
+"number"]),C=f("sqlite3_sql","string",["number"]),H=f("sqlite3_normalized_sql","string",["number"]),aa=f("sqlite3_prepare_v2","number",["number","number","number","number","number"]),jc=f("sqlite3_bind_text","number",["number","number","number","number","number"]),rb=f("sqlite3_bind_blob","number",["number","number","number","number","number"]),kc=f("sqlite3_bind_double","number",["number","number","number"]),lc=f("sqlite3_bind_int","number",["number","number","number"]),mc=f("sqlite3_bind_parameter_index",
+"number",["number","string"]),nc=f("sqlite3_step","number",["number"]),oc=f("sqlite3_errmsg","string",["number"]),pc=f("sqlite3_column_count","number",["number"]),qc=f("sqlite3_data_count","number",["number"]),rc=f("sqlite3_column_double","number",["number","number"]),sc=f("sqlite3_column_text","string",["number","number"]),tc=f("sqlite3_column_blob","number",["number","number"]),uc=f("sqlite3_column_bytes","number",["number","number"]),vc=f("sqlite3_column_type","number",["number","number"]),wc=
+f("sqlite3_column_name","string",["number","number"]),xc=f("sqlite3_reset","number",["number"]),yc=f("sqlite3_clear_bindings","number",["number"]),zc=f("sqlite3_finalize","number",["number"]),Ac=f("sqlite3_create_function_v2","number","number string number number number number number number number".split(" ")),Bc=f("sqlite3_value_type","number",["number"]),Cc=f("sqlite3_value_bytes","number",["number"]),Dc=f("sqlite3_value_text","string",["number"]),Ec=f("sqlite3_value_blob","number",["number"]),
+Fc=f("sqlite3_value_double","number",["number"]),Gc=f("sqlite3_result_double","",["number","number"]),sb=f("sqlite3_result_null","",["number"]),Hc=f("sqlite3_result_text","",["number","string","number","number"]),Ic=f("sqlite3_result_blob","",["number","number","number","number"]),Jc=f("sqlite3_result_int","",["number","number"]),tb=f("sqlite3_result_error","",["number","string","number"]),ic=f("RegisterExtensionFunctions","number",["number"]);a.prototype.bind=function(h){if(!this.Ra)throw"Statement closed";
+this.reset();return Array.isArray(h)?this.Bb(h):null!=h&&"object"===typeof h?this.Cb(h):!0};a.prototype.step=function(){if(!this.Ra)throw"Statement closed";this.Qa=1;var h=nc(this.Ra);switch(h){case 100:return!0;case 101:return!1;default:throw this.db.handleError(h);}};a.prototype.Hb=function(h){null==h&&(h=this.Qa,this.Qa+=1);return rc(this.Ra,h)};a.prototype.Ib=function(h){null==h&&(h=this.Qa,this.Qa+=1);return sc(this.Ra,h)};a.prototype.getBlob=function(h){null==h&&(h=this.Qa,this.Qa+=1);var l=
+uc(this.Ra,h);h=tc(this.Ra,h);for(var p=new Uint8Array(l),q=0;q<l;q+=1)p[q]=z[h+q];return p};a.prototype.get=function(h){null!=h&&this.bind(h)&&this.step();h=[];for(var l=qc(this.Ra),p=0;p<l;p+=1)switch(vc(this.Ra,p)){case 1:case 2:h.push(this.Hb(p));break;case 3:h.push(this.Ib(p));break;case 4:h.push(this.getBlob(p));break;default:h.push(null)}return h};a.prototype.getColumnNames=function(){for(var h=[],l=pc(this.Ra),p=0;p<l;p+=1)h.push(wc(this.Ra,p));return h};a.prototype.getAsObject=function(h){h=
+this.get(h);for(var l=this.getColumnNames(),p={},q=0;q<l.length;q+=1)p[l[q]]=h[q];return p};a.prototype.getSQL=function(){return C(this.Ra)};a.prototype.getNormalizedSQL=function(){return H(this.Ra)};a.prototype.run=function(h){null!=h&&this.bind(h);this.step();return this.reset()};a.prototype.Fb=function(h,l){null==l&&(l=this.Qa,this.Qa+=1);h=ma(h);var p=na(h);this.lb.push(p);this.db.handleError(jc(this.Ra,l,p,h.length-1,0))};a.prototype.Ab=function(h,l){null==l&&(l=this.Qa,this.Qa+=1);var p=na(h);
+this.lb.push(p);this.db.handleError(rb(this.Ra,l,p,h.length,0))};a.prototype.Eb=function(h,l){null==l&&(l=this.Qa,this.Qa+=1);this.db.handleError((h===(h|0)?lc:kc)(this.Ra,l,h))};a.prototype.Db=function(h){null==h&&(h=this.Qa,this.Qa+=1);rb(this.Ra,h,0,0,0)};a.prototype.tb=function(h,l){null==l&&(l=this.Qa,this.Qa+=1);switch(typeof h){case "string":this.Fb(h,l);return;case "number":case "boolean":this.Eb(h+0,l);return;case "object":if(null===h){this.Db(l);return}if(null!=h.length){this.Ab(h,l);return}}throw"Wrong API use : tried to bind a value of an unknown type ("+
+h+").";};a.prototype.Cb=function(h){var l=this;Object.keys(h).forEach(function(p){var q=mc(l.Ra,p);0!==q&&l.tb(h[p],q)});return!0};a.prototype.Bb=function(h){for(var l=0;l<h.length;l+=1)this.tb(h[l],l+1);return!0};a.prototype.reset=function(){return 0===yc(this.Ra)&&0===xc(this.Ra)};a.prototype.freemem=function(){for(var h;void 0!==(h=this.lb.pop());)oa(h)};a.prototype.free=function(){var h=0===zc(this.Ra);delete this.db.fb[this.Ra];this.Ra=0;return h};b.prototype.next=function(){if(null===this.eb)return{done:!0};
+null!==this.$a&&(this.$a.free(),this.$a=null);if(!this.db.db)throw this.nb(),Error("Database closed");var h=pa(),l=y(4);qa(d);qa(l);try{this.db.handleError(aa(this.db.db,this.jb,-1,d,l));this.jb=x(l,"i32");var p=x(d,"i32");if(0===p)return this.nb(),{done:!0};this.$a=new a(p,this.db);this.db.fb[p]=this.$a;return{value:this.$a,done:!1}}catch(q){throw this.pb=A(this.jb),this.nb(),q;}finally{ra(h)}};b.prototype.nb=function(){oa(this.eb);this.eb=null};b.prototype.getRemainingSQL=function(){return null!==
+this.pb?this.pb:A(this.jb)};"function"===typeof Symbol&&"symbol"===typeof Symbol.iterator&&(b.prototype[Symbol.iterator]=function(){return this});c.prototype.run=function(h,l){if(!this.db)throw"Database closed";if(l){h=this.prepare(h,l);try{h.step()}finally{h.free()}}else this.handleError(t(this.db,h,0,0,d));return this};c.prototype.exec=function(h,l){if(!this.db)throw"Database closed";var p=pa(),q=null;try{var B=ba(h)+1,ha=y(B);k(h,z,ha,B);var D=ha;var ia=y(4);for(h=[];0!==x(D,"i8");){qa(d);qa(ia);
+this.handleError(aa(this.db,D,-1,d,ia));var ja=x(d,"i32");D=x(ia,"i32");if(0!==ja){B=null;q=new a(ja,this);for(null!=l&&q.bind(l);q.step();)null===B&&(B={columns:q.getColumnNames(),values:[]},h.push(B)),B.values.push(q.get());q.free()}}return h}catch(E){throw q&&q.free(),E;}finally{ra(p)}};c.prototype.each=function(h,l,p,q){"function"===typeof l&&(q=p,p=l,l=void 0);h=this.prepare(h,l);try{for(;h.step();)p(h.getAsObject())}finally{h.free()}if("function"===typeof q)return q()};c.prototype.prepare=function(h,
+l){qa(d);this.handleError(u(this.db,h,-1,d,0));h=x(d,"i32");if(0===h)throw"Nothing to prepare";var p=new a(h,this);null!=l&&p.bind(l);return this.fb[h]=p};c.prototype.iterateStatements=function(h){return new b(h,this)};c.prototype["export"]=function(){Object.values(this.fb).forEach(function(l){l.free()});Object.values(this.Xa).forEach(sa);this.Xa={};this.handleError(m(this.db));var h=ta(this.filename);this.handleError(g(this.filename,d));this.db=x(d,"i32");return h};c.prototype.close=function(){null!==
+this.db&&(Object.values(this.fb).forEach(function(h){h.free()}),Object.values(this.Xa).forEach(sa),this.Xa={},this.handleError(m(this.db)),ua("/"+this.filename),this.db=null)};c.prototype.handleError=function(h){if(0===h)return null;h=oc(this.db);throw Error(h);};c.prototype.getRowsModified=function(){return w(this.db)};c.prototype.create_function=function(h,l){Object.prototype.hasOwnProperty.call(this.Xa,h)&&(sa(this.Xa[h]),delete this.Xa[h]);var p=va(function(q,B,ha){for(var D,ia=[],ja=0;ja<B;ja+=
+1){var E=x(ha+4*ja,"i32"),T=Bc(E);if(1===T||2===T)E=Fc(E);else if(3===T)E=Dc(E);else if(4===T){T=E;E=Cc(T);T=Ec(T);for(var wb=new Uint8Array(E),Ba=0;Ba<E;Ba+=1)wb[Ba]=z[T+Ba];E=wb}else E=null;ia.push(E)}try{D=l.apply(null,ia)}catch(Mc){tb(q,Mc,-1);return}switch(typeof D){case "boolean":Jc(q,D?1:0);break;case "number":Gc(q,D);break;case "string":Hc(q,D,-1,-1);break;case "object":null===D?sb(q):null!=D.length?(B=na(D),Ic(q,B,D.length,-1),oa(B)):tb(q,"Wrong API use : tried to return a value of an unknown type ("+
+D+").",-1);break;default:sb(q)}});this.Xa[h]=p;this.handleError(Ac(this.db,h,l.length,1,0,p,0,0,0));return this};e.Database=c};var wa={},F;for(F in e)e.hasOwnProperty(F)&&(wa[F]=e[F]);var xa="./this.program",ya=!1,za=!1,Aa=!1,Ca=!1;ya="object"===typeof window;za="function"===typeof importScripts;Aa="object"===typeof process&&"object"===typeof process.versions&&"string"===typeof process.versions.node;Ca=!ya&&!Aa&&!za;var G="",Da,Ea,Fa,Ga,Ha;
+if(Aa)G=za?require("path").dirname(G)+"/":__dirname+"/",Da=function(a,b){Ga||(Ga=require("fs"));Ha||(Ha=require("path"));a=Ha.normalize(a);return Ga.readFileSync(a,b?null:"utf8")},Fa=function(a){a=Da(a,!0);a.buffer||(a=new Uint8Array(a));assert(a.buffer);return a},1<process.argv.length&&(xa=process.argv[1].replace(/\\/g,"/")),process.argv.slice(2),"undefined"!==typeof module&&(module.exports=e),process.on("uncaughtException",function(a){throw a;}),process.on("unhandledRejection",I),e.inspect=function(){return"[Emscripten Module object]"};
+else if(Ca)"undefined"!=typeof read&&(Da=function(a){return read(a)}),Fa=function(a){if("function"===typeof readbuffer)return new Uint8Array(readbuffer(a));a=read(a,"binary");assert("object"===typeof a);return a},"undefined"!==typeof print&&("undefined"===typeof console&&(console={}),console.log=print,console.warn=console.error="undefined"!==typeof printErr?printErr:print);else if(ya||za)za?G=self.location.href:"undefined"!==typeof document&&document.currentScript&&(G=document.currentScript.src),
+G=0!==G.indexOf("blob:")?G.substr(0,G.lastIndexOf("/")+1):"",Da=function(a){var b=new XMLHttpRequest;b.open("GET",a,!1);b.send(null);return b.responseText},za&&(Fa=function(a){var b=new XMLHttpRequest;b.open("GET",a,!1);b.responseType="arraybuffer";b.send(null);return new Uint8Array(b.response)}),Ea=function(a,b,c){var d=new XMLHttpRequest;d.open("GET",a,!0);d.responseType="arraybuffer";d.onload=function(){200==d.status||0==d.status&&d.response?b(d.response):c()};d.onerror=c;d.send(null)};
+var Ia=e.print||console.log.bind(console),J=e.printErr||console.warn.bind(console);for(F in wa)wa.hasOwnProperty(F)&&(e[F]=wa[F]);wa=null;e.thisProgram&&(xa=e.thisProgram);var Ja=[],Ka;function sa(a){Ka.delete(K.get(a));Ja.push(a)}
+function va(a){if(!Ka){Ka=new WeakMap;for(var b=0;b<K.length;b++){var c=K.get(b);c&&Ka.set(c,b)}}if(Ka.has(a))a=Ka.get(a);else{if(Ja.length)b=Ja.pop();else{try{K.grow(1)}catch(g){if(!(g instanceof RangeError))throw g;throw"Unable to grow wasm table. Set ALLOW_TABLE_GROWTH.";}b=K.length-1}try{K.set(b,a)}catch(g){if(!(g instanceof TypeError))throw g;if("function"===typeof WebAssembly.Function){var d={i:"i32",j:"i64",f:"f32",d:"f64"},f={parameters:[],results:[]};for(c=1;4>c;++c)f.parameters.push(d["viii"[c]]);
+c=new WebAssembly.Function(f,a)}else{d=[1,0,1,96];f={i:127,j:126,f:125,d:124};d.push(3);for(c=0;3>c;++c)d.push(f["iii"[c]]);d.push(0);d[1]=d.length-2;c=new Uint8Array([0,97,115,109,1,0,0,0].concat(d,[2,7,1,1,101,1,102,0,0,7,5,1,1,102,0,0]));c=new WebAssembly.Module(c);c=(new WebAssembly.Instance(c,{e:{f:a}})).exports.f}K.set(b,c)}Ka.set(a,b);a=b}return a}var La;e.wasmBinary&&(La=e.wasmBinary);var noExitRuntime=e.noExitRuntime||!0;"object"!==typeof WebAssembly&&I("no native wasm support detected");
+function qa(a){var b="i32";"*"===b.charAt(b.length-1)&&(b="i32");switch(b){case "i1":z[a>>0]=0;break;case "i8":z[a>>0]=0;break;case "i16":Ma[a>>1]=0;break;case "i32":L[a>>2]=0;break;case "i64":M=[0,(N=0,1<=+Math.abs(N)?0<N?(Math.min(+Math.floor(N/4294967296),4294967295)|0)>>>0:~~+Math.ceil((N-+(~~N>>>0))/4294967296)>>>0:0)];L[a>>2]=M[0];L[a+4>>2]=M[1];break;case "float":Na[a>>2]=0;break;case "double":Oa[a>>3]=0;break;default:I("invalid type for setValue: "+b)}}
+function x(a,b){b=b||"i8";"*"===b.charAt(b.length-1)&&(b="i32");switch(b){case "i1":return z[a>>0];case "i8":return z[a>>0];case "i16":return Ma[a>>1];case "i32":return L[a>>2];case "i64":return L[a>>2];case "float":return Na[a>>2];case "double":return Oa[a>>3];default:I("invalid type for getValue: "+b)}return null}var Pa,Qa=!1;function assert(a,b){a||I("Assertion failed: "+b)}function Ra(a){var b=e["_"+a];assert(b,"Cannot call unknown function "+a+", make sure it is exported");return b}
+function Sa(a,b,c,d){var f={string:function(u){var C=0;if(null!==u&&void 0!==u&&0!==u){var H=(u.length<<2)+1;C=y(H);k(u,n,C,H)}return C},array:function(u){var C=y(u.length);z.set(u,C);return C}},g=Ra(a),m=[];a=0;if(d)for(var t=0;t<d.length;t++){var w=f[c[t]];w?(0===a&&(a=pa()),m[t]=w(d[t])):m[t]=d[t]}c=g.apply(null,m);c=function(u){return"string"===b?A(u):"boolean"===b?!!u:u}(c);0!==a&&ra(a);return c}var Ta=0,Ua=1;
+function na(a){var b=Ta==Ua?y(a.length):ca(a.length);a.subarray||a.slice?n.set(a,b):n.set(new Uint8Array(a),b);return b}var Va="undefined"!==typeof TextDecoder?new TextDecoder("utf8"):void 0;
+function Wa(a,b,c){var d=b+c;for(c=b;a[c]&&!(c>=d);)++c;if(16<c-b&&a.subarray&&Va)return Va.decode(a.subarray(b,c));for(d="";b<c;){var f=a[b++];if(f&128){var g=a[b++]&63;if(192==(f&224))d+=String.fromCharCode((f&31)<<6|g);else{var m=a[b++]&63;f=224==(f&240)?(f&15)<<12|g<<6|m:(f&7)<<18|g<<12|m<<6|a[b++]&63;65536>f?d+=String.fromCharCode(f):(f-=65536,d+=String.fromCharCode(55296|f>>10,56320|f&1023))}}else d+=String.fromCharCode(f)}return d}function A(a,b){return a?Wa(n,a,b):""}
+function k(a,b,c,d){if(!(0<d))return 0;var f=c;d=c+d-1;for(var g=0;g<a.length;++g){var m=a.charCodeAt(g);if(55296<=m&&57343>=m){var t=a.charCodeAt(++g);m=65536+((m&1023)<<10)|t&1023}if(127>=m){if(c>=d)break;b[c++]=m}else{if(2047>=m){if(c+1>=d)break;b[c++]=192|m>>6}else{if(65535>=m){if(c+2>=d)break;b[c++]=224|m>>12}else{if(c+3>=d)break;b[c++]=240|m>>18;b[c++]=128|m>>12&63}b[c++]=128|m>>6&63}b[c++]=128|m&63}}b[c]=0;return c-f}
+function ba(a){for(var b=0,c=0;c<a.length;++c){var d=a.charCodeAt(c);55296<=d&&57343>=d&&(d=65536+((d&1023)<<10)|a.charCodeAt(++c)&1023);127>=d?++b:b=2047>=d?b+2:65535>=d?b+3:b+4}return b}function Xa(a){var b=ba(a)+1,c=ca(b);c&&k(a,z,c,b);return c}var Ya,z,n,Ma,L,Na,Oa;
+function Za(){var a=Pa.buffer;Ya=a;e.HEAP8=z=new Int8Array(a);e.HEAP16=Ma=new Int16Array(a);e.HEAP32=L=new Int32Array(a);e.HEAPU8=n=new Uint8Array(a);e.HEAPU16=new Uint16Array(a);e.HEAPU32=new Uint32Array(a);e.HEAPF32=Na=new Float32Array(a);e.HEAPF64=Oa=new Float64Array(a)}var K,$a=[],ab=[],bb=[];function cb(){var a=e.preRun.shift();$a.unshift(a)}var db=0,eb=null,fb=null;e.preloadedImages={};e.preloadedAudios={};
+function I(a){if(e.onAbort)e.onAbort(a);J(a);Qa=!0;throw new WebAssembly.RuntimeError("abort("+a+"). Build with -s ASSERTIONS=1 for more info.");}function gb(){return O.startsWith("data:application/octet-stream;base64,")}var O;O="sql-wasm.wasm";if(!gb()){var hb=O;O=e.locateFile?e.locateFile(hb,G):G+hb}function ib(){var a=O;try{if(a==O&&La)return new Uint8Array(La);if(Fa)return Fa(a);throw"both async and sync fetching of the wasm failed";}catch(b){I(b)}}
+function jb(){if(!La&&(ya||za)){if("function"===typeof fetch&&!O.startsWith("file://"))return fetch(O,{credentials:"same-origin"}).then(function(a){if(!a.ok)throw"failed to load wasm binary file at '"+O+"'";return a.arrayBuffer()}).catch(function(){return ib()});if(Ea)return new Promise(function(a,b){Ea(O,function(c){a(new Uint8Array(c))},b)})}return Promise.resolve().then(function(){return ib()})}var N,M;
+function kb(a){for(;0<a.length;){var b=a.shift();if("function"==typeof b)b(e);else{var c=b.Rb;"number"===typeof c?void 0===b.mb?K.get(c)():K.get(c)(b.mb):c(void 0===b.mb?null:b.mb)}}}function lb(a){return a.replace(/\b_Z[\w\d_]+/g,function(b){return b===b?b:b+" ["+b+"]"})}
+function mb(){function a(m){return(m=m.toTimeString().match(/\(([A-Za-z ]+)\)$/))?m[1]:"GMT"}if(!nb){nb=!0;var b=(new Date).getFullYear(),c=new Date(b,0,1),d=new Date(b,6,1);b=c.getTimezoneOffset();var f=d.getTimezoneOffset(),g=Math.max(b,f);L[ob()>>2]=60*g;L[pb()>>2]=Number(b!=f);c=a(c);d=a(d);c=Xa(c);d=Xa(d);f<b?(L[qb()>>2]=c,L[qb()+4>>2]=d):(L[qb()>>2]=d,L[qb()+4>>2]=c)}}var nb;
+function ub(a,b){for(var c=0,d=a.length-1;0<=d;d--){var f=a[d];"."===f?a.splice(d,1):".."===f?(a.splice(d,1),c++):c&&(a.splice(d,1),c--)}if(b)for(;c;c--)a.unshift("..");return a}function r(a){var b="/"===a.charAt(0),c="/"===a.substr(-1);(a=ub(a.split("/").filter(function(d){return!!d}),!b).join("/"))||b||(a=".");a&&c&&(a+="/");return(b?"/":"")+a}
+function vb(a){var b=/^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/.exec(a).slice(1);a=b[0];b=b[1];if(!a&&!b)return".";b&&(b=b.substr(0,b.length-1));return a+b}function xb(a){if("/"===a)return"/";a=r(a);a=a.replace(/\/$/,"");var b=a.lastIndexOf("/");return-1===b?a:a.substr(b+1)}
+function yb(){if("object"===typeof crypto&&"function"===typeof crypto.getRandomValues){var a=new Uint8Array(1);return function(){crypto.getRandomValues(a);return a[0]}}if(Aa)try{var b=require("crypto");return function(){return b.randomBytes(1)[0]}}catch(c){}return function(){I("randomDevice")}}
+function zb(){for(var a="",b=!1,c=arguments.length-1;-1<=c&&!b;c--){b=0<=c?arguments[c]:"/";if("string"!==typeof b)throw new TypeError("Arguments to path.resolve must be strings");if(!b)return"";a=b+"/"+a;b="/"===b.charAt(0)}a=ub(a.split("/").filter(function(d){return!!d}),!b).join("/");return(b?"/":"")+a||"."}var Ab=[];function Bb(a,b){Ab[a]={input:[],output:[],cb:b};Cb(a,Db)}
+var Db={open:function(a){var b=Ab[a.node.rdev];if(!b)throw new P(43);a.tty=b;a.seekable=!1},close:function(a){a.tty.cb.flush(a.tty)},flush:function(a){a.tty.cb.flush(a.tty)},read:function(a,b,c,d){if(!a.tty||!a.tty.cb.xb)throw new P(60);for(var f=0,g=0;g<d;g++){try{var m=a.tty.cb.xb(a.tty)}catch(t){throw new P(29);}if(void 0===m&&0===f)throw new P(6);if(null===m||void 0===m)break;f++;b[c+g]=m}f&&(a.node.timestamp=Date.now());return f},write:function(a,b,c,d){if(!a.tty||!a.tty.cb.qb)throw new P(60);
+try{for(var f=0;f<d;f++)a.tty.cb.qb(a.tty,b[c+f])}catch(g){throw new P(29);}d&&(a.node.timestamp=Date.now());return f}},Eb={xb:function(a){if(!a.input.length){var b=null;if(Aa){var c=Buffer.zb?Buffer.zb(256):new Buffer(256),d=0;try{d=Ga.readSync(process.stdin.fd,c,0,256,null)}catch(f){if(f.toString().includes("EOF"))d=0;else throw f;}0<d?b=c.slice(0,d).toString("utf-8"):b=null}else"undefined"!=typeof window&&"function"==typeof window.prompt?(b=window.prompt("Input: "),null!==b&&(b+="\n")):"function"==
+typeof readline&&(b=readline(),null!==b&&(b+="\n"));if(!b)return null;a.input=ma(b,!0)}return a.input.shift()},qb:function(a,b){null===b||10===b?(Ia(Wa(a.output,0)),a.output=[]):0!=b&&a.output.push(b)},flush:function(a){a.output&&0<a.output.length&&(Ia(Wa(a.output,0)),a.output=[])}},Fb={qb:function(a,b){null===b||10===b?(J(Wa(a.output,0)),a.output=[]):0!=b&&a.output.push(b)},flush:function(a){a.output&&0<a.output.length&&(J(Wa(a.output,0)),a.output=[])}},Q={Va:null,Wa:function(){return Q.createNode(null,
+"/",16895,0)},createNode:function(a,b,c,d){if(24576===(c&61440)||4096===(c&61440))throw new P(63);Q.Va||(Q.Va={dir:{node:{Ua:Q.Ma.Ua,Ta:Q.Ma.Ta,lookup:Q.Ma.lookup,gb:Q.Ma.gb,rename:Q.Ma.rename,unlink:Q.Ma.unlink,rmdir:Q.Ma.rmdir,readdir:Q.Ma.readdir,symlink:Q.Ma.symlink},stream:{Za:Q.Na.Za}},file:{node:{Ua:Q.Ma.Ua,Ta:Q.Ma.Ta},stream:{Za:Q.Na.Za,read:Q.Na.read,write:Q.Na.write,sb:Q.Na.sb,hb:Q.Na.hb,ib:Q.Na.ib}},link:{node:{Ua:Q.Ma.Ua,Ta:Q.Ma.Ta,readlink:Q.Ma.readlink},stream:{}},ub:{node:{Ua:Q.Ma.Ua,
+Ta:Q.Ma.Ta},stream:Gb}});c=Hb(a,b,c,d);R(c.mode)?(c.Ma=Q.Va.dir.node,c.Na=Q.Va.dir.stream,c.Oa={}):32768===(c.mode&61440)?(c.Ma=Q.Va.file.node,c.Na=Q.Va.file.stream,c.Sa=0,c.Oa=null):40960===(c.mode&61440)?(c.Ma=Q.Va.link.node,c.Na=Q.Va.link.stream):8192===(c.mode&61440)&&(c.Ma=Q.Va.ub.node,c.Na=Q.Va.ub.stream);c.timestamp=Date.now();a&&(a.Oa[b]=c,a.timestamp=c.timestamp);return c},Sb:function(a){return a.Oa?a.Oa.subarray?a.Oa.subarray(0,a.Sa):new Uint8Array(a.Oa):new Uint8Array(0)},vb:function(a,
+b){var c=a.Oa?a.Oa.length:0;c>=b||(b=Math.max(b,c*(1048576>c?2:1.125)>>>0),0!=c&&(b=Math.max(b,256)),c=a.Oa,a.Oa=new Uint8Array(b),0<a.Sa&&a.Oa.set(c.subarray(0,a.Sa),0))},Ob:function(a,b){if(a.Sa!=b)if(0==b)a.Oa=null,a.Sa=0;else{var c=a.Oa;a.Oa=new Uint8Array(b);c&&a.Oa.set(c.subarray(0,Math.min(b,a.Sa)));a.Sa=b}},Ma:{Ua:function(a){var b={};b.dev=8192===(a.mode&61440)?a.id:1;b.ino=a.id;b.mode=a.mode;b.nlink=1;b.uid=0;b.gid=0;b.rdev=a.rdev;R(a.mode)?b.size=4096:32768===(a.mode&61440)?b.size=a.Sa:
+40960===(a.mode&61440)?b.size=a.link.length:b.size=0;b.atime=new Date(a.timestamp);b.mtime=new Date(a.timestamp);b.ctime=new Date(a.timestamp);b.Gb=4096;b.blocks=Math.ceil(b.size/b.Gb);return b},Ta:function(a,b){void 0!==b.mode&&(a.mode=b.mode);void 0!==b.timestamp&&(a.timestamp=b.timestamp);void 0!==b.size&&Q.Ob(a,b.size)},lookup:function(){throw Ib[44];},gb:function(a,b,c,d){return Q.createNode(a,b,c,d)},rename:function(a,b,c){if(R(a.mode)){try{var d=Jb(b,c)}catch(g){}if(d)for(var f in d.Oa)throw new P(55);
+}delete a.parent.Oa[a.name];a.parent.timestamp=Date.now();a.name=c;b.Oa[c]=a;b.timestamp=a.parent.timestamp;a.parent=b},unlink:function(a,b){delete a.Oa[b];a.timestamp=Date.now()},rmdir:function(a,b){var c=Jb(a,b),d;for(d in c.Oa)throw new P(55);delete a.Oa[b];a.timestamp=Date.now()},readdir:function(a){var b=[".",".."],c;for(c in a.Oa)a.Oa.hasOwnProperty(c)&&b.push(c);return b},symlink:function(a,b,c){a=Q.createNode(a,b,41471,0);a.link=c;return a},readlink:function(a){if(40960!==(a.mode&61440))throw new P(28);
+return a.link}},Na:{read:function(a,b,c,d,f){var g=a.node.Oa;if(f>=a.node.Sa)return 0;a=Math.min(a.node.Sa-f,d);if(8<a&&g.subarray)b.set(g.subarray(f,f+a),c);else for(d=0;d<a;d++)b[c+d]=g[f+d];return a},write:function(a,b,c,d,f,g){b.buffer===z.buffer&&(g=!1);if(!d)return 0;a=a.node;a.timestamp=Date.now();if(b.subarray&&(!a.Oa||a.Oa.subarray)){if(g)return a.Oa=b.subarray(c,c+d),a.Sa=d;if(0===a.Sa&&0===f)return a.Oa=b.slice(c,c+d),a.Sa=d;if(f+d<=a.Sa)return a.Oa.set(b.subarray(c,c+d),f),d}Q.vb(a,f+
+d);if(a.Oa.subarray&&b.subarray)a.Oa.set(b.subarray(c,c+d),f);else for(g=0;g<d;g++)a.Oa[f+g]=b[c+g];a.Sa=Math.max(a.Sa,f+d);return d},Za:function(a,b,c){1===c?b+=a.position:2===c&&32768===(a.node.mode&61440)&&(b+=a.node.Sa);if(0>b)throw new P(28);return b},sb:function(a,b,c){Q.vb(a.node,b+c);a.node.Sa=Math.max(a.node.Sa,b+c)},hb:function(a,b,c,d,f,g){if(0!==b)throw new P(28);if(32768!==(a.node.mode&61440))throw new P(43);a=a.node.Oa;if(g&2||a.buffer!==Ya){if(0<d||d+c<a.length)a.subarray?a=a.subarray(d,
+d+c):a=Array.prototype.slice.call(a,d,d+c);d=!0;g=65536*Math.ceil(c/65536);for(b=ca(g);c<g;)z[b+c++]=0;c=b;if(!c)throw new P(48);z.set(a,c)}else d=!1,c=a.byteOffset;return{Nb:c,kb:d}},ib:function(a,b,c,d,f){if(32768!==(a.node.mode&61440))throw new P(43);if(f&2)return 0;Q.Na.write(a,b,0,d,c,!1);return 0}}},Kb=null,Lb={},S=[],Mb=1,U=null,Nb=!0,V={},P=null,Ib={};
+function W(a,b){a=zb("/",a);b=b||{};if(!a)return{path:"",node:null};var c={wb:!0,rb:0},d;for(d in c)void 0===b[d]&&(b[d]=c[d]);if(8<b.rb)throw new P(32);a=ub(a.split("/").filter(function(m){return!!m}),!1);var f=Kb;c="/";for(d=0;d<a.length;d++){var g=d===a.length-1;if(g&&b.parent)break;f=Jb(f,a[d]);c=r(c+"/"+a[d]);f.ab&&(!g||g&&b.wb)&&(f=f.ab.root);if(!g||b.Ya)for(g=0;40960===(f.mode&61440);)if(f=Ob(c),c=zb(vb(c),f),f=W(c,{rb:b.rb}).node,40<g++)throw new P(32);}return{path:c,node:f}}
+function Pb(a){for(var b;;){if(a===a.parent)return a=a.Wa.yb,b?"/"!==a[a.length-1]?a+"/"+b:a+b:a;b=b?a.name+"/"+b:a.name;a=a.parent}}function Qb(a,b){for(var c=0,d=0;d<b.length;d++)c=(c<<5)-c+b.charCodeAt(d)|0;return(a+c>>>0)%U.length}function Rb(a){var b=Qb(a.parent.id,a.name);if(U[b]===a)U[b]=a.bb;else for(b=U[b];b;){if(b.bb===a){b.bb=a.bb;break}b=b.bb}}
+function Jb(a,b){var c;if(c=(c=Sb(a,"x"))?c:a.Ma.lookup?0:2)throw new P(c,a);for(c=U[Qb(a.id,b)];c;c=c.bb){var d=c.name;if(c.parent.id===a.id&&d===b)return c}return a.Ma.lookup(a,b)}function Hb(a,b,c,d){a=new Tb(a,b,c,d);b=Qb(a.parent.id,a.name);a.bb=U[b];return U[b]=a}function R(a){return 16384===(a&61440)}var Ub={r:0,"r+":2,w:577,"w+":578,a:1089,"a+":1090};function Vb(a){var b=["r","w","rw"][a&3];a&512&&(b+="w");return b}
+function Sb(a,b){if(Nb)return 0;if(!b.includes("r")||a.mode&292){if(b.includes("w")&&!(a.mode&146)||b.includes("x")&&!(a.mode&73))return 2}else return 2;return 0}function Wb(a,b){try{return Jb(a,b),20}catch(c){}return Sb(a,"wx")}function Xb(a,b,c){try{var d=Jb(a,b)}catch(f){return f.Pa}if(a=Sb(a,"wx"))return a;if(c){if(!R(d.mode))return 54;if(d===d.parent||"/"===Pb(d))return 10}else if(R(d.mode))return 31;return 0}function Yb(a){var b=4096;for(a=a||0;a<=b;a++)if(!S[a])return a;throw new P(33);}
+function Zb(a,b){$b||($b=function(){},$b.prototype={});var c=new $b,d;for(d in a)c[d]=a[d];a=c;b=Yb(b);a.fd=b;return S[b]=a}var Gb={open:function(a){a.Na=Lb[a.node.rdev].Na;a.Na.open&&a.Na.open(a)},Za:function(){throw new P(70);}};function Cb(a,b){Lb[a]={Na:b}}
+function ac(a,b){var c="/"===b,d=!b;if(c&&Kb)throw new P(10);if(!c&&!d){var f=W(b,{wb:!1});b=f.path;f=f.node;if(f.ab)throw new P(10);if(!R(f.mode))throw new P(54);}b={type:a,Tb:{},yb:b,Lb:[]};a=a.Wa(b);a.Wa=b;b.root=a;c?Kb=a:f&&(f.ab=b,f.Wa&&f.Wa.Lb.push(b))}function ea(a,b,c){var d=W(a,{parent:!0}).node;a=xb(a);if(!a||"."===a||".."===a)throw new P(28);var f=Wb(d,a);if(f)throw new P(f);if(!d.Ma.gb)throw new P(63);return d.Ma.gb(d,a,b,c)}
+function X(a,b){return ea(a,(void 0!==b?b:511)&1023|16384,0)}function bc(a,b,c){"undefined"===typeof c&&(c=b,b=438);ea(a,b|8192,c)}function cc(a,b){if(!zb(a))throw new P(44);var c=W(b,{parent:!0}).node;if(!c)throw new P(44);b=xb(b);var d=Wb(c,b);if(d)throw new P(d);if(!c.Ma.symlink)throw new P(63);c.Ma.symlink(c,b,a)}
+function ua(a){var b=W(a,{parent:!0}).node,c=xb(a),d=Jb(b,c),f=Xb(b,c,!1);if(f)throw new P(f);if(!b.Ma.unlink)throw new P(63);if(d.ab)throw new P(10);try{V.willDeletePath&&V.willDeletePath(a)}catch(g){J("FS.trackingDelegate['willDeletePath']('"+a+"') threw an exception: "+g.message)}b.Ma.unlink(b,c);Rb(d);try{if(V.onDeletePath)V.onDeletePath(a)}catch(g){J("FS.trackingDelegate['onDeletePath']('"+a+"') threw an exception: "+g.message)}}
+function Ob(a){a=W(a).node;if(!a)throw new P(44);if(!a.Ma.readlink)throw new P(28);return zb(Pb(a.parent),a.Ma.readlink(a))}function dc(a,b){a=W(a,{Ya:!b}).node;if(!a)throw new P(44);if(!a.Ma.Ua)throw new P(63);return a.Ma.Ua(a)}function ec(a){return dc(a,!0)}function fa(a,b){a="string"===typeof a?W(a,{Ya:!0}).node:a;if(!a.Ma.Ta)throw new P(63);a.Ma.Ta(a,{mode:b&4095|a.mode&-4096,timestamp:Date.now()})}
+function fc(a){a="string"===typeof a?W(a,{Ya:!0}).node:a;if(!a.Ma.Ta)throw new P(63);a.Ma.Ta(a,{timestamp:Date.now()})}function hc(a,b){if(0>b)throw new P(28);a="string"===typeof a?W(a,{Ya:!0}).node:a;if(!a.Ma.Ta)throw new P(63);if(R(a.mode))throw new P(31);if(32768!==(a.mode&61440))throw new P(28);var c=Sb(a,"w");if(c)throw new P(c);a.Ma.Ta(a,{size:b,timestamp:Date.now()})}
+function v(a,b,c,d){if(""===a)throw new P(44);if("string"===typeof b){var f=Ub[b];if("undefined"===typeof f)throw Error("Unknown file open mode: "+b);b=f}c=b&64?("undefined"===typeof c?438:c)&4095|32768:0;if("object"===typeof a)var g=a;else{a=r(a);try{g=W(a,{Ya:!(b&131072)}).node}catch(m){}}f=!1;if(b&64)if(g){if(b&128)throw new P(20);}else g=ea(a,c,0),f=!0;if(!g)throw new P(44);8192===(g.mode&61440)&&(b&=-513);if(b&65536&&!R(g.mode))throw new P(54);if(!f&&(c=g?40960===(g.mode&61440)?32:R(g.mode)&&
+("r"!==Vb(b)||b&512)?31:Sb(g,Vb(b)):44))throw new P(c);b&512&&hc(g,0);b&=-131713;d=Zb({node:g,path:Pb(g),flags:b,seekable:!0,position:0,Na:g.Na,Qb:[],error:!1},d);d.Na.open&&d.Na.open(d);!e.logReadFiles||b&1||(Kc||(Kc={}),a in Kc||(Kc[a]=1,J("FS.trackingDelegate error on read file: "+a)));try{V.onOpenFile&&(g=0,1!==(b&2097155)&&(g|=1),0!==(b&2097155)&&(g|=2),V.onOpenFile(a,g))}catch(m){J("FS.trackingDelegate['onOpenFile']('"+a+"', flags) threw an exception: "+m.message)}return d}
+function la(a){if(null===a.fd)throw new P(8);a.ob&&(a.ob=null);try{a.Na.close&&a.Na.close(a)}catch(b){throw b;}finally{S[a.fd]=null}a.fd=null}function Lc(a,b,c){if(null===a.fd)throw new P(8);if(!a.seekable||!a.Na.Za)throw new P(70);if(0!=c&&1!=c&&2!=c)throw new P(28);a.position=a.Na.Za(a,b,c);a.Qb=[]}
+function Nc(a,b,c,d,f){if(0>d||0>f)throw new P(28);if(null===a.fd)throw new P(8);if(1===(a.flags&2097155))throw new P(8);if(R(a.node.mode))throw new P(31);if(!a.Na.read)throw new P(28);var g="undefined"!==typeof f;if(!g)f=a.position;else if(!a.seekable)throw new P(70);b=a.Na.read(a,b,c,d,f);g||(a.position+=b);return b}
+function ka(a,b,c,d,f,g){if(0>d||0>f)throw new P(28);if(null===a.fd)throw new P(8);if(0===(a.flags&2097155))throw new P(8);if(R(a.node.mode))throw new P(31);if(!a.Na.write)throw new P(28);a.seekable&&a.flags&1024&&Lc(a,0,2);var m="undefined"!==typeof f;if(!m)f=a.position;else if(!a.seekable)throw new P(70);b=a.Na.write(a,b,c,d,f,g);m||(a.position+=b);try{if(a.path&&V.onWriteToFile)V.onWriteToFile(a.path)}catch(t){J("FS.trackingDelegate['onWriteToFile']('"+a.path+"') threw an exception: "+t.message)}return b}
+function ta(a){var b={encoding:"binary"};b=b||{};b.flags=b.flags||0;b.encoding=b.encoding||"binary";if("utf8"!==b.encoding&&"binary"!==b.encoding)throw Error('Invalid encoding type "'+b.encoding+'"');var c,d=v(a,b.flags);a=dc(a).size;var f=new Uint8Array(a);Nc(d,f,0,a,0);"utf8"===b.encoding?c=Wa(f,0):"binary"===b.encoding&&(c=f);la(d);return c}
+function Oc(){P||(P=function(a,b){this.node=b;this.Pb=function(c){this.Pa=c};this.Pb(a);this.message="FS error"},P.prototype=Error(),P.prototype.constructor=P,[44].forEach(function(a){Ib[a]=new P(a);Ib[a].stack="<generic error, no stack>"}))}var Pc;function da(a,b){var c=0;a&&(c|=365);b&&(c|=146);return c}
+function Qc(a,b,c){a=r("/dev/"+a);var d=da(!!b,!!c);Rc||(Rc=64);var f=Rc++<<8|0;Cb(f,{open:function(g){g.seekable=!1},close:function(){c&&c.buffer&&c.buffer.length&&c(10)},read:function(g,m,t,w){for(var u=0,C=0;C<w;C++){try{var H=b()}catch(aa){throw new P(29);}if(void 0===H&&0===u)throw new P(6);if(null===H||void 0===H)break;u++;m[t+C]=H}u&&(g.node.timestamp=Date.now());return u},write:function(g,m,t,w){for(var u=0;u<w;u++)try{c(m[t+u])}catch(C){throw new P(29);}w&&(g.node.timestamp=Date.now());return u}});
+bc(a,d,f)}var Rc,Y={},$b,Kc,Sc={};
+function Tc(a,b,c){try{var d=a(b)}catch(f){if(f&&f.node&&r(b)!==r(Pb(f.node)))return-54;throw f;}L[c>>2]=d.dev;L[c+4>>2]=0;L[c+8>>2]=d.ino;L[c+12>>2]=d.mode;L[c+16>>2]=d.nlink;L[c+20>>2]=d.uid;L[c+24>>2]=d.gid;L[c+28>>2]=d.rdev;L[c+32>>2]=0;M=[d.size>>>0,(N=d.size,1<=+Math.abs(N)?0<N?(Math.min(+Math.floor(N/4294967296),4294967295)|0)>>>0:~~+Math.ceil((N-+(~~N>>>0))/4294967296)>>>0:0)];L[c+40>>2]=M[0];L[c+44>>2]=M[1];L[c+48>>2]=4096;L[c+52>>2]=d.blocks;L[c+56>>2]=d.atime.getTime()/1E3|0;L[c+60>>2]=
+0;L[c+64>>2]=d.mtime.getTime()/1E3|0;L[c+68>>2]=0;L[c+72>>2]=d.ctime.getTime()/1E3|0;L[c+76>>2]=0;M=[d.ino>>>0,(N=d.ino,1<=+Math.abs(N)?0<N?(Math.min(+Math.floor(N/4294967296),4294967295)|0)>>>0:~~+Math.ceil((N-+(~~N>>>0))/4294967296)>>>0:0)];L[c+80>>2]=M[0];L[c+84>>2]=M[1];return 0}var Uc=void 0;function Vc(){Uc+=4;return L[Uc-4>>2]}function Z(a){a=S[a];if(!a)throw new P(8);return a}var Wc;
+Aa?Wc=function(){var a=process.hrtime();return 1E3*a[0]+a[1]/1E6}:"undefined"!==typeof dateNow?Wc=dateNow:Wc=function(){return performance.now()};var Xc={};function Yc(){if(!Zc){var a={USER:"web_user",LOGNAME:"web_user",PATH:"/",PWD:"/",HOME:"/home/web_user",LANG:("object"===typeof navigator&&navigator.languages&&navigator.languages[0]||"C").replace("-","_")+".UTF-8",_:xa||"./this.program"},b;for(b in Xc)void 0===Xc[b]?delete a[b]:a[b]=Xc[b];var c=[];for(b in a)c.push(b+"="+a[b]);Zc=c}return Zc}var Zc;
+function Tb(a,b,c,d){a||(a=this);this.parent=a;this.Wa=a.Wa;this.ab=null;this.id=Mb++;this.name=b;this.mode=c;this.Ma={};this.Na={};this.rdev=d}Object.defineProperties(Tb.prototype,{read:{get:function(){return 365===(this.mode&365)},set:function(a){a?this.mode|=365:this.mode&=-366}},write:{get:function(){return 146===(this.mode&146)},set:function(a){a?this.mode|=146:this.mode&=-147}}});Oc();U=Array(4096);ac(Q,"/");X("/tmp");X("/home");X("/home/web_user");
+(function(){X("/dev");Cb(259,{read:function(){return 0},write:function(b,c,d,f){return f}});bc("/dev/null",259);Bb(1280,Eb);Bb(1536,Fb);bc("/dev/tty",1280);bc("/dev/tty1",1536);var a=yb();Qc("random",a);Qc("urandom",a);X("/dev/shm");X("/dev/shm/tmp")})();
+(function(){X("/proc");var a=X("/proc/self");X("/proc/self/fd");ac({Wa:function(){var b=Hb(a,"fd",16895,73);b.Ma={lookup:function(c,d){var f=S[+d];if(!f)throw new P(8);c={parent:null,Wa:{yb:"fake"},Ma:{readlink:function(){return f.path}}};return c.parent=c}};return b}},"/proc/self/fd")})();function ma(a,b){var c=Array(ba(a)+1);a=k(a,c,0,c.length);b&&(c.length=a);return c}
+var cd={a:function(a,b,c,d){I("Assertion failed: "+A(a)+", at: "+[b?A(b):"unknown filename",c,d?A(d):"unknown function"])},s:function(a,b){mb();a=new Date(1E3*L[a>>2]);L[b>>2]=a.getSeconds();L[b+4>>2]=a.getMinutes();L[b+8>>2]=a.getHours();L[b+12>>2]=a.getDate();L[b+16>>2]=a.getMonth();L[b+20>>2]=a.getFullYear()-1900;L[b+24>>2]=a.getDay();var c=new Date(a.getFullYear(),0,1);L[b+28>>2]=(a.getTime()-c.getTime())/864E5|0;L[b+36>>2]=-(60*a.getTimezoneOffset());var d=(new Date(a.getFullYear(),6,1)).getTimezoneOffset();
+c=c.getTimezoneOffset();a=(d!=c&&a.getTimezoneOffset()==Math.min(c,d))|0;L[b+32>>2]=a;a=L[qb()+(a?4:0)>>2];L[b+40>>2]=a;return b},F:function(a,b){try{a=A(a);if(b&-8)var c=-28;else{var d;(d=W(a,{Ya:!0}).node)?(a="",b&4&&(a+="r"),b&2&&(a+="w"),b&1&&(a+="x"),c=a&&Sb(d,a)?-2:0):c=-44}return c}catch(f){return"undefined"!==typeof Y&&f instanceof P||I(f),-f.Pa}},h:function(a,b){try{return a=A(a),fa(a,b),0}catch(c){return"undefined"!==typeof Y&&c instanceof P||I(c),-c.Pa}},y:function(a){try{return a=A(a),
+fc(a),0}catch(b){return"undefined"!==typeof Y&&b instanceof P||I(b),-b.Pa}},i:function(a,b){try{var c=S[a];if(!c)throw new P(8);fa(c.node,b);return 0}catch(d){return"undefined"!==typeof Y&&d instanceof P||I(d),-d.Pa}},z:function(a){try{var b=S[a];if(!b)throw new P(8);fc(b.node);return 0}catch(c){return"undefined"!==typeof Y&&c instanceof P||I(c),-c.Pa}},b:function(a,b,c){Uc=c;try{var d=Z(a);switch(b){case 0:var f=Vc();return 0>f?-28:v(d.path,d.flags,0,f).fd;case 1:case 2:return 0;case 3:return d.flags;
+case 4:return f=Vc(),d.flags|=f,0;case 12:return f=Vc(),Ma[f+0>>1]=2,0;case 13:case 14:return 0;case 16:case 8:return-28;case 9:return L[$c()>>2]=28,-1;default:return-28}}catch(g){return"undefined"!==typeof Y&&g instanceof P||I(g),-g.Pa}},j:function(a,b){try{var c=Z(a);return Tc(dc,c.path,b)}catch(d){return"undefined"!==typeof Y&&d instanceof P||I(d),-d.Pa}},E:function(a,b,c){try{var d=S[a];if(!d)throw new P(8);if(0===(d.flags&2097155))throw new P(28);hc(d.node,c);return 0}catch(f){return"undefined"!==
+typeof Y&&f instanceof P||I(f),-f.Pa}},C:function(a,b){try{if(0===b)return-28;if(b<ba("/")+1)return-68;k("/",n,a,b);return a}catch(c){return"undefined"!==typeof Y&&c instanceof P||I(c),-c.Pa}},x:function(){return 0},d:function(){return 42},k:function(a,b){try{return a=A(a),Tc(ec,a,b)}catch(c){return"undefined"!==typeof Y&&c instanceof P||I(c),-c.Pa}},J:function(a,b){try{return a=A(a),a=r(a),"/"===a[a.length-1]&&(a=a.substr(0,a.length-1)),X(a,b),0}catch(c){return"undefined"!==typeof Y&&c instanceof
+P||I(c),-c.Pa}},G:function(a,b,c,d,f,g){try{a:{g<<=12;var m=!1;if(0!==(d&16)&&0!==a%65536)var t=-28;else{if(0!==(d&32)){var w=ad(65536,b);if(!w){t=-48;break a}bd(w,0,b);m=!0}else{var u=S[f];if(!u){t=-8;break a}var C=g;if(0!==(c&2)&&0===(d&2)&&2!==(u.flags&2097155))throw new P(2);if(1===(u.flags&2097155))throw new P(2);if(!u.Na.hb)throw new P(43);var H=u.Na.hb(u,a,b,C,c,d);w=H.Nb;m=H.kb}Sc[w]={Kb:w,Jb:b,kb:m,fd:f,Mb:c,flags:d,offset:g};t=w}}return t}catch(aa){return"undefined"!==typeof Y&&aa instanceof
+P||I(aa),-aa.Pa}},H:function(a,b){try{if(-1===(a|0)||0===b)var c=-28;else{var d=Sc[a];if(d&&b===d.Jb){var f=S[d.fd];if(f&&d.Mb&2){var g=d.flags,m=d.offset,t=n.slice(a,a+b);f&&f.Na.ib&&f.Na.ib(f,t,m,b,g)}Sc[a]=null;d.kb&&oa(d.Kb)}c=0}return c}catch(w){return"undefined"!==typeof Y&&w instanceof P||I(w),-w.Pa}},I:function(a,b,c){Uc=c;try{var d=A(a),f=c?Vc():0;return v(d,b,f).fd}catch(g){return"undefined"!==typeof Y&&g instanceof P||I(g),-g.Pa}},A:function(a,b,c){try{a=A(a);if(0>=c)var d=-28;else{var f=
+Ob(a),g=Math.min(c,ba(f)),m=z[b+g];k(f,n,b,c+1);z[b+g]=m;d=g}return d}catch(t){return"undefined"!==typeof Y&&t instanceof P||I(t),-t.Pa}},u:function(a){try{a=A(a);var b=W(a,{parent:!0}).node,c=xb(a),d=Jb(b,c),f=Xb(b,c,!0);if(f)throw new P(f);if(!b.Ma.rmdir)throw new P(63);if(d.ab)throw new P(10);try{V.willDeletePath&&V.willDeletePath(a)}catch(g){J("FS.trackingDelegate['willDeletePath']('"+a+"') threw an exception: "+g.message)}b.Ma.rmdir(b,c);Rb(d);try{if(V.onDeletePath)V.onDeletePath(a)}catch(g){J("FS.trackingDelegate['onDeletePath']('"+
+a+"') threw an exception: "+g.message)}return 0}catch(g){return"undefined"!==typeof Y&&g instanceof P||I(g),-g.Pa}},e:function(a,b){try{return a=A(a),Tc(dc,a,b)}catch(c){return"undefined"!==typeof Y&&c instanceof P||I(c),-c.Pa}},w:function(a){try{return a=A(a),ua(a),0}catch(b){return"undefined"!==typeof Y&&b instanceof P||I(b),-b.Pa}},l:function(){return 2147483648},n:function(a,b,c){n.copyWithin(a,b,b+c)},c:function(a){var b=n.length;a>>>=0;if(2147483648<a)return!1;for(var c=1;4>=c;c*=2){var d=b*
+(1+.2/c);d=Math.min(d,a+100663296);d=Math.max(a,d);0<d%65536&&(d+=65536-d%65536);a:{try{Pa.grow(Math.min(2147483648,d)-Ya.byteLength+65535>>>16);Za();var f=1;break a}catch(g){}f=void 0}if(f)return!0}return!1},r:function(a){for(var b=Wc();Wc()-b<a;);},p:function(a,b){try{var c=0;Yc().forEach(function(d,f){var g=b+c;f=L[a+4*f>>2]=g;for(g=0;g<d.length;++g)z[f++>>0]=d.charCodeAt(g);z[f>>0]=0;c+=d.length+1});return 0}catch(d){return"undefined"!==typeof Y&&d instanceof P||I(d),d.Pa}},q:function(a,b){try{var c=
+Yc();L[a>>2]=c.length;var d=0;c.forEach(function(f){d+=f.length+1});L[b>>2]=d;return 0}catch(f){return"undefined"!==typeof Y&&f instanceof P||I(f),f.Pa}},f:function(a){try{var b=Z(a);la(b);return 0}catch(c){return"undefined"!==typeof Y&&c instanceof P||I(c),c.Pa}},o:function(a,b){try{var c=Z(a);z[b>>0]=c.tty?2:R(c.mode)?3:40960===(c.mode&61440)?7:4;return 0}catch(d){return"undefined"!==typeof Y&&d instanceof P||I(d),d.Pa}},t:function(a,b,c,d){try{a:{for(var f=Z(a),g=a=0;g<c;g++){var m=L[b+(8*g+4)>>
+2],t=Nc(f,z,L[b+8*g>>2],m,void 0);if(0>t){var w=-1;break a}a+=t;if(t<m)break}w=a}L[d>>2]=w;return 0}catch(u){return"undefined"!==typeof Y&&u instanceof P||I(u),u.Pa}},m:function(a,b,c,d,f){try{var g=Z(a);a=4294967296*c+(b>>>0);if(-9007199254740992>=a||9007199254740992<=a)return-61;Lc(g,a,d);M=[g.position>>>0,(N=g.position,1<=+Math.abs(N)?0<N?(Math.min(+Math.floor(N/4294967296),4294967295)|0)>>>0:~~+Math.ceil((N-+(~~N>>>0))/4294967296)>>>0:0)];L[f>>2]=M[0];L[f+4>>2]=M[1];g.ob&&0===a&&0===d&&(g.ob=
+null);return 0}catch(m){return"undefined"!==typeof Y&&m instanceof P||I(m),m.Pa}},D:function(a){try{var b=Z(a);return b.Na&&b.Na.fsync?-b.Na.fsync(b):0}catch(c){return"undefined"!==typeof Y&&c instanceof P||I(c),c.Pa}},v:function(a,b,c,d){try{a:{for(var f=Z(a),g=a=0;g<c;g++){var m=ka(f,z,L[b+8*g>>2],L[b+(8*g+4)>>2],void 0);if(0>m){var t=-1;break a}a+=m}t=a}L[d>>2]=t;return 0}catch(w){return"undefined"!==typeof Y&&w instanceof P||I(w),w.Pa}},g:function(a){var b=Date.now();L[a>>2]=b/1E3|0;L[a+4>>2]=
+b%1E3*1E3|0;return 0},K:function(a){var b=Date.now()/1E3|0;a&&(L[a>>2]=b);return b},B:function(a,b){if(b){var c=b+8;b=1E3*L[c>>2];b+=L[c+4>>2]/1E3}else b=Date.now();a=A(a);try{var d=W(a,{Ya:!0}).node;d.Ma.Ta(d,{timestamp:Math.max(b,b)});var f=0}catch(g){if(!(g instanceof P)){b:{f=Error();if(!f.stack){try{throw Error();}catch(m){f=m}if(!f.stack){f="(no stack trace available)";break b}}f=f.stack.toString()}e.extraStackTrace&&(f+="\n"+e.extraStackTrace());f=lb(f);throw g+" : "+f;}f=g.Pa;L[$c()>>2]=f;
+f=-1}return f}};
+(function(){function a(f){e.asm=f.exports;Pa=e.asm.L;Za();K=e.asm.Da;ab.unshift(e.asm.M);db--;e.monitorRunDependencies&&e.monitorRunDependencies(db);0==db&&(null!==eb&&(clearInterval(eb),eb=null),fb&&(f=fb,fb=null,f()))}function b(f){a(f.instance)}function c(f){return jb().then(function(g){return WebAssembly.instantiate(g,d)}).then(f,function(g){J("failed to asynchronously prepare wasm: "+g);I(g)})}var d={a:cd};db++;e.monitorRunDependencies&&e.monitorRunDependencies(db);if(e.instantiateWasm)try{return e.instantiateWasm(d,a)}catch(f){return J("Module.instantiateWasm callback failed with error: "+
+f),!1}(function(){return La||"function"!==typeof WebAssembly.instantiateStreaming||gb()||O.startsWith("file://")||"function"!==typeof fetch?c(b):fetch(O,{credentials:"same-origin"}).then(function(f){return WebAssembly.instantiateStreaming(f,d).then(b,function(g){J("wasm streaming compile failed: "+g);J("falling back to ArrayBuffer instantiation");return c(b)})})})();return{}})();e.___wasm_call_ctors=function(){return(e.___wasm_call_ctors=e.asm.M).apply(null,arguments)};
+var bd=e._memset=function(){return(bd=e._memset=e.asm.N).apply(null,arguments)};e._sqlite3_free=function(){return(e._sqlite3_free=e.asm.O).apply(null,arguments)};var $c=e.___errno_location=function(){return($c=e.___errno_location=e.asm.P).apply(null,arguments)};e._sqlite3_step=function(){return(e._sqlite3_step=e.asm.Q).apply(null,arguments)};e._sqlite3_finalize=function(){return(e._sqlite3_finalize=e.asm.R).apply(null,arguments)};
+e._sqlite3_prepare_v2=function(){return(e._sqlite3_prepare_v2=e.asm.S).apply(null,arguments)};e._sqlite3_reset=function(){return(e._sqlite3_reset=e.asm.T).apply(null,arguments)};e._sqlite3_clear_bindings=function(){return(e._sqlite3_clear_bindings=e.asm.U).apply(null,arguments)};e._sqlite3_value_blob=function(){return(e._sqlite3_value_blob=e.asm.V).apply(null,arguments)};e._sqlite3_value_text=function(){return(e._sqlite3_value_text=e.asm.W).apply(null,arguments)};
+e._sqlite3_value_bytes=function(){return(e._sqlite3_value_bytes=e.asm.X).apply(null,arguments)};e._sqlite3_value_double=function(){return(e._sqlite3_value_double=e.asm.Y).apply(null,arguments)};e._sqlite3_value_int=function(){return(e._sqlite3_value_int=e.asm.Z).apply(null,arguments)};e._sqlite3_value_type=function(){return(e._sqlite3_value_type=e.asm._).apply(null,arguments)};e._sqlite3_result_blob=function(){return(e._sqlite3_result_blob=e.asm.$).apply(null,arguments)};
+e._sqlite3_result_double=function(){return(e._sqlite3_result_double=e.asm.aa).apply(null,arguments)};e._sqlite3_result_error=function(){return(e._sqlite3_result_error=e.asm.ba).apply(null,arguments)};e._sqlite3_result_int=function(){return(e._sqlite3_result_int=e.asm.ca).apply(null,arguments)};e._sqlite3_result_int64=function(){return(e._sqlite3_result_int64=e.asm.da).apply(null,arguments)};e._sqlite3_result_null=function(){return(e._sqlite3_result_null=e.asm.ea).apply(null,arguments)};
+e._sqlite3_result_text=function(){return(e._sqlite3_result_text=e.asm.fa).apply(null,arguments)};e._sqlite3_column_count=function(){return(e._sqlite3_column_count=e.asm.ga).apply(null,arguments)};e._sqlite3_data_count=function(){return(e._sqlite3_data_count=e.asm.ha).apply(null,arguments)};e._sqlite3_column_blob=function(){return(e._sqlite3_column_blob=e.asm.ia).apply(null,arguments)};e._sqlite3_column_bytes=function(){return(e._sqlite3_column_bytes=e.asm.ja).apply(null,arguments)};
+e._sqlite3_column_double=function(){return(e._sqlite3_column_double=e.asm.ka).apply(null,arguments)};e._sqlite3_column_text=function(){return(e._sqlite3_column_text=e.asm.la).apply(null,arguments)};e._sqlite3_column_type=function(){return(e._sqlite3_column_type=e.asm.ma).apply(null,arguments)};e._sqlite3_column_name=function(){return(e._sqlite3_column_name=e.asm.na).apply(null,arguments)};e._sqlite3_bind_blob=function(){return(e._sqlite3_bind_blob=e.asm.oa).apply(null,arguments)};
+e._sqlite3_bind_double=function(){return(e._sqlite3_bind_double=e.asm.pa).apply(null,arguments)};e._sqlite3_bind_int=function(){return(e._sqlite3_bind_int=e.asm.qa).apply(null,arguments)};e._sqlite3_bind_text=function(){return(e._sqlite3_bind_text=e.asm.ra).apply(null,arguments)};e._sqlite3_bind_parameter_index=function(){return(e._sqlite3_bind_parameter_index=e.asm.sa).apply(null,arguments)};e._sqlite3_sql=function(){return(e._sqlite3_sql=e.asm.ta).apply(null,arguments)};
+e._sqlite3_normalized_sql=function(){return(e._sqlite3_normalized_sql=e.asm.ua).apply(null,arguments)};e._sqlite3_errmsg=function(){return(e._sqlite3_errmsg=e.asm.va).apply(null,arguments)};e._sqlite3_exec=function(){return(e._sqlite3_exec=e.asm.wa).apply(null,arguments)};e._sqlite3_changes=function(){return(e._sqlite3_changes=e.asm.xa).apply(null,arguments)};e._sqlite3_close_v2=function(){return(e._sqlite3_close_v2=e.asm.ya).apply(null,arguments)};
+e._sqlite3_create_function_v2=function(){return(e._sqlite3_create_function_v2=e.asm.za).apply(null,arguments)};e._sqlite3_open=function(){return(e._sqlite3_open=e.asm.Aa).apply(null,arguments)};var ca=e._malloc=function(){return(ca=e._malloc=e.asm.Ba).apply(null,arguments)},oa=e._free=function(){return(oa=e._free=e.asm.Ca).apply(null,arguments)};e._RegisterExtensionFunctions=function(){return(e._RegisterExtensionFunctions=e.asm.Ea).apply(null,arguments)};
+var qb=e.__get_tzname=function(){return(qb=e.__get_tzname=e.asm.Fa).apply(null,arguments)},pb=e.__get_daylight=function(){return(pb=e.__get_daylight=e.asm.Ga).apply(null,arguments)},ob=e.__get_timezone=function(){return(ob=e.__get_timezone=e.asm.Ha).apply(null,arguments)},pa=e.stackSave=function(){return(pa=e.stackSave=e.asm.Ia).apply(null,arguments)},ra=e.stackRestore=function(){return(ra=e.stackRestore=e.asm.Ja).apply(null,arguments)},y=e.stackAlloc=function(){return(y=e.stackAlloc=e.asm.Ka).apply(null,
+arguments)},ad=e._memalign=function(){return(ad=e._memalign=e.asm.La).apply(null,arguments)};e.cwrap=function(a,b,c,d){c=c||[];var f=c.every(function(g){return"number"===g});return"string"!==b&&f&&!d?Ra(a):function(){return Sa(a,b,c,arguments)}};e.UTF8ToString=A;e.stackSave=pa;e.stackRestore=ra;e.stackAlloc=y;var dd;fb=function ed(){dd||fd();dd||(fb=ed)};
+function fd(){function a(){if(!dd&&(dd=!0,e.calledRun=!0,!Qa)){e.noFSInit||Pc||(Pc=!0,Oc(),e.stdin=e.stdin,e.stdout=e.stdout,e.stderr=e.stderr,e.stdin?Qc("stdin",e.stdin):cc("/dev/tty","/dev/stdin"),e.stdout?Qc("stdout",null,e.stdout):cc("/dev/tty","/dev/stdout"),e.stderr?Qc("stderr",null,e.stderr):cc("/dev/tty1","/dev/stderr"),v("/dev/stdin",0),v("/dev/stdout",1),v("/dev/stderr",1));Nb=!1;kb(ab);if(e.onRuntimeInitialized)e.onRuntimeInitialized();if(e.postRun)for("function"==typeof e.postRun&&(e.postRun=
+[e.postRun]);e.postRun.length;){var b=e.postRun.shift();bb.unshift(b)}kb(bb)}}if(!(0<db)){if(e.preRun)for("function"==typeof e.preRun&&(e.preRun=[e.preRun]);e.preRun.length;)cb();kb($a);0<db||(e.setStatus?(e.setStatus("Running..."),setTimeout(function(){setTimeout(function(){e.setStatus("")},1);a()},1)):a())}}e.run=fd;if(e.preInit)for("function"==typeof e.preInit&&(e.preInit=[e.preInit]);0<e.preInit.length;)e.preInit.pop()();fd();
+
+
+        // The shell-pre.js and emcc-generated code goes above
+        return Module;
+    }); // The end of the promise being returned
+
+  return initSqlJsPromise;
+} // The end of our initSqlJs function
+
+// This bit below is copied almost exactly from what you get when you use the MODULARIZE=1 flag with emcc
+// However, we don't want to use the emcc modularization. See shell-pre.js
+if (typeof exports === 'object' && typeof module === 'object'){
+    module.exports = initSqlJs;
+    // This will allow the module to be used in ES6 or CommonJS
+    module.exports.default = initSqlJs;
+}
+else if (typeof define === 'function' && define['amd']) {
+    define([], function() { return initSqlJs; });
+}
+else if (typeof exports === 'object'){
+    exports["Module"] = initSqlJs;
+}

lib/sql-js/make.sh

@@ -0,0 +1,9 @@
+#!/bin/bash -e
+
+docker build -t sqliteviz/sqljs .
+
+rm -r dist || true
+
+CONTAINER=$(docker create sqliteviz/sqljs)
+docker cp $CONTAINER:/tmp/build/dist .
+docker rm $CONTAINER

lib/sql-js/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "sql.js",
+  "main": "./dist/sql-wasm.js"
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sqliteviz",
-  "version": "0.11.0",
+  "version": "0.15.0",
   "license": "Apache-2.0",
   "private": true,
   "scripts": {
@@ -12,20 +12,24 @@
   "dependencies": {
     "codemirror": "^5.57.0",
     "core-js": "^3.6.5",
-    "debounce": "^1.2.0",
+    "html2canvas": "^1.1.4",
+    "jquery": "^3.6.0",
     "nanoid": "^3.1.12",
-    "papaparse": "^5.3.0",
+    "papaparse": "^5.3.1",
+    "pivottable": "^2.23.0",
     "plotly.js": "^1.58.4",
     "promise-worker": "^2.0.1",
     "react": "^16.13.1",
-    "react-chart-editor": "^0.42.0",
+    "react-chart-editor": "^0.45.0",
     "react-dom": "^16.13.1",
-    "sql.js": "^1.5.0",
+    "sql.js": "file:./lib/sql-js",
     "sqlite-parser": "^1.0.1",
     "vue": "^2.6.11",
     "vue-codemirror": "^4.0.6",
     "vue-js-modal": "^2.0.0-rc.6",
+    "vue-multiselect": "^2.1.6",
     "vue-router": "^3.2.0",
+    "vue2-teleport": "^1.0.1",
     "vuejs-paginate": "^2.1.0",
     "vuera": "^0.2.7",
     "vuex": "^3.4.0"

src/assets/images/arrow-hover.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.51581 7.54801C4.95181 7.10201 5.55881 7.06701 6.09181 7.54801L9.99981 11.295L13.9078 7.54801C14.4408 7.06701 15.0488 7.10201 15.4818 7.54801C15.9178 7.99301 15.8898 8.74501 15.4818 9.16301C15.0758 9.58101 10.7868 13.665 10.7868 13.665C10.5698 13.888 10.2848 14 9.99981 14C9.71481 14 9.42981 13.888 9.21081 13.665C9.21081 13.665 4.92381 9.58101 4.51581 9.16301C4.10781 8.74501 4.07981 7.99301 4.51581 7.54801V7.54801Z" fill="#119DFF"/>
+</svg>

src/assets/images/arrow.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.51581 7.54801C4.95181 7.10201 5.55881 7.06701 6.09181 7.54801L9.99981 11.295L13.9078 7.54801C14.4408 7.06701 15.0488 7.10201 15.4818 7.54801C15.9178 7.99301 15.8898 8.74501 15.4818 9.16301C15.0758 9.58101 10.7868 13.665 10.7868 13.665C10.5698 13.888 10.2848 14 9.99981 14C9.71481 14 9.42981 13.888 9.21081 13.665C9.21081 13.665 4.92381 9.58101 4.51581 9.16301C4.10781 8.74501 4.07981 7.99301 4.51581 7.54801V7.54801Z" fill="#C8D4E3"/>
+</svg>

src/assets/images/delete-tag-hover.svg

@@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.0436 10.3943C9.7153 10.7226 9.1833 10.7226 8.8557 10.3943L7 8.27329L5.1443 10.3936C4.816 10.7219 4.284 10.7219 3.9564 10.3936C3.6281 10.0653 3.6281 9.53329 3.9564 9.20569L5.887 7.00069L3.9557 4.79429C3.6274 4.46599 3.6274 3.93469 3.9557 3.60639C4.284 3.27809 4.8153 3.27809 5.1436 3.60639L7 5.72809L8.8557 3.60639C9.184 3.27809 9.7153 3.27809 10.0436 3.60639C10.3719 3.93469 10.3719 4.46669 10.0436 4.79429L8.113 7.00069L10.0436 9.20569C10.3719 9.53399 10.3719 10.066 10.0436 10.3943V10.3943Z" fill="#DE350B"/>
+</svg>

src/assets/images/delete-tag.svg

@@ -0,0 +1,3 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.0436 10.3945C9.7153 10.7228 9.1833 10.7228 8.8557 10.3945L7 8.27348L5.1443 10.3938C4.816 10.7221 4.284 10.7221 3.9564 10.3938C3.6281 10.0655 3.6281 9.53348 3.9564 9.20588L5.887 7.00088L3.9557 4.79448C3.6274 4.46618 3.6274 3.93488 3.9557 3.60658C4.284 3.27828 4.8153 3.27828 5.1436 3.60658L7 5.72828L8.8557 3.60658C9.184 3.27828 9.7153 3.27828 10.0436 3.60658C10.3719 3.93488 10.3719 4.46688 10.0436 4.79448L8.113 7.00088L10.0436 9.20588C10.3719 9.53418 10.3719 10.0662 10.0436 10.3945V10.3945Z" fill="#506784"/>
+</svg>

src/assets/images/sort.svg

@@ -0,0 +1,11 @@
+<svg width="6" height="12" viewBox="0 0 6 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M2.99932 -3.63032e-05C2.75092 -3.63032e-05 2.54932 0.201563 2.54932 0.449964L2.54932 11.55C2.54932 11.7984 2.75092 12 2.99932 12C3.24772 12 3.44932 11.7984 3.44932 11.55L3.44932 0.449964C3.44932 0.201563 3.24772 -3.63032e-05 2.99932 -3.63032e-05Z" fill="#506784"/>
+<path d="M2.99915 1.80492e-05C2.8839 1.80492e-05 2.76865 0.0438534 2.68109 0.132073L0.581055 2.232C0.405273 2.40789 0.405273 2.69287 0.581055 2.86865C0.756946 3.04443 1.04193 3.04443 1.21771 2.86865L2.99969 1.08667L4.78168 2.86865C4.95746 3.04443 5.24255 3.04443 5.41833 2.86865C5.59412 2.69287 5.59412 2.40789 5.41833 2.232L3.3183 0.132073C3.22953 0.0438534 3.11428 1.80492e-05 2.99915 1.80492e-05V1.80492e-05Z" fill="#506784"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="6" height="12" fill="white" transform="matrix(1 0 0 -1 0 12)"/>
+</clipPath>
+</defs>
+</svg>

src/assets/styles/multiselect.css

@@ -0,0 +1,136 @@
+.sqliteviz-select,
+.sqliteviz-select .multiselect__tags {
+  min-height: 36px;
+  color: var(--color-text-base);
+}
+
+.sqliteviz-select .multiselect__select {
+  height: 34px;
+  min-height: 34px;
+  padding: 6px;
+  width: 32px;
+  height: 32px;
+  margin-top: 1px;
+}
+
+.sqliteviz-select .multiselect__tags {
+  border-radius: var(--border-radius-medium-2);
+  border: 1px solid var(--color-border);
+  padding: 4px 32px 0 6px;
+}
+
+.sqliteviz-select,
+.sqliteviz-select .multiselect__input,
+.sqliteviz-select .multiselect__single,
+.sqliteviz-select .multiselect__placeholder {
+  font-size: 12px;
+}
+
+.sqliteviz-select .multiselect__single,
+.sqliteviz-select .multiselect__placeholder,
+.sqliteviz-select .multiselect__input {
+  padding: 0;
+  margin-bottom: 0;
+  line-height: 28px;
+}
+
+.sqliteviz-select .multiselect__input {
+  width: 0 !important;
+  color: var(--color-text-base);
+}
+
+.sqliteviz-select.multiselect--active .multiselect__input {
+  width: auto !important;
+}
+
+.sqliteviz-select .multiselect__placeholder,
+.sqliteviz-select .multiselect__input::placeholder {
+  color: var(--color-text-light-2);
+}
+
+.sqliteviz-select .multiselect__option.multiselect__option--highlight {
+  background-color: var(--color-bg-light);
+  color: var(--color-text-active);
+}
+
+.sqliteviz-select .multiselect__tag {
+  background-color: var(--color-bg-light-4);
+  border: 1px solid var(--color-border);
+  border-radius: var(--border-radius-small);
+  color: var(--color-text-active);
+  font-size: 11.05px;
+  margin: 2px;
+}
+.sqliteviz-select .multiselect__tag-icon:after {
+  content: url('~@/assets/images/delete-tag.svg');
+  height: 14px;
+  width: 14px;
+}
+
+.sqliteviz-select .multiselect__tag-icon:focus:after,
+.sqliteviz-select .multiselect__tag-icon:hover:after {
+  content: url('~@/assets/images/delete-tag-hover.svg');
+}
+
+.sqliteviz-select .multiselect__tag-icon:focus,
+.sqliteviz-select .multiselect__tag-icon:hover {
+  background-color: var(--color-bg-danger);
+  border-radius: var(--border-radius-small);
+}
+
+.sqliteviz-select .multiselect__option {
+  min-height: 29px;
+  padding: 8px 12px;
+  line-height: 13px;
+}
+
+.sqliteviz-select .multiselect__option:after {
+  line-height: 29px;
+}
+
+.sqliteviz-select .multiselect__content-wrapper {
+  border-radius: var(--border-radius-medium-2);
+  border: 1px solid var(--color-border);
+  box-shadow: var(--shadow-1);
+  top: calc(100% - 1px);
+  max-height: 292px !important;
+}
+
+.sqliteviz-select.multiselect--above .multiselect__content-wrapper {
+  top: unset;
+  bottom: calc(100% - 1px);
+}
+
+.sqliteviz-select .multiselect__select:before {
+  content: url('~@/assets/images/arrow.svg');
+  border: none;
+  top: 0;
+}
+
+.sqliteviz-select.multiselect--active .multiselect__select {
+  transform: none;
+}
+
+.sqliteviz-select:hover .multiselect__tags {
+  border-color: var(--color-border-dark);
+}
+
+.sqliteviz-select .multiselect__select:hover:before {
+  content: url('~@/assets/images/arrow-hover.svg');
+}
+
+.sqliteviz-select.multiselect--active .multiselect__tags {
+  border-radius: var(--border-radius-medium-2);
+}
+
+.sqliteviz-select .multiselect__option  .no-results {
+  color: var(--color-text-light-2);
+}
+
+.sqliteviz-select.multiselect--disabled {
+  opacity: unset;
+}
+
+.sqliteviz-select.multiselect--disabled .multiselect__select {
+  background: unset;
+}

src/assets/styles/tables.css

@@ -1,11 +1,17 @@
 .rounded-bg {
-  padding: 40px 5px 5px;
+  padding: 35px 5px 5px;
   background-color: white;
   border-radius: 5px;
   position: relative;
   border: 1px solid var(--color-border-light);
   box-sizing: border-box;
 }
+
+.straight .rounded-bg {
+  border-radius: 0;
+  border-width: 0 0 1px 0;
+}
+
 .header-container {
   overflow: hidden;
   position: absolute;
@@ -18,6 +24,19 @@
   border-radius: 5px 5px 0 0;
 }
 
+.straight .header-container {
+  border-radius: 0;
+}
+
+.straight {
+  height: 100%;
+}
+
+.straight .rounded-bg {
+  /* 27 - height of table footer */
+  height: calc(100% - 27px);
+}
+
 @supports (-moz-appearance:none) {
   .header-container {
     top: 0;
@@ -32,22 +51,25 @@
 }
 .table-container {
   width: 100%;
+  max-height: 100%;
   overflow: auto;
 }
-table {
+table.sqliteviz-table {
   min-width: 100%;
-  margin-top: -40px;
+  margin-top: -35px;
   border-collapse: collapse;
 }
-thead th, .fixed-header {
+.sqliteviz-table thead th, .fixed-header {
   font-size: 14px;
   font-weight: 600;
   box-sizing: border-box;
   background-color: var(--color-bg-dark);
   color: var(--color-text-light);
   border-right: 1px solid var(--color-border-light);
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
-tbody td {
+.sqliteviz-table tbody td {
   font-size: 13px;
   background-color:white;
   color: var(--color-text-base);
@@ -55,18 +77,20 @@ tbody td {
   border-bottom: 1px solid var(--color-border-light);
   border-right: 1px solid var(--color-border-light);
 }
-td, th, .fixed-header {
-  padding: 12px 24px;
+.sqliteviz-table td,
+.sqliteviz-table th,
+.fixed-header {
+  padding: 8px 24px;
   white-space: nowrap;
 }
 
-tbody tr td:last-child,
-thead tr th:last-child,
+.sqliteviz-table tbody tr td:last-child,
+.sqliteviz-table thead tr th:last-child,
 .header-container div .fixed-header:last-child {
   border-right: none;
 }
 
-td > div.cell-data {
+.sqliteviz-table td > div.cell-data {
   width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;

src/assets/styles/variables.css

@@ -11,6 +11,8 @@
   --color-blue-dark: #0D76BF;
   --color-blue-dark-2: #2A3F5F;
   --color-red: #EF553B;
+  --color-red-2: #DE350B;
+  --color-red-light: #FFBDAD;
   --color-yellow: #FBEFCB;
 
 
@@ -18,13 +20,16 @@
   --color-bg-light: var(--color-gray-light);
   --color-bg-light-2: var(--color-gray-light-2);
   --color-bg-light-3: var(--color-gray-light-5);
+  --color-bg-light-4: var(--color-gray-light-4);
   --color-bg-dark: var(--color-gray-dark);
   --color-bg-warning: var(--color-yellow);
-  --color-danger: var(--color-red);
+  --color-bg-danger: var(--color-red-light);
+  --color-danger: var(--color-red-2);
   --color-accent: var(--color-blue-medium);
   --color-accent-shade: var(--color-blue-dark);
   --color-border-light: var(--color-gray-light-2);
   --color-border: var(--color-gray-light-3);
+  --color-border-dark: var(--color-gray-medium);
   --color-text-light: var(--color-white);
   --color-text-light-2: var(--color-gray-medium);
   --color-text-base: var(--color-gray-dark);

src/components/CsvImport/csv.js

@@ -10,20 +10,26 @@ export default {
   getResult (source) {
     const result = {}
     if (source.meta.fields) {
-      result.columns = source.meta.fields.map(col => col.trim())
-      result.values = source.data.map(row => {
-        const resultRow = []
-        result.columns.forEach(col => { resultRow.push(row[col]) })
-        return resultRow
+      source.meta.fields.forEach(col => {
+        result[col.trim()] = source.data.map(row => {
+          let value = row[col]
+          if (value instanceof Date) {
+            value = value.toISOString()
+          }
+          return value
+        })
       })
     } else {
-      result.values = source.data
-      result.columns = []
-      for (let i = 1; i <= source.data[0].length; i++) {
-        result.columns.push(`col${i}`)
+      for (let i = 0; i <= source.data[0].length - 1; i++) {
+        result[`col${i + 1}`] = source.data.map(row => {
+          let value = row[i]
+          if (value instanceof Date) {
+            value = value.toISOString()
+          }
+          return value
+        })
       }
     }
-
     return result
   },
 
@@ -46,7 +52,8 @@ export default {
           const res = {
             data: this.getResult(results),
             delimiter: results.meta.delimiter,
-            hasErrors: false
+            hasErrors: false,
+            rowCount: results.data.length
           }
           res.messages = results.errors.map(msg => {
             msg.type = msg.code === 'UndetectableDelimiter' ? 'info' : 'error'

src/components/CsvImport/index.vue

@@ -0,0 +1,382 @@
+<template>
+  <modal
+    :name="dialogName"
+    classes="dialog"
+    height="auto"
+    width="80%"
+    scrollable
+    :clickToClose="false"
+  >
+    <div class="dialog-header">
+      CSV import
+      <close-icon @click="cancelCsvImport" :disabled="disableDialog"/>
+    </div>
+    <div class="dialog-body">
+      <text-field
+        label="Table name"
+        v-model="tableName"
+        width="484px"
+        :disabled="disableDialog"
+        :error-msg="tableNameError"
+        id="csv-table-name"
+      />
+      <div class="chars">
+        <delimiter-selector
+          v-model="delimiter"
+          width="210px"
+          class="char-input"
+          @input="previewCsv"
+          :disabled="disableDialog"
+        />
+        <text-field
+          label="Quote char"
+          hint="The character used to quote fields."
+          v-model="quoteChar"
+          width="93px"
+          :disabled="disableDialog"
+          class="char-input"
+          id="quote-char"
+        />
+        <text-field
+          label="Escape char"
+          hint='The character used to escape the quote character within a field (e.g. "column with ""quotes"" in text").'
+          max-hint-width="242px"
+          v-model="escapeChar"
+          width="93px"
+          :disabled="disableDialog"
+          class="char-input"
+          id="escape-char"
+        />
+      </div>
+      <check-box
+        @click="header = $event"
+        :init="true"
+        label="Use first row as column headers"
+        :disabled="disableDialog"
+      />
+      <sql-table
+        v-if="previewData
+          && (previewData.rowCount > 0 || Object.keys(previewData).length > 0)
+        "
+        :data-set="previewData"
+        class="preview-table"
+        :preview="true"
+      />
+      <div v-else class="no-data">No data</div>
+      <logs
+        class="import-csv-errors"
+        :messages="importCsvMessages"
+      />
+    </div>
+    <div class="dialog-buttons-container">
+      <button
+        class="secondary"
+        :disabled="disableDialog"
+        @click="cancelCsvImport"
+        id="csv-cancel"
+      >
+        Cancel
+      </button>
+      <button
+        v-show="!importCsvCompleted"
+        class="primary"
+        :disabled="disableDialog"
+        @click="loadFromCsv(file)"
+        id="csv-import"
+      >
+        Import
+      </button>
+      <button
+        v-show="importCsvCompleted"
+        class="primary"
+        :disabled="disableDialog"
+        @click="finish"
+        id="csv-finish"
+      >
+        Finish
+      </button>
+    </div>
+  </modal>
+</template>
+
+<script>
+import csv from './csv'
+import CloseIcon from '@/components/svg/close'
+import TextField from '@/components/TextField'
+import DelimiterSelector from './DelimiterSelector'
+import CheckBox from '@/components/CheckBox'
+import SqlTable from '@/components/SqlTable'
+import Logs from '@/components/Logs'
+import time from '@/lib/utils/time'
+import fIo from '@/lib/utils/fileIo'
+
+export default {
+  name: 'CsvImport',
+  components: {
+    CloseIcon,
+    TextField,
+    DelimiterSelector,
+    CheckBox,
+    SqlTable,
+    Logs
+  },
+  props: ['file', 'db', 'dialogName'],
+  data () {
+    return {
+      disableDialog: false,
+      tableName: '',
+      delimiter: '',
+      quoteChar: '"',
+      escapeChar: '"',
+      header: true,
+      importCsvCompleted: false,
+      importCsvMessages: [],
+      previewData: null,
+      addedTable: null,
+      tableNameError: ''
+    }
+  },
+  watch: {
+    quoteChar () {
+      this.previewCsv()
+    },
+
+    escapeChar () {
+      this.previewCsv()
+    },
+
+    header () {
+      this.previewCsv()
+    },
+    tableName: time.debounce(function () {
+      this.tableNameError = ''
+      if (!this.tableName) {
+        return
+      }
+      this.db.validateTableName(this.tableName)
+        .catch(err => {
+          this.tableNameError = err.message + '. Try another table name.'
+        })
+    }, 400)
+  },
+  methods: {
+    cancelCsvImport () {
+      if (!this.disableDialog) {
+        if (this.addedTable) {
+          this.db.execute(`DROP TABLE "${this.addedTable}"`)
+          this.db.refreshSchema()
+        }
+        this.$modal.hide(this.dialogName)
+        this.$emit('cancel')
+      }
+    },
+    reset () {
+      this.header = true
+      this.quoteChar = '"'
+      this.escapeChar = '"'
+      this.delimiter = ''
+      this.tableName = ''
+      this.disableDialog = false
+      this.importCsvCompleted = false
+      this.importCsvMessages = []
+      this.previewData = null
+      this.addedTable = null
+      this.tableNameError = ''
+    },
+    open () {
+      this.tableName = this.db.sanitizeTableName(fIo.getFileName(this.file))
+      this.$modal.show(this.dialogName)
+    },
+    async previewCsv () {
+      this.importCsvCompleted = false
+      const config = {
+        preview: 3,
+        quoteChar: this.quoteChar || '"',
+        escapeChar: this.escapeChar,
+        header: this.header,
+        delimiter: this.delimiter
+      }
+      try {
+        const start = new Date()
+        const parseResult = await csv.parse(this.file, config)
+        const end = new Date()
+        this.previewData = parseResult.data
+        this.delimiter = parseResult.delimiter
+
+        // In parseResult.messages we can get parse errors
+        this.importCsvMessages = parseResult.messages || []
+
+        if (!parseResult.hasErrors) {
+          this.importCsvMessages.push({
+            message: `Preview parsing is completed in ${time.getPeriod(start, end)}.`,
+            type: 'success'
+          })
+        }
+      } catch (err) {
+        this.importCsvMessages = [{
+          message: err,
+          type: 'error'
+        }]
+      }
+    },
+    async loadFromCsv (file) {
+      if (!this.tableName) {
+        this.tableNameError = "Table name can't be empty"
+        return
+      }
+
+      this.disableDialog = true
+      const config = {
+        quoteChar: this.quoteChar || '"',
+        escapeChar: this.escapeChar,
+        header: this.header,
+        delimiter: this.delimiter
+      }
+      const parseCsvMsg = {
+        message: 'Parsing CSV...',
+        type: 'info'
+      }
+      this.importCsvMessages.push(parseCsvMsg)
+      const parseCsvLoadingIndicator = setTimeout(() => { parseCsvMsg.type = 'loading' }, 1000)
+
+      const importMsg = {
+        message: 'Importing CSV into a SQLite database...',
+        type: 'info'
+      }
+      let importLoadingIndicator = null
+
+      const updateProgress = progress => {
+        this.$set(importMsg, 'progress', progress)
+      }
+      const progressCounterId = this.db.createProgressCounter(updateProgress)
+
+      try {
+        let start = new Date()
+        const parseResult = await csv.parse(this.file, config)
+        let end = new Date()
+
+        if (!parseResult.hasErrors) {
+          const rowCount = parseResult.rowCount
+          let period = time.getPeriod(start, end)
+          parseCsvMsg.type = 'success'
+
+          if (parseResult.messages.length > 0) {
+            this.importCsvMessages = this.importCsvMessages.concat(parseResult.messages)
+            parseCsvMsg.message = `${rowCount} rows are parsed in ${period}.`
+          } else {
+            // Inform about csv parsing success
+            parseCsvMsg.message = `${rowCount} rows are parsed successfully in ${period}.`
+          }
+
+          // Loading indicator for csv parsing is not needed anymore
+          clearTimeout(parseCsvLoadingIndicator)
+
+          // Add info about import start
+          this.importCsvMessages.push(importMsg)
+
+          // Show import progress after 1 second
+          importLoadingIndicator = setTimeout(() => {
+            importMsg.type = 'loading'
+          }, 1000)
+
+          // Add table
+          start = new Date()
+          await this.db.addTableFromCsv(this.tableName, parseResult.data, progressCounterId)
+          end = new Date()
+
+          this.addedTable = this.tableName
+          // Inform about import success
+          period = time.getPeriod(start, end)
+          importMsg.message = `Importing CSV into a SQLite database is completed in ${period}.`
+          importMsg.type = 'success'
+
+          // Loading indicator for import is not needed anymore
+          clearTimeout(importLoadingIndicator)
+
+          this.importCsvCompleted = true
+        } else {
+          parseCsvMsg.message = 'Parsing ended with errors.'
+          parseCsvMsg.type = 'info'
+          this.importCsvMessages = this.importCsvMessages.concat(parseResult.messages)
+        }
+      } catch (err) {
+        if (parseCsvMsg.type === 'loading') {
+          parseCsvMsg.type = 'info'
+        }
+
+        if (importMsg.type === 'loading') {
+          importMsg.type = 'info'
+        }
+
+        this.importCsvMessages.push({
+          message: err,
+          type: 'error'
+        })
+      }
+
+      clearTimeout(parseCsvLoadingIndicator)
+      clearTimeout(importLoadingIndicator)
+      this.db.deleteProgressCounter(progressCounterId)
+      this.disableDialog = false
+    },
+    async finish () {
+      this.$modal.hide(this.dialogName)
+      const stmt = [
+        '/*',
+        ` * Your CSV file has been imported into ${this.addedTable} table.`,
+        ' * You can run this SQL query to make all CSV records available for charting.',
+        ' */',
+        `SELECT * FROM "${this.addedTable}"`
+      ].join('\n')
+      const tabId = await this.$store.dispatch('addTab', { query: stmt })
+      this.$store.commit('setCurrentTabId', tabId)
+      this.importCsvCompleted = false
+      this.$emit('finish')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.dialog-body {
+  padding-bottom: 0;
+}
+
+.chars {
+  display: flex;
+  align-items: flex-end;
+  margin: 24px 0 20px;
+}
+.char-input {
+  margin-right: 44px;
+}
+.preview-table {
+  margin-top: 18px;
+}
+
+.import-csv-errors {
+  height: 136px;
+  margin-top: 8px;
+}
+.no-data {
+  margin-top: 32px;
+  background-color: white;
+  border-radius: 5px;
+  position: relative;
+  border: 1px solid var(--color-border-light);
+  box-sizing: border-box;
+  height: 147px;
+  font-size: 13px;
+  color: var(--color-text-base);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+/* https://github.com/euvl/vue-js-modal/issues/623 */
+>>> .vm--modal {
+  max-width: 1152px;
+  margin: auto;
+  left: 0 !important;
+}
+</style>

src/components/DbUploader.vue

@@ -0,0 +1,259 @@
+<template>
+  <div class="db-uploader-container" :style="{ width }">
+    <change-db-icon v-if="type === 'small'" @click="browse"/>
+    <div v-if="type === 'illustrated'" class="drop-area-container">
+      <div
+        class="drop-area"
+        @dragover.prevent="state = 'dragover'"
+        @dragleave.prevent="state=''"
+        @drop.prevent="drop"
+        @click="browse"
+      >
+        <div class="text">
+          Drop the database or CSV file here or click to choose a file from your computer.
+        </div>
+      </div>
+    </div>
+    <div v-if="type === 'illustrated'" id="img-container">
+      <img id="drop-file-top-img" :src="require('@/assets/images/top.svg')" />
+      <img
+        id="left-arm-img"
+        :class="{'swing': state === 'dragover'}"
+        :src="require('@/assets/images/leftArm.svg')"
+      />
+      <img
+        id="file-img"
+        ref="fileImg"
+        :class="{
+          'swing': state === 'dragover',
+          'fly': state === 'dropping',
+          'hidden': state === 'dropped'
+        }"
+        :src="require('@/assets/images/file.png')"
+      />
+      <img id="drop-file-bottom-img" :src="require('@/assets/images/bottom.svg')" />
+      <img id="body-img" :src="require('@/assets/images/body.svg')" />
+      <img
+        id="right-arm-img"
+        :class="{'swing': state === 'dragover'}"
+        :src="require('@/assets/images/rightArm.svg')"
+      />
+    </div>
+    <div id="error" class="error"></div>
+
+    <!--Parse csv dialog  -->
+    <csv-import
+      ref="addCsv"
+      :file="file"
+      :db="newDb"
+      dialog-name="importFromCsv"
+      @cancel="cancelCsvImport"
+      @finish="finish"
+    />
+  </div>
+</template>
+
+<script>
+import fIo from '@/lib/utils/fileIo'
+import ChangeDbIcon from '@/components/svg/changeDb'
+import database from '@/lib/database'
+import CsvImport from '@/components/CsvImport'
+
+export default {
+  name: 'DbUploader',
+  props: {
+    type: {
+      type: String,
+      required: false,
+      default: 'small',
+      validator: (value) => {
+        return ['illustrated', 'small'].includes(value)
+      }
+    },
+    width: {
+      type: String,
+      required: false,
+      default: 'unset'
+    }
+  },
+  components: {
+    ChangeDbIcon,
+    CsvImport
+  },
+  data () {
+    return {
+      state: '',
+      animationPromise: Promise.resolve(),
+      file: null,
+      newDb: null
+    }
+  },
+  mounted () {
+    if (this.type === 'illustrated') {
+      this.animationPromise = new Promise((resolve) => {
+        this.$refs.fileImg.addEventListener('animationend', event => {
+          if (event.animationName.startsWith('fly')) {
+            this.state = 'dropped'
+            resolve()
+          }
+        })
+      })
+    }
+  },
+  methods: {
+    cancelCsvImport () {
+      if (this.newDb) {
+        this.newDb.shutDown()
+        this.newDb = null
+      }
+    },
+
+    async finish () {
+      this.$store.commit('setDb', this.newDb)
+      if (this.$route.path !== '/workspace') {
+        this.$router.push('/workspace')
+      }
+    },
+
+    loadDb (file) {
+      return Promise.all([this.newDb.loadDb(file), this.animationPromise])
+        .then(this.finish)
+    },
+
+    async checkFile (file) {
+      this.state = 'dropping'
+      this.newDb = database.getNewDatabase()
+
+      if (fIo.isDatabase(file)) {
+        this.loadDb(file)
+      } else {
+        this.file = file
+        await this.$nextTick()
+        const csvImport = this.$refs.addCsv
+        csvImport.reset()
+        return Promise.all([csvImport.previewCsv(), this.animationPromise])
+          .then(csvImport.open)
+      }
+    },
+    browse () {
+      fIo.getFileFromUser('.db,.sqlite,.sqlite3,.csv')
+        .then(this.checkFile)
+    },
+
+    drop (event) {
+      this.checkFile(event.dataTransfer.files[0])
+    }
+  }
+}
+</script>
+
+<style scoped>
+.db-uploader-container {
+  position: relative;
+}
+.drop-area-container {
+  display: inline-block;
+  border: 1px dashed var(--color-border);
+  padding: 8px;
+  border-radius: var(--border-radius-big);
+  height: 100%;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.drop-area {
+  background-color: var(--color-bg-light-3);
+  border-radius: var(--border-radius-big);
+  color: var(--color-text-base);
+  font-size: 13px;
+  text-align: center;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+  cursor: pointer;
+}
+
+#img-container {
+  position: absolute;
+  top: 54px;
+  left: 50%;
+  transform: translate(-50%, 0);
+  width: 450px;
+  height: 338px;
+  pointer-events: none;
+}
+
+#drop-file-top-img {
+  width: 450px;
+  height: 175px;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+#drop-file-bottom-img {
+  width: 450px;
+  height: 167px;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+}
+#body-img {
+  width: 74px;
+  position: absolute;
+  top: 94.05px;
+  left: 46px;
+}
+#right-arm-img {
+  width: 106px;
+  position: absolute;
+  top: 110.05px;
+  left: 78px;
+}
+#left-arm-img {
+  width: 114px;
+  position: absolute;
+  top: 69.05px;
+  left: 69px;
+}
+#file-img {
+  width: 125px;
+  position: absolute;
+  top: 15.66px;
+  left: 152px;
+}
+
+.swing {
+  animation: swing ease-in-out 0.6s infinite alternate;
+}
+#left-arm-img.swing {
+  transform-origin: 9px 83px;
+}
+#right-arm-img.swing {
+  transform-origin: 0 56px;
+}
+#file-img.swing {
+   transform-origin: -74px 139px;
+}
+@keyframes swing {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(-7deg); }
+}
+
+#file-img.fly {
+  animation: fly ease-in-out 1s 1 normal;
+  transform-origin: center center;
+}
+@keyframes fly {
+  100% {
+    transform: rotate(360deg) scale(0.5);
+    top: 183px;
+    left: 225px;
+  }
+}
+
+#file-img.hidden {
+  display: none;
+}
+</style>

src/components/DbUploader/index.vue

@@ -1,551 +0,0 @@
-<template>
-  <div class="db-uploader-container" :style="{ width }">
-    <change-db-icon v-if="type === 'small'" @click.native="browse"/>
-    <div v-if="type === 'illustrated'" class="drop-area-container">
-      <div
-        class="drop-area"
-        @dragover.prevent="state = 'dragover'"
-        @dragleave.prevent="state=''"
-        @drop.prevent="drop"
-        @click="browse"
-      >
-        <div class="text">
-          Drop the database or CSV file here or click to choose a file from your computer.
-        </div>
-      </div>
-    </div>
-    <div v-if="type === 'illustrated'" id="img-container">
-      <img id="drop-file-top-img" :src="require('@/assets/images/top.svg')" />
-      <img
-        id="left-arm-img"
-        :class="{'swing': state === 'dragover'}"
-        :src="require('@/assets/images/leftArm.svg')"
-      />
-      <img
-        id="file-img"
-        ref="fileImg"
-        :class="{
-          'swing': state === 'dragover',
-          'fly': state === 'dropping',
-          'hidden': state === 'dropped'
-        }"
-        :src="require('@/assets/images/file.png')"
-      />
-      <img id="drop-file-bottom-img" :src="require('@/assets/images/bottom.svg')" />
-      <img id="body-img" :src="require('@/assets/images/body.svg')" />
-      <img
-        id="right-arm-img"
-        :class="{'swing': state === 'dragover'}"
-        :src="require('@/assets/images/rightArm.svg')"
-      />
-    </div>
-    <div id="error" class="error"></div>
-
-    <!--Parse csv dialog  -->
-    <modal name="parse" classes="dialog" height="auto" width="60%" :clickToClose="false">
-      <div class="dialog-header">
-        Import CSV
-        <close-icon @click="cancelCsvImport" :disabled="disableDialog"/>
-      </div>
-      <div class="dialog-body">
-        <div class="chars">
-          <delimiter-selector
-            v-model="delimiter"
-            width="210px"
-            class="char-input"
-            @input="previewCSV"
-            :disabled="disableDialog"
-          />
-          <text-field
-            label="Quote char"
-            hint="The character used to quote fields."
-            v-model="quoteChar"
-            width="93px"
-            :disabled="disableDialog"
-            class="char-input"
-            id="quote-char"
-          />
-          <text-field
-            label="Escape char"
-            hint='The character used to escape the quote character within a field (e.g. "column with ""quotes"" in text").'
-            max-hint-width="242px"
-            v-model="escapeChar"
-            width="93px"
-            :disabled="disableDialog"
-            class="char-input"
-            id="escape-char"
-          />
-        </div>
-        <check-box
-          @click="header = $event"
-          :init="true"
-          label="Use first row as column headers"
-          :disabled="disableDialog"
-        />
-        <sql-table
-          v-if="previewData"
-          :data-set="previewData"
-          height="160"
-          class="preview-table"
-          :preview="true"
-        />
-        <div v-if="!previewData" class="no-data">No data</div>
-        <logs
-          class="import-csv-errors"
-          :messages="importCsvMessages"
-        />
-      </div>
-      <div class="dialog-buttons-container">
-        <button
-          class="secondary"
-          :disabled="disableDialog"
-          @click="cancelCsvImport"
-          id="csv-cancel"
-        >
-          Cancel
-        </button>
-        <button
-          v-show="!importCsvCompleted"
-          class="primary"
-          :disabled="disableDialog"
-          @click="loadFromCsv(file)"
-          id="csv-import"
-        >
-          Import
-        </button>
-        <button
-          v-show="importCsvCompleted"
-          class="primary"
-          :disabled="disableDialog"
-          @click="finish"
-          id="csv-finish"
-        >
-          Finish
-        </button>
-      </div>
-    </modal>
-  </div>
-</template>
-
-<script>
-import fIo from '@/lib/utils/fileIo'
-import csv from './csv'
-import CloseIcon from '@/components/svg/close'
-import TextField from '@/components/TextField'
-import DelimiterSelector from './DelimiterSelector'
-import CheckBox from '@/components/CheckBox'
-import SqlTable from '@/components/SqlTable'
-import Logs from '@/components/Logs'
-import ChangeDbIcon from '@/components/svg/changeDb'
-import time from '@/lib/utils/time'
-import database from '@/lib/database'
-
-export default {
-  name: 'DbUploader',
-  props: {
-    type: {
-      type: String,
-      required: false,
-      default: 'small',
-      validator: (value) => {
-        return ['illustrated', 'small'].includes(value)
-      }
-    },
-    width: {
-      type: String,
-      required: false,
-      default: 'unset'
-    }
-  },
-  components: {
-    ChangeDbIcon,
-    TextField,
-    DelimiterSelector,
-    CloseIcon,
-    CheckBox,
-    SqlTable,
-    Logs
-  },
-  data () {
-    return {
-      state: '',
-      animationPromise: Promise.resolve(),
-      file: null,
-      schema: null,
-      delimiter: '',
-      quoteChar: '"',
-      escapeChar: '"',
-      header: true,
-      previewData: null,
-      importCsvMessages: [],
-      disableDialog: false,
-      importCsvCompleted: false,
-      newDb: null
-    }
-  },
-  mounted () {
-    if (this.type === 'illustrated') {
-      this.animationPromise = new Promise((resolve) => {
-        this.$refs.fileImg.addEventListener('animationend', event => {
-          if (event.animationName.startsWith('fly')) {
-            this.state = 'dropped'
-            resolve()
-          }
-        })
-      })
-    }
-  },
-  watch: {
-    quoteChar () {
-      this.previewCSV()
-    },
-
-    escapeChar () {
-      this.previewCSV()
-    },
-
-    header () {
-      this.previewCSV()
-    }
-  },
-  methods: {
-    cancelCsvImport () {
-      if (!this.disableDialog) {
-        this.$modal.hide('parse')
-        if (this.newDb) {
-          this.newDb.shutDown()
-          this.newDb = null
-        }
-      }
-    },
-
-    async finish () {
-      this.$store.commit('setDb', this.newDb)
-      this.$store.commit('saveSchema', this.schema)
-      if (this.importCsvCompleted) {
-        this.$modal.hide('parse')
-        const stmt = [
-          '/*',
-          ' * Your CSV file has been imported into csv_import table.',
-          ' * You can run this SQL query to make all CSV records available for charting.',
-          ' */',
-          'SELECT * FROM csv_import'
-        ].join('\n')
-        const tabId = await this.$store.dispatch('addTab', { query: stmt })
-        this.$store.commit('setCurrentTabId', tabId)
-        this.importCsvCompleted = false
-      }
-      if (this.$route.path !== '/editor') {
-        this.$router.push('/editor')
-      }
-    },
-
-    async previewCSV () {
-      this.importCsvCompleted = false
-      const config = {
-        preview: 3,
-        quoteChar: this.quoteChar || '"',
-        escapeChar: this.escapeChar,
-        header: this.header,
-        delimiter: this.delimiter
-      }
-      try {
-        const start = new Date()
-        const parseResult = await csv.parse(this.file, config)
-        const end = new Date()
-        this.previewData = parseResult.data
-        this.delimiter = parseResult.delimiter
-
-        // In parseResult.messages we can get parse errors
-        this.importCsvMessages = parseResult.messages || []
-
-        if (!parseResult.hasErrors) {
-          this.importCsvMessages.push({
-            message: `Preview parsing is completed in ${time.getPeriod(start, end)}.`,
-            type: 'success'
-          })
-        }
-      } catch (err) {
-        this.importCsvMessages = [{
-          message: err,
-          type: 'error'
-        }]
-      }
-    },
-
-    loadDb (file) {
-      this.newDb = database.getNewDatabase()
-      return Promise.all([this.newDb.loadDb(file), this.animationPromise])
-        .then(([schema]) => {
-          this.schema = schema
-          this.finish()
-        })
-    },
-
-    async loadFromCsv (file) {
-      this.disableDialog = true
-      const config = {
-        quoteChar: this.quoteChar || '"',
-        escapeChar: this.escapeChar,
-        header: this.header,
-        delimiter: this.delimiter
-      }
-      const parseCsvMsg = {
-        message: 'Parsing CSV...',
-        type: 'info'
-      }
-      this.importCsvMessages.push(parseCsvMsg)
-      const parseCsvLoadingIndicator = setTimeout(() => { parseCsvMsg.type = 'loading' }, 1000)
-
-      const importMsg = {
-        message: 'Importing CSV into a SQLite database...',
-        type: 'info'
-      }
-      let importLoadingIndicator = null
-
-      const updateProgress = progress => {
-        this.$set(importMsg, 'progress', progress)
-      }
-      this.newDb = database.getNewDatabase()
-      const progressCounterId = this.newDb.createProgressCounter(updateProgress)
-
-      try {
-        let start = new Date()
-        const parseResult = await csv.parse(this.file, config)
-        let end = new Date()
-
-        if (!parseResult.hasErrors) {
-          const rowCount = parseResult.data.values.length
-          let period = time.getPeriod(start, end)
-          parseCsvMsg.type = 'success'
-
-          if (parseResult.messages.length > 0) {
-            this.importCsvMessages = this.importCsvMessages.concat(parseResult.messages)
-            parseCsvMsg.message = `${rowCount} rows are parsed in ${period}.`
-          } else {
-            // Inform about csv parsing success
-            parseCsvMsg.message = `${rowCount} rows are parsed successfully in ${period}.`
-          }
-
-          // Loading indicator for csv parsing is not needed anymore
-          clearTimeout(parseCsvLoadingIndicator)
-
-          // Add info about import start
-          this.importCsvMessages.push(importMsg)
-
-          // Show import progress after 1 second
-          importLoadingIndicator = setTimeout(() => {
-            importMsg.type = 'loading'
-          }, 1000)
-
-          // Create db with csv table and get schema
-          const name = file.name.replace(/\.[^.]+$/, '')
-          start = new Date()
-          this.schema = await this.newDb.importDb(name, parseResult.data, progressCounterId)
-          end = new Date()
-
-          // Inform about import success
-          period = time.getPeriod(start, end)
-          importMsg.message = `Importing CSV into a SQLite database is completed in ${period}.`
-          importMsg.type = 'success'
-
-          // Loading indicator for import is not needed anymore
-          clearTimeout(importLoadingIndicator)
-
-          this.importCsvCompleted = true
-        } else {
-          parseCsvMsg.message = 'Parsing ended with errors.'
-          parseCsvMsg.type = 'info'
-          this.importCsvMessages = this.importCsvMessages.concat(parseResult.messages)
-        }
-      } catch (err) {
-        if (parseCsvMsg.type === 'loading') {
-          parseCsvMsg.type = 'info'
-        }
-
-        if (importMsg.type === 'loading') {
-          importMsg.type = 'info'
-        }
-
-        this.importCsvMessages.push({
-          message: err,
-          type: 'error'
-        })
-      }
-
-      clearTimeout(parseCsvLoadingIndicator)
-      clearTimeout(importLoadingIndicator)
-      this.newDb.deleteProgressCounter(progressCounterId)
-      this.disableDialog = false
-    },
-
-    async checkFile (file) {
-      this.state = 'dropping'
-      if (fIo.isDatabase(file)) {
-        this.loadDb(file)
-      } else {
-        this.file = file
-        this.header = true
-        this.quoteChar = '"'
-        this.escapeChar = '"'
-        this.delimiter = ''
-        return Promise.all([this.previewCSV(), this.animationPromise])
-          .then(() => {
-            this.$modal.show('parse')
-          })
-      }
-    },
-    browse () {
-      fIo.getFileFromUser('.db,.sqlite,.sqlite3,.csv')
-        .then(this.checkFile)
-    },
-
-    drop (event) {
-      this.checkFile(event.dataTransfer.files[0])
-    }
-  }
-}
-</script>
-
-<style scoped>
-.db-uploader-container {
-  position: relative;
-}
-.drop-area-container {
-  display: inline-block;
-  border: 1px dashed var(--color-border);
-  padding: 8px;
-  border-radius: var(--border-radius-big);
-  height: 100%;
-  width: 100%;
-  box-sizing: border-box;
-}
-
-.drop-area {
-  background-color: var(--color-bg-light-3);
-  border-radius: var(--border-radius-big);
-  color: var(--color-text-base);
-  font-size: 13px;
-  text-align: center;
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-  cursor: pointer;
-}
-
-#img-container {
-  position: absolute;
-  top: 54px;
-  left: 50%;
-  transform: translate(-50%, 0);
-  width: 450px;
-  height: 338px;
-  pointer-events: none;
-}
-
-#drop-file-top-img {
-  width: 450px;
-  height: 175px;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-#drop-file-bottom-img {
-  width: 450px;
-  height: 167px;
-  position: absolute;
-  bottom: 0;
-  left: 0;
-}
-#body-img {
-  width: 74px;
-  position: absolute;
-  top: 94.05px;
-  left: 46px;
-}
-#right-arm-img {
-  width: 106px;
-  position: absolute;
-  top: 110.05px;
-  left: 78px;
-}
-#left-arm-img {
-  width: 114px;
-  position: absolute;
-  top: 69.05px;
-  left: 69px;
-}
-#file-img {
-  width: 125px;
-  position: absolute;
-  top: 15.66px;
-  left: 152px;
-}
-
-.swing {
-  animation: swing ease-in-out 0.6s infinite alternate;
-}
-#left-arm-img.swing {
-  transform-origin: 9px 83px;
-}
-#right-arm-img.swing {
-  transform-origin: 0 56px;
-}
-#file-img.swing {
-   transform-origin: -74px 139px;
-}
-@keyframes swing {
-  0% { transform: rotate(0deg); }
-  100% { transform: rotate(-7deg); }
-}
-
-#file-img.fly {
-  animation: fly ease-in-out 1s 1 normal;
-  transform-origin: center center;
-}
-@keyframes fly {
-  100% {
-    transform: rotate(360deg) scale(0.5);
-    top: 183px;
-    left: 225px;
-  }
-}
-
-#file-img.hidden {
-  display: none;
-}
-
-/* Parse CSV dialog */
-.chars {
-  display: flex;
-  align-items: flex-end;
-  margin-bottom: 20px;
-}
-.char-input {
-  margin-right: 44px;
-}
-.preview-table {
-  margin-top: 32px;
-}
-
-.import-csv-errors {
-  height: 160px;
-  margin-top: 32px;
-}
-.no-data {
-  margin-top: 32px;
-  background-color: white;
-  border-radius: 5px;
-  position: relative;
-  border: 1px solid var(--color-border-light);
-  box-sizing: border-box;
-  height: 160px;
-  font-size: 13px;
-  color: var(--color-text-base);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-</style>

src/components/IconButton.vue

@@ -0,0 +1,110 @@
+<template>
+  <div
+    :class="['icon-btn', { active }, { disabled }]"
+    @click="onClick"
+    @mouseenter="showTooltip($event, tooltipPosition)"
+    @mouseleave="hideTooltip"
+  >
+    <div class="icon"><slot /></div>
+    <div v-show="loading" class="icon-in-progress">
+      <loading-indicator />
+    </div>
+    <span v-if="tooltip" class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+      {{ tooltip }}
+    </span>
+  </div>
+</template>
+
+<script>
+import tooltipMixin from '@/tooltipMixin'
+import LoadingIndicator from '@/components/LoadingIndicator'
+
+export default {
+  name: 'SideBarButton',
+  props: ['active', 'disabled', 'tooltip', 'tooltipPosition', 'loading'],
+  components: { LoadingIndicator },
+  mixins: [tooltipMixin],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.icon-btn {
+  box-sizing: border-box;
+  width: 26px;
+  height: 26px;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+}
+.icon-btn:hover {
+  border: 1px solid var(--color-border);
+  border-radius: var(--border-radius-medium-2);
+}
+
+.icon-btn:hover .icon >>> path,
+.icon-btn.active .icon >>> path,
+.icon-btn:hover .icon >>> circle,
+.icon-btn.active .icon >>> circle {
+  fill: var(--color-accent);
+}
+
+.disabled.icon-btn  .icon >>> path,
+.disabled.icon-btn  .icon >>> circle {
+  fill: var(--color-border);
+}
+
+.disabled.icon-btn {
+  cursor: default;
+  pointer-events: none;
+}
+
+.disabled.icon-btn:hover .icon >>> path {
+  fill: var(--color-border);
+}
+
+.icon-in-progress {
+  position: absolute;
+  width: 26px;
+  height: 26px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: var(--color-bg-light);
+  will-change: opacity;
+  /*
+    We need to show loader in 1 sec after starting query execution. We can't do that with
+    setTimeout because the main thread can be busy by getting a result set from the web worker.
+    But we can use CSS animation for opacity. Opacity triggers changes only in the Composite Layer
+    stage in rendering waterfall. Hence it can be processed only with Compositor Thread while
+    the Main Thread processes a result set.
+    https://www.viget.com/articles/animation-performance-101-browser-under-the-hood/
+  */
+  animation: show-loader 1s linear 0s 1;
+}
+
+@keyframes show-loader {
+  0% {
+    opacity: 0;
+  }
+  99% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
+.icon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>

src/components/Logs.vue

@@ -63,15 +63,16 @@ export default {
   border-radius: 5px;
   border: 1px solid var(--color-border-light);
   box-sizing: border-box;
-  overflow-y: scroll;
+  overflow-y: auto;
   color: var(--color-text-base);
 }
 .msg {
-  padding: 16px 7px;
+  padding: 12px 7px;
   border-bottom: 1px solid var(--color-border-light);
   display: flex;
   align-items: flex-start;
   font-family: monospace;
+  font-size: 13px;
 }
 
 .msg:last-child {

src/components/SqlTable/Pager.vue

@@ -49,6 +49,7 @@ export default {
 .paginator-continer {
   display: flex;
   align-items: center;
+  line-height: 10px;
 }
 >>> .paginator-page-link {
   padding: 2px 3px;

src/components/SqlTable/index.vue

@@ -17,20 +17,21 @@
         class="table-container"
         ref="table-container"
         @scroll="onScrollTable"
-        :style="{maxHeight: `${height}px`}"
       >
-      <table ref="table">
+      <table ref="table" class="sqliteviz-table">
         <thead>
           <tr>
-            <th v-for="(th,index) in dataSet.columns" :key="index" ref="th">
+            <th v-for="(th, index) in columns" :key="index" ref="th">
               <div class="cell-data" :style="cellStyle">{{ th }}</div>
             </th>
           </tr>
         </thead>
         <tbody>
-          <tr v-for="(row,index) in currentPageData" :key="index">
-            <td v-for="(value, valIndex) in row" :key="valIndex">
-              <div class="cell-data" :style="cellStyle">{{ value }}</div>
+          <tr v-for="rowIndex in currentPageData.count" :key="rowIndex">
+            <td v-for="(col, colIndex) in columns" :key="colIndex">
+              <div class="cell-data" :style="cellStyle">
+                {{ dataSet[col][rowIndex - 1 + currentPageData.start] }}
+              </div>
             </td>
           </tr>
         </tbody>
@@ -39,7 +40,7 @@
     </div>
     <div class="table-footer">
       <div class="table-footer-count">
-        {{ dataSet.values.length}} {{dataSet.values.length === 1 ? 'row' : 'rows'}} retrieved
+        {{ rowCount }} {{rowCount === 1 ? 'row' : 'rows'}} retrieved
         <span v-if="preview">for preview</span>
         <span v-if="time">in {{ time }}</span>
       </div>
@@ -54,7 +55,15 @@ import Pager from './Pager'
 export default {
   name: 'SqlTable',
   components: { Pager },
-  props: ['dataSet', 'time', 'height', 'preview'],
+  props: {
+    dataSet: Object,
+    time: String,
+    pageSize: {
+      type: Number,
+      default: 20
+    },
+    preview: Boolean
+  },
   data () {
     return {
       header: null,
@@ -64,20 +73,30 @@ export default {
     }
   },
   computed: {
+    columns () {
+      return Object.keys(this.dataSet)
+    },
+    rowCount () {
+      return this.dataSet[this.columns[0]].length
+    },
     cellStyle () {
-      const eq = this.tableWidth / this.dataSet.columns.length
-
+      const eq = this.tableWidth / this.columns.length
       return { maxWidth: `${Math.max(eq, 100)}px` }
     },
-    pageSize () {
-      return Math.max(Math.floor(this.height / 40), 20)
-    },
     pageCount () {
-      return Math.ceil(this.dataSet.values.length / this.pageSize)
+      return Math.ceil(this.rowCount / this.pageSize)
     },
     currentPageData () {
       const start = (this.currentPage - 1) * this.pageSize
-      return this.dataSet.values.slice(start, start + this.pageSize)
+      let end = start + this.pageSize
+      if (end > this.rowCount - 1) {
+        end = this.rowCount - 1
+      }
+      return {
+        start,
+        end,
+        count: end - start + 1
+      }
     }
   },
   methods: {

src/components/TextField.vue

@@ -87,4 +87,7 @@ input.error {
   margin-top: 2px;
   position: absolute;
 }
+.text-field-error:first-letter {
+  text-transform: uppercase;
+}
 </style>

src/components/svg/addTable.vue

@@ -0,0 +1,67 @@
+<template>
+  <span>
+    <svg
+      class="icon"
+      width="18"
+      height="18"
+      viewBox="0 0 18 18"
+      fill="none"
+      @click.stop="onClick"
+      @mouseenter="showTooltip"
+      @mouseleave="hideTooltip"
+    >
+      <g clip-path="url(#clip0)">
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="
+            M13.6573 1.5H2.59985C1.77485 1.5 1.09985 2.175 1.09985 3V13.6649C1.09985 14.4899
+            1.77485 15.1649 2.59985
+            15.1649H9.84V13.6649H8.87866V9.08244H13.6573V9.83777H15.1573V3C15.1573
+            2.17 14.4873 1.5 13.6573 1.5ZM13.6573
+            7.58244V3H8.87866V7.58244H13.6573ZM7.37866 3H2.59985V7.58244H7.37866V3ZM2.59985
+            9.08244V13.6649H7.37866V9.08244H2.59985ZM13.1702
+            10.8434H15.6702V13.1717H18.0001V15.6717H15.6702V18H13.1702V15.6717H10.8401V13.1717H13.1702V10.8434Z
+          "
+          fill="#A2B1C6"
+        />
+      </g>
+      <defs>
+        <clipPath id="clip0">
+          <rect width="18" height="18" fill="white"/>
+        </clipPath>
+      </defs>
+    </svg>
+    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+      Add new table from CSV
+    </span>
+  </span>
+</template>
+
+<script>
+import tooltipMixin from '@/tooltipMixin'
+
+export default {
+  name: 'AddTableIcon',
+  mixins: [tooltipMixin],
+  props: ['tooltip'],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.icon {
+  display: block;
+  margin: 0;
+  cursor: pointer;
+}
+
+.icon:hover path {
+  fill: var(--color-accent);
+}
+</style>

src/components/svg/changeDb.vue

@@ -6,16 +6,16 @@
     height="18"
     viewBox="0 0 18 18"
     fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-    @mouseover="showTooltip"
-    @mouseout="hideTooltip"
+    @click.stop="onClick"
+    @mouseenter="showTooltip"
+    @mouseleave="hideTooltip"
   >
     <path
       d="M3 10.5V12.75C3 14.25 5.2875 15.54 8.25 15.75V13.5825L8.3475 13.5C5.34 13.32 3 12.045 3 10.5ZM9 9.75C5.685 9.75 3 8.4075 3 6.75V9C3 10.6575 5.685 12 9 12C9.2925 12 9.5775 12 9.87 12L12.75 9.09C11.55 9.54 10.2825 9.75 9 9.75ZM9 2.25C5.685 2.25 3 3.5925 3 5.25C3 6.9075 5.685 8.25 9 8.25C12.315 8.25 15 6.9075 15 5.25C15 3.5925 12.315 2.25 9 2.25ZM15.75 8.3475C15.6375 8.3475 15.5325 8.3925 15.4575 8.475L14.7075 9.225L16.245 10.725L16.995 9.975C17.1525 9.825 17.16 9.57 16.995 9.3975L16.065 8.475C15.99 8.3925 15.885 8.3475 15.78 8.3475H15.75ZM14.28 9.66L9.75 14.205V15.75H11.295L15.84 11.1975L14.28 9.66Z"
       fill="#A2B1C6"
     />
   </svg>
-  <span class="icon-tooltip" :style="tooltipStyle">
+  <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
     Load another database or CSV
   </span>
 </div>
@@ -26,7 +26,13 @@ import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'changeDbIcon',
-  mixins: [tooltipMixin]
+  mixins: [tooltipMixin],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
 }
 </script>
 

src/components/svg/chart.vue

@@ -0,0 +1,22 @@
+<template>
+  <svg
+    width="18"
+    height="18"
+    viewBox="0 0 18 18"
+    fill="none"
+  >
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M8.41943 16V10H10.4194V16H8.41943Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M2.41943 16L2.41943 10H4.41943V16H2.41943Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M11.4194 16V7H13.4194V16H11.4194Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M14.4194 16V8H16.4194V16H14.4194Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M7.41943 12V16H5.41943V12H7.41943Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M12.4332 1.80676L16.6265 6.00001L15.9194 6.70712L12.4055 3.19326L5.93169 9.1691L1.71436 5.55424L2.36515 4.79499L5.90707 7.83092L12.4332 1.80676Z" fill="#A2B1C6"/>
+  </svg>
+</template>
+
+<script>
+
+export default {
+  name: 'ChartIcon'
+}
+</script>

src/components/svg/dataView.vue

@@ -0,0 +1,19 @@
+<template>
+  <svg
+    width="18"
+    height="18"
+    viewBox="0 0 18 18"
+    fill="none"
+  >
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M13.5552 6.91522C13.7584 6.91357 13.9535 6.99442 14.096 7.13926L17.2582 10.3541C17.5486 10.6494 17.5447 11.1242 17.2494 11.4147C16.9541 11.7051 16.4793 11.7012 16.1888 11.4059L13.57 8.74357L9.29577 13.2318C9.01977 13.5216 8.56484 13.5436 8.2621 13.2819L5.35435 10.7677L2.03285 13.7321C1.72382 14.0079 1.24971 13.981 0.973901 13.6719C0.69809 13.3629 0.725022 12.8888 1.03406 12.613L4.8471 9.20986C5.12827 8.95892 5.55198 8.95559 5.83705 9.20208L8.70249 11.6797L13.0182 7.14796C13.1583 7.00084 13.3521 6.91686 13.5552 6.91522Z" fill="#A2B1C6"/>
+    <circle cx="5.50049" cy="6.00339" r="1.5" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M16.036 1.21788L1.96546 1.213C1.14046 1.213 0.465462 1.888 0.465462 2.713L0.464111 15.2821C0.464111 16.1071 1.13911 16.7821 1.96411 16.7821L16.0347 16.787C16.8674 16.787 17.5347 16.1121 17.5347 15.287L17.536 2.71788C17.536 1.88787 16.866 1.21788 16.036 1.21788ZM16.0374 2.71788L1.96424 2.713L1.96289 15.2773L16.036 15.2821L16.0374 2.71788Z" fill="#A2B1C6"/>
+</svg>
+</template>
+
+<script>
+
+export default {
+  name: 'DataViewIcon'
+}
+</script>

src/components/svg/export.vue

@@ -6,17 +6,16 @@
       height="18"
       viewBox="0 0 18 18"
       fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      @click.stop="$emit('click')"
-      @mouseover="showTooltip"
-      @mouseout="hideTooltip"
+      @click.stop="onClick"
+      @mouseenter="showTooltip($event, tooltipPosition)"
+      @mouseleave="hideTooltip"
     >
       <path
         d="M10.5 1.5H4.5C3.675 1.5 3 2.175 3 3V15C3 15.825 3.675 16.5 4.5 16.5H13.5C14.325 16.5 15 15.825 15 15V6L10.5 1.5ZM13.5 15H4.5V3H9.75V6.75H13.5V15ZM12 8.25V13.575L10.425 12L8.325 14.1L6.225 12L8.325 9.9L6.675 8.25H12Z"
         fill="#A2B1C6"
       />
     </svg>
-    <span class="icon-tooltip" :style="tooltipStyle">
+    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
       {{ tooltip }}
     </span>
   </span>
@@ -28,7 +27,13 @@ import tooltipMixin from '@/tooltipMixin'
 export default {
   name: 'ExportIcon',
   mixins: [tooltipMixin],
-  props: ['tooltip']
+  props: ['tooltip', 'tooltipPosition'],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
 }
 </script>
 

src/components/svg/hint.vue

@@ -6,14 +6,14 @@
       height="20"
       viewBox="0 0 20 20"
       fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      @mouseover="showTooltip"
-      @mouseout="hideTooltip"
+      @click.stop="onClick"
+      @mouseenter="showTooltip"
+      @mouseleave="hideTooltip"
     >
       <path d="M8.75 14.1666H10.4167V12.5H8.75V14.1666ZM9.58333 16.25C5.90833 16.25 2.91667 13.2583 2.91667 9.58333C2.91667 5.90833 5.90833 2.91667 9.58333 2.91667C13.2583 2.91667 16.25 5.90833 16.25 9.58333C16.25 13.2583 13.2583 16.25 9.58333 16.25ZM9.58333 1.25C8.48898 1.25 7.40535 1.46555 6.3943 1.88434C5.38326 2.30313 4.4646 2.91696 3.69078 3.69078C2.12797 5.25358 1.25 7.3732 1.25 9.58333C1.25 11.7935 2.12797 13.9131 3.69078 15.4759C4.4646 16.2497 5.38326 16.8635 6.3943 17.2823C7.40535 17.7011 8.48898 17.9167 9.58333 17.9167C11.7935 17.9167 13.9131 17.0387 15.4759 15.4759C17.0387 13.9131 17.9167 11.7935 17.9167 9.58333C17.9167 8.48898 17.7011 7.40535 17.2823 6.3943C16.8635 5.38326 16.2497 4.4646 15.4759 3.69078C14.7021 2.91696 13.7834 2.30313 12.7724 1.88434C11.7613 1.46555 10.6777 1.25 9.58333 1.25Z" fill="#A2B1C6"/>
       <path d="M9.91601 4.51787C8.98167 4.42606 8.05144 4.69097 7.36309 5.24472C6.68735 5.78828 6.2998 6.56661 6.2998 7.38012H7.92488C7.92488 6.97463 8.11059 6.60187 8.44779 6.33061C8.79784 6.049 9.25647 5.92005 9.73896 5.96755C10.4832 6.04076 11.0828 6.57277 11.1647 7.23265C11.2306 7.764 10.9661 8.28194 10.4744 8.58426C9.38676 9.25303 8.73742 10.343 8.73742 11.5H10.3625C10.3625 10.8243 10.7477 10.184 11.3929 9.78733C12.3808 9.17985 12.9122 8.13913 12.7798 7.07124C12.6144 5.73863 11.41 4.66476 9.91601 4.51787Z" fill="#A2B1C6"/>
     </svg>
-    <span class="icon-tooltip" :style="{...tooltipStyle, maxWidth: maxWidth }">
+    <span class="icon-tooltip" :style="{...tooltipStyle, maxWidth: maxWidth }" ref="tooltip">
       {{ hint }}
     </span>
   </div>
@@ -25,7 +25,13 @@ import tooltipMixin from '@/tooltipMixin'
 export default {
   name: 'HintIcon',
   props: ['hint', 'maxWidth'],
-  mixins: [tooltipMixin]
+  mixins: [tooltipMixin],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
 }
 </script>
 

src/components/svg/pivot.vue

@@ -0,0 +1,20 @@
+<template>
+  <svg
+    width="18"
+    height="18"
+    viewBox="0 0 18 18"
+    fill="none"
+  >
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M15.7661 5.13901L18.3407 9.43008H16.5161V12.8467C16.5161 13.7957 16.2783 14.6451 15.6714 15.2521C15.0645 15.859 14.215 16.0967 13.2661 16.0967H9.84942V17.9214L5.55835 15.3467L9.84942 12.7721V14.5967H13.2661C13.9838 14.5967 14.3844 14.4178 14.6108 14.1914C14.8372 13.965 15.0161 13.5645 15.0161 12.8467V9.43008H13.1914L15.7661 5.13901Z" fill="#A2B1C6"/>
+    <path d="M6.41943 0H18.4194V4H6.41943V0Z" fill="#A2B1C6"/>
+    <path d="M0.419434 6H4.41943V18H0.419434V6Z" fill="#A2B1C6"/>
+    <path d="M0.419434 0H4.41943V4H0.419434V0Z" fill="#A2B1C6"/>
+  </svg>
+</template>
+
+<script>
+
+export default {
+  name: 'PivotIcon'
+}
+</script>

src/components/svg/png.svg

@@ -0,0 +1,5 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 5.51953C6.57686 5.51953 4.60547 7.49092 4.60547 9.91406C4.60547 12.3372 6.57686 14.3086 9 14.3086C11.4231 14.3086 13.3945 12.3372 13.3945 9.91406C13.3945 7.49092 11.4231 5.51953 9 5.51953ZM9 12.9023C7.35226 12.9023 6.01172 11.5618 6.01172 9.91406C6.01172 8.26632 7.35226 6.92578 9 6.92578C10.6477 6.92578 11.9883 8.26632 11.9883 9.91406C11.9883 11.5618 10.6477 12.9023 9 12.9023Z" fill="#A2B1C6"/>
+<path d="M15.8906 3.41016H13.304C13.2221 3.41016 13.1483 3.36547 13.1104 3.29319L12.3948 1.78945C12.3928 1.78534 12.3908 1.78126 12.3887 1.77718C12.1117 1.22312 11.5548 0.878906 10.9353 0.878906H7.11478C6.49529 0.878906 5.93835 1.22312 5.66135 1.77722C5.65928 1.7813 5.65731 1.78538 5.65534 1.78949L4.9397 3.2933C4.90173 3.36547 4.82797 3.41016 4.74609 3.41016H2.10938C0.946266 3.41016 0 4.35642 0 5.51953V15.0117C0 16.1748 0.946266 17.1211 2.10938 17.1211H15.8906C17.0537 17.1211 18 16.1748 18 15.0117V5.51953C18 4.35642 17.0537 3.41016 15.8906 3.41016ZM16.5938 15.0117C16.5938 15.3994 16.2783 15.7148 15.8906 15.7148H2.10938C1.72167 15.7148 1.40625 15.3994 1.40625 15.0117V5.51953C1.40625 5.13183 1.72167 4.81641 2.10938 4.81641H4.74609C5.36555 4.81641 5.92249 4.47223 6.19952 3.91816C6.2016 3.91409 6.20357 3.90997 6.20557 3.90586L6.92121 2.40205C6.95914 2.32984 7.0329 2.28516 7.11478 2.28516H10.9353C11.0172 2.28516 11.091 2.32984 11.1289 2.40202L11.8445 3.90582C11.8465 3.90994 11.8485 3.91405 11.8506 3.91813C12.1276 4.47219 12.6846 4.81637 13.304 4.81637H15.8906C16.2783 4.81637 16.5938 5.13179 16.5938 5.5195V15.0117Z" fill="#A2B1C6"/>
+<path d="M15.1875 6.22266H13.7812V7.62891H15.1875V6.22266Z" fill="#A2B1C6"/>
+</svg>

src/components/svg/png.vue

@@ -0,0 +1,18 @@
+<template>
+  <svg
+    width="18"
+    height="18"
+    viewBox="0 0 18 18"
+    fill="none"
+  >
+    <path d="M9 5.51953C6.57686 5.51953 4.60547 7.49092 4.60547 9.91406C4.60547 12.3372 6.57686 14.3086 9 14.3086C11.4231 14.3086 13.3945 12.3372 13.3945 9.91406C13.3945 7.49092 11.4231 5.51953 9 5.51953ZM9 12.9023C7.35226 12.9023 6.01172 11.5618 6.01172 9.91406C6.01172 8.26632 7.35226 6.92578 9 6.92578C10.6477 6.92578 11.9883 8.26632 11.9883 9.91406C11.9883 11.5618 10.6477 12.9023 9 12.9023Z" fill="#A2B1C6"/>
+    <path d="M15.8906 3.41016H13.304C13.2221 3.41016 13.1483 3.36547 13.1104 3.29319L12.3948 1.78945C12.3928 1.78534 12.3908 1.78126 12.3887 1.77718C12.1117 1.22312 11.5548 0.878906 10.9353 0.878906H7.11478C6.49529 0.878906 5.93835 1.22312 5.66135 1.77722C5.65928 1.7813 5.65731 1.78538 5.65534 1.78949L4.9397 3.2933C4.90173 3.36547 4.82797 3.41016 4.74609 3.41016H2.10938C0.946266 3.41016 0 4.35642 0 5.51953V15.0117C0 16.1748 0.946266 17.1211 2.10938 17.1211H15.8906C17.0537 17.1211 18 16.1748 18 15.0117V5.51953C18 4.35642 17.0537 3.41016 15.8906 3.41016ZM16.5938 15.0117C16.5938 15.3994 16.2783 15.7148 15.8906 15.7148H2.10938C1.72167 15.7148 1.40625 15.3994 1.40625 15.0117V5.51953C1.40625 5.13183 1.72167 4.81641 2.10938 4.81641H4.74609C5.36555 4.81641 5.92249 4.47223 6.19952 3.91816C6.2016 3.91409 6.20357 3.90997 6.20557 3.90586L6.92121 2.40205C6.95914 2.32984 7.0329 2.28516 7.11478 2.28516H10.9353C11.0172 2.28516 11.091 2.32984 11.1289 2.40202L11.8445 3.90582C11.8465 3.90994 11.8485 3.91405 11.8506 3.91813C12.1276 4.47219 12.6846 4.81637 13.304 4.81637H15.8906C16.2783 4.81637 16.5938 5.13179 16.5938 5.5195V15.0117Z" fill="#A2B1C6"/>
+    <path d="M15.1875 6.22266H13.7812V7.62891H15.1875V6.22266Z" fill="#A2B1C6"/>
+  </svg>
+</template>
+
+<script>
+export default {
+  name: 'PngIcon'
+}
+</script>

src/components/svg/run.vue

@@ -0,0 +1,17 @@
+<template>
+  <svg
+    width="12"
+    height="13"
+    viewBox="0 0 12 13"
+    fill="none"
+  >
+    <path d="M11.1624 6.94358L0.770043 12.9436L0.770043 0.943573L11.1624 6.94358Z" fill="#A2B1C6"/>
+  </svg>
+</template>
+
+<script>
+
+export default {
+  name: 'RunIcon'
+}
+</script>

src/components/svg/sort.vue

@@ -0,0 +1,45 @@
+<template>
+  <svg
+    :class="['sort-icon', { horizontal }, { asc }]"
+    width="6"
+    height="12"
+    viewBox="0 0 6 12"
+    fill="none"
+  >
+    <path d="M2.99932 -3.63032e-05C2.75092 -3.63032e-05 2.54932 0.201563 2.54932 0.449964L2.54932 11.55C2.54932 11.7984 2.75092 12 2.99932 12C3.24772 12 3.44932 11.7984 3.44932 11.55L3.44932 0.449964C3.44932 0.201563 3.24772 -3.63032e-05 2.99932 -3.63032e-05Z" fill="#506784"/>
+    <path d="M2.99915 1.80492e-05C2.8839 1.80492e-05 2.76865 0.0438534 2.68109 0.132073L0.581055 2.232C0.405273 2.40789 0.405273 2.69287 0.581055 2.86865C0.756946 3.04443 1.04193 3.04443 1.21771 2.86865L2.99969 1.08667L4.78168 2.86865C4.95746 3.04443 5.24255 3.04443 5.41833 2.86865C5.59412 2.69287 5.59412 2.40789 5.41833 2.232L3.3183 0.132073C3.22953 0.0438534 3.11428 1.80492e-05 2.99915 1.80492e-05V1.80492e-05Z" fill="#506784"/>
+  </svg>
+</template>
+
+<script>
+
+export default {
+  name: 'SortIcon',
+  props: {
+    horizontal: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    asc: {
+      type: Boolean,
+      required: false,
+      default: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+svg.asc {
+  transform: rotate(180deg);
+}
+
+svg.horizontal {
+  transform: rotate(-90deg);
+}
+
+svg.horizontal.asc {
+  transform: rotate(90deg);
+}
+</style>

src/components/svg/sqlEditor.vue

@@ -0,0 +1,25 @@
+<template>
+  <svg
+    width="18"
+    height="19"
+    viewBox="0 0 18 19"
+    fill="none"
+  >
+    <g clip-path="url(#clip0)">
+      <path d="M4.5 1.51343H10.5L15 6.01343V8.45284H13.5V6.76343H9.75V3.01343H4.5V8.45284H3V3.01343C3 2.18843 3.675 1.51343 4.5 1.51343Z" fill="#A2B1C6"/>
+      <path d="M4.28369 14.8127C4.28369 14.5872 4.20312 14.4114 4.04199 14.2854C3.88379 14.1594 3.604 14.0291 3.20264 13.8943C2.80127 13.7595 2.47314 13.6292 2.21826 13.5032C1.38916 13.0959 0.974609 12.5364 0.974609 11.8245C0.974609 11.47 1.07715 11.158 1.28223 10.8884C1.49023 10.616 1.7832 10.405 2.16113 10.2556C2.53906 10.1033 2.96387 10.0271 3.43555 10.0271C3.89551 10.0271 4.30713 10.1091 4.67041 10.2732C5.03662 10.4373 5.3208 10.6716 5.52295 10.9763C5.7251 11.2781 5.82617 11.6238 5.82617 12.0134H4.28809C4.28809 11.7527 4.20752 11.5505 4.04639 11.407C3.88818 11.2634 3.67285 11.1917 3.40039 11.1917C3.125 11.1917 2.90674 11.2532 2.74561 11.3762C2.5874 11.4963 2.5083 11.6501 2.5083 11.8376C2.5083 12.0017 2.59619 12.1511 2.77197 12.2859C2.94775 12.4177 3.25684 12.5554 3.69922 12.699C4.1416 12.8396 4.50488 12.9919 4.78906 13.156C5.48047 13.5544 5.82617 14.1038 5.82617 14.804C5.82617 15.3635 5.61523 15.803 5.19336 16.1223C4.77148 16.4417 4.19287 16.6013 3.45752 16.6013C2.93896 16.6013 2.46875 16.509 2.04688 16.3245C1.62793 16.137 1.31152 15.8821 1.09766 15.5598C0.886719 15.2346 0.78125 14.8611 0.78125 14.4392H2.32812C2.32812 14.782 2.41602 15.0354 2.5918 15.1995C2.77051 15.3606 3.05908 15.4412 3.45752 15.4412C3.7124 15.4412 3.91309 15.387 4.05957 15.2786C4.20898 15.1672 4.28369 15.012 4.28369 14.8127ZM12.0444 13.446C12.0444 14.0378 11.9463 14.5549 11.75 14.9973C11.5537 15.4368 11.2827 15.7898 10.937 16.0564L11.9697 16.8738L11.0161 17.6824L9.64062 16.575C9.51172 16.5925 9.38281 16.6013 9.25391 16.6013C8.70898 16.6013 8.22559 16.4753 7.80371 16.2234C7.38184 15.9714 7.05225 15.6111 6.81494 15.1423C6.58057 14.6736 6.45898 14.1345 6.4502 13.5251V13.1868C6.4502 12.5569 6.56445 12.0032 6.79297 11.5256C7.02441 11.0481 7.35254 10.679 7.77734 10.4182C8.20508 10.1575 8.69434 10.0271 9.24512 10.0271C9.78711 10.0271 10.2705 10.156 10.6953 10.4138C11.1201 10.6716 11.4497 11.0393 11.6841 11.5168C11.9214 11.9915 12.0415 12.5364 12.0444 13.1516V13.446ZM10.4756 13.178C10.4756 12.5422 10.3687 12.0603 10.1548 11.7322C9.94385 11.4011 9.64062 11.2356 9.24512 11.2356C8.83789 11.2356 8.53174 11.3982 8.32666 11.7234C8.12158 12.0486 8.01758 12.5247 8.01465 13.1516V13.446C8.01465 14.0759 8.11865 14.5593 8.32666 14.8962C8.53467 15.2302 8.84375 15.3972 9.25391 15.3972C9.64648 15.3972 9.94678 15.2317 10.1548 14.9006C10.3657 14.5696 10.4727 14.0935 10.4756 13.4724V13.178ZM14.3735 15.3269H17.0586V16.5134H12.8311V10.115H14.3735V15.3269Z" fill="#A2B1C6"/>
+    </g>
+    <defs>
+      <clipPath id="clip0">
+        <rect width="18" height="18" fill="white" transform="translate(0 0.0134277)"/>
+      </clipPath>
+    </defs>
+  </svg>
+</template>
+
+<script>
+
+export default {
+  name: 'SqlEditorIcon'
+}
+</script>

src/components/svg/table.vue

@@ -0,0 +1,21 @@
+<template>
+  <svg
+    width="18"
+    height="18"
+    viewBox="0 0 18 18"
+    fill="none"
+  >
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M14.5 2.16512L3.5 2.16999C2.675 2.16999 2 2.84499 2 3.66999V14.3349C2 15.1599 2.675 15.8349 3.5 15.8349L14.5 15.83C15.3327 15.83 16 15.1551 16 14.33V3.66512C16 2.83511 15.33 2.16512 14.5 2.16512ZM14.5014 3.66512L3.49878 3.66999V14.33L14.5014 14.3251V3.66512Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M6.27319 14.7069L6.27319 3.32135L7.77319 3.32135L7.77319 14.7069L6.27319 14.7069Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M10.2639 14.6932L10.2639 3.30772L11.7639 3.30772L11.7639 14.6932L10.2639 14.6932Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M15.5108 7.48325H2.4895V5.98325H15.5108V7.48325Z" fill="#A2B1C6"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M15.5108 11.6056H2.4895V10.1056H15.5108V11.6056Z" fill="#A2B1C6"/>
+  </svg>
+</template>
+
+<script>
+
+export default {
+  name: 'TableIcon'
+}
+</script>

src/lib/database/_sql.js

@@ -4,6 +4,17 @@ import dbUtils from './_statements'
 let SQL = null
 const sqlModuleReady = initSqlJs().then(sqlModule => { SQL = sqlModule })
 
+function _getDataSourcesFromSqlResult (sqlResult) {
+  if (!sqlResult) {
+    return {}
+  }
+  const dataSorces = {}
+  sqlResult.columns.forEach((column, index) => {
+    dataSorces[column] = sqlResult.values.map(row => row[index])
+  })
+  return dataSorces
+}
+
 export default class Sql {
   constructor () {
     this.db = null
@@ -36,16 +47,21 @@ export default class Sql {
     if (!sql) {
       throw new Error('exec: Missing query string')
     }
-    return this.db.exec(sql, params)
+    const sqlResults = this.db.exec(sql, params)
+    return sqlResults.map(result => _getDataSourcesFromSqlResult(result))
   }
 
-  import (columns, values, progressCounterId, progressCallback, chunkSize = 1500) {
-    this.createDb()
-    this.db.exec(dbUtils.getCreateStatement(columns, values))
-    const chunks = dbUtils.generateChunks(values, chunkSize)
-    const chunksAmount = Math.ceil(values.length / chunkSize)
+  import (tabName, data, progressCounterId, progressCallback, chunkSize = 1500) {
+    if (this.db === null) {
+      this.createDb()
+    }
+    const columns = Object.keys(data)
+    const rowCount = data[columns[0]].length
+    this.db.exec(dbUtils.getCreateStatement(tabName, data))
+    const chunks = dbUtils.generateChunks(data, chunkSize)
+    const chunksAmount = Math.ceil(rowCount / chunkSize)
     let count = 0
-    const insertStr = dbUtils.getInsertStmt(columns)
+    const insertStr = dbUtils.getInsertStmt(tabName, columns)
     const insertStmt = this.db.prepare(insertStr)
 
     progressCallback({ progress: 0, id: progressCounterId })

src/lib/database/_statements.js

@@ -1,25 +1,31 @@
+import sqliteParser from 'sqlite-parser'
+
 export default {
-  * generateChunks (arr, size) {
-    const count = Math.ceil(arr.length / size)
+  * generateChunks (data, size) {
+    const matrix = Object.keys(data).map(col => data[col])
+    const [row] = matrix
+    const transposedMatrix = row.map((value, column) => matrix.map(row => row[column]))
+
+    const count = Math.ceil(transposedMatrix.length / size)
 
     for (let i = 0; i <= count - 1; i++) {
       const start = size * i
       const end = start + size
-      yield arr.slice(start, end)
+      yield transposedMatrix.slice(start, end)
     }
   },
 
-  getInsertStmt (columns) {
+  getInsertStmt (tabName, columns) {
     const colList = `"${columns.join('", "')}"`
     const params = columns.map(() => '?').join(', ')
-    return `INSERT INTO csv_import (${colList}) VALUES (${params});`
+    return `INSERT INTO "${tabName}" (${colList}) VALUES (${params});`
   },
 
-  getCreateStatement (columns, values) {
-    let result = 'CREATE table csv_import('
-    columns.forEach((col, index) => {
-    // Get the first row of values to determine types
-      const value = values[0][index]
+  getCreateStatement (tabName, data) {
+    let result = `CREATE table "${tabName}"(`
+    for (const col in data) {
+      // Get the first row of values to determine types
+      const value = data[col][0]
       let type = ''
       switch (typeof value) {
         case 'number': {
@@ -37,8 +43,53 @@ export default {
         default: type = 'TEXT'
       }
       result += `"${col}" ${type}, `
-    })
+    }
+
     result = result.replace(/,\s$/, ');')
     return result
+  },
+
+  getAst (sql) {
+    // There is a bug is sqlite-parser
+    // It throws an error if tokenizer has an arguments:
+    // https://github.com/codeschool/sqlite-parser/issues/59
+    const fixedSql = sql
+      .replace(/(tokenize=[^,]+)"tokenchars=.+?"/, '$1')
+      .replace(/(tokenize=[^,]+)"remove_diacritics=.+?"/, '$1')
+      .replace(/(tokenize=[^,]+)"separators=.+?"/, '$1')
+      .replace(/tokenize=.+?(,|\))/, 'tokenize=unicode61$1')
+
+    return sqliteParser(fixedSql)
+  },
+
+  /*
+   * Return an array of columns with name and type. E.g.:
+   * [
+   *   { name: 'id',    type: 'INTEGER' },
+   *   { name: 'title', type: 'NVARCHAR(30)' },
+   * ]
+  */
+  getColumns (sql) {
+    const columns = []
+    const ast = this.getAst(sql)
+
+    const columnDefinition = ast.statement[0].format === 'table'
+      ? ast.statement[0].definition
+      : ast.statement[0].result.args.expression // virtual table
+
+    columnDefinition.forEach(item => {
+      if (item.variant === 'column' && ['identifier', 'definition'].includes(item.type)) {
+        let type = item.datatype ? item.datatype.variant : 'N/A'
+        if (item.datatype && item.datatype.args) {
+          type = type + '(' + item.datatype.args.expression[0].value
+          if (item.datatype.args.expression.length === 2) {
+            type = type + ', ' + item.datatype.args.expression[1].value
+          }
+          type = type + ')'
+        }
+        columns.push({ name: item.name, type: type })
+      }
+    })
+    return columns
   }
 }

src/lib/database/_worker.js

@@ -8,10 +8,17 @@ function processMsg (sql) {
   switch (data && data.action) {
     case 'open':
       return sql.open(data.buffer)
+    case 'reopen':
+      return sql.open(sql.export())
     case 'exec':
       return sql.exec(data.sql, data.params)
     case 'import':
-      return sql.import(data.columns, data.values, data.progressCounterId, postMessage)
+      return sql.import(
+        data.tabName,
+        data.data,
+        data.progressCounterId,
+        postMessage
+      )
     case 'export':
       return sql.export()
     case 'close':

src/lib/database/index.js

@@ -1,4 +1,4 @@
-import sqliteParser from 'sqlite-parser'
+import stms from './_statements'
 import fu from '@/lib/utils/fileIo'
 // We can import workers like so because of worker-loader:
 // https://webpack.js.org/loaders/worker-loader/
@@ -20,6 +20,8 @@ export default {
 let progressCounterIds = 0
 class Database {
   constructor (worker) {
+    this.dbName = null
+    this.schema = null
     this.worker = worker
     this.pw = new PromiseWorker(worker)
 
@@ -50,19 +52,19 @@ class Database {
     delete this.importProgresses[id]
   }
 
-  async importDb (name, data, progressCounterId) {
+  async addTableFromCsv (tabName, data, progressCounterId) {
     const result = await this.pw.postMessage({
       action: 'import',
-      columns: data.columns,
-      values: data.values,
-      progressCounterId
+      data,
+      progressCounterId,
+      tabName
     })
 
     if (result.error) {
       throw new Error(result.error)
     }
-
-    return await this.getSchema(name)
+    this.dbName = this.dbName || 'database'
+    this.refreshSchema()
   }
 
   async loadDb (file) {
@@ -73,11 +75,11 @@ class Database {
       throw new Error(res.error)
     }
 
-    const dbName = file ? file.name.replace(/\.[^.]+$/, '') : 'database'
-    return this.getSchema(dbName)
+    this.dbName = file ? fu.getFileName(file) : 'database'
+    this.refreshSchema()
   }
 
-  async getSchema (name) {
+  async refreshSchema () {
     const getSchemaSql = `
       SELECT name, sql
       FROM sqlite_master
@@ -86,23 +88,21 @@ class Database {
     const result = await this.execute(getSchemaSql)
     // Parse DDL statements to get column names and types
     const parsedSchema = []
-    if (result && result.values) {
-      result.values.forEach(item => {
+    if (result && result.name) {
+      result.name.forEach((table, index) => {
         parsedSchema.push({
-          name: item[0],
-          columns: getColumns(item[1])
+          name: table,
+          columns: stms.getColumns(result.sql[index])
         })
       })
     }
 
-    // Return db name and schema
-    return {
-      dbName: name,
-      schema: parsedSchema
-    }
+    // Refresh schema
+    this.schema = parsedSchema
   }
 
   async execute (commands) {
+    await this.pw.postMessage({ action: 'reopen' })
     const results = await this.pw.postMessage({ action: 'exec', sql: commands })
 
     if (results.error) {
@@ -120,48 +120,27 @@ class Database {
     }
     fu.exportToFile(data, fileName)
   }
-}
 
-function getAst (sql) {
-  // There is a bug is sqlite-parser
-  // It throws an error if tokenizer has an arguments:
-  // https://github.com/codeschool/sqlite-parser/issues/59
-  const fixedSql = sql
-    .replace(/(tokenize=[^,]+)"tokenchars=.+?"/, '$1')
-    .replace(/(tokenize=[^,]+)"remove_diacritics=.+?"/, '$1')
-    .replace(/(tokenize=[^,]+)"separators=.+?"/, '$1')
-    .replace(/tokenize=.+?(,|\))/, 'tokenize=unicode61$1')
-
-  return sqliteParser(fixedSql)
-}
-
-/*
- * Return an array of columns with name and type. E.g.:
- * [
- *   { name: 'id',    type: 'INTEGER' },
- *   { name: 'title', type: 'NVARCHAR(30)' },
- * ]
-*/
-function getColumns (sql) {
-  const columns = []
-  const ast = getAst(sql)
-
-  const columnDefinition = ast.statement[0].format === 'table'
-    ? ast.statement[0].definition
-    : ast.statement[0].result.args.expression // virtual table
-
-  columnDefinition.forEach(item => {
-    if (item.variant === 'column' && ['identifier', 'definition'].includes(item.type)) {
-      let type = item.datatype ? item.datatype.variant : 'N/A'
-      if (item.datatype && item.datatype.args) {
-        type = type + '(' + item.datatype.args.expression[0].value
-        if (item.datatype.args.expression.length === 2) {
-          type = type + ', ' + item.datatype.args.expression[1].value
-        }
-        type = type + ')'
-      }
-      columns.push({ name: item.name, type: type })
+  async validateTableName (name) {
+    if (name.startsWith('sqlite_')) {
+      throw new Error("Table name can't start with sqlite_")
     }
-  })
-  return columns
+
+    if (/[^\w]/.test(name)) {
+      throw new Error('Table name can contain only letters, digits and underscores')
+    }
+
+    if (/^(\d)/.test(name)) {
+      throw new Error("Table name can't start with a digit")
+    }
+
+    await this.execute(`BEGIN; CREATE TABLE "${name}"(id); ROLLBACK;`)
+  }
+
+  sanitizeTableName (tabName) {
+    return tabName
+      .replace(/[^\w]/g, '_') // replace everything that is not letter, digit or _  with _
+      .replace(/^(\d)/, '_$1') // add _ at beginning if starts with digit
+      .replace(/_{2,}/g, '_') // replace multiple _ with one _
+  }
 }

src/lib/storedInquiries/_migrations.js

@@ -0,0 +1,12 @@
+export default {
+  _migrate (installedVersion, inquiries) {
+    if (installedVersion === 1) {
+      inquiries.forEach(inquire => {
+        inquire.viewType = 'chart'
+        inquire.viewOptions = inquire.chart
+        delete inquire.chart
+      })
+      return inquiries
+    }
+  }
+}

src/lib/storedInquiries/index.js

@@ -0,0 +1,120 @@
+import { nanoid } from 'nanoid'
+import fu from '@/lib/utils/fileIo'
+import migration from './_migrations'
+
+const migrate = migration._migrate
+
+export default {
+  version: 2,
+  getStoredInquiries () {
+    let myInquiries = JSON.parse(localStorage.getItem('myInquiries'))
+    if (!myInquiries) {
+      const oldInquiries = localStorage.getItem('myQueries')
+      if (oldInquiries) {
+        myInquiries = migrate(1, JSON.parse(oldInquiries))
+        this.updateStorage(myInquiries)
+        return myInquiries
+      }
+      return []
+    }
+
+    return (myInquiries && myInquiries.inquiries) || []
+  },
+
+  duplicateInquiry (baseInquiry) {
+    const newInquiry = JSON.parse(JSON.stringify(baseInquiry))
+    newInquiry.name = newInquiry.name + ' Copy'
+    newInquiry.id = nanoid()
+    newInquiry.createdAt = new Date()
+    delete newInquiry.isPredefined
+
+    return newInquiry
+  },
+
+  isTabNeedName (inquiryTab) {
+    const isFromScratch = !inquiryTab.initName
+    return inquiryTab.isPredefined || isFromScratch
+  },
+
+  save (inquiryTab, newName) {
+    const value = {
+      id: inquiryTab.isPredefined ? nanoid() : inquiryTab.id,
+      query: inquiryTab.query,
+      viewType: inquiryTab.$refs.dataView.mode,
+      viewOptions: inquiryTab.$refs.dataView.getOptionsForSave(),
+      name: newName || inquiryTab.initName
+    }
+
+    // Get inquiries from local storage
+    const myInquiries = this.getStoredInquiries()
+
+    // Set createdAt
+    if (newName) {
+      value.createdAt = new Date()
+    } else {
+      var inquiryIndex = myInquiries.findIndex(oldInquiry => oldInquiry.id === inquiryTab.id)
+      value.createdAt = myInquiries[inquiryIndex].createdAt
+    }
+
+    // Insert in inquiries list
+    if (newName) {
+      myInquiries.push(value)
+    } else {
+      myInquiries[inquiryIndex] = value
+    }
+
+    // Save to local storage
+    this.updateStorage(myInquiries)
+    return value
+  },
+
+  updateStorage (inquiries) {
+    localStorage.setItem('myInquiries', JSON.stringify({ version: this.version, inquiries }))
+  },
+
+  serialiseInquiries (inquiryList) {
+    const preparedData = JSON.parse(JSON.stringify(inquiryList))
+    preparedData.forEach(inquiry => delete inquiry.isPredefined)
+    return JSON.stringify({ version: this.version, inquiries: preparedData }, null, 4)
+  },
+
+  deserialiseInquiries (str) {
+    const inquiries = JSON.parse(str)
+    let inquiryList = []
+    if (!inquiries.version) {
+      // Turn data into array if they are not
+      inquiryList = !Array.isArray(inquiries) ? [inquiries] : inquiries
+      inquiryList = migrate(1, inquiryList)
+    } else {
+      inquiryList = inquiries.inquiries || []
+    }
+
+    // Generate new ids if they are the same as existing inquiries
+    inquiryList.forEach(inquiry => {
+      const allInquiriesIds = this.getStoredInquiries().map(inquiry => inquiry.id)
+      if (allInquiriesIds.includes(inquiry.id)) {
+        inquiry.id = nanoid()
+      }
+    })
+
+    return inquiryList
+  },
+
+  importInquiries () {
+    return fu.importFile()
+      .then(str => {
+        return this.deserialiseInquiries(str)
+      })
+  },
+
+  async readPredefinedInquiries () {
+    const res = await fu.readFile('./inquiries.json')
+    const data = await res.json()
+
+    if (!data.version) {
+      return data.length > 0 ? migrate(1, data) : []
+    } else {
+      return data.inquiries
+    }
+  }
+}

src/lib/storedQueries.js

@@ -1,96 +0,0 @@
-import { nanoid } from 'nanoid'
-import fu from '@/lib/utils/fileIo'
-
-export default {
-  getStoredQueries () {
-    return JSON.parse(localStorage.getItem('myQueries')) || []
-  },
-
-  duplicateQuery (baseQuery) {
-    const newQuery = JSON.parse(JSON.stringify(baseQuery))
-    newQuery.name = newQuery.name + ' Copy'
-    newQuery.id = nanoid()
-    newQuery.createdAt = new Date()
-    delete newQuery.isPredefined
-
-    return newQuery
-  },
-
-  isTabNeedName (queryTab) {
-    const isFromScratch = !queryTab.initName
-    return queryTab.isPredefined || isFromScratch
-  },
-
-  save (queryTab, newName) {
-    const value = {
-      id: queryTab.isPredefined ? nanoid() : queryTab.id,
-      query: queryTab.query,
-      chart: queryTab.$refs.chart.getChartStateForSave(),
-      name: newName || queryTab.initName
-    }
-
-    // Get queries from local storage
-    const myQueries = this.getStoredQueries()
-
-    // Set createdAt
-    if (newName) {
-      value.createdAt = new Date()
-    } else {
-      var queryIndex = myQueries.findIndex(oldQuery => oldQuery.id === queryTab.id)
-      value.createdAt = myQueries[queryIndex].createdAt
-    }
-
-    // Insert in queries list
-    if (newName) {
-      myQueries.push(value)
-    } else {
-      myQueries[queryIndex] = value
-    }
-
-    // Save to local storage
-    this.updateStorage(myQueries)
-    return value
-  },
-
-  updateStorage (value) {
-    localStorage.setItem('myQueries', JSON.stringify(value))
-  },
-
-  serialiseQueries (queryList) {
-    const preparedData = JSON.parse(JSON.stringify(queryList))
-    preparedData.forEach(query => delete query.isPredefined)
-    return JSON.stringify(preparedData, null, 4)
-  },
-
-  deserialiseQueries (str) {
-    let queryList = JSON.parse(str)
-    // Turn data into array if they are not
-    if (!Array.isArray(queryList)) {
-      queryList = [queryList]
-    }
-
-    // Generate new ids if they are the same as existing queries
-    queryList.forEach(query => {
-      const allQueriesIds = this.getStoredQueries().map(query => query.id)
-      if (allQueriesIds.includes(query.id)) {
-        query.id = nanoid()
-      }
-    })
-
-    return queryList
-  },
-
-  importQueries () {
-    return fu.importFile()
-      .then(data => {
-        return this.deserialiseQueries(data)
-      })
-  },
-
-  readPredefinedQueries () {
-    return fu.readFile('./queries.json')
-      .then(resp => {
-        return resp.json()
-      })
-  }
-}

src/lib/utils/fileIo.js

@@ -6,11 +6,13 @@ export default {
       : /\.(db|sqlite(3)?)+$/.test(file.name)
   },
 
-  exportToFile (str, fileName, type = 'octet/stream') {
+  getFileName (file) {
+    return file.name.replace(/\.[^.]+$/, '')
+  },
+
+  downloadFromUrl (url, fileName) {
     // Create downloader
     const downloader = document.createElement('a')
-    const blob = new Blob([str], { type })
-    const url = URL.createObjectURL(blob)
     downloader.href = url
     downloader.download = fileName
 
@@ -21,6 +23,12 @@ export default {
     URL.revokeObjectURL(url)
   },
 
+  async exportToFile (str, fileName, type = 'octet/stream') {
+    const blob = new Blob([str], { type })
+    const url = URL.createObjectURL(blob)
+    this.downloadFromUrl(url, fileName)
+  },
+
   /**
    * Note: if user press Cancel in file choosing dialog
    * it will be an unsettled promise. But it's grabbed by

src/lib/utils/time.js

@@ -3,5 +3,13 @@ export default {
     const diff = end.getTime() - start.getTime()
     const seconds = diff / 1000
     return seconds.toFixed(3) + 's'
+  },
+
+  debounce (func, ms) {
+    let timeout
+    return function () {
+      clearTimeout(timeout)
+      timeout = setTimeout(() => func.apply(this, arguments), ms)
+    }
   }
 }

src/main.js

@@ -11,6 +11,8 @@ import '@/assets/styles/tables.css'
 import '@/assets/styles/dialogs.css'
 import '@/assets/styles/tooltips.css'
 import '@/assets/styles/messages.css'
+import 'vue-multiselect/dist/vue-multiselect.min.css'
+import '@/assets/styles/multiselect.css'
 
 if (!['localhost', '127.0.0.1'].includes(location.hostname)) {
   import('./registerServiceWorker') // eslint-disable-line no-unused-expressions

src/router.js

@@ -1,9 +1,11 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
-import Editor from '@/views/Main/Editor'
-import MyQueries from '@/views/Main/MyQueries'
+import Workspace from '@/views/Main/Workspace'
+import Inquiries from '@/views/Main/Inquiries'
 import Welcome from '@/views/Welcome'
 import Main from '@/views/Main'
+import store from '@/store'
+import database from '@/lib/database'
 
 Vue.use(VueRouter)
 
@@ -19,14 +21,14 @@ const routes = [
     component: Main,
     children: [
       {
-        path: '/editor',
-        name: 'Editor',
-        component: Editor
+        path: '/workspace',
+        name: 'Workspace',
+        component: Workspace
       },
       {
-        path: '/my-queries',
-        name: 'MyQueries',
-        component: MyQueries
+        path: '/inquiries',
+        name: 'Inquiries',
+        component: Inquiries
       }
     ]
   }
@@ -36,4 +38,13 @@ const router = new VueRouter({
   routes
 })
 
+router.beforeEach(async (to, from, next) => {
+  if (!store.state.db) {
+    const newDb = database.getNewDatabase()
+    await newDb.loadDb()
+    store.commit('setDb', newDb)
+  }
+  next()
+})
+
 export default router

src/store/actions.js

@@ -5,16 +5,18 @@ export default {
     const tab = data ? JSON.parse(JSON.stringify(data)) : {}
     // If no data then create a new blank one...
     // No data.id means to create new tab, but not blank,
-    // e.g. with 'select * from csv_import' query after csv import
+    // e.g. with 'select * from csv_import' inquiry after csv import
     if (!data || !data.id) {
       tab.id = nanoid()
       tab.name = null
       tab.tempName = state.untitledLastIndex
         ? `Untitled ${state.untitledLastIndex}`
         : 'Untitled'
-      tab.isUnsaved = true
+      tab.viewType = 'chart'
+      tab.viewOptions = undefined
+      tab.isSaved = false
     } else {
-      tab.isUnsaved = false
+      tab.isSaved = true
     }
 
     // add new tab only if was not already opened

src/store/mutations.js

@@ -7,12 +7,8 @@ export default {
     }
     state.db = db
   },
-  saveSchema (state, { dbName, schema }) {
-    state.dbName = dbName
-    state.schema = schema
-  },
 
-  updateTab (state, { index, name, id, query, chart, isUnsaved }) {
+  updateTab (state, { index, name, id, query, viewType, viewOptions, isSaved }) {
     const tab = state.tabs[index]
     const oldId = tab.id
 
@@ -23,15 +19,17 @@ export default {
     if (id) { tab.id = id }
     if (name) { tab.name = name }
     if (query) { tab.query = query }
-    if (chart) { tab.chart = chart }
-    if (isUnsaved !== undefined) { tab.isUnsaved = isUnsaved }
-    if (!isUnsaved) {
-      // Saved query is not predefined
+    if (viewType) { tab.viewType = viewType }
+    if (viewOptions) { tab.viewOptions = viewOptions }
+    if (isSaved !== undefined) { tab.isSaved = isSaved }
+    if (isSaved) {
+      // Saved inquiry is not predefined
       delete tab.isPredefined
     }
 
     Vue.set(state.tabs, index, tab)
   },
+
   deleteTab (state, index) {
     // If closing tab is the current opened
     if (state.tabs[index].id === state.currentTabId) {
@@ -53,11 +51,7 @@ export default {
   setCurrentTab (state, tab) {
     state.currentTab = tab
   },
-  updatePredefinedQueries (state, queries) {
-    if (Array.isArray(queries)) {
-      state.predefinedQueries = queries
-    } else {
-      state.predefinedQueries = [queries]
-    }
+  updatePredefinedInquiries (state, inquiries) {
+    state.predefinedInquiries = Array.isArray(inquiries) ? inquiries : [inquiries]
   }
 }

src/store/state.js

@@ -1,11 +1,8 @@
 export default {
-  schema: null,
-  dbFile: null,
-  dbName: null,
   tabs: [],
   currentTab: null,
   currentTabId: null,
   untitledLastIndex: 0,
-  predefinedQueries: [],
+  predefinedInquiries: [],
   db: null
 }

src/tooltipMixin.js

@@ -6,10 +6,28 @@ export default {
       }
     }
   },
+  computed: {
+    tooltipElement () {
+      return this.$refs.tooltip
+    }
+  },
   methods: {
-    showTooltip (e) {
-      this.tooltipStyle.top = e.clientY - 12 + 'px'
-      this.tooltipStyle.left = e.clientX + 12 + 'px'
+    showTooltip (e, tooltipPosition) {
+      const position = tooltipPosition ? tooltipPosition.split('-') : ['top', 'right']
+      const offset = 12
+
+      if (position[0] === 'top') {
+        this.tooltipStyle.top = e.clientY - offset + 'px'
+      } else {
+        this.tooltipStyle.top = e.clientY + offset + 'px'
+      }
+
+      if (position[1] === 'right') {
+        this.tooltipStyle.left = e.clientX + offset + 'px'
+      } else {
+        this.tooltipStyle.left = e.clientX - offset - this.tooltipElement.offsetWidth + 'px'
+      }
+
       this.tooltipStyle.visibility = 'visible'
     },
     hideTooltip () {

src/views/Main/AppDiagnosticInfo.vue

@@ -0,0 +1,90 @@
+<template>
+  <div id="app-info-container">
+    <img
+      id="app-info-icon"
+      :src="require('@/assets/images/info.svg')"
+      @click="$modal.show('app-info')"
+    />
+    <modal name="app-info" classes="dialog" height="auto" width="400px">
+      <div class="dialog-header">
+        App info
+        <close-icon @click="$modal.hide('app-info')"/>
+      </div>
+      <div class="dialog-body">
+        <div v-for="(item, index) in info" :key="index" class="info-item">
+          {{item.name}}
+          <div class="divider"/>
+          <div class="options">
+            <div v-for="(opt, index) in item.info" :key="index">
+              {{opt}}
+            </div>
+          </div>
+        </div>
+      </div>
+    </modal>
+  </div>
+</template>
+
+<script>
+import CloseIcon from '@/components/svg/close'
+
+export default {
+  name: 'AppDiagnosticInfo',
+  components: { CloseIcon },
+  data () {
+    return {
+      info: [
+        {
+          name: 'sqliteviz version',
+          info: [require('../../../package.json').version]
+        }
+      ]
+    }
+  },
+
+  async created () {
+    const state = this.$store.state
+    let result = await state.db.execute('select sqlite_version()')
+    this.info.push({
+      name: 'SQLite version',
+      info: result['sqlite_version()']
+    })
+
+    result = await state.db.execute('PRAGMA compile_options')
+    this.info.push({
+      name: 'SQLite compile options',
+      info: result.compile_options
+    })
+  }
+}
+</script>
+
+<style scoped>
+#app-info-icon {
+  cursor: pointer;
+}
+#app-info-container {
+  display: flex;
+  justify-content: center;
+  margin-left: 32px;
+}
+.divider {
+  height: 1px;
+  background-color: var(--color-border);
+  margin: 4px 0;
+}
+.options {
+  font-family: monospace;
+  font-size: 13px;
+  margin-left: 8px;
+  overflow: auto;
+  max-height: 170px;
+}
+.info-item {
+  margin-bottom: 32px;
+   font-size: 14px;
+}
+.info-item:last-child {
+  margin-bottom: 0;
+}
+</style>

src/views/Main/Editor/Tabs/Tab/Chart/index.vue

@@ -1,98 +0,0 @@
-<template>
-<div v-show="visible" class="chart-container">
-  <div class="warning chart-warning" v-show="!sqlResult && visible">
-    There is no data to build a chart. Run your sql query and make sure the result is not empty.
-  </div>
-  <PlotlyEditor
-    :data="state.data"
-    :layout="state.layout"
-    :frames="state.frames"
-    :config="{ editable: true, displaylogo: false }"
-    :dataSources="dataSources"
-    :dataSourceOptions="dataSourceOptions"
-    :plotly="plotly"
-    @onUpdate="update"
-    @onRender="go"
-    :useResizeHandler="true"
-    :debug="true"
-    :advancedTraceTypeSelector="true"
-    class="chart"
-    ref="plotlyEditor"
-    :style="{ height: !sqlResult ? 'calc(100% - 40px)' : '100%' }"
-  />
-</div>
-</template>
-
-<script>
-import plotly from 'plotly.js/dist/plotly'
-import 'react-chart-editor/lib/react-chart-editor.min.css'
-
-import PlotlyEditor from 'react-chart-editor'
-import chartHelper from './chartHelper'
-import dereference from 'react-chart-editor/lib/lib/dereference'
-
-export default {
-  name: 'Chart',
-  props: ['sqlResult', 'initChart', 'visible'],
-  components: {
-    PlotlyEditor
-  },
-  data () {
-    return {
-      plotly: plotly,
-      state: this.initChart || {
-        data: [],
-        layout: {},
-        frames: []
-      }
-    }
-  },
-  computed: {
-    dataSources () {
-      return chartHelper.getDataSourcesFromSqlResult(this.sqlResult)
-    },
-    dataSourceOptions () {
-      return chartHelper.getOptionsFromDataSources(this.dataSources)
-    }
-  },
-  watch: {
-    dataSources () {
-      // we need to update state.data in order to update the graph
-      // https://github.com/plotly/react-chart-editor/issues/948
-      dereference(this.state.data, this.dataSources)
-    }
-  },
-  methods: {
-    go (data, layout, frames) {
-      // TODO: check changes and enable Save button if needed
-    },
-    update (data, layout, frames) {
-      this.state = { data, layout, frames }
-      this.$emit('update')
-    },
-    getChartStateForSave () {
-      return chartHelper.getChartStateForSave(this.state, this.dataSources)
-    }
-  }
-}
-</script>
-
-<style scoped>
-.chart-container {
-  height: calc(100% - 89px);
-}
-
-.chart-warning {
-  height: 40px;
-  line-height: 40px;
-}
-
-.chart {
-  border-top: 1px solid var(--color-border);
-  min-height: 242px;
-}
-
->>> .editor_controls .sidebar__item:before {
-  width: 0;
-}
-</style>

src/views/Main/Editor/Tabs/Tab/SqlEditor/index.vue

@@ -1,66 +0,0 @@
-<template>
-  <div class="codemirror-container">
-    <codemirror v-model="query" :options="cmOptions" @changes="onChange" />
-  </div>
-</template>
-
-<script>
-import showHint, { showHintOnDemand } from './hint'
-import { debounce } from 'debounce'
-import { codemirror } from 'vue-codemirror'
-import 'codemirror/lib/codemirror.css'
-import 'codemirror/mode/sql/sql.js'
-import 'codemirror/theme/neo.css'
-import 'codemirror/addon/hint/show-hint.css'
-import 'codemirror/addon/display/autorefresh.js'
-
-export default {
-  name: 'SqlEditor',
-  props: ['value'],
-  components: { codemirror },
-  data () {
-    return {
-      query: this.value,
-      cmOptions: {
-        // codemirror options
-        tabSize: 4,
-        mode: 'text/x-mysql',
-        theme: 'neo',
-        lineNumbers: true,
-        line: true,
-        autofocus: true,
-        autoRefresh: true,
-        extraKeys: { 'Ctrl-Space': showHintOnDemand }
-      }
-    }
-  },
-  watch: {
-    query () {
-      this.$emit('input', this.query)
-    }
-  },
-  methods: {
-    onChange: debounce(showHint, 400)
-  }
-}
-</script>
-
-<style scoped>
-.codemirror-container {
-  flex-grow: 1;
-  min-height: 0;
-}
-
->>> .vue-codemirror {
-  height: 100%;
-  max-height: 100%;
-}
->>> .CodeMirror {
-  height: 100%;
-  max-height: 100%;
-}
->>> .CodeMirror-cursor {
-  width: 1px;
-  background: var(--color-text-base);
-}
-</style>

src/views/Main/Editor/Tabs/Tab/ViewSwitcher.vue

@@ -1,67 +0,0 @@
-<template>
-  <div class="view-switcher">
-    <div
-      :class="['table-mode', {'active-mode': view === 'table'}]"
-      @click="$emit('update:view','table')"
-    >
-      Table
-    </div>
-    <div
-      :class="['chart-mode', {'active-mode': view === 'chart'}]"
-      @click="$emit('update:view','chart')"
-    >
-      Chart
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'ViewSwitcher',
-  props: ['view']
-}
-</script>
-
-<style scoped>
-.view-switcher {
-  height: 28px;
-  display: flex;
-  padding: 30px;
-  justify-content: center;
-}
-.view-switcher div {
-  height: 100%;
-  width: 136px;
-  box-sizing: border-box;
-  line-height: 28px;
-  font-size: 12px;
-  cursor: pointer;
-  background: var(--color-white);
-  border: 1px solid var(--color-border);
-  color: var(--color-text-base);
-  text-align: center;
-  font-weight: 400;
-}
-.view-switcher div:hover {
-  background-color: var(--color-bg-light);
-  color: var(--color-text-active);
-}
-.view-switcher div.active-mode {
-  background: var(--color-accent);
-  border: 1px solid var(--color-accent-shade);
-  color: var(--color-text-light);
-  text-shadow: var(--shadow);
-  z-index: 1;
-  font-weight: 600;
-}
-.view-switcher div.active-mode:hover {
-  background: var(--color-accent-shade);
-}
-.table-mode {
-  border-radius: var(--border-radius-medium) 0 0 var(--border-radius-medium);
-}
-.chart-mode {
-  margin-left: -1px;
-  border-radius: 0 var(--border-radius-medium) var(--border-radius-medium) 0;
-}
-</style>

src/views/Main/Editor/Tabs/Tab/index.vue

@@ -1,224 +0,0 @@
-<template>
-  <div class="tab-content-container" v-show="isActive">
-    <splitpanes
-      class="query-results-splitter"
-      horizontal
-      :before="{ size: 50, max: 100 }"
-      :after="{ size: 50, max: 100 }"
-    >
-      <template #left-pane>
-        <div class="query-editor">
-          <sql-editor v-model="query" />
-        </div>
-      </template>
-      <template #right-pane>
-        <div id="bottomPane" ref="bottomPane">
-          <view-switcher :view.sync="view" />
-          <div v-show="view === 'table'" class="table-view">
-            <div
-              v-show="result === null && !isGettingResults && !error"
-              class="table-preview result-before"
-            >
-              Run your query and get results here
-            </div>
-            <div v-if="isGettingResults" class="table-preview result-in-progress">
-              <loading-indicator :size="30"/>
-              Fetching results...
-            </div>
-            <div
-              v-show="result === undefined && !isGettingResults && !error"
-              class="table-preview result-empty"
-            >
-              No rows retrieved according to your query
-            </div>
-            <logs v-if="error" :messages="[error]"/>
-            <sql-table v-if="result" :data-set="result" :time="time" :height="tableViewHeight" />
-          </div>
-          <chart
-            :visible="view === 'chart'"
-            :sql-result="result"
-            :init-chart="initChart"
-            ref="chart"
-            @update="$store.commit('updateTab', { index: tabIndex, isUnsaved: true })"
-          />
-        </div>
-      </template>
-    </splitpanes>
-  </div>
-</template>
-
-<script>
-import SqlTable from '@/components/SqlTable'
-import Splitpanes from '@/components/Splitpanes'
-import LoadingIndicator from '@/components/LoadingIndicator'
-import SqlEditor from './SqlEditor'
-import ViewSwitcher from './ViewSwitcher'
-import Chart from './Chart'
-import Logs from '@/components/Logs'
-import time from '@/lib/utils/time'
-
-export default {
-  name: 'Tab',
-  props: ['id', 'initName', 'initQuery', 'initChart', 'tabIndex', 'isPredefined'],
-  components: {
-    SqlEditor,
-    SqlTable,
-    Splitpanes,
-    ViewSwitcher,
-    Chart,
-    LoadingIndicator,
-    Logs
-  },
-  data () {
-    return {
-      query: this.initQuery,
-      result: null,
-      view: 'table',
-      tableViewHeight: 0,
-      isGettingResults: false,
-      error: null,
-      resizeObserver: null,
-      time: 0
-    }
-  },
-  computed: {
-    isActive () {
-      return this.id === this.$store.state.currentTabId
-    }
-  },
-  created () {
-    this.$store.commit('setCurrentTab', this)
-  },
-  mounted () {
-    this.resizeObserver = new ResizeObserver(this.handleResize)
-    this.resizeObserver.observe(this.$refs.bottomPane)
-    this.calculateTableHeight()
-  },
-  beforeDestroy () {
-    this.resizeObserver.unobserve(this.$refs.bottomPane)
-  },
-  watch: {
-    isActive () {
-      if (this.isActive) {
-        this.$store.commit('setCurrentTab', this)
-      }
-    },
-    query () {
-      this.$store.commit('updateTab', { index: this.tabIndex, isUnsaved: true })
-    }
-  },
-  methods: {
-    // Run a command in the database
-    async execute () {
-      this.isGettingResults = true
-      this.result = null
-      this.error = null
-      const state = this.$store.state
-      try {
-        const start = new Date()
-        this.result = await state.db.execute(this.query + ';')
-        this.time = time.getPeriod(start, new Date())
-        const schema = await state.db.getSchema(state.dbName)
-        this.$store.commit('saveSchema', schema)
-      } catch (err) {
-        this.error = {
-          type: 'error',
-          message: err
-        }
-      }
-      this.isGettingResults = false
-    },
-    handleResize () {
-      if (this.view === 'chart') {
-        // hack react-chart editor: hidden and show in order to make the graph resize
-        this.view = 'not chart'
-        this.$nextTick(() => {
-          this.view = 'chart'
-        })
-      }
-      this.calculateTableHeight()
-    },
-    calculateTableHeight () {
-      const bottomPane = this.$refs.bottomPane
-      // 88 - view swittcher height
-      // 42 - table footer width
-      // 30 - desirable space after the table
-      // 5 - padding-bottom of rounded table container
-      // 40 - height of table header
-      const freeSpace = bottomPane.offsetHeight - 88 - 42 - 30 - 5 - 40
-      this.tableViewHeight = freeSpace - (freeSpace % 40)
-    }
-  }
-}
-</script>
-
-<style scoped>
-.tab-content-container {
-  background-color: var(--color-white);
-  border-top: 1px solid var(--color-border-light);
-  margin-top: -1px;
-}
-
-#bottomPane {
-  height: 100%;
-  background-color: var(--color-bg-light);
-}
-
-.query-results-splitter {
-  height: calc(100vh - 104px);
-  background-color: var(--color-bg-light);
-}
-
-.query-editor {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  max-height: 100%;
-  box-sizing: border-box;
-  min-height: 190px;
-}
-
-.table-view {
-  margin: 0 52px;
-  height: calc(100% - 88px);
-  position: relative;
-}
-
-.table-preview {
-  position: absolute;
-  top: 40%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  color: var(--color-text-base);
-  font-size: 13px;
-}
-
-.result-in-progress {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  will-change: opacity;
-  /*
-    We need to show loader in 1 sec after starting query execution. We can't do that with
-    setTimeout because the main thread can be busy by getting a result set from the web worker.
-    But we can use CSS animation for opacity. Opacity triggers changes only in the Composite Layer
-    stage in rendering waterfall. Hence it can be processed only with Compositor Thread while
-    the Main Thread processes a result set.
-    https://www.viget.com/articles/animation-performance-101-browser-under-the-hood/
-  */
-  animation: show-loader 1s linear 0s 1;
-}
-
-@keyframes show-loader {
-  0% {
-    opacity: 0;
-  }
-  99% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
-}
-</style>

src/views/Main/Inquiries/index.vue

@@ -1,22 +1,22 @@
 <template>
   <div>
-    <div id="start-guide" v-if="showedQueries.length === 0">
-      You don't have saved queries so far.
-      <span class="link" @click="$root.$emit('createNewQuery')">Create</span>
+    <div id="start-guide" v-if="showedInquiries.length === 0">
+      You don't have saved inquiries so far.
+      <span class="link" @click="$root.$emit('createNewInquiry')">Create</span>
       the one from scratch or
-      <span @click="importQueries" class="link">import</span> from a file.
+      <span @click="importInquiries" class="link">import</span> from a file.
     </div>
-    <div id="my-queries-content" ref="my-queries-content" v-show="showedQueries.length > 0">
-      <div id="my-queries-toolbar">
+    <div id="my-inquiries-content" ref="my-inquiries-content" v-show="showedInquiries.length > 0">
+      <div id="my-inquiries-toolbar">
         <div id="toolbar-buttons">
-          <button id="toolbar-btns-import" class="toolbar" @click="importQueries">
+          <button id="toolbar-btns-import" class="toolbar" @click="importInquiries">
             Import
           </button>
           <button
             id="toolbar-btns-export"
             class="toolbar"
-            v-show="selectedQueriesCount > 0"
-            @click="exportSelectedQueries()"
+            v-show="selectedInquiriesCount > 0"
+            @click="exportSelectedInquiries()"
           >
             Export
           </button>
@@ -24,13 +24,13 @@
             id="toolbar-btns-delete"
             class="toolbar"
             v-show="selectedNotPredefinedCount > 0"
-            @click="showDeleteDialog(selectedQueriesIds)"
+            @click="showDeleteDialog(selectedInquiriesIds)"
           >
             Delete
           </button>
         </div>
         <div id="toolbar-search">
-          <text-field placeholder="Search query by name" width="300px" v-model="filter"/>
+          <text-field placeholder="Search inquiry by name" width="300px" v-model="filter"/>
         </div>
       </div>
       <div class="rounded-bg">
@@ -46,48 +46,49 @@
         </div>
       </div>
       <div class="table-container" :style="{ 'max-height': `${maxTableHeight}px` }">
-        <table ref="table">
+        <table ref="table" class="sqliteviz-table">
           <tbody>
             <tr
-              v-for="(query, index) in showedQueries"
-              :key="query.id"
-              @click="openQuery(index)"
+              v-for="(inquiry, index) in showedInquiries"
+              :key="inquiry.id"
+              @click="openInquiry(index)"
             >
               <td ref="name-td">
                  <div class="cell-data">
                     <check-box
                       ref="rowCheckBox"
-                      :init="selectAll || selectedQueriesIds.has(query.id)"
-                      @click="toggleRow($event, query.id)"
+                      :init="selectAll || selectedInquiriesIds.has(inquiry.id)"
+                      @click="toggleRow($event, inquiry.id)"
                     />
-                    <div class="name">{{ query.name }}</div>
+                    <div class="name">{{ inquiry.name }}</div>
                     <div
-                      v-if="query.isPredefined"
+                      v-if="inquiry.isPredefined"
                       class="badge"
-                      @mouseover="showTooltip"
-                      @mouseout="hideTooltip"
+                      @mouseenter="showTooltip"
+                      @mouseleave="hideTooltip"
                     >
                       Predefined
-                      <span class="icon-tooltip" :style="tooltipStyle">
-                        Predefined queries come from the server.
-                        These queries can’t be deleted or renamed.
+                      <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+                        Predefined inquiries come from the server.
+                        These inquiries can’t be deleted or renamed.
                       </span>
                     </div>
                  </div>
               </td>
               <td>
                 <div class="second-column">
-                  <div class="date-container">{{ query.createdAt | date }}</div>
+                  <div class="date-container">{{ inquiry.createdAt | date }}</div>
                   <div class="icons-container">
-                    <rename-icon v-if="!query.isPredefined" @click="showRenameDialog(query.id)" />
-                    <copy-icon @click="duplicateQuery(index)"/>
+                    <rename-icon v-if="!inquiry.isPredefined" @click="showRenameDialog(inquiry.id)" />
+                    <copy-icon @click="duplicateInquiry(index)"/>
                     <export-icon
-                      @click="exportToFile([query], `${query.name}.json`)"
-                      tooltip="Export query to file"
+                      @click="exportToFile([inquiry], `${inquiry.name}.json`)"
+                      tooltip="Export inquiry to file"
+                      tooltip-position="top-left"
                     />
                     <delete-icon
-                      v-if="!query.isPredefined"
-                      @click="showDeleteDialog((new Set()).add(query.id))"
+                      v-if="!inquiry.isPredefined"
+                      @click="showDeleteDialog((new Set()).add(inquiry.id))"
                     />
                   </div>
                 </div>
@@ -99,15 +100,15 @@
     </div>
   </div>
 
-  <!--Rename Query dialog  -->
+  <!--Rename Inquiry dialog  -->
   <modal name="rename" classes="dialog" height="auto">
     <div class="dialog-header">
-      Rename query
+      Rename inquiry
       <close-icon @click="$modal.hide('rename')"/>
     </div>
     <div class="dialog-body">
       <text-field
-        label="New query name"
+        label="New inquiry name"
         :error-msg="errorMsg"
         v-model="newName"
         width="100%"
@@ -115,26 +116,26 @@
     </div>
     <div class="dialog-buttons-container">
       <button class="secondary" @click="$modal.hide('rename')">Cancel</button>
-      <button class="primary" @click="renameQuery">Rename</button>
+      <button class="primary" @click="renameInquiry">Rename</button>
     </div>
   </modal>
 
-  <!--Delete Query dialog  -->
+  <!--Delete Inquiry dialog  -->
   <modal name="delete" classes="dialog" height="auto">
     <div class="dialog-header">
-      Delete {{ deleteGroup ? 'queries' : 'query' }}
+      Delete {{ deleteGroup ? 'inquiries' : 'inquiry' }}
       <close-icon @click="$modal.hide('delete')"/>
     </div>
     <div class="dialog-body">
       {{ deleteDialogMsg }}
-      <div v-show="selectedQueriesCount > selectedNotPredefinedCount" id="note">
+      <div v-show="selectedInquiriesCount > selectedNotPredefinedCount" id="note">
         <img :src="require('@/assets/images/info.svg')">
-        Note: Predefined queries you've selected won't be deleted
+        Note: Predefined inquiries you've selected won't be deleted
       </div>
     </div>
     <div class="dialog-buttons-container">
       <button class="secondary" @click="$modal.hide('delete')">Cancel</button>
-      <button class="primary" @click="deleteQuery">Delete</button>
+      <button class="primary" @click="deleteInquiry">Delete</button>
     </div>
   </modal>
 </div>
@@ -149,11 +150,11 @@ import CloseIcon from '@/components/svg/close'
 import TextField from '@/components/TextField'
 import CheckBox from '@/components/CheckBox'
 import tooltipMixin from '@/tooltipMixin'
-import storedQueries from '@/lib/storedQueries'
+import storedInquiries from '@/lib/storedInquiries'
 import fu from '@/lib/utils/fileIo'
 
 export default {
-  name: 'MyQueries',
+  name: 'Inquiries',
   components: {
     RenameIcon,
     CopyIcon,
@@ -166,13 +167,13 @@ export default {
   mixins: [tooltipMixin],
   data () {
     return {
-      queries: [],
+      inquiries: [],
       filter: null,
       newName: null,
-      processedQueryId: null,
+      processedInquiryId: null,
       errorMsg: null,
-      selectedQueriesIds: new Set(),
-      selectedQueriesCount: 0,
+      selectedInquiriesIds: new Set(),
+      selectedInquiriesCount: 0,
       selectedNotPredefinedCount: 0,
       selectAll: false,
       deleteGroup: false,
@@ -181,61 +182,61 @@ export default {
     }
   },
   computed: {
-    predefinedQueries () {
-      return this.$store.state.predefinedQueries.map(query => {
-        query.isPredefined = true
-        return query
+    predefinedInquiries () {
+      return this.$store.state.predefinedInquiries.map(inquiry => {
+        inquiry.isPredefined = true
+        return inquiry
       })
     },
-    predefinedQueriesIds () {
-      return new Set(this.predefinedQueries.map(query => query.id))
+    predefinedInquiriesIds () {
+      return new Set(this.predefinedInquiries.map(inquiry => inquiry.id))
     },
-    showedQueries () {
-      let showedQueries = this.allQueries
+    showedInquiries () {
+      let showedInquiries = this.allInquiries
       if (this.filter) {
-        showedQueries = showedQueries.filter(
-          query => query.name.toUpperCase().indexOf(this.filter.toUpperCase()) >= 0
+        showedInquiries = showedInquiries.filter(
+          inquiry => inquiry.name.toUpperCase().indexOf(this.filter.toUpperCase()) >= 0
         )
       }
-      return showedQueries
+      return showedInquiries
     },
-    allQueries () {
-      return this.predefinedQueries.concat(this.queries)
+    allInquiries () {
+      return this.predefinedInquiries.concat(this.inquiries)
     },
-    processedQueryIndex () {
-      return this.queries.findIndex(query => query.id === this.processedQueryId)
+    processedInquiryIndex () {
+      return this.inquiries.findIndex(inquiry => inquiry.id === this.processedInquiryId)
     },
     deleteDialogMsg () {
       if (!this.deleteGroup && (
-        this.processedQueryIndex === null ||
-          this.processedQueryIndex < 0 ||
-          this.processedQueryIndex > this.queries.length
+        this.processedInquiryIndex === null ||
+          this.processedInquiryIndex < 0 ||
+          this.processedInquiryIndex > this.inquiries.length
       )) {
         return ''
       }
 
       const deleteItem = this.deleteGroup
         ? `${this.selectedNotPredefinedCount} ${this.selectedNotPredefinedCount > 1
-          ? 'queries'
-          : 'query'}`
-        : `"${this.queries[this.processedQueryIndex].name}"`
+          ? 'inquiries'
+          : 'inquiry'}`
+        : `"${this.inquiries[this.processedInquiryIndex].name}"`
 
       return `Are you sure you want to delete ${deleteItem}?`
     }
   },
   created () {
-    storedQueries.readPredefinedQueries()
-      .then(queries => {
-        this.$store.commit('updatePredefinedQueries', queries)
+    storedInquiries.readPredefinedInquiries()
+      .then(inquiries => {
+        this.$store.commit('updatePredefinedInquiries', inquiries)
       })
       .catch(console.error)
       .finally(() => {
-        this.queries = storedQueries.getStoredQueries()
+        this.inquiries = storedInquiries.getStoredInquiries()
       })
   },
   mounted () {
     this.resizeObserver = new ResizeObserver(this.calcMaxTableHeight)
-    this.resizeObserver.observe(this.$refs['my-queries-content'])
+    this.resizeObserver.observe(this.$refs['my-inquiries-content'])
 
     this.tableResizeObserver = new ResizeObserver(this.calcNameWidth)
     this.tableResizeObserver.observe(this.$refs.table)
@@ -243,7 +244,7 @@ export default {
     this.calcMaxTableHeight()
   },
   beforeDestroy () {
-    this.resizeObserver.unobserve(this.$refs['my-queries-content'])
+    this.resizeObserver.unobserve(this.$refs['my-inquiries-content'])
     this.tableResizeObserver.unobserve(this.$refs.table)
   },
   filters: {
@@ -269,153 +270,153 @@ export default {
       this.$refs['name-th'].style = `width: ${nameWidth}px`
     },
     calcMaxTableHeight () {
-      const freeSpace = this.$refs['my-queries-content'].offsetHeight - 200
+      const freeSpace = this.$refs['my-inquiries-content'].offsetHeight - 200
       this.maxTableHeight = freeSpace - (freeSpace % 40) + 1
     },
-    openQuery (index) {
-      const tab = this.showedQueries[index]
+    openInquiry (index) {
+      const tab = this.showedInquiries[index]
       this.$store.dispatch('addTab', tab).then(id => {
         this.$store.commit('setCurrentTabId', id)
-        this.$router.push('/editor')
+        this.$router.push('/workspace')
       })
     },
     showRenameDialog (id) {
       this.errorMsg = null
-      this.processedQueryId = id
-      this.newName = this.queries[this.processedQueryIndex].name
+      this.processedInquiryId = id
+      this.newName = this.inquiries[this.processedInquiryIndex].name
       this.$modal.show('rename')
     },
-    renameQuery () {
+    renameInquiry () {
       if (!this.newName) {
-        this.errorMsg = 'Query name can\'t be empty'
+        this.errorMsg = "Inquiry name can't be empty"
         return
       }
-      const processedQuery = this.queries[this.processedQueryIndex]
-      processedQuery.name = this.newName
-      this.$set(this.queries, this.processedQueryIndex, processedQuery)
+      const processedInquiry = this.inquiries[this.processedInquiryIndex]
+      processedInquiry.name = this.newName
+      this.$set(this.inquiries, this.processedInquiryIndex, processedInquiry)
 
-      // update queries in local storage
-      storedQueries.updateStorage(this.queries)
+      // update inquiries in local storage
+      storedInquiries.updateStorage(this.inquiries)
 
-      // update tab, if renamed query is opened
-      const tabIndex = this.findTabIndex(processedQuery.id)
+      // update tab, if renamed inquiry is opened
+      const tabIndex = this.findTabIndex(processedInquiry.id)
       if (tabIndex >= 0) {
         this.$store.commit('updateTab', {
           index: tabIndex,
           name: this.newName,
-          id: processedQuery.id
+          id: processedInquiry.id
         })
       }
       // hide dialog
       this.$modal.hide('rename')
     },
-    duplicateQuery (index) {
-      const newQuery = storedQueries.duplicateQuery(this.showedQueries[index])
+    duplicateInquiry (index) {
+      const newInquiry = storedInquiries.duplicateInquiry(this.showedInquiries[index])
       if (this.selectAll) {
-        this.selectedQueriesIds.add(newQuery.id)
-        this.selectedQueriesCount = this.selectedQueriesIds.size
+        this.selectedInquiriesIds.add(newInquiry.id)
+        this.selectedInquiriesCount = this.selectedInquiriesIds.size
       }
-      this.queries.push(newQuery)
-      storedQueries.updateStorage(this.queries)
+      this.inquiries.push(newInquiry)
+      storedInquiries.updateStorage(this.inquiries)
     },
     showDeleteDialog (idsSet) {
       this.deleteGroup = idsSet.size > 1
       if (!this.deleteGroup) {
-        this.processedQueryId = idsSet.values().next().value
+        this.processedInquiryId = idsSet.values().next().value
       }
       this.$modal.show('delete')
     },
-    deleteQuery () {
+    deleteInquiry () {
       this.$modal.hide('delete')
       if (!this.deleteGroup) {
-        this.queries.splice(this.processedQueryIndex, 1)
+        this.inquiries.splice(this.processedInquiryIndex, 1)
 
-        // Close deleted query tab if it was opened
-        const tabIndex = this.findTabIndex(this.processedQueryId)
+        // Close deleted inquiry tab if it was opened
+        const tabIndex = this.findTabIndex(this.processedInquiryId)
         if (tabIndex >= 0) {
           this.$store.commit('deleteTab', tabIndex)
         }
 
         // Clear checkboxes
-        if (this.selectedQueriesIds.has(this.processedQueryId)) {
-          this.selectedQueriesIds.delete(this.processedQueryId)
+        if (this.selectedInquiriesIds.has(this.processedInquiryId)) {
+          this.selectedInquiriesIds.delete(this.processedInquiryId)
         }
       } else {
-        this.queries = this.selectAll
+        this.inquiries = this.selectAll
           ? []
-          : this.queries.filter(query => !this.selectedQueriesIds.has(query.id))
+          : this.inquiries.filter(inquiry => !this.selectedInquiriesIds.has(inquiry.id))
 
-        // Close deleted queries if it was opened
+        // Close deleted inquiries if it was opened
         const tabs = this.$store.state.tabs
         for (let i = tabs.length - 1; i >= 0; i--) {
-          if (this.selectedQueriesIds.has(tabs[i].id)) {
+          if (this.selectedInquiriesIds.has(tabs[i].id)) {
             this.$store.commit('deleteTab', i)
           }
         }
 
         // Clear checkboxes
-        this.selectedQueriesIds.clear()
+        this.selectedInquiriesIds.clear()
       }
-      this.selectedQueriesCount = this.selectedQueriesIds.size
-      storedQueries.updateStorage(this.queries)
+      this.selectedInquiriesCount = this.selectedInquiriesIds.size
+      storedInquiries.updateStorage(this.inquiries)
     },
     findTabIndex (id) {
       return this.$store.state.tabs.findIndex(tab => tab.id === id)
     },
-    exportToFile (queryList, fileName) {
-      const jsonStr = storedQueries.serialiseQueries(queryList)
+    exportToFile (inquiryList, fileName) {
+      const jsonStr = storedInquiries.serialiseInquiries(inquiryList)
       fu.exportToFile(jsonStr, fileName)
     },
-    exportSelectedQueries () {
-      const queryList = this.selectAll
-        ? this.allQueries
-        : this.allQueries.filter(query => this.selectedQueriesIds.has(query.id))
+    exportSelectedInquiries () {
+      const inquiryList = this.selectAll
+        ? this.allInquiries
+        : this.allInquiries.filter(inquiry => this.selectedInquiriesIds.has(inquiry.id))
 
-      this.exportToFile(queryList, 'My sqliteviz queries.json')
+      this.exportToFile(inquiryList, 'My sqliteviz inquiries.json')
     },
-    importQueries () {
-      storedQueries.importQueries()
-        .then(importedQueries => {
+    importInquiries () {
+      storedInquiries.importInquiries()
+        .then(importedInquiries => {
           if (this.selectAll) {
-            importedQueries.forEach(query => {
-              this.selectedQueriesIds.add(query.id)
+            importedInquiries.forEach(inquiry => {
+              this.selectedInquiriesIds.add(inquiry.id)
             })
-            this.selectedQueriesCount = this.selectedQueriesIds.size
+            this.selectedInquiriesCount = this.selectedInquiriesIds.size
           }
 
-          this.queries = this.queries.concat(importedQueries)
-          storedQueries.updateStorage(this.queries)
+          this.inquiries = this.inquiries.concat(importedInquiries)
+          storedInquiries.updateStorage(this.inquiries)
         })
     },
     toggleSelectAll (checked) {
       this.selectAll = checked
       this.$refs.rowCheckBox.forEach(item => { item.checked = checked })
 
-      this.selectedQueriesIds = checked
-        ? new Set(this.allQueries.map(query => query.id))
+      this.selectedInquiriesIds = checked
+        ? new Set(this.allInquiries.map(inquiry => inquiry.id))
         : new Set()
 
-      this.selectedQueriesCount = this.selectedQueriesIds.size
-      this.selectedNotPredefinedCount = checked ? this.queries.length : 0
+      this.selectedInquiriesCount = this.selectedInquiriesIds.size
+      this.selectedNotPredefinedCount = checked ? this.inquiries.length : 0
     },
     toggleRow (checked, id) {
-      const isPredefined = this.predefinedQueriesIds.has(id)
+      const isPredefined = this.predefinedInquiriesIds.has(id)
       if (checked) {
-        this.selectedQueriesIds.add(id)
+        this.selectedInquiriesIds.add(id)
         if (!isPredefined) {
           this.selectedNotPredefinedCount += 1
         }
       } else {
-        if (this.selectedQueriesIds.size === this.allQueries.length) {
+        if (this.selectedInquiriesIds.size === this.allInquiries.length) {
           this.$refs.mainCheckBox.checked = false
           this.selectAll = false
         }
-        this.selectedQueriesIds.delete(id)
+        this.selectedInquiriesIds.delete(id)
         if (!isPredefined) {
           this.selectedNotPredefinedCount -= 1
         }
       }
-      this.selectedQueriesCount = this.selectedQueriesIds.size
+      this.selectedInquiriesCount = this.selectedInquiriesIds.size
     }
   }
 }
@@ -432,13 +433,13 @@ export default {
   text-align: center;
 }
 
-#my-queries-content {
+#my-inquiries-content {
   padding: 52px;
   height: 100%;
   box-sizing: border-box;
 }
 
-#my-queries-toolbar {
+#my-inquiries-toolbar {
   display: flex;
   justify-content: space-between;
   margin-bottom: 18px;
@@ -448,6 +449,7 @@ export default {
 }
 
 .rounded-bg {
+  padding-top: 40px;
   margin: 0 auto;
   max-width: 1500px;
   width: 100%;
@@ -464,47 +466,47 @@ export default {
   margin-left: 24px;
 }
 
-table {
+table.sqliteviz-table {
   margin-top: 0;
 }
 
-tbody tr td {
+.sqliteviz-table tbody tr td {
   min-width: 0;
   height: 40px;
 }
 
-tbody tr td:first-child {
+.sqliteviz-table tbody tr td:first-child {
   width: 70%;
   max-width: 0;
   padding: 0 12px;
 }
-tbody tr td:last-child {
+.sqliteviz-table tbody tr td:last-child {
   width: 30%;
   max-width: 0;
   padding: 0 24px;
 }
 
-tbody .cell-data {
+.sqliteviz-table tbody .cell-data {
   display: flex;
   align-items: center;
   max-width: 100%;
   width: 100%;
 }
-tbody .cell-data div.name {
+.sqliteviz-table tbody .cell-data div.name {
   overflow: hidden;
   text-overflow: ellipsis;
   margin-left: 24px;
 }
 
-tbody tr:hover td {
+.sqliteviz-table tbody tr:hover td {
   cursor: pointer;
 }
 
-tbody tr:hover td {
+.sqliteviz-table tbody tr:hover td {
   color: var(--color-text-active);
 }
 
-.second-column {
+.sqliteviz-table .second-column {
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -522,7 +524,7 @@ tbody tr:hover td {
   overflow: hidden;
   text-overflow: ellipsis;
 }
-tbody tr:hover .icons-container {
+.sqliteviz-table tbody tr:hover .icons-container {
   display: flex;
 }
 .dialog input {
@@ -544,7 +546,7 @@ button.toolbar {
   margin-left: 12px;
 }
 
-tbody tr:hover .badge {
+.sqliteviz-table tbody tr:hover .badge {
   display: block;
 }
 #note {

src/views/Main/Inquiries/svg/copy.vue

@@ -6,18 +6,17 @@
       height="18"
       viewBox="0 0 18 18"
       fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      @click.stop="$emit('click')"
-      @mouseover="showTooltip"
-      @mouseout="hideTooltip"
+      @click.stop="onClick"
+      @mouseenter="showTooltip"
+      @mouseleave="hideTooltip"
     >
       <path
         d="M14.25 15.75H6V5.25H14.25V15.75ZM14.25 3.75H6C5.60218 3.75 5.22064 3.90804 4.93934 4.18934C4.65804 4.47064 4.5 4.85218 4.5 5.25V15.75C4.5 16.1478 4.65804 16.5294 4.93934 16.8107C5.22064 17.092 5.60218 17.25 6 17.25H14.25C14.6478 17.25 15.0294 17.092 15.3107 16.8107C15.592 16.5294 15.75 16.1478 15.75 15.75V5.25C15.75 4.85218 15.592 4.47064 15.3107 4.18934C15.0294 3.90804 14.6478 3.75 14.25 3.75ZM12 0.75H3C2.60218 0.75 2.22064 0.908035 1.93934 1.18934C1.65804 1.47064 1.5 1.85218 1.5 2.25V12.75H3V2.25H12V0.75Z"
         fill="#A2B1C6"
       />
     </svg>
-    <span class="icon-tooltip" :style="tooltipStyle">
-      Duplicate query
+    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+      Duplicate inquiry
     </span>
   </span>
 </template>
@@ -27,7 +26,13 @@ import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'CopyIcon',
-  mixins: [tooltipMixin]
+  mixins: [tooltipMixin],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
 }
 </script>
 

src/views/Main/Inquiries/svg/delete.vue

@@ -6,18 +6,17 @@
       height="18"
       viewBox="0 0 18 18"
       fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      @click.stop="$emit('click')"
-      @mouseover="showTooltip"
-      @mouseout="hideTooltip"
+      @click.stop="onClick"
+      @mouseenter="showTooltip($event, 'top-left')"
+      @mouseleave="hideTooltip"
     >
       <path
         d="M6.75 2.25V3H3V4.5H3.75V14.25C3.75 14.6478 3.90804 15.0294 4.18934 15.3107C4.47064 15.592 4.85218 15.75 5.25 15.75H12.75C13.1478 15.75 13.5294 15.592 13.8107 15.3107C14.092 15.0294 14.25 14.6478 14.25 14.25V4.5H15V3H11.25V2.25H6.75ZM5.25 4.5H12.75V14.25H5.25V4.5ZM6.75 6V12.75H8.25V6H6.75ZM9.75 6V12.75H11.25V6H9.75Z"
         fill="#A2B1C6"
       />
     </svg>
-    <span class="icon-tooltip" :style="tooltipStyle">
-      Delete query
+    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+      Delete inquiry
     </span>
   </span>
 </template>
@@ -27,7 +26,13 @@ import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'DeleteIcon',
-  mixins: [tooltipMixin]
+  mixins: [tooltipMixin],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
 }
 </script>
 

src/views/Main/Inquiries/svg/rename.vue

@@ -6,18 +6,17 @@
       height="18"
       viewBox="0 0 18 18"
       fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      @click.stop="$emit('click')"
-      @mouseover="showTooltip"
-      @mouseout="hideTooltip"
+      @click.stop="onClick"
+      @mouseenter="showTooltip"
+      @mouseleave="hideTooltip"
     >
       <path
         d="M10.545 6.75L11.25 7.455L4.44 14.25H3.75V13.56L10.545 6.75ZM13.245 2.25C13.0575 2.25 12.8625 2.325 12.72 2.4675L11.3475 3.84L14.16 6.6525L15.5325 5.28C15.825 4.9875 15.825 4.5 15.5325 4.2225L13.7775 2.4675C13.6275 2.3175 13.44 2.25 13.245 2.25ZM10.545 4.6425L2.25 12.9375V15.75H5.0625L13.3575 7.455L10.545 4.6425Z"
         fill="#A2B1C6"
       />
     </svg>
-    <span class="icon-tooltip" :style="tooltipStyle">
-      Rename query
+    <span class="icon-tooltip" :style="tooltipStyle" ref="tooltip">
+      Rename inquiry
     </span>
   </span>
 </template>
@@ -27,7 +26,13 @@ import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'RenameIcon',
-  mixins: [tooltipMixin]
+  mixins: [tooltipMixin],
+  methods: {
+    onClick () {
+      this.hideTooltip()
+      this.$emit('click')
+    }
+  }
 }
 </script>
 

src/views/Main/MainMenu.vue

@@ -1,52 +1,44 @@
 <template>
   <nav>
     <div>
-      <router-link to="/editor">Editor</router-link>
-      <router-link to="/my-queries">My queries</router-link>
+      <router-link to="/workspace">Workspace</router-link>
+      <router-link to="/inquiries">Inquiries</router-link>
       <a href="https://github.com/lana-k/sqliteviz/wiki" target="_blank">Help</a>
     </div>
-    <div>
-      <button
-        id="run-btn"
-        v-if="currentQuery && $route.path === '/editor'"
-        class="primary"
-        :disabled="runDisabled"
-        @click="currentQuery.execute"
-      >
-        Run
-      </button>
+    <div id="nav-buttons">
       <button
         id="save-btn"
-        v-show="currentQuery && $route.path === '/editor'"
+        v-show="currentInquiry && $route.path === '/workspace'"
         class="primary"
-        :disabled="!isUnsaved"
-        @click="checkQueryBeforeSave"
+        :disabled="isSaved"
+        @click="checkInquiryBeforeSave"
       >
         Save
       </button>
       <button
         id="create-btn"
         class="primary"
-        @click="createNewQuery"
+        @click="createNewInquiry"
       >
         Create
       </button>
+      <app-diagnostic-info />
     </div>
 
-    <!--Save Query dialog  -->
+    <!--Save Inquiry dialog  -->
     <modal name="save" classes="dialog" height="auto">
       <div class="dialog-header">
-        Save query
+        Save inquiry
         <close-icon @click="cancelSave"/>
       </div>
       <div class="dialog-body">
         <div v-show="isPredefined" id="save-note">
           <img :src="require('@/assets/images/info.svg')">
-          Note: Predefined queries can't be edited.
-          That's why your modifications will be saved as a new query. Enter the name for it.
+          Note: Predefined inquiries can't be edited.
+          That's why your modifications will be saved as a new inquiry. Enter the name for it.
         </div>
         <text-field
-          label="Query name"
+          label="Inquiry name"
           :error-msg="errorMsg"
           v-model="name"
           width="100%"
@@ -54,7 +46,7 @@
       </div>
       <div class="dialog-buttons-container">
         <button class="secondary" @click="cancelSave">Cancel</button>
-        <button class="primary" @click="saveQuery">Save</button>
+        <button class="primary" @click="saveInquiry">Save</button>
       </div>
     </modal>
   </nav>
@@ -63,13 +55,15 @@
 <script>
 import TextField from '@/components/TextField'
 import CloseIcon from '@/components/svg/close'
-import storedQueries from '@/lib/storedQueries'
+import storedInquiries from '@/lib/storedInquiries'
+import AppDiagnosticInfo from './AppDiagnosticInfo'
 
 export default {
   name: 'MainMenu',
   components: {
     TextField,
-    CloseIcon
+    CloseIcon,
+    AppDiagnosticInfo
   },
   data () {
     return {
@@ -78,121 +72,122 @@ export default {
     }
   },
   computed: {
-    currentQuery () {
+    currentInquiry () {
       return this.$store.state.currentTab
     },
-    isUnsaved () {
-      if (!this.currentQuery) {
+    isSaved () {
+      if (!this.currentInquiry) {
         return false
       }
-      const tabIndex = this.currentQuery.tabIndex
+      const tabIndex = this.currentInquiry.tabIndex
       const tab = this.$store.state.tabs[tabIndex]
-      return tab && tab.isUnsaved
+      return tab && tab.isSaved
     },
     isPredefined () {
-      if (this.currentQuery) {
-        return this.currentQuery.isPredefined
+      if (this.currentInquiry) {
+        return this.currentInquiry.isPredefined
       } else {
         return false
       }
     },
     runDisabled () {
-      return this.currentQuery && (!this.$store.state.schema || !this.currentQuery.query)
+      return this.currentInquiry && (!this.$store.state.db || !this.currentInquiry.query)
     }
   },
   created () {
-    this.$root.$on('createNewQuery', this.createNewQuery)
-    this.$root.$on('saveQuery', this.checkQueryBeforeSave)
+    this.$root.$on('createNewInquiry', this.createNewInquiry)
+    this.$root.$on('saveInquiry', this.checkInquiryBeforeSave)
     document.addEventListener('keydown', this._keyListener)
   },
   beforeDestroy () {
     document.removeEventListener('keydown', this._keyListener)
   },
   methods: {
-    createNewQuery () {
+    createNewInquiry () {
       this.$store.dispatch('addTab').then(id => {
         this.$store.commit('setCurrentTabId', id)
-        if (this.$route.path !== '/editor') {
-          this.$router.push('/editor')
+        if (this.$route.path !== '/workspace') {
+          this.$router.push('/workspace')
         }
       })
     },
     cancelSave () {
       this.$modal.hide('save')
-      this.$root.$off('querySaved')
+      this.$root.$off('inquirySaved')
     },
-    checkQueryBeforeSave () {
+    checkInquiryBeforeSave () {
       this.errorMsg = null
       this.name = ''
 
-      if (storedQueries.isTabNeedName(this.currentQuery)) {
+      if (storedInquiries.isTabNeedName(this.currentInquiry)) {
         this.$modal.show('save')
       } else {
-        this.saveQuery()
+        this.saveInquiry()
       }
     },
-    saveQuery () {
-      const isNeedName = storedQueries.isTabNeedName(this.currentQuery)
+    saveInquiry () {
+      const isNeedName = storedInquiries.isTabNeedName(this.currentInquiry)
       if (isNeedName && !this.name) {
-        this.errorMsg = 'Query name can\'t be empty'
+        this.errorMsg = 'Inquiry name can\'t be empty'
         return
       }
-      const dataSet = this.currentQuery.result
-      const tabView = this.currentQuery.view
+      const dataSet = this.currentInquiry.result
+      const tabView = this.currentInquiry.view
 
-      // Save query
-      const value = storedQueries.save(this.currentQuery, this.name)
+      // Save inquiry
+      const value = storedInquiries.save(this.currentInquiry, this.name)
 
       // Update tab in store
       this.$store.commit('updateTab', {
-        index: this.currentQuery.tabIndex,
+        index: this.currentInquiry.tabIndex,
         name: value.name,
         id: value.id,
         query: value.query,
-        chart: value.chart,
-        isUnsaved: false
+        viewType: value.viewType,
+        viewOptions: value.viewOptions,
+        isSaved: true
       })
 
       // Restore data:
-      // e.g. if we save predefined query the tab will be created again
+      // e.g. if we save predefined inquiry the tab will be created again
       // (because of new id) and
       // it will be without sql result and has default view - table.
       // That's why we need to restore data and view
       this.$nextTick(() => {
-        this.currentQuery.result = dataSet
-        this.currentQuery.view = tabView
+        this.currentInquiry.result = dataSet
+        this.currentInquiry.view = tabView
       })
 
       // Hide dialog
       this.$modal.hide('save')
 
       // Signal about saving
-      this.$root.$emit('querySaved')
+      this.$root.$emit('inquirySaved')
     },
     _keyListener (e) {
-      if (this.$route.path === '/editor') {
+      if (this.$route.path === '/workspace') {
         // Run query Ctrl+R or Ctrl+Enter
         if ((e.key === 'r' || e.key === 'Enter') && (e.ctrlKey || e.metaKey)) {
           e.preventDefault()
           if (!this.runDisabled) {
-            this.currentQuery.execute()
+            this.currentInquiry.execute()
           }
           return
         }
 
-        // Save query Ctrl+S
+        // Save inquiry Ctrl+S
         if (e.key === 's' && (e.ctrlKey || e.metaKey)) {
           e.preventDefault()
-          if (this.isUnsaved) {
-            this.checkQueryBeforeSave()
+          if (!this.isSaved) {
+            this.checkInquiryBeforeSave()
           }
           return
         }
       }
-      // New (blank) query Ctrl+B
+      // New (blank) inquiry Ctrl+B
       if (e.key === 'b' && (e.ctrlKey || e.metaKey)) {
         e.preventDefault()
-        this.createNewQuery()
+        this.createNewInquiry()
       }
     }
   }
@@ -213,7 +208,7 @@ nav {
   top: 0;
   left: 0;
   width: 100vw;
-  padding: 0 52px;
+  padding: 0 16px 0 52px;
   z-index: 999;
 }
 a {
@@ -238,4 +233,8 @@ button {
 #save-note img {
   margin: -3px 6px 0 0;
 }
+
+#nav-buttons {
+  display: flex;
+}
 </style>

src/views/Main/Workspace/Schema/index.vue

@@ -10,6 +10,7 @@
       </div>
       <db-uploader id="db-edit" type="small" />
       <export-icon tooltip="Export database" @click="exportToFile"/>
+      <add-table-icon @click="addCsv"/>
     </div>
     <div v-show="schemaVisible" class="schema">
       <table-description
@@ -19,15 +20,26 @@
         :columns="table.columns"
       />
     </div>
+
+    <!--Parse csv dialog  -->
+    <csv-import
+      ref="addCsv"
+      :file="file"
+      :db="$store.state.db"
+      dialog-name="addCsv"
+    />
   </div>
 </template>
 
 <script>
+import fIo from '@/lib/utils/fileIo'
 import TableDescription from './TableDescription'
 import TextField from '@/components/TextField'
 import TreeChevron from '@/components/svg/treeChevron'
 import DbUploader from '@/components/DbUploader'
 import ExportIcon from '@/components/svg/export'
+import AddTableIcon from '@/components/svg/addTable'
+import CsvImport from '@/components/CsvImport'
 
 export default {
   name: 'Schema',
@@ -36,33 +48,44 @@ export default {
     TextField,
     TreeChevron,
     DbUploader,
-    ExportIcon
+    ExportIcon,
+    AddTableIcon,
+    CsvImport
   },
   data () {
     return {
       schemaVisible: true,
-      filter: null
+      filter: null,
+      file: null
     }
   },
   computed: {
     schema () {
-      if (!this.$store.state.schema) {
+      if (!this.$store.state.db.schema) {
         return []
       }
 
       return !this.filter
-        ? this.$store.state.schema
-        : this.$store.state.schema.filter(
+        ? this.$store.state.db.schema
+        : this.$store.state.db.schema.filter(
           table => table.name.toUpperCase().indexOf(this.filter.toUpperCase()) !== -1
         )
     },
     dbName () {
-      return this.$store.state.dbName
+      return this.$store.state.db.dbName
     }
   },
   methods: {
     exportToFile () {
       this.$store.state.db.export(`${this.dbName}.sqlite`)
+    },
+    async addCsv () {
+      this.file = await fIo.getFileFromUser('.csv')
+      await this.$nextTick()
+      const csvImport = this.$refs.addCsv
+      csvImport.reset()
+      await csvImport.previewCsv()
+      csvImport.open()
     }
   }
 }

src/views/Main/Workspace/Tabs/Tab/DataView/Chart/chartHelper.js

@@ -1,27 +1,17 @@
 import dereference from 'react-chart-editor/lib/lib/dereference'
 
-export function getDataSourcesFromSqlResult (sqlResult) {
-  if (!sqlResult) {
-    return {}
-  }
-  const dataSorces = {}
-  const matrix = sqlResult.values
-  const [row] = matrix
-  const transposedMatrix = row.map((value, column) => matrix.map(row => row[column]))
-  sqlResult.columns.forEach((column, index) => {
-    dataSorces[column] = transposedMatrix[index]
-  })
-  return dataSorces
-}
-
 export function getOptionsFromDataSources (dataSources) {
+  if (!dataSources) {
+    return []
+  }
+
   return Object.keys(dataSources).map(name => ({
     value: name,
     label: name
   }))
 }
 
-export function getChartStateForSave (state, dataSources) {
+export function getOptionsForSave (state, dataSources) {
   // we don't need to save the data, only settings
   // so we modify state.data using dereference
   const stateCopy = JSON.parse(JSON.stringify(state))
@@ -34,7 +24,6 @@ export function getChartStateForSave (state, dataSources) {
 }
 
 export default {
-  getDataSourcesFromSqlResult,
   getOptionsFromDataSources,
-  getChartStateForSave
+  getOptionsForSave
 }

src/views/Main/Workspace/Tabs/Tab/DataView/Chart/index.vue

@@ -0,0 +1,118 @@
+<template>
+  <div v-show="visible" class="chart-container" ref="chartContainer">
+    <div class="warning chart-warning" v-show="!dataSources && visible">
+      There is no data to build a chart. Run your SQL query and make sure the result is not empty.
+    </div>
+    <PlotlyEditor
+      :data="state.data"
+      :layout="state.layout"
+      :frames="state.frames"
+      :config="{ editable: true, displaylogo: false, modeBarButtonsToRemove: ['toImage'] }"
+      :dataSources="dataSources"
+      :dataSourceOptions="dataSourceOptions"
+      :plotly="plotly"
+      @onUpdate="update"
+      @onRender="onRender"
+      :useResizeHandler="true"
+      :debug="true"
+      :advancedTraceTypeSelector="true"
+      class="chart"
+      ref="plotlyEditor"
+      :style="{ height: !dataSources ? 'calc(100% - 40px)' : '100%' }"
+    />
+</div>
+</template>
+
+<script>
+import plotly from 'plotly.js'
+import 'react-chart-editor/lib/react-chart-editor.min.css'
+
+import PlotlyEditor from 'react-chart-editor'
+import chartHelper from './chartHelper'
+import dereference from 'react-chart-editor/lib/lib/dereference'
+import fIo from '@/lib/utils/fileIo'
+
+export default {
+  name: 'Chart',
+  props: ['dataSources', 'initOptions', 'importToPngEnabled'],
+  components: {
+    PlotlyEditor
+  },
+  data () {
+    return {
+      plotly: plotly,
+      state: this.initOptions || {
+        data: [],
+        layout: {},
+        frames: []
+      },
+      visible: true,
+      resizeObserver: null
+    }
+  },
+  computed: {
+    dataSourceOptions () {
+      return chartHelper.getOptionsFromDataSources(this.dataSources)
+    }
+  },
+  mounted () {
+    this.resizeObserver = new ResizeObserver(this.handleResize)
+    this.resizeObserver.observe(this.$refs.chartContainer)
+  },
+  beforeDestroy () {
+    this.resizeObserver.unobserve(this.$refs.chartContainer)
+  },
+  watch: {
+    dataSources () {
+      // we need to update state.data in order to update the graph
+      // https://github.com/plotly/react-chart-editor/issues/948
+      dereference(this.state.data, this.dataSources)
+    }
+  },
+  methods: {
+    handleResize () {
+      this.visible = false
+      this.$nextTick(() => {
+        this.visible = true
+      })
+    },
+    onRender (data, layout, frames) {
+      // TODO: check changes and enable Save button if needed
+    },
+    update (data, layout, frames) {
+      this.state = { data, layout, frames }
+      this.$emit('update')
+    },
+    getOptionsForSave () {
+      return chartHelper.getOptionsForSave(this.state, this.dataSources)
+    },
+    async saveAsPng () {
+      const chartElement = this.$refs.plotlyEditor.$el.querySelector('.js-plotly-plot')
+      const url = await plotly.toImage(chartElement, { format: 'png', width: null, height: null })
+      this.$emit('loadingImageCompleted')
+      fIo.downloadFromUrl(url, 'chart')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.chart-container {
+  height: 100%;
+}
+
+.chart-warning {
+  height: 40px;
+  line-height: 40px;
+  border-bottom: 1px solid var(--color-border);
+  box-sizing: border-box;
+}
+
+.chart {
+  min-height: 242px;
+}
+
+>>> .editor_controls .sidebar__item:before {
+  width: 0;
+}
+</style>

src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/PivotSortBtn.vue

@@ -0,0 +1,71 @@
+<template>
+  <div :class="['pivot-sort-btn', direction] " @click="changeSorting">
+  {{ value.includes('key') ? 'key' : 'value' }}
+  <sort-icon
+    class="sort-icon"
+    :horizontal="direction === 'col'"
+    :asc="value.includes('a_to_z')"
+  />
+  </div>
+</template>
+
+<script>
+import SortIcon from '@/components/svg/sort'
+
+export default {
+  name: 'PivotSortBtn',
+  props: ['direction', 'value'],
+  components: {
+    SortIcon
+  },
+  methods: {
+    changeSorting () {
+      if (this.value === 'key_a_to_z') {
+        this.$emit('input', 'value_a_to_z')
+      } else if (this.value === 'value_a_to_z') {
+        this.$emit('input', 'value_z_to_a')
+      } else {
+        this.$emit('input', 'key_a_to_z')
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.pivot-sort-btn {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 43px;
+  height: 27px;
+  background-color: var(--color-bg-light-4);
+  border-radius: var(--border-radius-medium-2);
+  border: 1px solid var(--color-border);
+  cursor: pointer;
+  font-size: 11px;
+  color: var(--color-text-base);
+  line-height: 8px;
+  box-sizing: border-box;
+}
+.pivot-sort-btn:hover {
+  color: var(--color-text-active);
+  border-color: var(--color-border-dark);
+}
+.pivot-sort-btn:hover >>> .sort-icon path {
+  fill: var(--color-text-active);
+}
+
+.pivot-sort-btn.col {
+  flex-direction: column;
+  padding-top: 5px;
+}
+
+.pivot-sort-btn.row {
+  flex-direction: row;
+}
+
+.pivot-sort-btn.row .sort-icon {
+  margin-left: 2px;
+}
+</style>

src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/index.vue

@@ -0,0 +1,302 @@
+<template>
+  <div class="pivot-ui">
+    <div :class="{collapsed}">
+      <div class="row">
+        <label>Columns</label>
+        <multiselect
+          class="sqliteviz-select cols"
+          v-model="cols"
+          :options="colsToSelect"
+          :disabled="colsToSelect.length === 0"
+          :multiple="true"
+          :hideSelected="true"
+          :close-on-select="true"
+          :show-labels="false"
+          :max="colsToSelect.length"
+          open-direction="bottom"
+          placeholder=""
+        >
+          <template slot="maxElements">
+            <span class="no-results">No Results</span>
+          </template>
+
+          <template slot="placeholder">Choose columns</template>
+
+          <template slot="noResult">
+            <span class="no-results">No Results</span>
+          </template>
+        </multiselect>
+        <pivot-sort-btn class="sort-btn" direction="col" v-model="colOrder" />
+      </div>
+
+      <div class="row">
+        <label>Rows</label>
+        <multiselect
+          class="sqliteviz-select rows"
+          v-model="rows"
+          :options="rowsToSelect"
+          :disabled="rowsToSelect.length === 0"
+          :multiple="true"
+          :hideSelected="true"
+          :close-on-select="true"
+          :show-labels="false"
+          :max="rowsToSelect.length"
+          :option-height="29"
+          open-direction="bottom"
+          placeholder=""
+        >
+          <template slot="maxElements">
+            <span class="no-results">No Results</span>
+          </template>
+
+          <template slot="placeholder">Choose rows</template>
+
+          <template slot="noResult">
+            <span class="no-results">No Results</span>
+          </template>
+        </multiselect>
+        <pivot-sort-btn class="sort-btn" direction="row" v-model="rowOrder" />
+      </div>
+
+      <div class="row aggregator">
+        <label>Aggregator</label>
+        <multiselect
+          class="sqliteviz-select short aggregator"
+          v-model="aggregator"
+          :options="aggregators"
+          label="name"
+          track-by="name"
+          :close-on-select="true"
+          :show-labels="false"
+          :hideSelected="true"
+          :option-height="29"
+          open-direction="bottom"
+          placeholder="Choose a function"
+        >
+          <template slot="noResult">
+            <span class="no-results">No Results</span>
+          </template>
+        </multiselect>
+
+        <multiselect
+          class="sqliteviz-select aggr-arg"
+          v-show="valCount > 0"
+          v-model="val1"
+          :options="keyNames"
+          :disabled="keyNames.length === 0"
+          :close-on-select="true"
+          :show-labels="false"
+          :hideSelected="true"
+          :option-height="29"
+          open-direction="bottom"
+          placeholder="Choose an argument"
+        />
+
+        <multiselect
+          class="sqliteviz-select aggr-arg"
+          v-show="valCount > 1"
+          v-model="val2"
+          :options="keyNames"
+          :disabled="keyNames.length === 0"
+          :close-on-select="true"
+          :show-labels="false"
+          :hideSelected="true"
+          :option-height="29"
+          open-direction="bottom"
+          placeholder="Choose a second argument"
+        />
+      </div>
+
+      <div class="row">
+        <label>View</label>
+        <multiselect
+          class="sqliteviz-select short renderer"
+          v-model="renderer"
+          :options="renderers"
+          label="name"
+          track-by="name"
+          :close-on-select="true"
+          :allow-empty="false"
+          :show-labels="false"
+          :hideSelected="true"
+          :option-height="29"
+          open-direction="bottom"
+          placeholder="Choose a view"
+        >
+          <template slot="noResult">
+            <span class="no-results">No Results</span>
+          </template>
+        </multiselect>
+      </div>
+    </div>
+    <span @click="collapsed = !collapsed" class="switcher">
+      {{ collapsed ? 'Show pivot settings' : 'Hide pivot settings' }}
+    </span>
+  </div>
+</template>
+
+<script>
+import $ from 'jquery'
+import Multiselect from 'vue-multiselect'
+import PivotSortBtn from './PivotSortBtn'
+import { renderers, aggregators, zeroValAggregators, twoValAggregators } from './pivotHelper'
+import Chart from '@/views/Main/Workspace/Tabs/Tab/DataView/Chart'
+import Vue from 'vue'
+const ChartClass = Vue.extend(Chart)
+
+export default {
+  name: 'pivotUi',
+  props: ['keyNames', 'value'],
+  components: {
+    Multiselect,
+    PivotSortBtn
+  },
+  data () {
+    const aggregatorName = (this.value && this.value.aggregatorName) || 'Count'
+    const rendererName = (this.value && this.value.rendererName) || 'Table'
+    return {
+      collapsed: false,
+      renderer: { name: rendererName, fun: $.pivotUtilities.renderers[rendererName] },
+      aggregator: { name: aggregatorName, fun: $.pivotUtilities.aggregators[aggregatorName] },
+      rows: (this.value && this.value.rows) || [],
+      cols: (this.value && this.value.cols) || [],
+      val1: (this.value && this.value.vals && this.value.vals[0]) || '',
+      val2: (this.value && this.value.vals && this.value.vals[1]) || '',
+      colOrder: (this.value && this.value.colOrder) || 'key_a_to_z',
+      rowOrder: (this.value && this.value.rowOrder) || 'key_a_to_z',
+      customChartComponent:
+        (this.value && this.value.rendererOptions && this.value.rendererOptions.customChartComponent) ||
+        new ChartClass()
+    }
+  },
+  computed: {
+    valCount () {
+      if (zeroValAggregators.includes(this.aggregator.name)) {
+        return 0
+      }
+
+      if (twoValAggregators.includes(this.aggregator.name)) {
+        return 2
+      }
+
+      return 1
+    },
+    renderers () {
+      return renderers
+    },
+    aggregators () {
+      return aggregators
+    },
+    rowsToSelect () {
+      return this.keyNames.filter(key => !this.cols.includes(key))
+    },
+    colsToSelect () {
+      return this.keyNames.filter(key => !this.rows.includes(key))
+    }
+  },
+  watch: {
+    renderer () {
+      this.returnValue()
+    },
+    aggregator () {
+      this.returnValue()
+    },
+    rows () {
+      this.returnValue()
+    },
+    cols () {
+      this.returnValue()
+    },
+    val1 () {
+      this.returnValue()
+    },
+    val2 () {
+      this.returnValue()
+    },
+    colOrder () {
+      this.returnValue()
+    },
+    rowOrder () {
+      this.returnValue()
+    }
+  },
+  created () {
+    this.customChartComponent.$on('update', () => { this.$emit('update') })
+    this.customChartComponent.$on('loadingImageCompleted', value => { this.$emit('loadingCustomChartImageCompleted') })
+  },
+  methods: {
+    returnValue () {
+      const vals = []
+      for (let i = 1; i <= this.valCount; i++) {
+        vals.push(this[`val${i}`])
+      }
+      this.$emit('update')
+      this.$emit('input', {
+        rows: this.rows,
+        cols: this.cols,
+        colOrder: this.colOrder,
+        rowOrder: this.rowOrder,
+        aggregator: this.aggregator.fun(vals),
+        aggregatorName: this.aggregator.name,
+        renderer: this.renderer.fun,
+        rendererName: this.renderer.name,
+        rendererOptions: this.renderer.name !== 'Custom chart' ? undefined : {
+          customChartComponent: this.customChartComponent
+        },
+        vals
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.pivot-ui {
+  padding: 12px 24px;
+  color: var(--color-text-base);
+  font-size: 12px;
+  border-bottom: 1px solid var(--color-border-light);
+  background-color: var(--color-bg-light);
+}
+
+.pivot-ui .row {
+  display: flex;
+  align-items: center;
+  margin: 12px 0;
+}
+
+.pivot-ui .row label {
+  width: 76px;
+  flex-shrink: 0;
+}
+
+.pivot-ui .row .sqliteviz-select.short {
+  width: 220px;
+  flex-shrink: 0;
+}
+
+.pivot-ui .row .aggr-arg {
+  margin-left: 12px;
+  max-width: 220px;
+}
+
+.pivot-ui .row .sort-btn {
+  margin-left: 12px;
+  flex-shrink: 0;
+}
+.collapsed {
+  display: none;
+}
+
+.switcher {
+  display: block;
+  width: min-content;
+  white-space: nowrap;
+  margin: auto;
+  cursor: pointer;
+
+}
+
+.switcher:hover {
+  color: var(--color-accent);
+}
+</style>

src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/PivotUi/pivotHelper.js

@@ -0,0 +1,77 @@
+import $ from 'jquery'
+import 'pivottable'
+import 'pivottable/dist/export_renderers.js'
+import 'pivottable/dist/plotly_renderers.js'
+
+export const zeroValAggregators = [
+  'Count',
+  'Count as Fraction of Total',
+  'Count as Fraction of Rows',
+  'Count as Fraction of Columns'
+]
+
+export const twoValAggregators = [
+  'Sum over Sum',
+  '80% Upper Bound',
+  '80% Lower Bound'
+]
+
+export function _getDataSources (pivotData) {
+  const rowKeys = pivotData.getRowKeys()
+  const colKeys = pivotData.getColKeys()
+
+  const dataSources = {
+    'Column keys': colKeys.map(colKey => colKey.join('-')),
+    'Row keys': rowKeys.map(rowKey => rowKey.join('-'))
+  }
+
+  const dataSourcesByRows = {}
+  const dataSourcesByCols = {}
+
+  const rowAttrs = pivotData.rowAttrs.join('-')
+  const colAttrs = pivotData.colAttrs.join('-')
+
+  colKeys.forEach(colKey => {
+    const sourceColKey = colAttrs + ':' + colKey.join('-')
+    dataSourcesByCols[sourceColKey] = []
+    rowKeys.forEach(rowKey => {
+      const value = pivotData.getAggregator(rowKey, colKey).value()
+      dataSourcesByCols[sourceColKey].push(value)
+      const sourceRowKey = rowAttrs + ':' + rowKey.join('-')
+      if (!dataSourcesByRows[sourceRowKey]) {
+        dataSourcesByRows[sourceRowKey] = []
+      }
+      dataSourcesByRows[sourceRowKey].push(value)
+    })
+  })
+
+  return Object.assign(dataSources, dataSourcesByCols, dataSourcesByRows)
+}
+
+function customChartRenderer (data, options) {
+  options.customChartComponent.dataSources = _getDataSources(data)
+  options.customChartComponent.$mount()
+
+  return $(options.customChartComponent.$el)
+}
+
+$.extend(
+  $.pivotUtilities.renderers,
+  $.pivotUtilities.export_renderers,
+  $.pivotUtilities.plotly_renderers,
+  { 'Custom chart': customChartRenderer }
+)
+
+export const renderers = Object.keys($.pivotUtilities.renderers).map(key => {
+  return {
+    name: key,
+    fun: $.pivotUtilities.renderers[key]
+  }
+})
+
+export const aggregators = Object.keys($.pivotUtilities.aggregators).map(key => {
+  return {
+    name: key,
+    fun: $.pivotUtilities.aggregators[key]
+  }
+})

src/views/Main/Workspace/Tabs/Tab/DataView/Pivot/index.vue

@@ -0,0 +1,228 @@
+<template>
+<div class="pivot-container">
+  <div class="warning pivot-warning" v-show="!dataSources">
+    There is no data to build a pivot. Run your SQL query and make sure the result is not empty.
+  </div>
+  <pivot-ui
+    :key-names="columns"
+    v-model="pivotOptions"
+    @update="$emit('update')"
+    @loadingCustomChartImageCompleted="$emit('loadingImageCompleted')"
+  />
+  <div ref="pivotOutput" class="pivot-output"/>
+</div>
+</template>
+
+<script>
+import html2canvas from 'html2canvas'
+import plotly from 'plotly.js'
+import fIo from '@/lib/utils/fileIo'
+import $ from 'jquery'
+import 'pivottable'
+import 'pivottable/dist/pivot.css'
+import PivotUi from './PivotUi'
+import Chart from '@/views/Main/Workspace/Tabs/Tab/DataView/Chart'
+import Vue from 'vue'
+const ChartClass = Vue.extend(Chart)
+
+export default {
+  name: 'pivot',
+  props: ['dataSources', 'initOptions', 'importToPngEnabled'],
+  components: {
+    PivotUi
+  },
+  data () {
+    return {
+      resizeObserver: null,
+      pivotOptions: !this.initOptions
+        ? {
+          rows: [],
+          cols: [],
+          colOrder: 'key_a_to_z',
+          rowOrder: 'key_a_to_z',
+          aggregatorName: 'Count',
+          aggregator: $.pivotUtilities.aggregators.Count(),
+          vals: [],
+          rendererName: 'Table',
+          renderer: $.pivotUtilities.renderers.Table,
+          rendererOptions: undefined
+        }
+        : {
+          rows: this.initOptions.rows,
+          cols: this.initOptions.cols,
+          colOrder: this.initOptions.colOrder,
+          rowOrder: this.initOptions.rowOrder,
+          aggregatorName: this.initOptions.aggregatorName,
+          aggregator: $.pivotUtilities.aggregators[this.initOptions.aggregatorName](this.initOptions.vals),
+          vals: this.initOptions.vals,
+          rendererName: this.initOptions.rendererName,
+          renderer: $.pivotUtilities.renderers[this.initOptions.rendererName],
+          rendererOptions: !this.initOptions.rendererOptions ? undefined : {
+            customChartComponent: new ChartClass({
+              propsData: { initOptions: this.initOptions.rendererOptions.customChartOptions }
+            })
+          }
+        }
+    }
+  },
+  computed: {
+    columns () {
+      return Object.keys(this.dataSources || {})
+    }
+  },
+  watch: {
+    dataSources () {
+      this.show()
+    },
+    'pivotOptions.rendererName': {
+      immediate: true,
+      handler () {
+        this.$emit('update:importToPngEnabled', this.pivotOptions.rendererName !== 'TSV Export')
+      }
+    },
+    pivotOptions () {
+      this.show()
+    }
+  },
+  mounted () {
+    this.show()
+    // We need to detect resizing because plotly doesn't resize when resixe its container
+    // but it resize on window.resize (we will trigger it manualy in order to make plotly resize)
+    this.resizeObserver = new ResizeObserver(this.handleResize)
+    this.resizeObserver.observe(this.$refs.pivotOutput)
+  },
+  beforeDestroy () {
+    this.resizeObserver.unobserve(this.$refs.pivotOutput)
+  },
+  methods: {
+    handleResize () {
+      // hack: plotly changes size only on window.resize event,
+      // so, we trigger it when container resizes (e.g. when move splitter)
+      if (this.pivotOptions.rendererName in $.pivotUtilities.plotly_renderers) {
+        window.dispatchEvent(new Event('resize'))
+      }
+    },
+
+    show () {
+      const options = { ...this.pivotOptions }
+      if (this.pivotOptions.rendererName in $.pivotUtilities.plotly_renderers) {
+        options.rendererOptions = {
+          plotly: {
+            autosize: true,
+            width: null,
+            height: null
+          },
+          plotlyConfig: {
+            displaylogo: false,
+            responsive: true,
+            modeBarButtonsToRemove: ['toImage']
+          }
+        }
+      }
+
+      $(this.$refs.pivotOutput).pivot(
+        function (callback) {
+          const rowCount = !this.dataSources ? 0 : this.dataSources[this.columns[0]].length
+          for (let i = 1; i <= rowCount; i++) {
+            const row = {}
+            this.columns.forEach(col => {
+              row[col] = this.dataSources[col][i - 1]
+            })
+            callback(row)
+          }
+        }.bind(this),
+        options
+      )
+
+      // fix for Firefox: fit plotly renderers just after choosing it in pivotUi
+      if (this.pivotOptions.rendererName in $.pivotUtilities.plotly_renderers) {
+        window.dispatchEvent(new Event('resize'))
+      }
+    },
+
+    getOptionsForSave () {
+      const options = { ...this.pivotOptions }
+      if (options.rendererOptions) {
+        const chartComponent = this.pivotOptions.rendererOptions.customChartComponent
+        options.rendererOptions = {
+          customChartOptions: chartComponent.getOptionsForSave()
+        }
+      }
+
+      return options
+    },
+
+    async saveAsPng () {
+      if (this.pivotOptions.rendererName === 'Custom chart') {
+        this.pivotOptions.rendererOptions.customChartComponent.saveAsPng()
+      } else if (this.pivotOptions.rendererName in $.pivotUtilities.plotly_renderers) {
+        const chartElement = this.$refs.pivotOutput.querySelector('.js-plotly-plot')
+        const url = await plotly.toImage(chartElement, {
+          format: 'png',
+          width: null,
+          height: null
+        })
+        this.$emit('loadingImageCompleted')
+        fIo.downloadFromUrl(url, 'pivot')
+      } else {
+        const tableElement = this.$refs.pivotOutput.querySelector('.pvtTable')
+        const canvas = await html2canvas(tableElement)
+        this.$emit('loadingImageCompleted')
+        fIo.downloadFromUrl(canvas.toDataURL('image/png'), 'pivot', 'image/png')
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.pivot-container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  background-color: var(--color-white);
+}
+
+.pivot-output {
+  flex-grow: 1;
+  width: 100%;
+  overflow: auto;
+}
+
+.pivot-warning {
+  height: 40px;
+  line-height: 40px;
+  box-sizing: border-box;
+}
+>>> .pvtTable {
+  min-width: 100%;
+}
+
+>>> table.pvtTable tbody tr td,
+>>> table.pvtTable thead tr th,
+>>> table.pvtTable tbody tr th {
+  border-color: var(--color-border-light);
+}
+>>> table.pvtTable thead tr th,
+>>> table.pvtTable tbody tr th {
+  background-color: var(--color-bg-dark);
+  color: var(--color-text-light);
+}
+
+>>> table.pvtTable tbody tr td {
+  color: var(--color-text-base);
+}
+
+.pivot-output >>> textarea {
+  color: var(--color-text-base);
+  min-width: 100%;
+  height: 100% !important;
+  display: block;
+  box-sizing: border-box;
+  border-width: 0;
+}
+
+.pivot-output >>> textarea:focus-visible {
+  outline: none;
+}
+</style>

src/views/Main/Workspace/Tabs/Tab/DataView/index.vue

@@ -0,0 +1,118 @@
+<template>
+  <div class="data-view-panel">
+    <div class="data-view-panel-content">
+      <component
+        :is="mode"
+        :init-options="mode === initMode ? initOptions : undefined"
+        :data-sources="dataSource"
+        :import-to-png-enabled.sync="importToPngEnabled"
+        @loadingImageCompleted="loadingImage = false"
+        ref="viewComponent"
+        @update="$emit('update')"
+      />
+    </div>
+    <side-tool-bar panel="dataView" @switchTo="$emit('switchTo', $event)">
+      <icon-button
+        :active="mode === 'chart'"
+        @click="mode = 'chart'"
+        tooltip="Switch to chart"
+        tooltip-position="top-left"
+      >
+        <chart-icon />
+      </icon-button>
+      <icon-button
+        :active="mode === 'pivot'"
+        @click="mode = 'pivot'"
+        tooltip="Switch to pivot"
+        tooltip-position="top-left"
+      >
+        <pivot-icon />
+      </icon-button>
+
+      <div class="side-tool-bar-divider"/>
+
+      <icon-button
+        :disabled="!importToPngEnabled || loadingImage"
+        :loading="loadingImage"
+        tooltip="Save as PNG image"
+        tooltip-position="top-left"
+        @click="saveAsPng"
+      >
+        <png-icon />
+      </icon-button>
+    </side-tool-bar>
+  </div>
+</template>
+
+<script>
+import Chart from './Chart'
+import Pivot from './Pivot'
+import SideToolBar from '../SideToolBar'
+import IconButton from '@/components/IconButton'
+import ChartIcon from '@/components/svg/chart'
+import PivotIcon from '@/components/svg/pivot'
+import PngIcon from '@/components/svg/png'
+
+export default {
+  name: 'DataView',
+  props: ['dataSource', 'initOptions', 'initMode'],
+  components: {
+    Chart,
+    Pivot,
+    SideToolBar,
+    IconButton,
+    ChartIcon,
+    PivotIcon,
+    PngIcon
+  },
+  data () {
+    return {
+      mode: this.initMode || 'chart',
+      importToPngEnabled: true,
+      loadingImage: false
+    }
+  },
+  watch: {
+    mode () {
+      this.$emit('update')
+      this.importToPngEnabled = true
+    }
+  },
+  methods: {
+    async saveAsPng () {
+      this.loadingImage = true
+      /*
+      setTimeout does its thing by putting its callback on the callback queue. The callback queue is only called by the browser after both the call stack and the render queue are done. So our animation (which is on the call stack) gets done, the render queue renders it, and then the browser is ready for the callback queue and calls the long-calculation.
+
+      nextTick allows you to do something after you have changed the data and VueJS has updated the DOM based on your data change, but before the browser has rendered those changed on the page.
+
+      Lees meer van Katinka Hesselink: http://www.hesselinkwebdesign.nl/2019/nexttick-vs-settimeout-in-vue/
+
+      */
+      setTimeout(() => {
+        this.$refs.viewComponent.saveAsPng()
+      }, 0)
+    },
+    getOptionsForSave () {
+      return this.$refs.viewComponent.getOptionsForSave()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.data-view-panel {
+  display: flex;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+
+.data-view-panel-content {
+  position: relative;
+  flex-grow: 1;
+  width: calc(100% - 39px);
+  height: 100%;
+  overflow: auto;
+}
+</style>

src/views/Main/Workspace/Tabs/Tab/RunResult.vue

@@ -0,0 +1,130 @@
+<template>
+  <div class="run-result-panel" ref="runResultPanel">
+    <div class="run-result-panel-content">
+      <div
+        v-show="result === null && !isGettingResults && !error"
+        class="table-preview result-before"
+      >
+        Run your query and get results here
+      </div>
+      <div v-if="isGettingResults" class="table-preview result-in-progress">
+        <loading-indicator :size="30"/>
+        Fetching results...
+      </div>
+      <div
+        v-show="result === undefined && !isGettingResults && !error"
+        class="table-preview result-empty"
+      >
+        No rows retrieved according to your query
+      </div>
+      <logs v-if="error" :messages="[error]"/>
+      <sql-table
+        v-if="result"
+        :data-set="result"
+        :time="time"
+        :pageSize="pageSize"
+        class="straight"
+      />
+    </div>
+    <side-tool-bar @switchTo="$emit('switchTo', $event)" panel="table"/>
+  </div>
+</template>
+
+<script>
+import Logs from '@/components/Logs'
+import SqlTable from '@/components/SqlTable'
+import LoadingIndicator from '@/components/LoadingIndicator'
+import SideToolBar from './SideToolBar'
+
+export default {
+  name: 'RunResult',
+  props: ['result', 'isGettingResults', 'error', 'time'],
+  data () {
+    return {
+      resizeObserver: null,
+      pageSize: 20
+    }
+  },
+  components: {
+    SqlTable,
+    LoadingIndicator,
+    Logs,
+    SideToolBar
+  },
+  mounted () {
+    this.resizeObserver = new ResizeObserver(this.handleResize)
+    this.resizeObserver.observe(this.$refs.runResultPanel)
+    this.calculatePageSize()
+  },
+  beforeDestroy () {
+    this.resizeObserver.unobserve(this.$refs.runResultPanel)
+  },
+  methods: {
+    handleResize () {
+      this.calculatePageSize()
+    },
+    calculatePageSize () {
+      const runResultPanel = this.$refs.runResultPanel
+      // 27 - table footer hight
+      // 5 - padding-bottom of rounded table container
+      // 35 - height of table header
+      const freeSpace = runResultPanel.offsetHeight - 27 - 5 - 35
+      this.pageSize = Math.max(Math.floor(freeSpace / 35), 20)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.run-result-panel {
+  display: flex;
+  height: 100%;
+  overflow: hidden;
+}
+
+.run-result-panel-content {
+  position: relative;
+  flex-grow: 1;
+  height: 100%;
+  width: 0;
+  box-sizing: border-box;
+}
+
+.table-preview {
+  position: absolute;
+  top: 40%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  color: var(--color-text-base);
+  font-size: 13px;
+}
+
+.result-in-progress {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  will-change: opacity;
+  /*
+    We need to show loader in 1 sec after starting query execution. We can't do that with
+    setTimeout because the main thread can be busy by getting a result set from the web worker.
+    But we can use CSS animation for opacity. Opacity triggers changes only in the Composite Layer
+    stage in rendering waterfall. Hence it can be processed only with Compositor Thread while
+    the Main Thread processes a result set.
+    https://www.viget.com/articles/animation-performance-101-browser-under-the-hood/
+  */
+  animation: show-loader 1s linear 0s 1;
+}
+
+@keyframes show-loader {
+  0% {
+    opacity: 0;
+  }
+  99% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+</style>

src/views/Main/Workspace/Tabs/Tab/SideToolBar.vue

@@ -0,0 +1,67 @@
+<template>
+  <div class="side-tool-bar">
+    <icon-button
+      :active="panel === 'sqlEditor'"
+      tooltip="Switch panel to SQL editor"
+      tooltip-position="top-left"
+      @click.native="$emit('switchTo', 'sqlEditor')"
+    >
+      <sql-editor-icon />
+    </icon-button>
+
+    <icon-button
+      :active="panel === 'table'"
+      tooltip="Switch panel to result set"
+      tooltip-position="top-left"
+      @click.native="$emit('switchTo', 'table')"
+    >
+      <table-icon/>
+    </icon-button>
+
+    <icon-button
+      :active="panel === 'dataView'"
+      tooltip="Switch panel to data view"
+      tooltip-position="top-left"
+      @click.native="$emit('switchTo', 'dataView')"
+    >
+      <data-view-icon />
+    </icon-button>
+
+    <div class="side-tool-bar-divider" v-if="$slots.default"/>
+
+    <slot/>
+  </div>
+</template>
+
+<script>
+import IconButton from '@/components/IconButton'
+import TableIcon from '@/components/svg/table'
+import SqlEditorIcon from '@/components/svg/sqlEditor'
+import DataViewIcon from '@/components/svg/dataView'
+
+export default {
+  name: 'SideToolBar',
+  props: ['panel'],
+  components: {
+    IconButton,
+    SqlEditorIcon,
+    DataViewIcon,
+    TableIcon
+  }
+}
+</script>
+
+<style scoped>
+.side-tool-bar {
+  background-color: var(--color-bg-light);
+  border-left: 1px solid var(--color-border-light);
+  padding: 6px;
+}
+
+.side-tool-bar-divider {
+  width: 26px;
+  height: 1px;
+  background: var(--color-border-light);
+  margin: 6px 0;
+}
+</style>

src/views/Main/Workspace/Tabs/Tab/SqlEditor/hint.js

@@ -17,15 +17,15 @@ export function getHints (cm, options) {
 const hintOptions = {
   get tables () {
     const tables = {}
-    if (store.state.schema) {
-      store.state.schema.forEach(table => {
+    if (store.state.db.schema) {
+      store.state.db.schema.forEach(table => {
         tables[table.name] = table.columns.map(column => column.name)
       })
     }
     return tables
   },
   get defaultTable () {
-    const schema = store.state.schema
+    const schema = store.state.db.schema
     return schema && schema.length === 1 ? schema[0].name : null
   },
   completeSingle: false,

src/views/Main/Workspace/Tabs/Tab/SqlEditor/index.vue

@@ -0,0 +1,107 @@
+<template>
+  <div class="sql-editor-panel">
+    <div class="codemirror-container">
+      <codemirror
+        ref="cm"
+        v-model="query"
+        :options="cmOptions"
+        @changes="onChange"
+      />
+    </div>
+    <side-tool-bar panel="sqlEditor" @switchTo="$emit('switchTo', $event)">
+      <icon-button
+        :disabled="runDisabled"
+        :loading="isGettingResults"
+        tooltip="Run SQL query"
+        tooltip-position="top-left"
+        @click="$emit('run')"
+      >
+        <run-icon :disabled="runDisabled"/>
+      </icon-button>
+    </side-tool-bar>
+  </div>
+</template>
+
+<script>
+import showHint, { showHintOnDemand } from './hint'
+import time from '@/lib/utils/time'
+import { codemirror } from 'vue-codemirror'
+import 'codemirror/lib/codemirror.css'
+import 'codemirror/mode/sql/sql.js'
+import 'codemirror/theme/neo.css'
+import 'codemirror/addon/hint/show-hint.css'
+import 'codemirror/addon/display/autorefresh.js'
+import SideToolBar from '../SideToolBar'
+import IconButton from '@/components/IconButton'
+import RunIcon from '@/components/svg/run'
+
+export default {
+  name: 'SqlEditor',
+  props: ['value', 'isGettingResults'],
+  components: {
+    codemirror,
+    SideToolBar,
+    IconButton,
+    RunIcon
+  },
+  data () {
+    return {
+      query: this.value,
+      cmOptions: {
+        tabSize: 4,
+        mode: 'text/x-mysql',
+        theme: 'neo',
+        lineNumbers: true,
+        line: true,
+        autoRefresh: true,
+        extraKeys: { 'Ctrl-Space': showHintOnDemand }
+      }
+    }
+  },
+  computed: {
+    runDisabled () {
+      return (!this.$store.state.db || !this.query || this.isGettingResults)
+    }
+  },
+  watch: {
+    query () {
+      this.$emit('input', this.query)
+    }
+  },
+  methods: {
+    onChange: time.debounce(showHint, 400),
+    focus () {
+      this.$refs.cm.codemirror.focus()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.sql-editor-panel {
+  display: flex;
+  flex-grow: 1;
+  height: 100%;
+  max-height: 100%;
+  box-sizing: border-box;
+  overflow: hidden;
+}
+
+.codemirror-container {
+  flex-grow: 1;
+  overflow: auto;
+}
+
+>>> .vue-codemirror {
+  height: 100%;
+  max-height: 100%;
+}
+>>> .CodeMirror {
+  height: 100%;
+  max-height: 100%;
+}
+>>> .CodeMirror-cursor {
+  width: 1px;
+  background: var(--color-text-base);
+}
+</style>

src/views/Main/Workspace/Tabs/Tab/index.vue

@@ -0,0 +1,160 @@
+<template>
+  <div class="tab-content-container" v-show="isActive">
+    <splitpanes
+      class="query-results-splitter"
+      horizontal
+      :before="{ size: 50, max: 100 }"
+      :after="{ size: 50, max: 100 }"
+    >
+      <template #left-pane>
+        <div :id="'above-' + tabIndex" class="above" />
+      </template>
+      <template #right-pane>
+        <div :id="'bottom-'+ tabIndex" ref="bottomPane" class="bottomPane" />
+      </template>
+    </splitpanes>
+
+    <div :id="'hidden-'+ tabIndex" class="hidden-part" />
+
+    <teleport :to="`#${layout.sqlEditor}-${tabIndex}`">
+      <sql-editor
+        ref="sqlEditor"
+        v-model="query"
+        :is-getting-results="isGettingResults"
+        @switchTo="onSwitchView('sqlEditor', $event)"
+        @run="execute"
+      />
+    </teleport>
+
+    <teleport :to="`#${layout.table}-${tabIndex}`">
+      <run-result
+        :result="result"
+        :is-getting-results="isGettingResults"
+        :error="error"
+        :time="time"
+        @switchTo="onSwitchView('table', $event)"
+      />
+    </teleport>
+
+    <teleport :to="`#${layout.dataView}-${tabIndex}`">
+      <data-view
+        :data-source="result"
+        :init-options="initViewOptions"
+        :init-mode="initViewType"
+        ref="dataView"
+        @switchTo="onSwitchView('dataView', $event)"
+        @update="onDataViewUpdate"
+      />
+    </teleport>
+  </div>
+</template>
+
+<script>
+import Splitpanes from '@/components/Splitpanes'
+import SqlEditor from './SqlEditor'
+import DataView from './DataView'
+import RunResult from './RunResult'
+import time from '@/lib/utils/time'
+import Teleport from 'vue2-teleport'
+
+export default {
+  name: 'Tab',
+  props: ['id', 'initName', 'initQuery', 'initViewOptions', 'tabIndex', 'isPredefined', 'initViewType'],
+  components: {
+    SqlEditor,
+    DataView,
+    RunResult,
+    Splitpanes,
+    Teleport
+  },
+  data () {
+    return {
+      query: this.initQuery,
+      result: null,
+      isGettingResults: false,
+      error: null,
+      time: 0,
+      layout: {
+        sqlEditor: 'above',
+        table: 'bottom',
+        dataView: 'hidden'
+      }
+    }
+  },
+  computed: {
+    isActive () {
+      return this.id === this.$store.state.currentTabId
+    }
+  },
+  watch: {
+    isActive: {
+      immediate: true,
+      async handler () {
+        if (this.isActive) {
+          this.$store.commit('setCurrentTab', this)
+          await this.$nextTick()
+          this.$refs.sqlEditor.focus()
+        }
+      }
+    },
+    query () {
+      this.$store.commit('updateTab', { index: this.tabIndex, isSaved: false })
+    }
+  },
+  methods: {
+    onSwitchView (from, to) {
+      const fromPosition = this.layout[from]
+      this.layout[from] = this.layout[to]
+      this.layout[to] = fromPosition
+    },
+    onDataViewUpdate () {
+      this.$store.commit('updateTab', { index: this.tabIndex, isSaved: false })
+    },
+    async execute () {
+      this.isGettingResults = true
+      this.result = null
+      this.error = null
+      const state = this.$store.state
+      try {
+        const start = new Date()
+        this.result = await state.db.execute(this.query + ';')
+        this.time = time.getPeriod(start, new Date())
+      } catch (err) {
+        this.error = {
+          type: 'error',
+          message: err
+        }
+      }
+      state.db.refreshSchema()
+      this.isGettingResults = false
+    }
+  }
+}
+</script>
+
+<style scoped>
+.above {
+  height: 100%;
+  max-height: 100%;
+}
+
+.hidden-part {
+  display: none;
+}
+
+.tab-content-container {
+  background-color: var(--color-white);
+  border-top: 1px solid var(--color-border-light);
+  margin-top: -1px;
+}
+
+.bottomPane {
+  height: 100%;
+  background-color: var(--color-bg-light);
+}
+
+.query-results-splitter {
+  height: calc(100vh - 104px);
+  background-color: var(--color-bg-light);
+}
+</style>

src/views/Main/Workspace/Tabs/index.vue

@@ -8,7 +8,7 @@
         :class="[{'tab-selected': (tab.id === selectedIndex)}, 'tab']"
       >
         <div class="tab-name">
-          <span v-show="tab.isUnsaved" class="star">*</span>
+          <span v-show="!tab.isSaved" class="star">*</span>
           <span v-if="tab.name">{{ tab.name }}</span>
           <span v-else class="tab-untitled">{{ tab.tempName }}</span>
         </div>
@@ -23,14 +23,15 @@
       :id="tab.id"
       :init-name="tab.name"
       :init-query="tab.query"
-      :init-chart="tab.chart"
+      :init-view-options="tab.viewOptions"
+      :init-view-type="tab.viewType"
       :is-predefined="tab.isPredefined"
       :tab-index="index"
     />
     <div v-show="tabs.length === 0" id="start-guide">
-      <span class="link" @click="$root.$emit('createNewQuery')">Create</span>
-      a new query from scratch or open the one from
-      <router-link class="link" to="/my-queries">My queries</router-link>
+      <span class="link" @click="$root.$emit('createNewInquiry')">Create</span>
+      new inquiry from scratch or open one from
+      <router-link class="link" to="/inquiries">Inquiries</router-link>
     </div>
 
     <!--Close tab warning dialog  -->
@@ -88,7 +89,7 @@ export default {
   },
   methods: {
     leavingSqliteviz (event) {
-      if (this.tabs.some(tab => tab.isUnsaved)) {
+      if (this.tabs.some(tab => !tab.isSaved)) {
         event.preventDefault()
         event.returnValue = ''
       }
@@ -98,7 +99,7 @@ export default {
     },
     beforeCloseTab (index) {
       this.closingTabIndex = index
-      if (this.tabs[index].isUnsaved) {
+      if (!this.tabs[index].isSaved) {
         this.$modal.show('close-warn')
       } else {
         this.closeTab(index)
@@ -110,14 +111,14 @@ export default {
       this.$store.commit('deleteTab', index)
     },
     saveAndClose (index) {
-      this.$root.$on('querySaved', () => {
+      this.$root.$on('inquirySaved', () => {
         this.closeTab(index)
-        this.$root.$off('querySaved')
+        this.$root.$off('inquirySaved')
       })
       this.selectTab(this.tabs[index].id)
       this.$modal.hide('close-warn')
       this.$nextTick(() => {
-        this.$root.$emit('saveQuery')
+        this.$root.$emit('saveInquiry')
       })
     }
   }
@@ -159,18 +160,29 @@ export default {
   flex-shrink: 1;
 }
 
-#tabs-header div:hover {
+#tabs-header .tab:hover {
   cursor: pointer;
 }
 
 #tabs-header .tab-selected {
   color: var(--color-text-active);
-  font-weight: 600;
   border-bottom: none;
   background-color: var(--color-white);
+  position: relative;
 }
-#tabs-header .tab-selected:hover {
-    cursor: default;
+
+#tabs-header .tab-selected:after {
+  content: '';
+  width: 100%;
+  height: 4px;
+  background-color: var(--color-accent);
+  position: absolute;
+  left: 0;
+  bottom: 0;
+}
+
+#tabs-header .tab.tab-selected:hover {
+  cursor: default;
 }
 
 .close-icon {

src/views/Main/Workspace/index.vue

@@ -19,22 +19,17 @@
 import Splitpanes from '@/components/Splitpanes'
 import Schema from './Schema'
 import Tabs from './Tabs'
-import database from '@/lib/database'
-import store from '@/store'
 
 export default {
-  name: 'Editor',
+  name: 'Workspace',
   components: {
     Schema,
     Splitpanes,
     Tabs
   },
-  async beforeRouteEnter (to, from, next) {
-    if (!store.state.schema) {
-      const newDb = database.getNewDatabase()
-      const newSchema = await newDb.loadDb()
-      store.commit('setDb', newDb)
-      store.commit('saveSchema', newSchema)
+  async beforeCreate () {
+    const schema = this.$store.state.db.schema
+    if (!schema || schema.length === 0) {
       const stmt = [
         '/*',
         ' * Your database is empty. In order to start building charts',
@@ -52,10 +47,9 @@ export default {
         "('Slytherin', 80);"
       ].join('\n')
 
-      const tabId = await store.dispatch('addTab', { query: stmt })
-      store.commit('setCurrentTabId', tabId)
+      const tabId = await this.$store.dispatch('addTab', { query: stmt })
+      this.$store.commit('setCurrentTabId', tabId)
     }
-    next()
   }
 }
 </script>

src/views/Main/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <main-menu />
-    <keep-alive include="Editor">
+    <keep-alive include="Workspace">
       <router-view id="main-view" />
     </keep-alive>
   </div>

src/views/Welcome.vue

@@ -4,7 +4,7 @@
     <div id="note">
       Sqliteviz is fully client-side. Your database never leaves your computer.
     </div>
-    <button id="skip" class="secondary" @click="$router.push('/editor')">
+    <button id="skip" class="secondary" @click="$router.push('/workspace')">
       Create empty database
     </button>
   </div>

tests/components/CsvImport/CsvImport.spec.js

@@ -1,172 +1,26 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
 import Vuex from 'vuex'
-import { shallowMount, mount } from '@vue/test-utils'
-import DbUploader from '@/components/DbUploader'
-import fu from '@/lib/utils/fileIo'
-import database from '@/lib/database'
-import csv from '@/components/DbUploader/csv'
+import { mount } from '@vue/test-utils'
+import CsvImport from '@/components/CsvImport'
+import csv from '@/components/CsvImport/csv'
 
-describe('DbUploader.vue', () => {
+describe('CsvImport.vue', () => {
   let state = {}
-  let mutations = {}
-  let store = {}
-  let place
-
-  beforeEach(() => {
-    // mock store state and mutations
-    state = {}
-    mutations = {
-      saveSchema: sinon.stub(),
-      setDb: sinon.stub()
-    }
-    store = new Vuex.Store({ state, mutations })
-
-    place = document.createElement('div')
-    document.body.appendChild(place)
-  })
-
-  afterEach(() => {
-    sinon.restore()
-    place.remove()
-  })
-
-  it('loads db on click and redirects to /editor', async () => {
-    // mock getting a file from user
-    const file = { name: 'test.db' }
-    sinon.stub(fu, 'getFileFromUser').resolves(file)
-
-    // mock db loading
-    const schema = {}
-    const db = {
-      loadDb: sinon.stub().resolves(schema)
-    }
-    sinon.stub(database, 'getNewDatabase').returns(db)
-
-    // mock router
-    const $router = { push: sinon.stub() }
-    const $route = { path: '/' }
-
-    // mount the component
-    const wrapper = shallowMount(DbUploader, {
-      attachTo: place,
-      store,
-      mocks: { $router, $route },
-      propsData: {
-        type: 'illustrated'
-      }
-    })
-
-    await wrapper.find('.drop-area').trigger('click')
-    expect(db.loadDb.calledOnceWith(file)).to.equal(true)
-    await db.loadDb.returnValues[0]
-    await wrapper.vm.animationPromise
-    await wrapper.vm.$nextTick()
-    expect(mutations.saveSchema.calledOnceWith(state, schema)).to.equal(true)
-    expect($router.push.calledOnceWith('/editor')).to.equal(true)
-    wrapper.destroy()
-  })
-
-  it('loads db on drop and redirects to /editor', async () => {
-    // mock db loading
-    const schema = {}
-    const db = {
-      loadDb: sinon.stub().resolves(schema)
-    }
-    sinon.stub(database, 'getNewDatabase').returns(db)
-
-    // mock router
-    const $router = { push: sinon.stub() }
-    const $route = { path: '/' }
-
-    // mount the component
-    const wrapper = shallowMount(DbUploader, {
-      attachTo: place,
-      store,
-      mocks: { $router, $route },
-      propsData: {
-        type: 'illustrated'
-      }
-    })
-
-    // mock a file dropped by a user
-    const file = { name: 'test.db' }
-    const dropData = { dataTransfer: new DataTransfer() }
-    Object.defineProperty(dropData.dataTransfer, 'files', {
-      value: [file],
-      writable: false
-    })
-
-    await wrapper.find('.drop-area').trigger('drop', dropData)
-    expect(db.loadDb.calledOnceWith(file)).to.equal(true)
-    await db.loadDb.returnValues[0]
-    await wrapper.vm.animationPromise
-    await wrapper.vm.$nextTick()
-    expect(mutations.saveSchema.calledOnceWith(state, schema)).to.equal(true)
-    expect($router.push.calledOnceWith('/editor')).to.equal(true)
-    wrapper.destroy()
-  })
-
-  it("doesn't redirect if already on /editor", async () => {
-    // mock getting a file from user
-    const file = { name: 'test.db' }
-    sinon.stub(fu, 'getFileFromUser').resolves(file)
-
-    // mock db loading
-    const schema = {}
-    const db = {
-      loadDb: sinon.stub().resolves(schema)
-    }
-    sinon.stub(database, 'getNewDatabase').returns(db)
-
-    // mock router
-    const $router = { push: sinon.stub() }
-    const $route = { path: '/editor' }
-
-    // mount the component
-    const wrapper = shallowMount(DbUploader, {
-      attachTo: place,
-      store,
-      mocks: { $router, $route },
-      propsData: {
-        type: 'illustrated'
-      }
-    })
-
-    await wrapper.find('.drop-area').trigger('click')
-    await db.loadDb.returnValues[0]
-    await wrapper.vm.animationPromise
-    await wrapper.vm.$nextTick()
-    expect($router.push.called).to.equal(false)
-    wrapper.destroy()
-  })
-})
-
-describe('DbUploader.vue import CSV', () => {
-  let state = {}
-  let mutations = {}
   let actions = {}
-  const newTabId = 1
+  let mutations = {}
   let store = {}
-  let place
-
-  // mock router
-  const $router = { }
-  const $route = { path: '/' }
-
   let clock
   let wrapper
+  const newTabId = 1
+  const file = { name: 'my data.csv' }
 
   beforeEach(() => {
-    // mock getting a file from user
-    sinon.stub(fu, 'getFileFromUser').resolves({ type: 'text/csv', name: 'foo.csv' })
-
     clock = sinon.useFakeTimers()
 
     // mock store state and mutations
     state = {}
     mutations = {
-      saveSchema: sinon.stub(),
       setDb: sinon.stub(),
       setCurrentTabId: sinon.stub()
     }
@@ -175,38 +29,39 @@ describe('DbUploader.vue import CSV', () => {
     }
     store = new Vuex.Store({ state, mutations, actions })
 
-    $router.push = sinon.stub()
-
-    place = document.createElement('div')
-    document.body.appendChild(place)
+    const db = {
+      sanitizeTableName: sinon.stub().returns('my_data'),
+      addTableFromCsv: sinon.stub().resolves(),
+      createProgressCounter: sinon.stub().returns(1),
+      deleteProgressCounter: sinon.stub(),
+      validateTableName: sinon.stub().resolves(),
+      execute: sinon.stub().resolves(),
+      refreshSchema: sinon.stub().resolves()
+    }
 
     // mount the component
-    wrapper = mount(DbUploader, {
-      attachTo: place,
+    wrapper = mount(CsvImport, {
       store,
-      mocks: { $router, $route },
       propsData: {
-        type: 'illustrated'
+        file,
+        dialogName: 'addCsv',
+        db
       }
     })
   })
 
   afterEach(() => {
     sinon.restore()
-    wrapper.destroy()
-    place.remove()
   })
 
-  it('shows parse dialog if gets csv file', async () => {
+  it('previews', async () => {
     sinon.stub(csv, 'parse').resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
       },
+      rowCount: 2,
       messages: [{
         code: 'UndetectableDelimiter',
         message: 'Comma was used as a standart delimiter',
@@ -216,12 +71,11 @@ describe('DbUploader.vue import CSV', () => {
       }]
     })
 
-    await wrapper.find('.drop-area').trigger('click')
-    await csv.parse.returnValues[0]
-    await wrapper.vm.animationPromise
+    wrapper.vm.previewCsv()
+    await wrapper.vm.open()
     await wrapper.vm.$nextTick()
-    await wrapper.vm.$nextTick()
-    expect(wrapper.find('[data-modal="parse"]').exists()).to.equal(true)
+    expect(wrapper.find('[data-modal="addCsv"]').exists()).to.equal(true)
+    expect(wrapper.find('#csv-table-name input').element.value).to.equal('my_data')
     expect(wrapper.findComponent({ name: 'delimiter-selector' }).vm.value).to.equal('|')
     expect(wrapper.find('#quote-char input').element.value).to.equal('"')
     expect(wrapper.find('#escape-char input').element.value).to.equal('"')
@@ -245,27 +99,24 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(0).resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
-      }
+        col1: [1],
+        col2: ['foo']
+      },
+      rowCount: 1
     })
 
-    await wrapper.find('.drop-area').trigger('click')
+    wrapper.vm.previewCsv()
+    wrapper.vm.open()
     await csv.parse.returnValues[0]
-    await wrapper.vm.animationPromise
-    await wrapper.vm.$nextTick()
     await wrapper.vm.$nextTick()
 
     parse.onCall(1).resolves({
       delimiter: ',',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [2, 'bar']
-        ]
+        col1: [2],
+        col2: ['bar']
       },
+      rowCount: 1,
       hasErrors: false
     })
     await wrapper.find('.delimiter-selector-container input').setValue(',')
@@ -282,11 +133,10 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(2).resolves({
       delimiter: ',',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [3, 'baz']
-        ]
+        col1: [3],
+        col2: ['baz']
       },
+      rowCount: 1,
       hasErrors: true,
       messages: [{
         code: 'MissingQuotes',
@@ -312,11 +162,10 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(3).resolves({
       delimiter: ',',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [4, 'qux']
-        ]
+        col1: [4],
+        col2: ['qux']
       },
+      rowCount: 1,
       hasErrors: false
     })
     await wrapper.find('#escape-char input').setValue("'")
@@ -332,11 +181,10 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(4).resolves({
       delimiter: ',',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [5, 'corge']
-        ]
+        col1: [5],
+        col2: ['corge']
       },
+      rowCount: 1,
       hasErrors: false
     })
     await wrapper.findComponent({ name: 'check-box' }).trigger('click')
@@ -355,24 +203,24 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(0).resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
-      }
+        col1: [1],
+        col2: ['foo']
+      },
+      rowCount: 1
     })
 
-    await wrapper.find('.drop-area').trigger('click')
-    await csv.parse.returnValues[0]
-    await wrapper.vm.animationPromise
-    await wrapper.vm.$nextTick()
+    wrapper.vm.previewCsv()
+    wrapper.vm.open()
     await wrapper.vm.$nextTick()
 
     let resolveParsing
     parse.onCall(1).returns(new Promise(resolve => {
       resolveParsing = resolve
     }))
+
+    await wrapper.find('#csv-table-name input').setValue('foo')
     await wrapper.find('#csv-import').trigger('click')
+    await wrapper.vm.$nextTick()
 
     // "Parsing CSV..." in the logs
     expect(wrapper.findComponent({ name: 'logs' }).findAll('.msg').at(1).text())
@@ -408,11 +256,10 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(0).resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
       },
+      rowCount: 1,
       hasErrors: false,
       messages: []
     })
@@ -420,22 +267,24 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(1).resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
       },
+      rowCount: 2,
       hasErrors: false,
       messages: []
     })
 
-    await wrapper.find('.drop-area').trigger('click')
-    await csv.parse.returnValues[0]
-    await wrapper.vm.animationPromise
-    await wrapper.vm.$nextTick()
+    wrapper.vm.previewCsv()
+    wrapper.vm.open()
     await wrapper.vm.$nextTick()
 
+    let resolveImport
+    wrapper.vm.db.addTableFromCsv.onCall(0).returns(new Promise(resolve => {
+      resolveImport = resolve
+    }))
+
+    await wrapper.find('#csv-table-name input').setValue('foo')
     await wrapper.find('#csv-import').trigger('click')
     await csv.parse.returnValues[1]
     await wrapper.vm.$nextTick()
@@ -454,6 +303,7 @@ describe('DbUploader.vue import CSV', () => {
     expect(wrapper.findComponent({ name: 'close-icon' }).vm.disabled).to.equal(true)
     expect(wrapper.find('#csv-finish').isVisible()).to.equal(false)
     expect(wrapper.find('#csv-import').isVisible()).to.equal(true)
+    await resolveImport()
   })
 
   it('parsing is completed with notes', async () => {
@@ -461,11 +311,10 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(0).resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
       },
+      rowCount: 1,
       hasErrors: false,
       messages: []
     })
@@ -473,12 +322,10 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(1).resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
       },
+      rowCount: 2,
       hasErrors: false,
       messages: [{
         code: 'UndetectableDelimiter',
@@ -488,12 +335,16 @@ describe('DbUploader.vue import CSV', () => {
       }]
     })
 
-    await wrapper.find('.drop-area').trigger('click')
-    await csv.parse.returnValues[0]
-    await wrapper.vm.animationPromise
-    await wrapper.vm.$nextTick()
+    let resolveImport
+    wrapper.vm.db.addTableFromCsv.onCall(0).returns(new Promise(resolve => {
+      resolveImport = resolve
+    }))
+
+    wrapper.vm.previewCsv()
+    wrapper.vm.open()
     await wrapper.vm.$nextTick()
 
+    await wrapper.find('#csv-table-name input').setValue('foo')
     await wrapper.find('#csv-import').trigger('click')
     await csv.parse.returnValues[1]
     await wrapper.vm.$nextTick()
@@ -514,6 +365,7 @@ describe('DbUploader.vue import CSV', () => {
     expect(wrapper.findComponent({ name: 'close-icon' }).vm.disabled).to.equal(true)
     expect(wrapper.find('#csv-finish').isVisible()).to.equal(false)
     expect(wrapper.find('#csv-import').isVisible()).to.equal(true)
+    await resolveImport()
   })
 
   it('parsing is completed with errors', async () => {
@@ -521,11 +373,10 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(0).resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
       },
+      rowCount: 1,
       hasErrors: false,
       messages: []
     })
@@ -533,12 +384,10 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(1).resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
       },
+      rowCount: 2,
       hasErrors: true,
       messages: [{
         code: 'Error',
@@ -548,12 +397,11 @@ describe('DbUploader.vue import CSV', () => {
       }]
     })
 
-    await wrapper.find('.drop-area').trigger('click')
-    await csv.parse.returnValues[0]
-    await wrapper.vm.animationPromise
-    await wrapper.vm.$nextTick()
+    wrapper.vm.previewCsv()
+    wrapper.vm.open()
     await wrapper.vm.$nextTick()
 
+    await wrapper.find('#csv-table-name input').setValue('foo')
     await wrapper.find('#csv-import').trigger('click')
     await csv.parse.returnValues[1]
     await wrapper.vm.$nextTick()
@@ -581,11 +429,10 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(0).resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
       },
+      rowCount: 1,
       hasErrors: false,
       messages: []
     })
@@ -593,30 +440,23 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(1).resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
       },
+      rowCount: 2,
       hasErrors: false,
       messages: []
     })
 
     let resolveImport = sinon.stub()
-    const newDb = {
-      importDb: sinon.stub().resolves(new Promise(resolve => { resolveImport = resolve })),
-      createProgressCounter: sinon.stub().returns(1),
-      deleteProgressCounter: sinon.stub()
-    }
-    sinon.stub(database, 'getNewDatabase').returns(newDb)
+    wrapper.vm.db.addTableFromCsv = sinon.stub()
+      .resolves(new Promise(resolve => { resolveImport = resolve }))
 
-    await wrapper.find('.drop-area').trigger('click')
-    await csv.parse.returnValues[0]
-    await wrapper.vm.animationPromise
-    await wrapper.vm.$nextTick()
+    wrapper.vm.previewCsv()
+    wrapper.vm.open()
     await wrapper.vm.$nextTick()
 
+    await wrapper.find('#csv-table-name input').setValue('foo')
     await wrapper.find('#csv-import').trigger('click')
     await csv.parse.returnValues[1]
     await wrapper.vm.$nextTick()
@@ -641,11 +481,11 @@ describe('DbUploader.vue import CSV', () => {
     expect(wrapper.findComponent({ name: 'close-icon' }).vm.disabled).to.equal(true)
     expect(wrapper.find('#csv-finish').isVisible()).to.equal(false)
     expect(wrapper.find('#csv-import').isVisible()).to.equal(true)
-    expect(newDb.importDb.getCall(0).args[0]).to.equal('foo') // file name
+    expect(wrapper.vm.db.addTableFromCsv.getCall(0).args[0]).to.equal('foo') // table name
 
     // After resolving - loading indicator is not shown
     await resolveImport()
-    await newDb.importDb.returnValues[0]
+    await wrapper.vm.db.addTableFromCsv.returnValues[0]
     expect(
       wrapper.findComponent({ name: 'logs' }).findComponent({ name: 'LoadingIndicator' }).exists()
     ).to.equal(false)
@@ -656,11 +496,10 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(0).resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
       },
+      rowCount: 1,
       hasErrors: false,
       messages: []
     })
@@ -668,30 +507,19 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(1).resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
       },
+      rowCount: 2,
       hasErrors: false,
       messages: []
     })
 
-    const schema = {}
-    const newDb = {
-      importDb: sinon.stub().resolves(schema),
-      createProgressCounter: sinon.stub().returns(1),
-      deleteProgressCounter: sinon.stub()
-    }
-    sinon.stub(database, 'getNewDatabase').returns(newDb)
-
-    await wrapper.find('.drop-area').trigger('click')
-    await csv.parse.returnValues[0]
-    await wrapper.vm.animationPromise
-    await wrapper.vm.$nextTick()
+    wrapper.vm.previewCsv()
+    wrapper.vm.open()
     await wrapper.vm.$nextTick()
 
+    await wrapper.find('#csv-table-name input').setValue('foo')
     await wrapper.find('#csv-import').trigger('click')
     await csv.parse.returnValues[1]
     await wrapper.vm.$nextTick()
@@ -717,11 +545,10 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(0).resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
       },
+      rowCount: 1,
       hasErrors: false,
       messages: []
     })
@@ -729,29 +556,21 @@ describe('DbUploader.vue import CSV', () => {
     parse.onCall(1).resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
       },
+      rowCount: 2,
       hasErrors: false,
       messages: []
     })
 
-    const newDb = {
-      importDb: sinon.stub().rejects(new Error('fail')),
-      createProgressCounter: sinon.stub().returns(1),
-      deleteProgressCounter: sinon.stub()
-    }
-    sinon.stub(database, 'getNewDatabase').returns(newDb)
+    wrapper.vm.db.addTableFromCsv = sinon.stub().rejects(new Error('fail'))
 
-    await wrapper.find('.drop-area').trigger('click')
-    await csv.parse.returnValues[0]
-    await wrapper.vm.animationPromise
-    await wrapper.vm.$nextTick()
+    wrapper.vm.previewCsv()
+    wrapper.vm.open()
     await wrapper.vm.$nextTick()
 
+    await wrapper.find('#csv-table-name input').setValue('foo')
     await wrapper.find('#csv-import').trigger('click')
     await csv.parse.returnValues[1]
     await wrapper.vm.$nextTick()
@@ -773,134 +592,87 @@ describe('DbUploader.vue import CSV', () => {
     expect(wrapper.find('#csv-finish').isVisible()).to.equal(false)
   })
 
-  it('import final', async () => {
+  it('import finish', async () => {
     sinon.stub(csv, 'parse').resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
       },
+      rowCount: 1,
       hasErrors: false,
       messages: []
     })
 
-    const schema = {}
-    const newDb = {
-      importDb: sinon.stub().resolves(schema),
-      createProgressCounter: sinon.stub().returns(1),
-      deleteProgressCounter: sinon.stub()
-    }
-    sinon.stub(database, 'getNewDatabase').returns(newDb)
-
-    await wrapper.find('.drop-area').trigger('click')
-    await csv.parse.returnValues[0]
-    await wrapper.vm.animationPromise
-    await wrapper.vm.$nextTick()
+    wrapper.vm.previewCsv()
+    wrapper.vm.open()
     await wrapper.vm.$nextTick()
 
     await wrapper.find('#csv-import').trigger('click')
-    await csv.parse.returnValues[1]
     await wrapper.vm.$nextTick()
 
     await wrapper.find('#csv-finish').trigger('click')
 
-    expect(mutations.setDb.calledOnceWith(state, newDb)).to.equal(true)
-    expect(mutations.saveSchema.calledOnceWith(state, schema)).to.equal(true)
     expect(actions.addTab.calledOnce).to.equal(true)
     await actions.addTab.returnValues[0]
     expect(mutations.setCurrentTabId.calledOnceWith(state, newTabId)).to.equal(true)
-    expect($router.push.calledOnceWith('/editor')).to.equal(true)
-    expect(wrapper.find('[data-modal="parse"]').exists()).to.equal(false)
+    expect(wrapper.find('[data-modal="addCsv"]').exists()).to.equal(false)
+    expect(wrapper.emitted('finish')).to.have.lengthOf(1)
   })
 
   it('import cancel', async () => {
     sinon.stub(csv, 'parse').resolves({
       delimiter: '|',
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
+        col1: [1],
+        col2: ['foo']
       },
+      rowCount: 1,
       hasErrors: false,
       messages: []
     })
 
-    const schema = {}
-    const newDb = {
-      importDb: sinon.stub().resolves(schema),
-      createProgressCounter: sinon.stub().returns(1),
-      deleteProgressCounter: sinon.stub(),
-      shutDown: sinon.stub()
-    }
-    sinon.stub(database, 'getNewDatabase').returns(newDb)
-
-    await wrapper.find('.drop-area').trigger('click')
-    await csv.parse.returnValues[0]
-    await wrapper.vm.animationPromise
-    await wrapper.vm.$nextTick()
+    await wrapper.vm.previewCsv()
+    await wrapper.vm.open()
     await wrapper.vm.$nextTick()
 
     await wrapper.find('#csv-import').trigger('click')
-    await csv.parse.returnValues[1]
     await wrapper.vm.$nextTick()
 
     await wrapper.find('#csv-cancel').trigger('click')
 
-    expect(mutations.setDb.called).to.equal(false)
-    expect(mutations.saveSchema.called).to.equal(false)
-    expect(actions.addTab.called).to.equal(false)
-    expect(mutations.setCurrentTabId.called).to.equal(false)
-    expect($router.push.called).to.equal(false)
-    expect(newDb.shutDown.calledOnce).to.equal(true)
-    expect(wrapper.find('[data-modal="parse"]').exists()).to.equal(false)
+    expect(wrapper.find('[data-modal="addCsv"]').exists()).to.equal(false)
+    expect(wrapper.vm.db.execute.calledOnceWith('DROP TABLE "my_data"')).to.equal(true)
+    expect(wrapper.vm.db.refreshSchema.calledOnce).to.equal(true)
+    expect(wrapper.emitted('cancel')).to.have.lengthOf(1)
   })
 
-  it("doesn't open new tab when load db after importing CSV", async () => {
-    fu.getFileFromUser.onCall(0).resolves({ type: 'text/csv', name: 'foo.csv' })
-    fu.getFileFromUser.onCall(1).resolves({ type: 'application/x-sqlite3', name: 'bar.sqlite3' })
-    sinon.stub(csv, 'parse').resolves({
-      delimiter: '|',
-      data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo']
-        ]
-      },
-      hasErrors: false,
-      messages: []
-    })
-
-    const schema = {}
-    const newDb = {
-      importDb: sinon.stub().resolves(schema),
-      createProgressCounter: sinon.stub().returns(1),
-      deleteProgressCounter: sinon.stub(),
-      loadDb: sinon.stub().resolves()
-    }
-    sinon.stub(database, 'getNewDatabase').returns(newDb)
-
-    await wrapper.find('.drop-area').trigger('click')
-    await csv.parse.returnValues[0]
-    await wrapper.vm.animationPromise
+  it('checks table name', async () => {
+    sinon.stub(csv, 'parse').resolves()
+    await wrapper.vm.previewCsv()
+    await wrapper.vm.open()
     await wrapper.vm.$nextTick()
+
+    await wrapper.find('#csv-table-name input').setValue('foo')
+    await clock.tick(400)
     await wrapper.vm.$nextTick()
+    expect(wrapper.find('#csv-table-name .text-field-error').text()).to.equal('')
+
+    wrapper.vm.db.validateTableName = sinon.stub().rejects(new Error('this is a bad table name'))
+    await wrapper.find('#csv-table-name input').setValue('bar')
+    await clock.tick(400)
+    await wrapper.vm.$nextTick()
+    expect(wrapper.find('#csv-table-name .text-field-error').text())
+      .to.equal('this is a bad table name. Try another table name.')
+
+    await wrapper.find('#csv-table-name input').setValue('')
+    await clock.tick(400)
+    await wrapper.vm.$nextTick()
+    expect(wrapper.find('#csv-table-name .text-field-error').text()).to.equal('')
 
     await wrapper.find('#csv-import').trigger('click')
-    await csv.parse.returnValues[1]
-    await wrapper.vm.$nextTick()
-
-    await wrapper.find('#csv-finish').trigger('click')
-
-    expect(actions.addTab.calledOnce).to.equal(true)
-    await actions.addTab.returnValues[0]
-    expect(mutations.setCurrentTabId.calledOnceWith(state, newTabId)).to.equal(true)
-
-    await wrapper.find('.drop-area').trigger('click')
-    await newDb.loadDb.returnValues[0]
-    expect(actions.addTab.calledOnce).to.equal(true)
-    expect(mutations.setCurrentTabId.calledOnce).to.equal(true)
+    expect(wrapper.find('#csv-table-name .text-field-error').text())
+      .to.equal("Table name can't be empty")
+    expect(wrapper.vm.db.addTableFromCsv.called).to.equal(false)
   })
 })

tests/components/CsvImport/DelimiterSelector.spec.js

@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import { mount, shallowMount } from '@vue/test-utils'
-import DelimiterSelector from '@/components/DbUploader/DelimiterSelector'
+import DelimiterSelector from '@/components/CsvImport/DelimiterSelector'
 
 describe('DelimiterSelector', async () => {
   it('shows the name of value', async () => {

tests/components/CsvImport/csv.spec.js

@@ -1,6 +1,6 @@
 import { expect } from 'chai'
 import sinon from 'sinon'
-import csv from '@/components/DbUploader/csv'
+import csv from '@/components/CsvImport/csv'
 import Papa from 'papaparse'
 
 describe('csv.js', () => {
@@ -11,36 +11,32 @@ describe('csv.js', () => {
   it('getResult with fields', () => {
     const source = {
       data: [
-        { id: 1, name: 'foo' },
-        { id: 2, name: 'bar' }
+        { id: 1, 'name ': 'foo', date: new Date('2021-06-30T14:10:24.717Z') },
+        { id: 2, 'name ': 'bar', date: new Date('2021-07-30T14:10:15.717Z') }
       ],
       meta: {
-        fields: ['id', 'name ']
+        fields: ['id', 'name ', 'date']
       }
     }
     expect(csv.getResult(source)).to.eql({
-      columns: ['id', 'name'],
-      values: [
-        [1, 'foo'],
-        [2, 'bar']
-      ]
+      id: [1, 2],
+      name: ['foo', 'bar'],
+      date: ['2021-06-30T14:10:24.717Z', '2021-07-30T14:10:15.717Z']
     })
   })
 
   it('getResult without fields', () => {
     const source = {
       data: [
-        [1, 'foo'],
-        [2, 'bar']
+        [1, 'foo', new Date('2021-06-30T14:10:24.717Z')],
+        [2, 'bar', new Date('2021-07-30T14:10:15.717Z')]
       ],
       meta: {}
     }
     expect(csv.getResult(source)).to.eql({
-      columns: ['col1', 'col2'],
-      values: [
-        [1, 'foo'],
-        [2, 'bar']
-      ]
+      col1: [1, 2],
+      col2: ['foo', 'bar'],
+      col3: ['2021-06-30T14:10:24.717Z', '2021-07-30T14:10:15.717Z']
     })
   })
 
@@ -77,13 +73,11 @@ describe('csv.js', () => {
     const result = await csv.parse(file)
     expect(result).to.eql({
       data: {
-        columns: ['col1', 'col2'],
-        values: [
-          [1, 'foo'],
-          [2, 'bar']
-        ]
+        col1: [1, 2],
+        col2: ['foo', 'bar']
       },
       delimiter: ',',
+      rowCount: 2,
       hasErrors: true,
       messages: [
         {

tests/components/DbUploader.spec.js

@@ -0,0 +1,199 @@
+import { expect } from 'chai'
+import sinon from 'sinon'
+import Vuex from 'vuex'
+import { shallowMount, mount } from '@vue/test-utils'
+import DbUploader from '@/components/DbUploader'
+import fu from '@/lib/utils/fileIo'
+import database from '@/lib/database'
+
+describe('DbUploader.vue', () => {
+  let state = {}
+  let mutations = {}
+  let store = {}
+  let place
+
+  beforeEach(() => {
+    // mock store state and mutations
+    state = {}
+    mutations = {
+      setDb: sinon.stub()
+    }
+    store = new Vuex.Store({ state, mutations })
+
+    place = document.createElement('div')
+    document.body.appendChild(place)
+  })
+
+  afterEach(() => {
+    sinon.restore()
+    place.remove()
+  })
+
+  it('loads db on click and redirects to /workspace', async () => {
+    // mock getting a file from user
+    const file = { name: 'test.db' }
+    sinon.stub(fu, 'getFileFromUser').resolves(file)
+
+    // mock db loading
+    const db = {
+      loadDb: sinon.stub().resolves()
+    }
+    sinon.stub(database, 'getNewDatabase').returns(db)
+
+    // mock router
+    const $router = { push: sinon.stub() }
+    const $route = { path: '/' }
+
+    // mount the component
+    const wrapper = shallowMount(DbUploader, {
+      attachTo: place,
+      store,
+      mocks: { $router, $route },
+      propsData: {
+        type: 'illustrated'
+      }
+    })
+
+    await wrapper.find('.drop-area').trigger('click')
+    expect(db.loadDb.calledOnceWith(file)).to.equal(true)
+    await db.loadDb.returnValues[0]
+    await wrapper.vm.animationPromise
+    await wrapper.vm.$nextTick()
+    expect($router.push.calledOnceWith('/workspace')).to.equal(true)
+    wrapper.destroy()
+  })
+
+  it('loads db on drop and redirects to /workspace', async () => {
+    // mock db loading
+    const db = {
+      loadDb: sinon.stub().resolves()
+    }
+    sinon.stub(database, 'getNewDatabase').returns(db)
+
+    // mock router
+    const $router = { push: sinon.stub() }
+    const $route = { path: '/' }
+
+    // mount the component
+    const wrapper = shallowMount(DbUploader, {
+      attachTo: place,
+      store,
+      mocks: { $router, $route },
+      propsData: {
+        type: 'illustrated'
+      }
+    })
+
+    // mock a file dropped by a user
+    const file = { name: 'test.db' }
+    const dropData = { dataTransfer: new DataTransfer() }
+    Object.defineProperty(dropData.dataTransfer, 'files', {
+      value: [file],
+      writable: false
+    })
+
+    await wrapper.find('.drop-area').trigger('drop', dropData)
+    expect(db.loadDb.calledOnceWith(file)).to.equal(true)
+    await db.loadDb.returnValues[0]
+    await wrapper.vm.animationPromise
+    await wrapper.vm.$nextTick()
+    expect($router.push.calledOnceWith('/workspace')).to.equal(true)
+    wrapper.destroy()
+  })
+
+  it("doesn't redirect if already on /workspace", async () => {
+    // mock getting a file from user
+    const file = { name: 'test.db' }
+    sinon.stub(fu, 'getFileFromUser').resolves(file)
+
+    // mock db loading
+    const db = {
+      loadDb: sinon.stub().resolves()
+    }
+    sinon.stub(database, 'getNewDatabase').returns(db)
+
+    // mock router
+    const $router = { push: sinon.stub() }
+    const $route = { path: '/workspace' }
+
+    // mount the component
+    const wrapper = shallowMount(DbUploader, {
+      attachTo: place,
+      store,
+      mocks: { $router, $route },
+      propsData: {
+        type: 'illustrated'
+      }
+    })
+
+    await wrapper.find('.drop-area').trigger('click')
+    await db.loadDb.returnValues[0]
+    await wrapper.vm.animationPromise
+    await wrapper.vm.$nextTick()
+    expect($router.push.called).to.equal(false)
+    wrapper.destroy()
+  })
+
+  it('shows parse dialog if gets csv file', async () => {
+    // mock getting a file from user
+    const file = { name: 'test.csv' }
+    sinon.stub(fu, 'getFileFromUser').resolves(file)
+
+    // mock router
+    const $router = { push: sinon.stub() }
+    const $route = { path: '/workspace' }
+
+    // mount the component
+    const wrapper = mount(DbUploader, {
+      attachTo: place,
+      store,
+      mocks: { $router, $route },
+      propsData: {
+        type: 'illustrated'
+      }
+    })
+
+    const CsvImport = wrapper.vm.$refs.addCsv
+    sinon.stub(CsvImport, 'reset')
+    sinon.stub(CsvImport, 'previewCsv').resolves()
+    sinon.stub(CsvImport, 'open')
+
+    await wrapper.find('.drop-area').trigger('click')
+    await wrapper.vm.$nextTick()
+    expect(CsvImport.reset.calledOnce).to.equal(true)
+    await wrapper.vm.animationPromise
+    expect(CsvImport.previewCsv.calledOnce).to.equal(true)
+    await wrapper.vm.$nextTick()
+    expect(CsvImport.open.calledOnce).to.equal(true)
+    wrapper.destroy()
+  })
+
+  it('deletes temporary db if CSV import is canceled', async () => {
+    // mock getting a file from user
+    const file = { name: 'test.csv' }
+    sinon.stub(fu, 'getFileFromUser').resolves(file)
+
+    // mock router
+    const $router = { push: sinon.stub() }
+    const $route = { path: '/workspace' }
+
+    // mount the component
+    const wrapper = mount(DbUploader, {
+      store,
+      mocks: { $router, $route },
+      propsData: {
+        type: 'illustrated'
+      }
+    })
+
+    const CsvImport = wrapper.vm.$refs.addCsv
+    sinon.stub(CsvImport, 'reset')
+    sinon.stub(CsvImport, 'previewCsv').resolves()
+    sinon.stub(CsvImport, 'open')
+
+    await wrapper.find('.drop-area').trigger('click')
+    await wrapper.vm.$nextTick()
+    await CsvImport.$emit('cancel')
+    expect(wrapper.vm.newDb).to.equal(null)
+  })
+})

tests/components/Logs.spec.js

@@ -8,6 +8,7 @@ describe('Logs.vue', () => {
     place = document.createElement('div')
     document.body.appendChild(place)
   })
+
   afterEach(() => {
     place.remove()
   })

tests/lib/database/_sql.spec.js

@@ -34,10 +34,11 @@ describe('_sql.js', () => {
     sql.open(data)
     const result = sql.exec('SELECT * from test')
     expect(result).to.have.lengthOf(1)
-    expect(result[0].columns).to.eql(['id', 'name', 'faculty'])
-    expect(result[0].values).to.have.lengthOf(2)
-    expect(result[0].values[0]).to.eql([1, 'Harry Potter', 'Griffindor'])
-    expect(result[0].values[1]).to.eql([2, 'Draco Malfoy', 'Slytherin'])
+    expect(result[0]).to.eql({
+      id: [1, 2],
+      name: ['Harry Potter', 'Draco Malfoy'],
+      faculty: ['Griffindor', 'Slytherin']
+    })
   })
 
   it('throws an error if query is empty', async () => {
@@ -63,26 +64,21 @@ describe('_sql.js', () => {
 
   it('imports', async () => {
     const data = {
-      columns: ['id', 'name'],
-      values: [
-        [1, 'Harry Potter'],
-        [2, 'Draco Malfoy'],
-        [3, 'Hermione Granger'],
-        [4, 'Ron Weasley']
+      id: [1, 2, 3, 4],
+      name: [
+        'Harry Potter',
+        'Draco Malfoy',
+        'Hermione Granger',
+        'Ron Weasley'
       ]
     }
     const progressCallback = sinon.stub()
     const progressCounterId = 1
     const sql = await Sql.build()
-    sql.import(data.columns, data.values, progressCounterId, progressCallback, 2)
-    const result = sql.exec('SELECT * from csv_import')
+    sql.import('foo', data, progressCounterId, progressCallback, 2)
+    const result = sql.exec('SELECT * from foo')
     expect(result).to.have.lengthOf(1)
-    expect(result[0].columns).to.eql(['id', 'name'])
-    expect(result[0].values).to.have.lengthOf(4)
-    expect(result[0].values[0]).to.eql([1, 'Harry Potter'])
-    expect(result[0].values[1]).to.eql([2, 'Draco Malfoy'])
-    expect(result[0].values[2]).to.eql([3, 'Hermione Granger'])
-    expect(result[0].values[3]).to.eql([4, 'Ron Weasley'])
+    expect(result[0]).to.eql(data)
 
     expect(progressCallback.calledThrice).to.equal(true)
     expect(progressCallback.getCall(0).args[0]).to.eql({ progress: 0, id: 1 })
@@ -108,10 +104,11 @@ describe('_sql.js', () => {
     anotherSql.open(data)
     const result = anotherSql.exec('SELECT * from test')
     expect(result).to.have.lengthOf(1)
-    expect(result[0].columns).to.eql(['id', 'name', 'faculty'])
-    expect(result[0].values).to.have.lengthOf(2)
-    expect(result[0].values[0]).to.eql([1, 'Harry Potter', 'Griffindor'])
-    expect(result[0].values[1]).to.eql([2, 'Draco Malfoy', 'Slytherin'])
+    expect(result[0]).to.eql({
+      id: [1, 2],
+      name: ['Harry Potter', 'Draco Malfoy'],
+      faculty: ['Griffindor', 'Slytherin']
+    })
   })
 
   it('closes', async () => {
@@ -135,7 +132,7 @@ describe('_sql.js', () => {
     expect(sql.db.db).to.equal(null)
   })
 
-  it('overwrites', async () => {
+  it('adds', async () => {
     const sql = await Sql.build()
     sql.exec(`
       CREATE TABLE test (
@@ -149,23 +146,28 @@ describe('_sql.js', () => {
     `)
 
     let result = sql.exec('SELECT * from test')
-    expect(result[0].values).to.have.lengthOf(2)
+    expect(result[0]).to.eql({
+      id: [1, 2],
+      name: ['foo', 'bar']
+    })
 
     const data = {
-      columns: ['id', 'name'],
-      values: [
-        [1, 'Harry Potter'],
-        [2, 'Draco Malfoy'],
-        [3, 'Hermione Granger'],
-        [4, 'Ron Weasley']
+      id: [1, 2, 3, 4],
+      name: [
+        'Harry Potter',
+        'Draco Malfoy',
+        'Hermione Granger',
+        'Ron Weasley'
       ]
     }
-    // rewrite the database by import
-    sql.import(data.columns, data.values, 1, sinon.stub(), 2)
-    result = sql.exec('SELECT * from csv_import')
-    expect(result[0].values).to.have.lengthOf(4)
-
-    // test table oesn't exists anymore: the db was overwritten
-    expect(() => { sql.exec('SELECT * from test') }).to.throw('no such table: test')
+    // import adds table
+    sql.import('foo', data, 1, sinon.stub(), 2)
+    result = sql.exec('SELECT * from foo')
+    expect(result[0]).to.eql(data)
+    result = sql.exec('SELECT * from test')
+    expect(result[0]).to.eql({
+      id: [1, 2],
+      name: ['foo', 'bar']
+    })
   })
 })

tests/lib/database/_statements.spec.js

@@ -1,34 +1,66 @@
 import { expect } from 'chai'
-import dbUtils from '@/lib/database/_statements'
+import stmts from '@/lib/database/_statements'
 
 describe('_statements.js', () => {
   it('generateChunks', () => {
-    const arr = ['1', '2', '3', '4', '5']
+    const source = {
+      id: ['1', '2', '3', '4', '5']
+    }
     const size = 2
-    const chunks = dbUtils.generateChunks(arr, size)
+    const chunks = stmts.generateChunks(source, size)
     const output = []
     for (const chunk of chunks) {
       output.push(chunk)
     }
-    expect(output[0]).to.eql(['1', '2'])
-    expect(output[1]).to.eql(['3', '4'])
-    expect(output[2]).to.eql(['5'])
+    expect(output[0]).to.eql([['1'], ['2']])
+    expect(output[1]).to.eql([['3'], ['4']])
+    expect(output[2]).to.eql([['5']])
   })
 
   it('getInsertStmt', () => {
     const columns = ['id', 'name']
-    expect(dbUtils.getInsertStmt(columns))
-      .to.equal('INSERT INTO csv_import ("id", "name") VALUES (?, ?);')
+    expect(stmts.getInsertStmt('foo', columns))
+      .to.equal('INSERT INTO "foo" ("id", "name") VALUES (?, ?);')
   })
 
   it('getCreateStatement', () => {
-    const columns = ['id', 'name', 'isAdmin', 'startDate']
-    const values = [
-      [1, 'foo', true, new Date()],
-      [2, 'bar', false, new Date()]
-    ]
-    expect(dbUtils.getCreateStatement(columns, values)).to.equal(
-      'CREATE table csv_import("id" REAL, "name" TEXT, "isAdmin" INTEGER, "startDate" TEXT);'
+    const data = {
+      id: [1, 2],
+      name: ['foo', 'bar'],
+      isAdmin: [true, false],
+      startDate: [new Date(), new Date()]
+    }
+
+    expect(stmts.getCreateStatement('foo', data)).to.equal(
+      'CREATE table "foo"("id" REAL, "name" TEXT, "isAdmin" INTEGER, "startDate" TEXT);'
     )
   })
+
+  it('getColumns', () => {
+    const sql = `CREATE TABLE test (
+      col1,
+      col2 integer,
+      col3 decimal(5,2),
+      col4 varchar(30)
+    )`
+    expect(stmts.getColumns(sql)).to.eql([
+      { name: 'col1', type: 'N/A' },
+      { name: 'col2', type: 'integer' },
+      { name: 'col3', type: 'decimal(5, 2)' },
+      { name: 'col4', type: 'varchar(30)' }
+    ])
+  })
+
+  it('getColumns with virtual table', async () => {
+    const sql = `
+      CREATE VIRTUAL TABLE test_virtual USING fts4(
+        col1, col2,
+        notindexed=col1, notindexed=col2,
+        tokenize=unicode61 "tokenchars=.+#")
+    `
+    expect(stmts.getColumns(sql)).to.eql([
+      { name: 'col1', type: 'N/A' },
+      { name: 'col2', type: 'N/A' }
+    ])
+  })
 })

tests/lib/database/database.spec.js

@@ -25,60 +25,38 @@ describe('database.js', () => {
   it('creates schema', async () => {
     const SQL = await getSQL
     const tempDb = new SQL.Database()
-    tempDb.run(`CREATE TABLE test (
-      col1,
-      col2 integer,
-      col3 decimal(5,2),
-      col4 varchar(30)
-    )`)
+    tempDb.run('CREATE TABLE test (col1, col2 integer)')
 
     const data = tempDb.export()
     const buffer = new Blob([data])
     buffer.name = 'foo.sqlite'
 
-    const { schema, dbName } = await db.loadDb(buffer)
-    expect(dbName).to.equal('foo')
+    sinon.spy(db, 'refreshSchema')
+
+    await db.loadDb(buffer)
+    await db.refreshSchema.returnValues[0]
+    const schema = db.schema
+    expect(db.dbName).to.equal('foo')
     expect(schema).to.have.lengthOf(1)
     expect(schema[0].name).to.equal('test')
+
     expect(schema[0].columns[0].name).to.equal('col1')
     expect(schema[0].columns[0].type).to.equal('N/A')
+
     expect(schema[0].columns[1].name).to.equal('col2')
     expect(schema[0].columns[1].type).to.equal('integer')
-    expect(schema[0].columns[2].name).to.equal('col3')
-    expect(schema[0].columns[2].type).to.equal('decimal(5, 2)')
-    expect(schema[0].columns[3].name).to.equal('col4')
-    expect(schema[0].columns[3].type).to.equal('varchar(30)')
   })
 
-  it('creates schema with virtual table', async () => {
-    const SQL = await getSQL
-    const tempDb = new SQL.Database()
-    tempDb.run(`
-      CREATE VIRTUAL TABLE test_virtual USING fts4(
-        col1, col2,
-        notindexed=col1, notindexed=col2,
-        tokenize=unicode61 "tokenchars=.+#")
-    `)
+  it('creates empty db with name database', async () => {
+    sinon.spy(db, 'refreshSchema')
 
-    const data = tempDb.export()
-    const buffer = new Blob([data])
-    buffer.name = 'foo.sqlite'
-
-    const { schema } = await db.loadDb(buffer)
-    expect(schema[0].name).to.equal('test_virtual')
-    expect(schema[0].columns[0].name).to.equal('col1')
-    expect(schema[0].columns[0].type).to.equal('N/A')
-    expect(schema[0].columns[1].name).to.equal('col2')
-    expect(schema[0].columns[1].type).to.equal('N/A')
+    await db.loadDb()
+    await db.refreshSchema.returnValues[0]
+    expect(db.dbName).to.equal('database')
   })
 
   it('loadDb throws errors', async () => {
-    const SQL = await getSQL
-    const tempDb = new SQL.Database()
-    tempDb.run('CREATE TABLE test (col1, col2)')
-
-    const data = tempDb.export()
-    const buffer = new Blob([data])
+    const buffer = new Blob([])
     buffer.name = 'foo.sqlite'
 
     sinon.stub(db.pw, 'postMessage').resolves({ error: new Error('foo') })
@@ -107,11 +85,11 @@ describe('database.js', () => {
 
     await db.loadDb(buffer)
     const result = await db.execute('SELECT * from test limit 1; SELECT * from test;')
-    expect(result.columns).to.have.lengthOf(3)
-    expect(result.columns).to.eql(['id', 'name', 'faculty'])
-    expect(result.values).to.have.lengthOf(2)
-    expect(result.values[0]).to.eql([1, 'Harry Potter', 'Griffindor'])
-    expect(result.values[1]).to.eql([2, 'Draco Malfoy', 'Slytherin'])
+    expect(result).to.eql({
+      id: [1, 2],
+      name: ['Harry Potter', 'Draco Malfoy'],
+      faculty: ['Griffindor', 'Slytherin']
+    })
   })
 
   it('returns an error', async () => {
@@ -136,46 +114,43 @@ describe('database.js', () => {
     await expect(db.execute('SELECT * from foo')).to.be.rejectedWith(/^no such table: foo$/)
   })
 
-  it('creates db', async () => {
+  it('adds table from csv', async () => {
     const data = {
-      columns: ['id', 'name', 'faculty'],
-      values: [
-        [1, 'Harry Potter', 'Griffindor'],
-        [2, 'Draco Malfoy', 'Slytherin']
-      ]
+      id: [1, 2],
+      name: ['Harry Potter', 'Draco Malfoy'],
+      faculty: ['Griffindor', 'Slytherin']
     }
     const progressHandler = sinon.spy()
     const progressCounterId = db.createProgressCounter(progressHandler)
-    const { dbName, schema } = await db.importDb('foo', data, progressCounterId)
-    expect(dbName).to.equal('foo')
-    expect(schema).to.have.lengthOf(1)
-    expect(schema[0].name).to.equal('csv_import')
-    expect(schema[0].columns).to.have.lengthOf(3)
-    expect(schema[0].columns[0]).to.eql({ name: 'id', type: 'real' })
-    expect(schema[0].columns[1]).to.eql({ name: 'name', type: 'text' })
-    expect(schema[0].columns[2]).to.eql({ name: 'faculty', type: 'text' })
+    sinon.spy(db, 'refreshSchema')
 
-    const result = await db.execute('SELECT * from csv_import')
-    expect(result.columns).to.eql(data.columns)
-    expect(result.values).to.eql(data.values)
+    await db.addTableFromCsv('foo', data, progressCounterId)
+    await db.refreshSchema.returnValues[0]
+    expect(db.dbName).to.equal('database')
+    expect(db.schema).to.have.lengthOf(1)
+    expect(db.schema[0].name).to.equal('foo')
+    expect(db.schema[0].columns).to.have.lengthOf(3)
+    expect(db.schema[0].columns[0]).to.eql({ name: 'id', type: 'real' })
+    expect(db.schema[0].columns[1]).to.eql({ name: 'name', type: 'text' })
+    expect(db.schema[0].columns[2]).to.eql({ name: 'faculty', type: 'text' })
+
+    const result = await db.execute('SELECT * from foo')
+    expect(result).to.eql(data)
 
     expect(progressHandler.calledTwice).to.equal(true)
     expect(progressHandler.firstCall.calledWith(0)).to.equal(true)
     expect(progressHandler.secondCall.calledWith(100)).to.equal(true)
   })
 
-  it('importDb throws errors', async () => {
+  it('addTableFromCsv throws errors', async () => {
     const data = {
-      columns: ['id', 'name'],
-      values: [
-        [1, 'Harry Potter', 'Griffindor'],
-        [2, 'Draco Malfoy', 'Slytherin']
-      ]
+      id: [1, 2],
+      name: ['Harry Potter', 'Draco Malfoy'],
+      faculty: null
     }
     const progressHandler = sinon.stub()
     const progressCounterId = db.createProgressCounter(progressHandler)
-    await expect(db.importDb('foo', data, progressCounterId))
-      .to.be.rejectedWith('column index out of range')
+    await expect(db.addTableFromCsv('foo', data, progressCounterId)).to.be.rejected
   })
 
   it('progressCounters', () => {
@@ -238,8 +213,28 @@ describe('database.js', () => {
 
     // check that new db works and has the same table and data
     result = await anotherDb.execute('SELECT * from foo')
-    expect(result.columns).to.eql(['id', 'name'])
-    expect(result.values).to.have.lengthOf(1)
-    expect(result.values[0]).to.eql([1, 'Harry Potter'])
+    expect(result).to.eql({
+      id: [1],
+      name: ['Harry Potter']
+    })
+  })
+
+  it('sanitizeTableName', () => {
+    let name = 'foo[]bar'
+    expect(db.sanitizeTableName(name)).to.equal('foo_bar')
+
+    name = '1 foo(01.05.2020)'
+    expect(db.sanitizeTableName(name)).to.equal('_1_foo_01_05_2020_')
+  })
+
+  it('validateTableName', async () => {
+    await db.execute('CREATE TABLE foo(id)')
+    await expect(db.validateTableName('foo')).to.be.rejectedWith('table "foo" already exists')
+    await expect(db.validateTableName('1foo'))
+      .to.be.rejectedWith("Table name can't start with a digit")
+    await expect(db.validateTableName('foo(05.08.2020)'))
+      .to.be.rejectedWith('Table name can contain only letters, digits and underscores')
+    await expect(db.validateTableName('sqlite_foo'))
+      .to.be.rejectedWith("Table name can't start with sqlite_")
   })
 })

tests/lib/database/sqliteExtensions.spec.js

@@ -0,0 +1,299 @@
+import chai from 'chai'
+import database from '@/lib/database'
+
+const expect = chai.expect
+
+describe('SQLite extensions', function () {
+  let db
+
+  beforeEach(() => {
+    db = database.getNewDatabase()
+  })
+
+  afterEach(() => {
+    db.shutDown()
+  })
+
+  it('supports contrib trigonometric functions', async function () {
+    const actual = await db.execute(`
+      SELECT
+        abs(3.1415926 - pi())       < 0.000001,
+        abs(1 - cos(2 * pi()))      < 0.000001,
+        abs(0 - sin(pi()))          < 0.000001,
+        abs(0 - tan(0))             < 0.000001,
+        abs(0 - cot(pi() / 2))      < 0.000001,
+        abs(1 - acos(cos(1)))       < 0.000001,
+        abs(1 - asin(sin(1)))       < 0.000001,
+        abs(1 - atan(tan(1)))       < 0.000001,
+        abs(1 - cosh(0))            < 0.000001,
+        abs(0 - sinh(0))            < 0.000001,
+        abs(tanh(1) + tanh(-1))     < 0.000001,
+        abs(coth(1) + coth(-1))     < 0.000001,
+        abs(1 - acosh(cosh(1)))     < 0.000001,
+        abs(1 - asinh(sinh(1)))     < 0.000001,
+        abs(1 - atanh(tanh(1)))     < 0.000001,
+        abs(180 - degrees(pi()))    < 0.000001,
+        abs(pi() - radians(180))    < 0.000001,
+        abs(pi() / 2 - atan2(1, 0)) < 0.000001
+    `)
+
+    expect(actual).to.eql({
+      'abs(3.1415926 - pi())       < 0.000001': [1],
+      'abs(1 - cos(2 * pi()))      < 0.000001': [1],
+      'abs(0 - sin(pi()))          < 0.000001': [1],
+      'abs(0 - tan(0))             < 0.000001': [1],
+      'abs(0 - cot(pi() / 2))      < 0.000001': [1],
+      'abs(1 - acos(cos(1)))       < 0.000001': [1],
+      'abs(1 - asin(sin(1)))       < 0.000001': [1],
+      'abs(1 - atan(tan(1)))       < 0.000001': [1],
+      'abs(1 - cosh(0))            < 0.000001': [1],
+      'abs(0 - sinh(0))            < 0.000001': [1],
+      'abs(tanh(1) + tanh(-1))     < 0.000001': [1],
+      'abs(coth(1) + coth(-1))     < 0.000001': [1],
+      'abs(1 - acosh(cosh(1)))     < 0.000001': [1],
+      'abs(1 - asinh(sinh(1)))     < 0.000001': [1],
+      'abs(1 - atanh(tanh(1)))     < 0.000001': [1],
+      'abs(180 - degrees(pi()))    < 0.000001': [1],
+      'abs(pi() - radians(180))    < 0.000001': [1],
+      'abs(pi() / 2 - atan2(1, 0)) < 0.000001': [1]
+    })
+  })
+
+  it('supports contrib math functions', async function () {
+    const actual = await db.execute(`
+      SELECT
+        exp(0),
+        log(exp(1)),
+        log10(10000),
+        power(2, 3),
+        sign(-10) + sign(20),
+        sqrt(square(16)),
+        ceil(-1.95) + ceil(1.95),
+        floor(-1.95) + floor(1.95)
+    `)
+    expect(actual).to.eql({
+      'exp(0)': [1],
+      'log(exp(1))': [1],
+      'log10(10000)': [4],
+      'power(2, 3)': [8],
+      'sign(-10) + sign(20)': [0],
+      'sqrt(square(16))': [16],
+      'ceil(-1.95) + ceil(1.95)': [1],
+      'floor(-1.95) + floor(1.95)': [-1]
+
+    })
+  })
+
+  it('supports contrib string functions', async function () {
+    const actual = await db.execute(`
+      SELECT
+        replicate('ab', 4),
+        charindex('ab', 'foobarabbarfoo'),
+        charindex('ab', 'foobarabbarfoo', 8),
+        leftstr('foobar', 2),
+        rightstr('foobar', 2),
+        reverse('foobar'),
+        proper('fooBar'),
+        padl('foo', 5),
+        padr('foo', 5),
+        padc('foo', 5),
+        strfilter('abcba', 'bc')
+    `)
+    expect(actual).to.eql({
+      "replicate('ab', 4)": ['abababab'],
+      "charindex('ab', 'foobarabbarfoo')": [7],
+      "charindex('ab', 'foobarabbarfoo', 8)": [0],
+      "leftstr('foobar', 2)": ['fo'],
+      "rightstr('foobar', 2)": ['ar'],
+      "reverse('foobar')": ['raboof'],
+      "proper('fooBar')": ['Foobar'],
+      "padl('foo', 5)": ['  foo'],
+      "padr('foo', 5)": ['foo  '],
+      "padc('foo', 5)": [' foo '],
+      "strfilter('abcba', 'bc')": ['bcb']
+    })
+  })
+
+  it('supports contrib aggregate functions', async function () {
+    const actual = await db.execute(`
+      WITH RECURSIVE series(x) AS (
+          SELECT 1
+        UNION ALL
+          SELECT x + 1
+          FROM series
+          WHERE x + 1 <= 12
+      )
+      SELECT
+        abs( 3.77406806 - stdev(x))    < 0.000001,
+        abs(14.24358974 - variance(x)) < 0.000001,
+        mode(x),
+        median(x),
+        lower_quartile(x),
+        upper_quartile(x)
+      FROM (
+        SELECT x
+        FROM series
+        UNION ALL
+        VALUES (1)
+      )
+    `)
+    expect(actual).to.eql({
+      'abs( 3.77406806 - stdev(x))    < 0.000001': [1],
+      'abs(14.24358974 - variance(x)) < 0.000001': [1],
+      'mode(x)': [1],
+      'median(x)': [6],
+      'lower_quartile(x)': [3],
+      'upper_quartile(x)': [9]
+    })
+  })
+
+  it('supports generate_series', async function () {
+    const actual = await db.execute(`
+      SELECT value
+      FROM generate_series(5, 20, 5)
+    `)
+    expect(actual).to.eql({
+      value: [5, 10, 15, 20]
+    })
+  })
+
+  it('supports transitive_closure', async function () {
+    const actual = await db.execute(`
+      CREATE TABLE node(
+      node_id   INTEGER NOT NULL PRIMARY KEY,
+      parent_id INTEGER,
+      name      VARCHAR(127),
+      FOREIGN KEY (parent_id) REFERENCES node(node_id)
+    );
+    CREATE INDEX node_parent_id_idx ON node(parent_id);
+
+    CREATE VIRTUAL TABLE node_closure USING transitive_closure(
+        tablename    = "node",
+        idcolumn     = "node_id",
+        parentcolumn = "parent_id"
+      );
+
+    INSERT INTO node VALUES
+      (1,  NULL, 'tests'),
+      (2,  1,    'lib'),
+      (3,  2,    'database'),
+      (4,  2,    'utils'),
+      (5,  2,    'storedQueries.spec.js'),
+      (6,  3,    '_sql.spec.js'),
+      (7,  3,    '_statements.spec.js'),
+      (8,  3,    'database.spec.js'),
+      (9,  3,    'sqliteExtensions.spec.js'),
+      (10, 4,    'fileIo.spec.js'),
+      (11, 4,    'time.spec.js');
+
+      SELECT name
+      FROM node
+      WHERE node_id IN (
+        SELECT nc.id
+        FROM node_closure AS nc
+        WHERE nc.root = 2 AND nc.depth = 2
+      );
+    `)
+    expect(actual).to.eql({
+      name: [
+        '_sql.spec.js',
+        '_statements.spec.js',
+        'database.spec.js',
+        'sqliteExtensions.spec.js',
+        'fileIo.spec.js',
+        'time.spec.js'
+      ]
+    })
+  })
+
+  it('supports UUID functions', async function () {
+    const actual = await db.execute(`
+      SELECT
+        length(uuid()) as length,
+        uuid_str(uuid_blob('26a8349c8a7f4cbeb519bf792c3d7ac6')) as uid
+    `)
+    expect(actual).to.eql({
+      length: [36],
+      uid: ['26a8349c-8a7f-4cbe-b519-bf792c3d7ac6']
+    })
+  })
+
+  it('supports regexp', async function () {
+    const actual = await db.execute(`
+      SELECT
+        regexp('=\\s?\\d+',  'const foo = 123; const bar = "bar"') as one,
+        regexpi('=\\s?\\d+', 'const foo = 123; const bar = "bar"') as two,
+        'const foo = 123; const bar = "bar"' REGEXP '=\\s?\\d+' as three
+    `)
+    expect(actual).to.eql({
+      one: [1],
+      two: [1],
+      three: [1]
+    })
+  })
+
+  it('supports pivot virtual table', async function () {
+    const actual = await db.execute(`
+      CREATE TABLE point(x REAL, y REAL, z REAL);
+      INSERT INTO point VALUES
+        (5,3,3.2),  (5,6,4.3),  (5,9,5.4),
+        (10,3,4),   (10,6,3.8), (10,9,3.6),
+        (15,3,4.8), (15,6,4),   (15,9,3.5);
+
+      CREATE VIRTUAL TABLE pivot USING pivot_vtab(
+        (SELECT y FROM point GROUP BY y),
+        (SELECT x, x FROM point GROUP BY x),
+        (SELECT z FROM point WHERE y = :y AND x = :x)
+      );
+
+      CREATE TEMPORARY TABLE surface AS
+      SELECT xt.x, p.*
+      FROM (
+        SELECT row_number() OVER () rownum, *
+        FROM pivot
+      ) p
+      JOIN (
+        SELECT row_number() OVER () rownum, x
+        FROM point
+        GROUP BY x
+      ) xt USING(rownum);
+      ALTER TABLE surface DROP COLUMN rownum;
+      SELECT * FROM surface;
+    `)
+    expect(actual).to.eql({
+      x: [5, 10, 15],
+      y: [3, 6, 9],
+      '5.0': [3.2, 4.3, 5.4],
+      '10.0': [4, 3.8, 3.6],
+      '15.0': [4.8, 4, 3.5]
+    })
+  })
+
+  it('supports FTS5', async function () {
+    const actual = await db.execute(`
+      CREATE VIRTUAL TABLE email USING fts5(sender, title, body, tokenize = 'porter ascii');
+
+      INSERT INTO email VALUES
+        (
+          'foo@localhost',
+          'fts3/4',
+          'FTS3 and FTS4 are SQLite virtual table modules that allows users to perform '
+          || 'full-text searches on a set of documents.'
+        ),
+        (
+          'bar@localhost',
+          'fts4',
+          'FTS5 is an SQLite virtual table module that provides full-text search '
+          || 'functionality to database applications.'
+        );
+
+      SELECT sender
+      FROM email
+      WHERE body MATCH '"full-text" NOT document'
+      ORDER BY rank;
+    `)
+    expect(actual).to.eql({
+      sender: ['bar@localhost']
+    })
+  })
+})

tests/lib/storedInquiries/_migrations.spec.js

@@ -0,0 +1,42 @@
+import { expect } from 'chai'
+import migrations from '@/lib/storedInquiries/_migrations'
+
+describe('_migrations.js', () => {
+  it('migrates from version 1 to the current', () => {
+    const oldInquiries = [
+      {
+        id: '123',
+        name: 'foo',
+        query: 'SELECT * FROM foo',
+        chart: { here_are: 'foo chart settings' },
+        createdAt: '2021-05-06T11:05:50.877Z'
+      },
+      {
+        id: '456',
+        name: 'bar',
+        query: 'SELECT * FROM bar',
+        chart: { here_are: 'bar chart settings' },
+        createdAt: '2021-05-07T11:05:50.877Z'
+      }
+    ]
+
+    expect(migrations._migrate(1, oldInquiries)).to.eql([
+      {
+        id: '123',
+        name: 'foo',
+        query: 'SELECT * FROM foo',
+        viewType: 'chart',
+        viewOptions: { here_are: 'foo chart settings' },
+        createdAt: '2021-05-06T11:05:50.877Z'
+      },
+      {
+        id: '456',
+        name: 'bar',
+        query: 'SELECT * FROM bar',
+        viewType: 'chart',
+        viewOptions: { here_are: 'bar chart settings' },
+        createdAt: '2021-05-07T11:05:50.877Z'
+      }
+    ])
+  })
+})