v4.1.10-beta.1

add arm64 arch target for macOS

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve DbGate
+title: 'BUG: Say something here'
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Version Information (please complete the following information):**
+ - OS: [e.g. Windows/Mac/Ubuntu]
+ - App Version [see Help -> About]
+ - Install source [e.g. installer/SNAP/Docker/NPM]
+ - Type - Web/Application
+ - Database engine: [e.g. MySQL/PostgreSQL/SQL Server]
+
+**Additional context**
+Anything else you think might be helpful

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for DbGate
+title: 'FEAT: '
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,18 @@
+---
+name: Question
+about: Ask a question about how to do something
+title: 'QUESTION: Summary of your question'
+labels: ''
+assignees: ''
+
+---
+
+**Details:**
+Details about your question
+
+**Version Information [might be relevant to your issue]**
+Operating System: 
+App Version [help -> about]:
+
+**Screenshot [if appropriate]**:
+A screenshot of the app if that helps

.github/workflows/build-app-beta.yaml

@@ -0,0 +1,85 @@
+name: Electron app
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+'
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-18.04, windows-2016]
+        # os: [macOS-10.14, windows-2016, ubuntu-18.04]
+
+    steps:
+      - name: Context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+      - uses: actions/checkout@v1
+        with:
+          fetch-depth: 1
+      - name: Use Node.js 10.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+      - name: yarn install
+        run: |
+          yarn install
+      - name: setCurrentVersion
+        run: |
+          yarn setCurrentVersion
+      - name: fillNativeModulesElectron
+        run: |
+          yarn fillNativeModulesElectron
+      - name: Install Snapcraft
+        if: matrix.os == 'ubuntu-18.04'
+        uses: samuelmeuli/action-snapcraft@v1
+      - name: Publish
+        run: |
+          yarn run build:app
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }} # token for electron publish
+          WIN_CSC_LINK: ${{ secrets.WINCERT_CERTIFICATE }}
+          WIN_CSC_KEY_PASSWORD: ${{ secrets.WINCERT_PASSWORD }}
+
+      - name: Save snap login
+        if: matrix.os == 'ubuntu-18.04'
+        run: 'echo "$SNAPCRAFT_LOGIN" > snapcraft.login'
+        shell: bash
+        env:
+          SNAPCRAFT_LOGIN: ${{secrets.SNAPCRAFT_LOGIN}}
+
+      - name: publishSnap
+        if: matrix.os == 'ubuntu-18.04'
+        run: |
+          snapcraft login --with snapcraft.login
+          snapcraft upload --release=beta app/dist/*.snap
+
+      - name: Copy artifacts
+        run: |
+          mkdir artifacts          
+
+          mv app/dist/*.exe artifacts/ || true
+          mv app/dist/*.AppImage artifacts/ || true
+          mv app/dist/*.deb artifacts/ || true
+          mv app/dist/*.snap artifacts/ || true
+#          mv app/dist/*.dmg artifacts/ || true
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v1
+        with:
+          name: ${{ matrix.os }}
+          path: artifacts
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: 'artifacts/**'
+          prerelease: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-app.yaml

@@ -3,14 +3,14 @@ name: Electron app
 on:
   push:
     tags:
-    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+      # - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 
     # branches:
     #   - production
 
 jobs:
   build:
-
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -36,31 +36,91 @@ jobs:
       - name: setCurrentVersion
         run: |
           yarn setCurrentVersion
+      - name: fillNativeModulesElectron
+        run: |
+          yarn fillNativeModulesElectron
+      - name: Install Snapcraft
+        if: matrix.os == 'ubuntu-18.04'
+        uses: samuelmeuli/action-snapcraft@v1
       - name: Publish
         run: |
           yarn run build:app
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }} # token for electron publish
+          WIN_CSC_LINK: ${{ secrets.WINCERT_CERTIFICATE }}
+          WIN_CSC_KEY_PASSWORD: ${{ secrets.WINCERT_PASSWORD }}
 
-      - name: Copy artifacts Linux, MacOs
-        if: matrix.os != 'windows-2016'
+      - name: generatePadFile
         run: |
-          mkdir artifacts
-          mv app/dist/*.deb artifacts/dbgate-linux.deb || true
-          mv app/dist/*.AppImage artifacts/dbgate-linux.AppImage || true
-          mv app/dist/*.dmg artifacts/dbgate-mac.dmg || true
+          yarn generatePadFile
 
-          mv app/dist/*.deb artifacts || true
-          mv app/dist/*.AppImage artifacts || true
-          mv app/dist/*.dmg artifacts || true          
+      - name: Save snap login
+        if: matrix.os == 'ubuntu-18.04'
+        run: 'echo "$SNAPCRAFT_LOGIN" > snapcraft.login'
+        shell: bash
+        env:
+          SNAPCRAFT_LOGIN: ${{secrets.SNAPCRAFT_LOGIN}}
 
-          mv app/dist/latest.yml artifacts/latest.yml || true
-      - name: Copy artifacts Win
+      - name: publishSnap
+        if: matrix.os == 'ubuntu-18.04'
+        run: |
+          snapcraft login --with snapcraft.login
+          snapcraft upload --release=stable app/dist/*.snap
+
+      - name: Copy artifacts
+        run: |
+          mkdir artifacts          
+
+          cp app/dist/*.deb artifacts/dbgate-latest.deb || true
+          cp app/dist/*.AppImage artifacts/dbgate-latest.AppImage || true
+          cp app/dist/*.exe artifacts/dbgate-latest.exe || true
+          cp app/dist/*.dmg artifacts/dbgate-latest.dmg || true
+
+          mv app/dist/*.exe artifacts/ || true
+          mv app/dist/*.AppImage artifacts/ || true
+          mv app/dist/*.deb artifacts/ || true
+          mv app/dist/*.dmg artifacts/ || true
+          mv app/dist/*.snap artifacts/dbgate-latest.snap || true
+
+      # - name: Copy artifacts Linux, MacOs
+      #   if: matrix.os != 'windows-2016'
+      #   run: |
+      #     mkdir artifacts
+
+      #     cp app/dist/*.AppImage artifacts/ || true
+      #     cp app/dist/*.dmg artifacts/ || true
+      #     cp app/dist/*.deb artifacts/ || true
+
+      #     mv app/dist/*.deb artifacts/dbgate-linux.deb || true
+      #     mv app/dist/*.AppImage artifacts/dbgate-linux.AppImage || true
+      #     mv app/dist/*.dmg artifacts/dbgate-mac.dmg || true
+
+      # - name: Copy artifacts Win
+      #   if: matrix.os == 'windows-2016'
+      #   run: |
+      #     mkdir artifacts
+
+      #     cp app/dist/*.exe artifacts/ || true
+
+      #     mv app/dist/*.exe artifacts/dbgate-windows.exe
+
+      #     mv app/dist/latest.yml artifacts/latest.yml || true
+
+      - name: Copy latest.yml (windows)
         if: matrix.os == 'windows-2016'
         run: |
-          mkdir artifacts
-          mv app/dist/*.exe artifacts/dbgate-windows.exe
-          mv app/dist/*.zip artifacts/dbgate-windows.zip
+          mv app/dist/latest.yml artifacts/latest.yml || true
+          mv app/dist/dbgate-pad.xml artifacts/ || true
 
-          mv app/dist/*.exe artifacts || true          
+      - name: Copy latest-linux.yml
+        if: matrix.os == 'ubuntu-18.04'
+        run: |
+          mv app/dist/latest-linux.yml artifacts/latest-linux.yml || true
+
+      - name: Copy latest-mac.yml
+        if: matrix.os == 'macOS-10.14'
+        run: |
+          mv app/dist/latest-mac.yml artifacts/latest-mac.yml || true
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v1
@@ -72,7 +132,7 @@ jobs:
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
-          files: "artifacts/**"
+          files: 'artifacts/**'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -85,4 +145,4 @@ jobs:
       #     tag_name: ${{ github.ref }}
       #     release_name: Release ${{ github.ref }}
       #     draft: false
-      #     prerelease: false
+      #     prerelease: false

.github/workflows/build-docker.yaml

@@ -5,7 +5,8 @@ name: Docker image
 on:
   push:
     tags:
-    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+    # - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
 
 # on:
 #   push:

.github/workflows/build-npm.yaml

@@ -0,0 +1,121 @@
+name: NPM packages
+
+# on: [push]
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+      # - 'v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+'
+
+# on:
+#   push:
+#     branches:
+#       - production
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-18.04]
+        # os: [macOS-10.14, windows-2016, ubuntu-18.04]
+
+    steps:
+      - name: Context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+      - uses: actions/checkout@v1
+        with:
+          fetch-depth: 1
+      - name: Use Node.js 10.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 10.x
+
+      - name: Configure NPM token
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: |
+          npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
+
+      - name: yarn install
+        run: |
+          yarn install
+          
+      - name: setCurrentVersion
+        run: |
+          yarn setCurrentVersion
+
+      - name: Publish types
+        working-directory: packages/types
+        run: |
+          npm publish
+
+      - name: Publish tools
+        working-directory: packages/tools
+        run: |
+          npm publish
+
+      - name: Publish sqltree
+        working-directory: packages/sqltree
+        run: |
+          npm publish
+                    
+      - name: Publish api
+        working-directory: packages/api
+        run: |
+          npm publish
+
+      - name: Publish datalib
+        working-directory: packages/datalib
+        run: |
+          npm publish
+
+      - name: Publish filterparser
+        working-directory: packages/filterparser
+        run: |
+          npm publish
+
+      - name: Publish web
+        working-directory: packages/web
+        run: |
+          npm publish
+                                        
+      - name: Publish dbgate
+        working-directory: packages/dbgate
+        run: |
+          npm publish
+
+      - name: Publish dbgate-plugin-csv
+        working-directory: plugins/dbgate-plugin-csv
+        run: |
+          npm publish
+
+      - name: Publish dbgate-plugin-excel
+        working-directory: plugins/dbgate-plugin-excel
+        run: |
+          npm publish
+
+      - name: Publish dbgate-plugin-mssql
+        working-directory: plugins/dbgate-plugin-mssql
+        run: |
+          npm publish
+
+      - name: Publish dbgate-plugin-mysql
+        working-directory: plugins/dbgate-plugin-mysql
+        run: |
+          npm publish
+
+      - name: Publish dbgate-plugin-mongo
+        working-directory: plugins/dbgate-plugin-mongo
+        run: |
+          npm publish
+
+      - name: Publish dbgate-plugin-postgres
+        working-directory: plugins/dbgate-plugin-postgres
+        run: |
+          npm publish

.gitignore

@@ -12,6 +12,12 @@ node_modules
 build
 dist
 
+app/packages/web/public
+app/packages/plugins
+docker/public
+docker/bundle.js
+docker/plugins
+
 # misc
 .DS_Store
 .env.local
@@ -22,3 +28,6 @@ dist
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+app/src/nativeModulesContent.js
+packages/api/src/nativeModulesContent.js
+.VSCodeCounter

CHANGELOG.md

@@ -0,0 +1,36 @@
+# ChangeLog
+
+### 4.1.1
+- CHANGED: Default plugins are now part of installation
+### 4.1.0
+- ADDED: MongoDB support
+- ADDED: Configurable keyboard shortcuts
+- ADDED: JSON row cell data view
+- FIX: Fixed some problems from migration to Svelte
+
+### 4.0.3
+- FIX: fixes for FireFox (mainly incorrent handle of bind:clientHeight, replaces with resizeobserver)
+### 4.0.2
+- FIX: fixed docker and NPM build
+### 4.0.0
+- CHANGED: Excahnged React with Svelte. Changed theme colors. Huge speed and memory optimalization
+- ADDED: SQL Generator (CREATE, INSERT, DROP)
+- ADDED: Command palette (F1). Introduced commands, extended some context menus
+- ADDED: New keyboard shortcuts
+- ADDED: Switch to recent database feature
+- ADDED: Macros from free table editor are available also in table data editor
+- CHANGED: Cell data preview is now in left widgets panel
+- CHANGED: Toolbar refactor
+- FIX: Solved reconnecting expired connection
+
+### 3.9.6
+- ADDED: Connect using SSH Tunnel
+- ADDED: Connect using SSL
+- ADDED: Database connection dialog redesigned
+- ADDED: #63 Ctrl+Enter runs query
+- ADDED: Published dbgate NPM package
+- ADDED: SQL editor context menu
+- FIX: #62 - import, export executed from SNAP installs didn't work
+
+### 3.9.5
+- Start point of changelog

LICENSE

@@ -1,674 +1,21 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+MIT License
+
+Copyright (c) 2021 Jan Prochazka
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,34 +1,53 @@
+[![NPM version](https://img.shields.io/npm/v/dbgate.svg)](https://www.npmjs.com/package/dbgate)
+[![dbgate](https://snapcraft.io/dbgate/badge.svg)](https://snapcraft.io/dbgate)
+[![dbgate](https://snapcraft.io/dbgate/trending.svg?name=0)](https://snapcraft.io/dbgate)
 [![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
-[![Donate](https://img.shields.io/badge/donate-paypal-blue.svg)](https://paypal.me/JanProchazkaCz/30eur)
-[![NPM version](https://img.shields.io/npm/v/dbgate-api.svg)](https://www.npmjs.com/package/dbgate-api)
 
 # DbGate - database administration tool
 
-DbGate is fast and efficient database administration tool. It is focused to work with data (filtering, editing, master/detail views etc.)
+DbGate modern, fast and easy to use database manager
 
-**Try it online** - https://demo.dbgate.org - online demo application
+* Try it online - [demo.dbgate.org](https://demo.dbgate.org) - online demo application
+* Download application for Windows, Linux or Mac from [dbgate.org](https://dbgate.org/download/)
+* Run web version as [NPM package](https://www.npmjs.com/package/dbgate) or as [docker image](https://hub.docker.com/r/dbgate/dbgate)
+
+Supported databases:
+* MySQL
+* PostgreSQL
+* SQL Server
+* MongoDB
+
+![Screenshot](https://raw.githubusercontent.com/dbgate/dbgate/master/screenshot.png)
 
 ## Features
-* Support for Microsoft SQL Server, Postgre SQL, MySQL
-* Table data browsing - filtering, sorting, related columns using foreign keys
-* Master/detail views
-* Browsing objects - tables, views, procedures, functions
+* Connect to Microsoft SQL Server, Postgre SQL, MySQL, MongoDB
 * Table data editing, with SQL change script preview
+* Master/detail views
+* Query designer
+* Form view for comfortable work with tables with many columns
+* JSON view on MongoDB collections
+* Explore tables, views, procedures, functions, MongoDB collections
 * SQL editor, execute SQL script, SQL code formatter, SQL code completion, SQL join wizard
+* Mongo JavaScript editor, execute Mongo script (with NodeJs syntax)
 * Runs as application for Windows, Linux and Mac. Or in Docker container on server and in web Browser on client.
 * Import, export from/to CSV, Excel, JSON
 * Free table editor - quick table data editing (cleanup data after import/before export, prototype tables etc.)
 * Archives - backup your data in JSON files on local filesystem (or on DbGate server, when using web application)
 * Light and dark theme
+* Charts
 * For detailed info, how to run DbGate in docker container, visit [docker hub](https://hub.docker.com/r/dbgate/dbgate)
 * Extensible plugin architecture
 
-![Screenshot](https://raw.githubusercontent.com/dbshell/dbgate/master/screenshot.png)
+## Why is DbGate different
+There are many database managers now, so why DbGate? 
+* Works everywhere - Windows, Linux, Mac, Web browser (+mobile web is planned), without compromises in features
+* Based on standalone NPM packages, scripts can be run without DbGate (example - [CSV export](https://www.npmjs.com/package/dbgate-plugin-csv) )
+* Many data browsing functions based using foreign keys - master/detail, expand columns, expandable form view (on screenshot above)
 
 ## Design goals
 * Application simplicity - DbGate takes the best and only the best from old [DbGate](http://www.jenasoft.com/dbgate), [DatAdmin](http://www.jenasoft.com/datadmin) and [DbMouse](http://www.jenasoft.com/dbmouse) .
 * Minimal dependencies
-    * Frontend - React, styled-components, socket.io
+    * Frontend - Svelte, socket.io
     * Backend - NodeJs, ExpressJs, socket.io, database connection drivers
     * JavaScript + TypeScript
     * App - electron
@@ -38,35 +57,13 @@ DbGate is fast and efficient database administration tool. It is focused to work
 ## Plugins
 Plugins are standard NPM packages published on [npmjs.com](https://www.npmjs.com).  
 See all [existing DbGate plugins](https://www.npmjs.com/search?q=keywords:dbgateplugin).  
-Visit [dbgate generator homepage](https://github.com/dbshell/generator-dbgate) to see, how to create your own plugin.  
+Visit [dbgate generator homepage](https://github.com/dbgate/generator-dbgate) to see, how to create your own plugin.  
 
 Currently following extensions can be implemented using plugins:
 - File format parsers/writers
 - Database engine connectors
 
-## How Can I Contribute?
-You're welcome to contribute to this project! Below are some ideas, how to contribute:
-
-* Create plugins for new import/export formats
-* Bug fixing
-* Test Mac edition
-* Improve linux package build, add to APT repository
-* Auto-upgrade of electron application
-
-Any help is appreciated!
-
-Feel free to report issues and open merge requests.
-
-## Roadmap
-
-| Feature | Complexity | Schedule |
-|---|---|---|
-| Query designer | medium | december 2020 |
-| Table designer (structure editor) | big | january 2021 |
-| Filter SQL result sets | small | november 2020 |
-| Filtering, sorting in free table editor | small | november 2020 |
-| Using tedious driver instead of mssql | small | january 2021 |
-| Support for SQLite | big | 2021 |
+Basic set of plugins is part of DbGate git repository and is installed with app. Additional plugins pust be downloaded from NPM (this task is handled by DbGate)
 
 ## How to run development environment
 
@@ -75,14 +72,14 @@ yarn
 yarn start
 ```
 
-If you want to make modifications in TypeScript packages, run TypeScript compiler in watch mode in seconds terminal:
+If you want to make modifications in libraries or plugins, run library compiler in watch mode in the second terminal:
 ```sh
 yarn lib
 ```
 
 Open http://localhost:5000 in your browser
 
-You could run electron app, using this server:
+You could run electron app (requires running localhost:5000):
 ```sh
 cd app
 yarn
@@ -90,7 +87,7 @@ yarn start
 ```
 
 ## How to run built electron app locally
-This mode is very similar to production run of electron app. Electron app forks process with API on dynamically allocated port, works with compiled javascript files.
+This mode is very similar to production run of electron app. Electron app forks process with API on dynamically allocated port, works with compiled javascript files and uses compiled version of plugins (doesn't use localhost:5000)
 
 ```sh
 cd app
@@ -106,13 +103,12 @@ yarn start:app:local
 ## Packages
 Some dbgate packages can be used also without DbGate. You can find them on [NPM repository](https://www.npmjs.com/search?q=keywords:dbgate)
 
-* [api](https://github.com/dbshell/dbgate/tree/master/packages/api) - backend, Javascript, ExpressJS [![NPM version](https://img.shields.io/npm/v/dbgate-api.svg)](https://www.npmjs.com/package/dbgate-api)
-* [datalib](https://github.com/dbshell/dbgate/tree/master/packages/datalib) - TypeScript library for utility classes
-* [app](https://github.com/dbshell/dbgate/tree/master/app) - application (JavaScript)
-structure, creating specific queries (JavaScript) [![NPM version](https://img.shields.io/npm/v/dbgate-engines.svg)](https://www.npmjs.com/package/dbgate-engines)
-* [filterparser](https://github.com/dbshell/dbgate/tree/master/packages/filterparser) - TypeScript library for parsing data filter expressions using parsimmon
-* [sqltree](https://github.com/dbshell/dbgate/tree/master/packages/sqltree) - JSON representation of SQL query, functions converting to SQL (TypeScript) [![NPM version](https://img.shields.io/npm/v/dbgate-sqltree.svg)](https://www.npmjs.com/package/dbgate-sqltree)
-* [types](https://github.com/dbshell/dbgate/tree/master/packages/types) - common TypeScript definitions [![NPM version](https://img.shields.io/npm/v/dbgate-types.svg)](https://www.npmjs.com/package/dbgate-types)
-* [web](https://github.com/dbshell/dbgate/tree/master/packages/web) - frontend in React (JavaScript)
-* [tools](https://github.com/dbshell/dbgate/tree/master/packages/tools) - various tools [![NPM version](https://img.shields.io/npm/v/dbgate-tools.svg)](https://www.npmjs.com/package/dbgate-tools)
+* [api](https://github.com/dbgate/dbgate/tree/master/packages/api) - backend, Javascript, ExpressJS [![NPM version](https://img.shields.io/npm/v/dbgate-api.svg)](https://www.npmjs.com/package/dbgate-api)
+* [datalib](https://github.com/dbgate/dbgate/tree/master/packages/datalib) - TypeScript library for utility classes [![NPM version](https://img.shields.io/npm/v/dbgate-datalib.svg)](https://www.npmjs.com/package/dbgate-datalib)
+* [app](https://github.com/dbgate/dbgate/tree/master/app) - application (JavaScript) structure, creating specific queries (JavaScript)
+* [filterparser](https://github.com/dbgate/dbgate/tree/master/packages/filterparser) - TypeScript library for parsing data filter expressions using parsimmon [![NPM version](https://img.shields.io/npm/v/dbgate-filterparser.svg)](https://www.npmjs.com/package/dbgate-filterparser)
+* [sqltree](https://github.com/dbgate/dbgate/tree/master/packages/sqltree) - JSON representation of SQL query, functions converting to SQL (TypeScript) [![NPM version](https://img.shields.io/npm/v/dbgate-sqltree.svg)](https://www.npmjs.com/package/dbgate-sqltree)
+* [types](https://github.com/dbgate/dbgate/tree/master/packages/types) - common TypeScript definitions [![NPM version](https://img.shields.io/npm/v/dbgate-types.svg)](https://www.npmjs.com/package/dbgate-types)
+* [web](https://github.com/dbgate/dbgate/tree/master/packages/web) - frontend in Svelte (JavaScript) [![NPM version](https://img.shields.io/npm/v/dbgate-web.svg)](https://www.npmjs.com/package/dbgate-web)
+* [tools](https://github.com/dbgate/dbgate/tree/master/packages/tools) - various tools [![NPM version](https://img.shields.io/npm/v/dbgate-tools.svg)](https://www.npmjs.com/package/dbgate-tools)
 

app/DbGate_pad.xml

@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<XML_DIZ_INFO>
+  <MASTER_PAD_VERSION_INFO>
+    <MASTER_PAD_VERSION>4.0</MASTER_PAD_VERSION>
+    <MASTER_PAD_EDITOR>AppVisor 1.0.43</MASTER_PAD_EDITOR>
+    <MASTER_PAD_EDITOR_URL>http://publisher.appvisor.com</MASTER_PAD_EDITOR_URL>
+    <MASTER_PAD_INFO>Portable Application Description, or PAD(TM) 2004 Association of Software Professionals (ASP)http://www.asp-shareware.org/pad is a data set standard and specification that is commercialsoftware publishers to disseminate certified information about their software application. The PAD format is copyright of the ASP and cannot be used without the formal licensing and permission of both the Association of Software Professionals and its agent AppVisor.com.</MASTER_PAD_INFO>
+    <CERTIFIED>No</CERTIFIED>
+    <CERTIFICATE_ID></CERTIFICATE_ID>
+    <CERTIFICATE_LICENSE></CERTIFICATE_LICENSE>
+  </MASTER_PAD_VERSION_INFO>
+  <RoboSoft>
+    <Company_UIN>CMP-9600EC03382B</Company_UIN>
+    <Product_UIN>APP-A60089A1482B</Product_UIN>
+    <Publish_on_CD>N</Publish_on_CD>
+    <NewsFeed_Search_String></NewsFeed_Search_String>
+    <Search_String>DbGate</Search_String>
+    <Press_Release_Search_String></Press_Release_Search_String>
+    <Backlink></Backlink>
+    <Comments_For_Reviewer></Comments_For_Reviewer>
+    <Search_String_Unique>DbGate</Search_String_Unique>
+    <Search_Engine_Search_String></Search_Engine_Search_String>
+    <Web_Directories_Search_String></Web_Directories_Search_String>
+    <Company_Description></Company_Description>
+  </RoboSoft>
+  <Company_Info>
+    <PublisherID>pid-86000673282b</PublisherID>
+    <BrandID>bid-9600ec03382b</BrandID>
+    <Company_Name>Jan Prochazka</Company_Name>
+    <Country>Czech Republic</Country>
+    <State_Province>Czechia</State_Province>
+    <City_Town>Prague</City_Town>
+    <Zip_Postal_Code>18100</Zip_Postal_Code>
+    <Address_1>Vratislavska 396</Address_1>
+    <Address_2>Praha 8</Address_2>
+    <Company_WebSite_URL>https://dbgate.org/</Company_WebSite_URL>
+    <Contact_Info>
+      <Contact_First_Name>Jan</Contact_First_Name>
+      <Contact_Last_Name>Prochazka</Contact_Last_Name>
+      <Contact_Email>jenasoft.database@gmail.com</Contact_Email>
+      <Author_First_Name>Jan</Author_First_Name>
+      <Author_Last_Name>Prochazka</Author_Last_Name>
+      <Author_Email>jenasoft.database@gmail.com</Author_Email>
+      <Contact_Phone></Contact_Phone>
+    </Contact_Info>
+    <Support_Info>
+      <Sales_Email>jenasoft.database@gmail.com</Sales_Email>
+      <Support_Email>jenasoft.database@gmail.com</Support_Email>
+      <General_Email>jenasoft.database@gmail.com</General_Email>
+      <Sales_Phone></Sales_Phone>
+      <Support_Phone></Support_Phone>
+      <General_Phone></General_Phone>
+      <Fax_Phone></Fax_Phone>
+    </Support_Info>
+    <LinkedinPage></LinkedinPage>
+    <TwitterCompanyPage></TwitterCompanyPage>
+    <FacebookCompanyPage></FacebookCompanyPage>
+  </Company_Info>
+  <Program_Info>
+    <AppID>app-a60089a1482b</AppID>
+    <Program_Name>DbGate</Program_Name>
+    <Program_Version>3.8.40</Program_Version>
+    <Program_Release_Month>01</Program_Release_Month>
+    <Program_Release_Day>21</Program_Release_Day>
+    <Program_Release_Year>2021</Program_Release_Year>
+    <Program_Cost_Dollars>0</Program_Cost_Dollars>
+    <Program_Type>Freeware</Program_Type>
+    <Program_Category_Class>Business::Databases &amp; Tools</Program_Category_Class>
+    <Program_Specific_Category></Program_Specific_Category>
+    <Program_Categories>Business &amp; Finance :: Database Managers,Programming :: SQL,Programming :: Databases &amp; Networks</Program_Categories>
+    <Program_Release_Status>New Release</Program_Release_Status>
+    <Program_Install_Support>Install and Uninstall</Program_Install_Support>
+    <Program_Target_Platform>Windows</Program_Target_Platform>
+    <Program_OS_Support>Win2000,WinXP,Win7 x32,Win7 x64,Windows 8,Windows 10,WinServer,WinOther,Windows2000,Windows2003,Windows Server 2000,Windows Server 2003,Windows Server 2008,Windows Server 2008r2,Windows Server 2012,Windows Tablet PC Edition 2005,Windows Media Center Edition 2005,WinVista,Windows Vista Starter,Windows Vista Home Basic,Windows Vista Home Premium,Windows Vista Business,Windows Vista Enterprise,Windows Vista Ultimate,WinVista x64,Windows Vista Home Basic x64,Windows Vista Home Premium x64,Windows Vista Business x64,Windows Vista Enterprise x64,Windows Vista Ultimate x64</Program_OS_Support>
+    <Program_Language>English</Program_Language>
+    <Program_Change_Info>Form view - for tables with may columns
+Windows authentization for SQL Server
+Support for MariaDB</Program_Change_Info>
+    <Program_System_Requirements>2GB RAM, 100MB disk space</Program_System_Requirements>
+    <Limitations>No limitations</Limitations>
+    <Awards></Awards>
+    <File_Info>
+      <File_Size_Bytes>60973056</File_Size_Bytes>
+      <File_Size_K>59544</File_Size_K>
+      <File_Size_MB>58.15</File_Size_MB>
+    </File_Info>
+    <Expire_Info>
+      <Has_Expire_Info>N</Has_Expire_Info>
+      <Expire_Count></Expire_Count>
+      <Expire_Based_On></Expire_Based_On>
+      <Expire_Year></Expire_Year>
+      <Expire_Other_Info></Expire_Other_Info>
+      <Expire_Month></Expire_Month>
+      <Expire_Day></Expire_Day>
+    </Expire_Info>
+    <Includes_JAVA_VM></Includes_JAVA_VM>
+    <Includes_DirectX></Includes_DirectX>
+    <Includes_VB_Runtime></Includes_VB_Runtime>
+  </Program_Info>
+  <Web_Info>
+    <Application_URLs>
+      <Application_Info_URL>https://dbgate.org/</Application_Info_URL>
+      <Application_Order_URL></Application_Order_URL>
+      <Application_Screenshot_URL>https://raw.githubusercontent.com/dbshell/dbgate/master/screenshot800.png</Application_Screenshot_URL>
+      <Application_Icon_URL>https://raw.githubusercontent.com/dbshell/dbgate/master/app/icon32.png</Application_Icon_URL>
+      <Application_XML_File_URL>http://repository.appvisor.com/app-a60089a1482b/site-01/DbGate_pad.xml</Application_XML_File_URL>
+    </Application_URLs>
+    <Download_URLs>
+      <Primary_Download_URL>https://github.com/dbshell/dbgate/releases/latest/download/dbgate-latest.exe</Primary_Download_URL>
+      <Secondary_Download_URL></Secondary_Download_URL>
+      <Additional_Download_URL_1></Additional_Download_URL_1>
+      <Additional_Download_URL_2></Additional_Download_URL_2>
+    </Download_URLs>
+  </Web_Info>
+  <Program_Descriptions>
+    <English>
+      <Keywords>sql, management, tool, microsoft, sql, mssql, postgres, postgresql, mysql, csv, data, export, import, javascript, database</Keywords>
+      <Char_Desc_45>Modern data manipulation tool</Char_Desc_45>
+      <Char_Desc_80>Modern cross-platform data manipulation tool</Char_Desc_80>
+      <Char_Desc_250>Modern cross-platform data manipulation tool for Microsoft SQL Server, PostgreSQL and MySQL. Query designer. Master/detail views. Advanced data filtering. Export, import. Exports can be saved as jobs</Char_Desc_250>
+      <Char_Desc_450>Modern cross-platform data manipulation tool for Microsoft SQL Server, PostgreSQL and MySQL. Query designer. Charts. Master/detail views. Advanced data filtering. Export, import. Exports can be saved as jobs</Char_Desc_450>
+      <Char_Desc_2000>Modern cross-platform data manipulation tool for Microsoft SQL Server, PostgreSQL and MySQL
+Main features: 
+  Quick database browser
+  Database editor, view and and views, stored procedures, functions, triggers, table relations
+  Export, import - CSV, MS Excel
+  Form view for tables with many columns
+  Query designer
+  Advanced data filtering 
+  JavaScript data scripting
+  Run queries, code completion
+  Display data from referenced tables
+  Create charts, supports for active charts - are refreshed when underlying source is changed</Char_Desc_2000>
+    </English>
+    <Czech>
+      <Keywords>sql, management, tool, microsoft, sql, mssql, postgres, postgresql, mysql, csv, data, export, import, javascript, database</Keywords>
+      <Char_Desc_45>Moderní správce databází</Char_Desc_45>
+      <Char_Desc_80>Správce databází MS SQL Server, MySQL a PostgreSQL</Char_Desc_80>
+      <Char_Desc_250>Nástroj pro správu databází MS SQL Server, MySQL a PostgreSQL</Char_Desc_250>
+      <Char_Desc_450>Nástroj pro správu databází MS SQL Server, MySQL a PostgreSQL</Char_Desc_450>
+      <Char_Desc_2000>Moderní multiplatformní nástroj pro práci s databázemi pro Microsoft SQL Server, PostgreSQL a MySQL. 
+Hlavní funkce: 
+  Prohlížení databáze, tabulek, pohledů, uložených procedur a funkcí
+  Export, import - CSV, MS Excel
+  Zobrazení jednoho řádku tabulky "na výšku" - vhodné pro tabulky s mnoha sloupci
+  Grafický návrh dotazů
+  Pokročilé filtrování dat
+  Advanced data filtering 
+  Skriptování pomocí jazyka JavaScript
+  SQL editor, doplňování kódu
+  Zobrazování referencových dat, na základě cizích klíčů
+  Vytváření grafů, podpora aktivních grafů - obnoví se, pokud se změní zdroj dat</Char_Desc_2000>
+    </Czech>
+  </Program_Descriptions>
+  <Permissions>
+    <Distribution_Permissions>This product can be freely distributed without limitations.</Distribution_Permissions>
+    <EULA>MIT License
+
+Copyright (c) 2021 Jan Prochazka
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.</EULA>
+  </Permissions>
+  <Affiliates>
+    <Affiliates_Regsoft_Order_Page></Affiliates_Regsoft_Order_Page>
+    <Affiliates_Regsoft_Vendor_ID></Affiliates_Regsoft_Vendor_ID>
+    <Affiliates_Regsoft_Product_ID></Affiliates_Regsoft_Product_ID>
+    <Affiliates_FORM></Affiliates_FORM>
+    <Affiliates_FORM_VER></Affiliates_FORM_VER>
+    <Affiliates_VERSION></Affiliates_VERSION>
+    <Affiliates_URL></Affiliates_URL>
+    <Affiliates_Information_Page></Affiliates_Information_Page>
+    <Affiliates_Avangate_Order_Page></Affiliates_Avangate_Order_Page>
+    <Affiliates_Avangate_Vendor_ID></Affiliates_Avangate_Vendor_ID>
+    <Affiliates_Avangate_Product_ID></Affiliates_Avangate_Product_ID>
+    <Affiliates_Avangate_Maximum_Commission_Rate></Affiliates_Avangate_Maximum_Commission_Rate>
+    <Affiliates_BlueSnap_Order_Page></Affiliates_BlueSnap_Order_Page>
+    <Affiliates_BlueSnap_Vendor_ID></Affiliates_BlueSnap_Vendor_ID>
+    <Affiliates_BlueSnap_Product_ID></Affiliates_BlueSnap_Product_ID>
+    <Affiliates_BlueSnap_Maximum_Commission_Rate></Affiliates_BlueSnap_Maximum_Commission_Rate>
+    <Affiliates_BMTMicro_Order_Page></Affiliates_BMTMicro_Order_Page>
+    <Affiliates_BMTMicro_Vendor_ID></Affiliates_BMTMicro_Vendor_ID>
+    <Affiliates_BMTMicro_Product_ID></Affiliates_BMTMicro_Product_ID>
+    <Affiliates_BMTMicro_Maximum_Commission_Rate></Affiliates_BMTMicro_Maximum_Commission_Rate>
+    <Affiliates_eSellerate_Order_Page></Affiliates_eSellerate_Order_Page>
+    <Affiliates_eSellerate_Vendor_ID></Affiliates_eSellerate_Vendor_ID>
+    <Affiliates_eSellerate_Product_ID></Affiliates_eSellerate_Product_ID>
+    <Affiliates_eSellerate_Maximum_Commission_Rate></Affiliates_eSellerate_Maximum_Commission_Rate>
+    <Affiliates_Regnet_Order_Page></Affiliates_Regnet_Order_Page>
+    <Affiliates_Regnet_Vendor_ID></Affiliates_Regnet_Vendor_ID>
+    <Affiliates_Regnet_Product_ID></Affiliates_Regnet_Product_ID>
+    <Affiliates_Regnet_Maximum_Commission_Rate></Affiliates_Regnet_Maximum_Commission_Rate>
+    <Affiliates_Regsoft_Maximum_Commission_Rate></Affiliates_Regsoft_Maximum_Commission_Rate>
+    <Affiliates_ShareIt_Order_Page></Affiliates_ShareIt_Order_Page>
+    <Affiliates_ShareIt_Vendor_ID></Affiliates_ShareIt_Vendor_ID>
+    <Affiliates_ShareIt_Product_ID></Affiliates_ShareIt_Product_ID>
+    <Affiliates_ShareIt_Maximum_Commission_Rate></Affiliates_ShareIt_Maximum_Commission_Rate>
+  </Affiliates>
+  <NewsFeed>
+    <NewsFeed_FORM></NewsFeed_FORM>
+    <NewsFeed_VERSION></NewsFeed_VERSION>
+    <NewsFeed_URL></NewsFeed_URL>
+    <NewsFeed_DESCRIPTION></NewsFeed_DESCRIPTION>
+    <NewsFeed_Feed_URL></NewsFeed_Feed_URL>
+    <NewsFeed_Type></NewsFeed_Type>
+    <NewsFeed_Site_URL></NewsFeed_Site_URL>
+    <NewsFeed_Author_First_Name>Jan</NewsFeed_Author_First_Name>
+    <NewsFeed_Author_Last_Name>Prochazka</NewsFeed_Author_Last_Name>
+    <NewsFeed_Author_Email>jenasoft.database@gmail.com</NewsFeed_Author_Email>
+    <NewsFeed_Language></NewsFeed_Language>
+    <NewsFeed_Title></NewsFeed_Title>
+    <NewsFeed_Description_70></NewsFeed_Description_70>
+    <NewsFeed_Description_250></NewsFeed_Description_250>
+    <NewsFeed_Purpose></NewsFeed_Purpose>
+    <NewsFeed_Site_Name></NewsFeed_Site_Name>
+  </NewsFeed>
+  <Press_Release>
+    <Press_Release></Press_Release>
+    <Headline></Headline>
+    <Summary></Summary>
+    <Press_Release_Plain></Press_Release_Plain>
+  </Press_Release>
+  <Site>
+    <Site_FORM></Site_FORM>
+    <Site_VERSION></Site_VERSION>
+    <Site_DESCRIPTION></Site_DESCRIPTION>
+    <Site_Site_Title>DbGate github</Site_Site_Title>
+    <Site_Site_URL>https://github.com/dbshell/dbgate</Site_Site_URL>
+    <Site_Keywords>database, manager, organizer, explorer, mssql, sqlserver, tsql, sql, mysql, postgre, postgresql,  export, import, filter</Site_Keywords>
+    <Site_Description_100>DbGate developer site</Site_Description_100>
+    <Site_Description_250>Source code for DbGate. Create issues, porticipate, post pull requests. Explore, how to write plugins for DbGate</Site_Description_250>
+    <Site_Description_450>Source code for DbGate. Create issues, porticipate, post pull requests. Explore, how to write plugins for DbGate</Site_Description_450>
+    <Site_Contact_First_Name>Jan</Site_Contact_First_Name>
+    <Site_Contact_Last_Name>Prochazka</Site_Contact_Last_Name>
+    <Site_Contact_Email>jenasoft.database@gmail.com</Site_Contact_Email>
+  </Site>
+  <Dynamic_PAD>
+    <General>
+      <DP_Pad_Enabled>TRUE</DP_Pad_Enabled>
+      <DP_AtFormFill_Enabled>TRUE</DP_AtFormFill_Enabled>
+      <DP_Distributive_Enabled>TRUE</DP_Distributive_Enabled>
+      <DP_Script_Base_URL>http://repository.appvisor.com/</DP_Script_Base_URL>
+      <DP_Pad_Mask>DbGate_pad.xml</DP_Pad_Mask>
+      <DP_Distributive_Primary_URL>https://github.com/dbshell/dbgate/releases/latest/download/dbgate-latest.exe</DP_Distributive_Primary_URL>
+      <DP_Distributive_Mask>dbgate-latest.exe</DP_Distributive_Mask>
+    </General>
+  </Dynamic_PAD>
+</XML_DIZ_INFO>

app/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Jan Prochazka
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

app/dbgate-pad-template.xml

@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<XML_DIZ_INFO>
+  <MASTER_PAD_VERSION_INFO>
+    <MASTER_PAD_VERSION>3.01</MASTER_PAD_VERSION>
+    <MASTER_PAD_EDITOR>PADManager 2.0.46</MASTER_PAD_EDITOR>
+    <MASTER_PAD_INFO>Portable Application Description, or PAD for short, is a data set that is used by shareware authors to disseminate information to anyone interested in their software products. To find out more go to http://www.asp-shareware.org/pad</MASTER_PAD_INFO>
+  </MASTER_PAD_VERSION_INFO>
+  <Company_Info>
+    <Company_Name>Jan Prochazka</Company_Name>
+    <Address_1>Vratislavska 396</Address_1>
+    <Address_2>Praha 8</Address_2>
+    <City_Town>Prague</City_Town>
+    <State_Province/>
+    <Zip_Postal_Code>18100</Zip_Postal_Code>
+    <Country>Czech Republic</Country>
+    <Company_WebSite_URL>https://dbgate.org/</Company_WebSite_URL>
+    <Contact_Info>
+      <Contact_First_Name>Jan</Contact_First_Name>
+      <Contact_Last_Name>Prochazka</Contact_Last_Name>
+      <Contact_Email>jenasoft.database@gmail.com</Contact_Email>
+      <Author_First_Name>Jan</Author_First_Name>
+      <Author_Last_Name>Prochazka</Author_Last_Name>
+      <Author_Email>jenasoft.database@gmail.com</Author_Email>
+    </Contact_Info>
+    <Support_Info>
+      <Sales_Email>jenasoft.database@gmail.com</Sales_Email>
+      <Support_Email>jenasoft.database@gmail.com</Support_Email>
+      <General_Email>jenasoft.database@gmail.com</General_Email>
+      <Sales_Phone/>
+      <Support_Phone/>
+      <General_Phone/>
+      <Fax_Phone/>
+    </Support_Info>
+  </Company_Info>
+  <Site>
+    <Site_FORM>Y</Site_FORM>
+    <Site_VERSION>1.0</Site_VERSION>
+    <Site_URL>https://dbgate.org/</Site_URL>
+    <Site_DESCRIPTION>This PAD extension allows you to add your site info into your PAD file. This info can be used by site submission software or by web directories themselves.</Site_DESCRIPTION>
+    <Site_Contact_Email>jenasoft.database@gmail.com</Site_Contact_Email>
+    <Site_Contact_First_Name>Jan</Site_Contact_First_Name>
+    <Site_Contact_Last_Name>Prochazka</Site_Contact_Last_Name>
+    <Site_Description_100>Database tools - effecient data manipulation</Site_Description_100>
+    <Site_Description_250>Database tools - effecient data manipulation, import, export, filtering, master/detail, query designer</Site_Description_250>
+    <Site_Description_450>Database tools - effecient data manipulation, import, export, filtering, master/detail, query designer</Site_Description_450>
+    <Site_Site_URL>https://dbgate.org/</Site_Site_URL>
+    <Site_Site_Title>DbGate</Site_Site_Title>
+    <Site_Keywords>database, manager, organizer, explorer, mssql, sqlserver, tsql, sql, mysql, postgre, postgresql,  export, import, filter</Site_Keywords>
+  </Site>
+  <Program_Info>
+    <Program_Name>DbGate</Program_Name>
+    <Program_Version>#VERSION#</Program_Version>
+    <Program_Release_Month>#MONTH#</Program_Release_Month>
+    <Program_Release_Day>#DAY#</Program_Release_Day>
+    <Program_Release_Year>#YEAR#</Program_Release_Year>
+    <Program_Cost_Dollars>0.00</Program_Cost_Dollars>
+    <Program_Type>Freeware</Program_Type>
+    <Program_Release_Status>Major Update</Program_Release_Status>
+    <Program_Install_Support>Install and Uninstall</Program_Install_Support>
+    <Program_OS_Support>Linux,Linux Gnome,Linux GPL,Linux Open Source,Mac OS X,Win7 x64,WinOther</Program_OS_Support>
+    <Program_Language>English</Program_Language>
+    <Program_Change_Info>Query designer</Program_Change_Info>
+    <Program_System_Requirements></Program_System_Requirements>
+    <Program_Category_Class>Business::Databases &amp; Tools</Program_Category_Class>
+    <File_Info>
+      <File_Size_Bytes>#SIZE_BYTES#</File_Size_Bytes>
+      <File_Size_K>#SIZE_KB#</File_Size_K>
+      <File_Size_MB>#SIZE_MB#</File_Size_MB>
+      <Filename_Versioned/>
+      <Filename_Previous/>
+      <Filename_Generic/>
+      <Filename_Long/>
+    </File_Info>
+    <Expire_Info>
+      <Has_Expire_Info>N</Has_Expire_Info>
+      <Expire_Based_On>Days</Expire_Based_On>
+      <Expire_Count/>
+      <Expire_Other_Info/>
+      <Expire_Month/>
+      <Expire_Day/>
+      <Expire_Year/>
+    </Expire_Info>
+    <Program_Categories>Business &amp; Finance :: Database Managers,Programming :: Databases &amp; Networks,Programming :: SQL</Program_Categories>
+    <Limitations>No limitations</Limitations>
+    <Program_Cost_Other_Code/>
+    <Program_Cost_Other/>
+    <Awards/>
+    <Program_Specific_Category/>
+    <Includes_JAVA_VM/>
+    <Includes_VB_Runtime/>
+    <Includes_DirectX/>
+  </Program_Info>
+  <Web_Info>
+    <Application_URLs>
+      <Application_Info_URL>https://dbgate.org/</Application_Info_URL>
+      <Application_Screenshot_URL>https://raw.githubusercontent.com/dbshell/dbgate/master/screenshot.png</Application_Screenshot_URL>
+      <Application_Icon_URL>https://github.com/dbshell/dbgate/raw/master/app/icon.png</Application_Icon_URL>
+      <Application_XML_File_URL>https://github.com/dbshell/dbgate/releases/latest/download/dbgate-pad.xml</Application_XML_File_URL>
+      <Application_Order_URL></Application_Order_URL>
+    </Application_URLs>
+    <Download_URLs>
+      <Primary_Download_URL>https://github.com/dbshell/dbgate/releases/latest/download/dbgate-latest.exe</Primary_Download_URL>
+      <Secondary_Download_URL></Secondary_Download_URL>
+      <Additional_Download_URL_1/>
+      <Additional_Download_URL_2/>
+    </Download_URLs>
+  </Web_Info>
+  <Permissions>
+    <Distribution_Permissions>This product can be freely distributed through the Internet. To put it onto a CD, please contact jenasoft.database@gmail.com</Distribution_Permissions>
+    <EULA>MIT License
+
+Copyright (c) 2021 Jan Prochazka
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.</EULA>
+  </Permissions>
+  <Program_Descriptions>
+    <English>
+      <Keywords>sql, management, tool, microsoft, sql, mssql, postgres, postgresql, mysql, csv, data, export, import, javascript, database</Keywords>
+      <Char_Desc_45>Modern data manipulation tool</Char_Desc_45>
+      <Char_Desc_80>Modern cross-platform data manipulation tool</Char_Desc_80>
+      <Char_Desc_250>Modern cross-platform data manipulation tool for Microsoft SQL Server, PostgreSQL and MySQL. Query designer. Master/detail views. Advanced data filtering. Export, import. Exports can be saved as jobs</Char_Desc_250>
+      <Char_Desc_450>Modern cross-platform data manipulation tool for Microsoft SQL Server, PostgreSQL and MySQL. Query designer. Charts. Master/detail views. Advanced data filtering. Export, import. Exports can be saved as jobs</Char_Desc_450>
+      <Char_Desc_2000>
+Modern cross-platform data manipulation tool for Microsoft SQL Server, PostgreSQL and MySQL
+Main features: 
+  Quick database browser
+  Database editor, view and and views, stored procedures, functions, triggers, table relations
+  Export, import - CSV, MS Excel
+  Form view for tables with many columns
+  Query designer
+  Advanced data filtering 
+  JavaScript data scripting
+  Run queries, code completion
+  Display data from referenced tables
+  Create charts, supports for active charts - are refreshed when underlying source is changed
+</Char_Desc_2000>
+    </English>
+    <Czech>
+      <Char_Desc_250>Správce databází MS SQL Server, MySQL a PostgreSQL</Char_Desc_250>
+      <Char_Desc_2000>
+Moderní multiplatformní nástroj pro práci s databázemi pro Microsoft SQL Server, PostgreSQL a MySQL. 
+Hlavní funkce: 
+  Prohlížení databáze, tabulek, pohledů, uložených procedur a funkcí
+  Export, import - CSV, MS Excel
+  Zobrazení jednoho řádku tabulky "na výšku" - vhodné pro tabulky s mnoha sloupci
+  Grafický návrh dotazů
+  Pokročilé filtrování dat
+  Advanced data filtering 
+  Skriptování pomocí jazyka JavaScript
+  SQL editor, doplňování kódu
+  Zobrazování referencových dat, na základě cizích klíčů
+  Vytváření grafů, podpora aktivních grafů - obnoví se, pokud se změní zdroj dat
+</Char_Desc_2000>
+    </Czech>
+  </Program_Descriptions>
+</XML_DIZ_INFO>

app/license.txt

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.

app/package.json

@@ -1,36 +1,74 @@
 {
   "name": "dbgate",
-  "version": "3.8.14",
+  "version": "4.1.1",
   "private": true,
   "author": "Jan Prochazka <jenasoft.database@gmail.com>",
+  "description": "Opensource database administration tool",
   "dependencies": {
+    "electron-log": "^4.3.1",
     "electron-store": "^5.1.1",
-    "electron-updater": "^4.3.1"
+    "electron-updater": "^4.3.5"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dbgate/dbgate.git"
   },
   "build": {
     "appId": "org.dbgate",
     "mac": {
       "category": "database",
-      "icon": "icon512.png"
+      "icon": "icon512.png",
+      "artifactName": "dbgate-mac-${version}.${ext}",
+      "publish": [
+        "github"
+      ],
+      "target": {
+        "target": "default",
+        "arch": [
+          "arm64",
+          "x64"
+        ]
+      }
     },
     "linux": {
       "target": [
         "AppImage",
-        "deb"
+        "deb",
+        "snap"
       ],
-      "icon": "256x256.png",
+      "icon": "icon.png",
+      "artifactName": "dbgate-linux-${version}.${ext}",
       "category": "Development",
-      "synopsis": "Database administration tool for MS SQL, MySQL and PostgreSQL"
+      "synopsis": "Database administration tool for MS SQL, MySQL and PostgreSQL",
+      "publish": [
+        "github"
+      ]
+    },
+    "snap": {
+      "publish": [
+        "github",
+        "snapStore"
+      ],
+      "environment": {
+        "ELECTRON_SNAP": "true"
+      }
     },
     "win": {
       "target": [
-        "nsis"
+        "nsis",
+        "zip"
       ],
-      "icon": "icon.ico"
+      "artifactName": "dbgate-windows-${version}.${ext}",
+      "icon": "icon.ico",
+      "publish": [
+        "github"
+      ],
+      "rfc3161TimeStampServer": "http://sha256timestamp.ws.symantec.com/sha256/timestamp"
     },
     "files": [
       "packages",
-      "src"
+      "src",
+      "icon.png"
     ]
   },
   "homepage": "./",
@@ -38,16 +76,19 @@
     "start": "cross-env ELECTRON_START_URL=http://localhost:5000 electron .",
     "start:local": "cross-env electron .",
     "dist": "electron-builder",
-    "build": "cd ../packages/api && yarn build && cd ../web && yarn build:app && cd ../../app && yarn dist",
-    "build:local": "cd ../packages/api && yarn build && cd ../web && yarn build:app && cd ../../app && yarn predist",
+    "build": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn dist",
+    "build:local": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn predist",
     "postinstall": "electron-builder install-app-deps",
-    "predist": "copyfiles ../packages/api/dist/* packages && copyfiles \"../packages/web/build/*\" packages && copyfiles \"../packages/web/build/**/*\" packages"
+    "predist": "copyfiles ../packages/api/dist/* packages && copyfiles \"../packages/web/public/*\" packages && copyfiles \"../packages/web/public/**/*\" packages && copyfiles --up 3 \"../plugins/dist/**/*\" packages/plugins"
   },
   "main": "src/electron.js",
   "devDependencies": {
     "copyfiles": "^2.2.0",
     "cross-env": "^6.0.3",
-    "electron": "8.1.1",
-    "electron-builder": "22.4.1"
+    "electron": "11.2.3",
+    "electron-builder": "22.9.1"
+  },
+  "optionalDependencies": {
+    "msnodesqlv8": "^2.0.10"
   }
 }

app/src/electron.js

@@ -1,9 +1,11 @@
 const electron = require('electron');
 const os = require('os');
-const { Menu } = require('electron');
+const { Menu, ipcMain } = require('electron');
 const { fork } = require('child_process');
-var { autoUpdater } = require('electron-updater');
+const { autoUpdater } = require('electron-updater');
 const Store = require('electron-store');
+const log = require('electron-log');
+
 // Module to control application life.
 const app = electron.app;
 // Module to create native browser window.
@@ -18,6 +20,14 @@ const store = new Store();
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow;
 let splashWindow;
+let mainMenu;
+
+log.transports.file.level = 'debug';
+autoUpdater.logger = log;
+// TODO - create settings for this
+// appUpdater.channel = 'beta';
+
+let commands = {};
 
 function hideSplash() {
   if (splashWindow) {
@@ -27,29 +37,48 @@ function hideSplash() {
   mainWindow.show();
 }
 
+function commandItem(id) {
+  const command = commands[id];
+  return {
+    id,
+    label: command ? command.menuName || command.toolbarName || command.name : id,
+    accelerator: command ? command.keyText : undefined,
+    enabled: command ? command.enabled : false,
+    click() {
+      mainWindow.webContents.executeJavaScript(`dbgate_runCommand('${id}')`);
+    },
+  };
+}
+
 function buildMenu() {
   const template = [
     {
       label: 'File',
       submenu: [
-        {
-          label: 'Connect to database',
-          click() {
-            mainWindow.webContents.executeJavaScript(`dbgate_createNewConnection()`);
-          },
-        },
-        {
-          label: 'New query',
-          click() {
-            mainWindow.webContents.executeJavaScript(`dbgate_newQuery()`);
-          },
-        },
+        commandItem('new.connection'),
+        commandItem('file.open'),
+        commandItem('group.save'),
+        commandItem('group.saveAs'),
+        { type: 'separator' },
+        { role: 'close' },
       ],
     },
     {
-      label: 'Edit',
-      submenu: [{ role: 'copy' }, { role: 'paste' }],
+      label: 'Window',
+      submenu: [commandItem('new.query'), { type: 'separator' }, commandItem('tabs.closeAll'), { role: 'minimize' }],
     },
+
+    // {
+    //   label: 'Edit',
+    //   submenu: [
+    //     { role: 'undo' },
+    //     { role: 'redo' },
+    //     { type: 'separator' },
+    //     { role: 'cut' },
+    //     { role: 'copy' },
+    //     { role: 'paste' },
+    //   ],
+    // },
     {
       label: 'View',
       submenu: [
@@ -62,20 +91,7 @@ function buildMenu() {
         { role: 'zoomout' },
         { type: 'separator' },
         { role: 'togglefullscreen' },
-      ],
-    },
-    {
-      role: 'window',
-      submenu: [
-        {
-          label: 'Close all tabs',
-          click() {
-            mainWindow.webContents.executeJavaScript('dbgate_closeAll()');
-          },
-        },
-        { type: 'separator' },
-        { role: 'minimize' },
-        { role: 'close' },
+        commandItem('theme.changeTheme'),
       ],
     },
     {
@@ -90,7 +106,7 @@ function buildMenu() {
         {
           label: 'DbGate on GitHub',
           click() {
-            require('electron').shell.openExternal('https://github.com/dbshell/dbgate');
+            require('electron').shell.openExternal('https://github.com/dbgate/dbgate');
           },
         },
         {
@@ -100,11 +116,12 @@ function buildMenu() {
           },
         },
         {
-          label: 'About',
+          label: 'Report problem or feature request',
           click() {
-            mainWindow.webContents.executeJavaScript(`dbgate_showAbout()`);
+            require('electron').shell.openExternal('https://github.com/dbgate/dbgate/issues/new');
           },
         },
+        commandItem('about.show'),
       ],
     },
   ];
@@ -112,27 +129,48 @@ function buildMenu() {
   return Menu.buildFromTemplate(template);
 }
 
+ipcMain.on('update-commands', async (event, arg) => {
+  commands = JSON.parse(arg);
+  for (const key of Object.keys(commands)) {
+    const menu = mainMenu.getMenuItemById(key);
+    if (!menu) continue;
+    const command = commands[key];
+
+    // rebuild menu
+    if (menu.label != command.text || menu.accelerator != command.keyText) {
+      mainMenu = buildMenu();
+      mainWindow.setMenu(mainMenu);
+      return;
+    }
+
+    menu.enabled = command.enabled;
+  }
+});
+
 function createWindow() {
   const bounds = store.get('winBounds');
+
   mainWindow = new BrowserWindow({
     width: 1200,
     height: 800,
     title: 'DbGate',
-    icon: os.platform() == 'win32' ? 'icon.ico' : 'icon512.png',
     ...bounds,
+    icon: os.platform() == 'win32' ? 'icon.ico' : path.resolve(__dirname, '../icon.png'),
     show: false,
     webPreferences: {
       nodeIntegration: true,
+      enableRemoteModule: true,
     },
   });
 
-  mainWindow.setMenu(buildMenu());
+  mainMenu = buildMenu();
+  mainWindow.setMenu(mainMenu);
 
   function loadMainWindow() {
     const startUrl =
       process.env.ELECTRON_START_URL ||
       url.format({
-        pathname: path.join(__dirname, '../packages/web/build/index.html'),
+        pathname: path.join(__dirname, '../packages/web/public/index.html'),
         protocol: 'file:',
         slashes: true,
       });
@@ -143,6 +181,9 @@ function createWindow() {
       store.set('winBounds', mainWindow.getBounds());
     });
     mainWindow.loadURL(startUrl);
+    if (os.platform() == 'linux') {
+      mainWindow.setIcon(path.resolve(__dirname, '../icon.png'));
+    }
   }
 
   splashWindow = new BrowserWindow({
@@ -162,11 +203,18 @@ function createWindow() {
   if (process.env.ELECTRON_START_URL) {
     loadMainWindow();
   } else {
-    const apiProcess = fork(path.join(__dirname, '../packages/api/dist/bundle.js'), ['--dynport']);
-    apiProcess.on('message', (msg) => {
+    const apiProcess = fork(path.join(__dirname, '../packages/api/dist/bundle.js'), [
+      '--dynport',
+      '--is-electron-bundle',
+      '--native-modules',
+      path.join(__dirname, 'nativeModules'),
+      // '../../../src/nativeModules'
+    ]);
+    apiProcess.on('message', msg => {
       if (msg.msgtype == 'listening') {
-        const { port } = msg;
+        const { port, authorization } = msg;
         global['port'] = port;
+        global['authorization'] = authorization;
         loadMainWindow();
       }
     });

app/src/nativeModules.js

@@ -0,0 +1,3 @@
+const content = require('./nativeModulesContent');
+
+module.exports = content;

fillNativeModules.js

@@ -0,0 +1,22 @@
+const fs = require('fs');
+
+let fillContent = '';
+
+if (process.platform == 'win32') {
+  fillContent += `content.msnodesqlv8 = () => require('msnodesqlv8');`;
+}
+
+const getContent = (empty) => `
+// this file is generated automatically by script fillNativeModules.js, do not edit it manually
+const content = {};
+
+${empty ? '' : fillContent}
+
+module.exports = content;
+`;
+
+fs.writeFileSync(
+  'packages/api/src/nativeModulesContent.js',
+  getContent(process.argv.includes('--electron') ? true : false)
+);
+fs.writeFileSync('app/src/nativeModulesContent.js', getContent(false));

generatePadFile.js

@@ -0,0 +1,31 @@
+const fs = require('fs');
+const path = require('path');
+const packageJson = fs.readFileSync('app/package.json', { encoding: 'utf-8' });
+const json = JSON.parse(packageJson);
+const { version } = json;
+
+const template = fs.readFileSync('app/dbgate-pad-template.xml', { encoding: 'utf-8' });
+
+const date = new Date();
+let size = 0;
+
+const files = fs.readdirSync('app/dist');
+for (const file of files) {
+  if (file.endsWith('.exe')) {
+    const stats = fs.statSync(path.join('app', 'dist', file));
+    size = stats.size;
+  }
+}
+
+const padContent = template
+  .replace('#VERSION#', version)
+  .replace('#YEAR#', date.getFullYear())
+  .replace('#MONTH#', (date.getMonth() + 1).toString().padStart(2, '0'))
+  .replace('#DAY#', date.getDate().toString().padStart(2, '0'))
+  .replace('#SIZE_BYTES#', size)
+  .replace('#SIZE_KB#', Math.round(size / 1024))
+  .replace('#SIZE_MB#', Math.round(size / 1024 / 1024));
+
+if (size > 0) {
+  fs.writeFileSync('app/dist/dbgate-pad.xml', padContent, 'utf-8');
+}

package.json

@@ -1,14 +1,16 @@
 {
   "private": true,
+  "version": "4.1.10-beta.1",
   "name": "dbgate-all",
   "workspaces": [
-    "packages/*"
+    "packages/*",
+    "plugins/*"
   ],
   "scripts": {
     "start:api": "yarn workspace dbgate-api start",
     "start:api:portal": "yarn workspace dbgate-api start:portal",
     "start:api:covid": "yarn workspace dbgate-api start:covid",
-    "start:web": "yarn workspace dbgate-web start",
+    "start:web": "yarn workspace dbgate-web dev",
     "start:sqltree": "yarn workspace dbgate-sqltree start",
     "start:tools": "yarn workspace dbgate-tools start",
     "start:datalib": "yarn workspace dbgate-datalib start",
@@ -18,23 +20,27 @@
     "build:filterparser": "yarn workspace dbgate-filterparser build",
     "build:tools": "yarn workspace dbgate-tools build",
     "build:lib": "yarn build:tools && yarn build:sqltree && yarn build:filterparser && yarn build:datalib",
-    "build:app": "cd app && yarn install && yarn build",
+    "build:app": "yarn plugins:copydist && cd app && yarn install && yarn build",
     "build:api": "yarn workspace dbgate-api build",
-    "build:web:docker": "yarn workspace dbgate-web build:docker",
-    "build:app:local": "cd app && yarn build:local",
+    "build:web:docker": "yarn workspace dbgate-web build",
+    "build:plugins:frontend": "workspaces-run --only=\"dbgate-plugin-*\" -- yarn build:frontend",
+    "build:plugins:frontend:watch": "workspaces-run --parallel --only=\"dbgate-plugin-*\" -- yarn build:frontend:watch",
+    "plugins:copydist": "workspaces-run --only=\"dbgate-plugin-*\" -- yarn copydist",
+    "build:app:local": "yarn plugins:copydist && cd app && yarn build:local",
     "start:app:local": "cd app && yarn start:local",
     "setCurrentVersion": "node setCurrentVersion",
-
-    "copy:docker:build": "copyfiles packages/api/dist/* docker -f && copyfiles packages/web/build/* docker -u 2 && copyfiles \"packages/web/build/**/*\" docker -u 2",
-    "prepare:docker": "yarn build:web:docker && yarn build:api && yarn copy:docker:build",
-
-    "prepare": "yarn build:lib",
+    "generatePadFile": "node generatePadFile",
+    "fillNativeModules": "node fillNativeModules",
+    "fillNativeModulesElectron": "node fillNativeModules --eletron",
+    "prettier": "prettier --write packages/api/src && prettier --write packages/datalib/src && prettier --write packages/filterparser/src && prettier --write packages/sqltree/src && prettier --write packages/tools/src && prettier --write packages/types && prettier --write packages/web/src && prettier --write app/src",
+    "copy:docker:build": "copyfiles packages/api/dist/* docker -f && copyfiles packages/web/public/* docker -u 2 && copyfiles \"packages/web/public/**/*\" docker -u 2 && copyfiles \"plugins/dist/**/*\" docker/plugins -u 2",
+    "prepare:docker": "yarn plugins:copydist && yarn build:web:docker && yarn build:api && yarn copy:docker:build",
     "start": "concurrently --kill-others-on-fail \"yarn start:api\" \"yarn start:web\"",
-    "lib": "concurrently --kill-others-on-fail \"yarn start:sqltree\" \"yarn start:filterparser\" \"yarn start:datalib\" \"yarn start:tools\"",
+    "lib": "concurrently --kill-others-on-fail \"yarn start:sqltree\" \"yarn start:filterparser\" \"yarn start:datalib\" \"yarn start:tools\" \"yarn build:plugins:frontend:watch\"",
     "ts:api": "yarn workspace dbgate-api ts",
     "ts:web": "yarn workspace dbgate-web ts",
     "ts": "yarn ts:api && yarn ts:web",
-    "postinstall": "patch-package"
+    "postinstall": "yarn build:lib && patch-package && yarn fillNativeModules && yarn build:plugins:frontend"
   },
   "dependencies": {
     "concurrently": "^5.1.0",
@@ -42,6 +48,8 @@
     "socket.io": "^2.3.0"
   },
   "devDependencies": {
-    "copyfiles": "^2.2.0"
+    "copyfiles": "^2.2.0",
+    "prettier": "^2.2.1",
+    "workspaces-run": "^1.0.1"
   }
 }

packages/api/.env

@@ -1,23 +1 @@
-CONNECTIONS=mysql,postgres
-
-LABEL_mysql=MySql localhost
-SERVER_mysql=localhost
-USER_mysql=root
-PASSWORD_mysql=test
-PORT_mysql=3307
-ENGINE_mysql=mysql
-
-LABEL_postgres=Postgres localhost
-SERVER_postgres=localhost
-USER_postgres=postgres
-PASSWORD_postgres=test
-PORT_postgres=5433
-ENGINE_postgres=postgres
-
-TOOLBAR=home
-ICON_home=mdi mdi-home
-TITLE_home=Home
-PAGE_home=home.html
-STARTUP_PAGES=home
-
-PAGES_DIRECTORY=/home/jena/jenasoft/dbgate-web/pages
+DEVMODE=1

packages/api/.env-covid

@@ -1,3 +1,5 @@
+DEVMODE=1
+
 CONNECTIONS=mysql
 
 LABEL_mysql=MySql

packages/api/.env-portal

@@ -0,0 +1,17 @@
+DEVMODE=1
+
+CONNECTIONS=mysql,postgres
+
+LABEL_mysql=MySql localhost
+SERVER_mysql=localhost
+USER_mysql=root
+PASSWORD_mysql=test
+PORT_mysql=3307
+ENGINE_mysql=mysql@dbgate-plugin-mysql
+
+LABEL_postgres=Postgres localhost
+SERVER_postgres=localhost
+USER_postgres=postgres
+PASSWORD_postgres=test
+PORT_postgres=5433
+ENGINE_postgres=postgres@dbgate-plugin-postgres

packages/api/README.md

@@ -32,7 +32,7 @@ dbgateApi.runScript(run);
 
 ```
 
-Silly example, runs without any dependencies. Copy [fakeObjectReader](https://github.com/dbshell/dbgate/blob/master/packages/api/src/shell/fakeObjectReader.js) to [consoleObjectWriter](https://github.com/dbshell/dbgate/blob/master/packages/api/src/shell/consoleObjectWriter.js) .
+Silly example, runs without any dependencies. Copy [fakeObjectReader](https://github.com/dbgate/dbgate/blob/master/packages/api/src/shell/fakeObjectReader.js) to [consoleObjectWriter](https://github.com/dbgate/dbgate/blob/master/packages/api/src/shell/consoleObjectWriter.js) .
 
 ```javascript
 

packages/api/package.json

@@ -1,15 +1,14 @@
 {
   "name": "dbgate-api",
   "main": "src/index.js",
-  "version": "1.0.7",
+  "version": "4.1.1",
   "homepage": "https://dbgate.org/",
   "repository": {
     "type": "git",
-    "url": "https://github.com/dbshell/dbgate.git"
+    "url": "https://github.com/dbgate/dbgate.git"
   },
-  "funding": "https://www.paypal.com/paypalme/JanProchazkaCz/30eur",
   "author": "Jan Prochazka",
-  "license": "GPL",
+  "license": "MIT",
   "keywords": [
     "sql",
     "json",
@@ -23,39 +22,50 @@
     "body-parser": "^1.19.0",
     "bufferutil": "^4.0.1",
     "byline": "^5.0.0",
+    "compare-versions": "^3.6.0",
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
-    "dbgate-sqltree": "^1.0.0",
-    "dbgate-tools": "^1.0.0",
+    "dbgate-sqltree": "^4.1.1",
+    "dbgate-tools": "^4.1.1",
     "eslint": "^6.8.0",
     "express": "^4.17.1",
     "express-basic-auth": "^1.2.0",
     "express-fileupload": "^1.2.0",
-    "find-free-port": "^2.0.0",
-    "fs-extra": "^8.1.0",
+    "fs-extra": "^9.1.0",
+    "get-port": "^5.1.1",
     "http": "^0.0.0",
+    "json-stable-stringify": "^1.0.1",
     "line-reader": "^0.4.0",
     "lodash": "^4.17.15",
     "ncp": "^2.0.0",
     "nedb-promises": "^4.0.1",
     "node-cron": "^2.0.3",
+    "node-ssh-forward": "^0.7.2",
+    "portfinder": "^1.0.28",
+    "simple-encryptor": "^4.0.0",
+    "socket.io": "^2.3.0",
     "tar": "^6.0.5",
     "uuid": "^3.4.0"
   },
   "scripts": {
-    "start": "nodemon src/index.js",
-    "start:portal": "env-cmd nodemon src/index.js",
-    "start:covid": "env-cmd -f .covid-env nodemon src/index.js",
+    "start": "env-cmd node src/index.js",
+    "start:portal": "env-cmd -f .env-portal node src/index.js",
+    "start:covid": "env-cmd -f .env-covid node src/index.js",
     "ts": "tsc",
     "build": "webpack"
   },
   "devDependencies": {
+    "@types/fs-extra": "^9.0.11",
     "@types/lodash": "^4.14.149",
-    "dbgate-types": "^1.0.0",
+    "dbgate-types": "^4.1.1",
     "env-cmd": "^10.1.0",
+    "node-loader": "^1.0.2",
     "nodemon": "^2.0.2",
     "typescript": "^3.7.4",
     "webpack": "^4.42.0",
     "webpack-cli": "^3.3.11"
+  },
+  "optionalDependencies": {
+    "msnodesqlv8": "^2.0.10"
   }
 }

packages/api/src/controllers/archive.js

@@ -18,8 +18,8 @@ module.exports = {
         type: 'jsonl',
       },
       ...folders
-        .filter((x) => x != 'default')
-        .map((name) => ({
+        .filter(x => x != 'default')
+        .map(name => ({
           name,
           type: 'jsonl',
         })),
@@ -39,8 +39,8 @@ module.exports = {
     if (!(await fs.exists(dir))) return [];
     const files = await fs.readdir(dir);
     return files
-      .filter((name) => name.endsWith('.jsonl'))
-      .map((name) => ({
+      .filter(name => name.endsWith('.jsonl'))
+      .map(name => ({
         name: name.slice(0, -'.jsonl'.length),
         type: 'jsonl',
       }));
@@ -84,7 +84,7 @@ module.exports = {
       });
       let structure = null;
       const rows = [];
-      liner.on('line', (line) => {
+      liner.on('line', line => {
         const data = JSON.parse(line);
         if (structure) rows.push(data);
         else structure = data;

packages/api/src/controllers/config.js

@@ -1,4 +1,12 @@
+const fs = require('fs-extra');
+const path = require('path');
+const { datadir } = require('../utility/directories');
+const hasPermission = require('../utility/hasPermission');
+const socket = require('../utility/socket');
+const _ = require('lodash');
+
 const currentVersion = require('../currentVersion');
+const platformInfo = require('../utility/platformInfo');
 
 module.exports = {
   get_meta: 'get',
@@ -31,4 +39,35 @@ module.exports = {
       ...currentVersion,
     };
   },
+
+  platformInfo_meta: 'get',
+  async platformInfo() {
+    return platformInfo;
+  },
+
+  getSettings_meta: 'get',
+  async getSettings() {
+    try {
+      return JSON.parse(await fs.readFile(path.join(datadir(), 'settings.json'), { encoding: 'utf-8' }));
+    } catch (err) {
+      return {};
+    }
+  },
+
+  updateSettings_meta: 'post',
+  async updateSettings(values) {
+    if (!hasPermission(`settings/change`)) return false;
+    const oldSettings = await this.getSettings();
+    try {
+      const updated = {
+        ...oldSettings,
+        ...values,
+      };
+      await fs.writeFile(path.join(datadir(), 'settings.json'), JSON.stringify(updated, undefined, 2));
+      socket.emitChanged(`settings-changed`);
+      return updated;
+    } catch (err) {
+      return false;
+    }
+  },
 };

packages/api/src/controllers/connections.js

@@ -5,10 +5,12 @@ const nedb = require('nedb-promises');
 
 const { datadir } = require('../utility/directories');
 const socket = require('../utility/socket');
+const { encryptConnection } = require('../utility/crypting');
+const { handleProcessCommunication } = require('../utility/processComm');
 
 function getPortalCollections() {
   if (process.env.CONNECTIONS) {
-    return _.compact(process.env.CONNECTIONS.split(',')).map((id) => ({
+    return _.compact(process.env.CONNECTIONS.split(',')).map(id => ({
       _id: id,
       engine: process.env[`ENGINE_${id}`],
       server: process.env[`SERVER_${id}`],
@@ -44,8 +46,9 @@ module.exports = {
     raw: true,
   },
   test(req, res) {
-    const subprocess = fork(process.argv[1], ['connectProcess']);
-    subprocess.on('message', (resp) => {
+    const subprocess = fork(process.argv[1], ['--start-process', 'connectProcess', ...process.argv.slice(3)]);
+    subprocess.on('message', resp => {
+      if (handleProcessCommunication(resp, subprocess)) return;
       // @ts-ignore
       const { msgtype } = resp;
       if (msgtype == 'connected' || msgtype == 'error') {
@@ -59,10 +62,11 @@ module.exports = {
   async save(connection) {
     if (portalConnections) return;
     let res;
+    const encrypted = encryptConnection(connection);
     if (connection._id) {
-      res = await this.datastore.update(_.pick(connection, '_id'), connection);
+      res = await this.datastore.update(_.pick(connection, '_id'), encrypted);
     } else {
-      res = await this.datastore.insert(connection);
+      res = await this.datastore.insert(encrypted);
     }
     socket.emitChanged('connection-list-changed');
     return res;
@@ -78,7 +82,7 @@ module.exports = {
 
   get_meta: 'get',
   async get({ conid }) {
-    if (portalConnections) return portalConnections.find((x) => x._id == conid);
+    if (portalConnections) return portalConnections.find(x => x._id == conid);
     const res = await this.datastore.find({ _id: conid });
     return res[0];
   },

packages/api/src/controllers/databaseConnections.js

@@ -3,15 +3,16 @@ const connections = require('./connections');
 const socket = require('../utility/socket');
 const { fork } = require('child_process');
 const { DatabaseAnalyser } = require('dbgate-tools');
+const { handleProcessCommunication } = require('../utility/processComm');
 
 module.exports = {
   /** @type {import('dbgate-types').OpenedDatabaseConnection[]} */
   opened: [],
-  closed: [],
+  closed: {},
   requests: {},
 
   handle_structure(conid, database, { structure }) {
-    const existing = this.opened.find((x) => x.conid == conid && x.database == database);
+    const existing = this.opened.find(x => x.conid == conid && x.database == database);
     if (!existing) return;
     existing.structure = structure;
     socket.emitChanged(`database-structure-changed-${conid}-${database}`);
@@ -26,8 +27,9 @@ module.exports = {
     delete this.requests[msgid];
   },
   handle_status(conid, database, { status }) {
-    const existing = this.opened.find((x) => x.conid == conid && x.database == database);
+    const existing = this.opened.find(x => x.conid == conid && x.database == database);
     if (!existing) return;
+    if (existing.status == status) return;
     existing.status = status;
     socket.emitChanged(`database-status-changed-${conid}-${database}`);
   },
@@ -35,11 +37,15 @@ module.exports = {
   handle_ping() {},
 
   async ensureOpened(conid, database) {
-    const existing = this.opened.find((x) => x.conid == conid && x.database == database);
+    const existing = this.opened.find(x => x.conid == conid && x.database == database);
     if (existing) return existing;
     const connection = await connections.get({ conid });
-    const subprocess = fork(process.argv[1], ['databaseConnectionProcess']);
-    const lastClosed = this.closed.find((x) => x.conid == conid && x.database == database);
+    const subprocess = fork(process.argv[1], [
+      '--start-process',
+      'databaseConnectionProcess',
+      ...process.argv.slice(3),
+    ]);
+    const lastClosed = this.closed[`${conid}/${database}`];
     const newOpened = {
       conid,
       database,
@@ -49,8 +55,10 @@ module.exports = {
       status: { name: 'pending' },
     };
     this.opened.push(newOpened);
-    // @ts-ignore
-    subprocess.on('message', ({ msgtype, ...message }) => {
+    subprocess.on('message', message => {
+      // @ts-ignore
+      const { msgtype } = message;
+      if (handleProcessCommunication(message, subprocess)) return;
       if (newOpened.disconnected) return;
       this[`handle_${msgtype}`](conid, database, message);
     });
@@ -81,14 +89,33 @@ module.exports = {
   async queryData({ conid, database, sql }) {
     console.log(`Processing query, conid=${conid}, database=${database}, sql=${sql}`);
     const opened = await this.ensureOpened(conid, database);
+    // if (opened && opened.status && opened.status.name == 'error') {
+    //   return opened.status;
+    // }
     const res = await this.sendRequest(opened, { msgtype: 'queryData', sql });
     return res;
   },
 
+  collectionData_meta: 'post',
+  async collectionData({ conid, database, options }) {
+    const opened = await this.ensureOpened(conid, database);
+    const res = await this.sendRequest(opened, { msgtype: 'collectionData', options });
+    return res.result;
+  },
+
+  updateCollection_meta: 'post',
+  async updateCollection({ conid, database, changeSet }) {
+    const opened = await this.ensureOpened(conid, database);
+    const res = await this.sendRequest(opened, { msgtype: 'updateCollection', changeSet });
+    return res.result;
+  },
+
   status_meta: 'get',
   async status({ conid, database }) {
-    const existing = this.opened.find((x) => x.conid == conid && x.database == database);
+    const existing = this.opened.find(x => x.conid == conid && x.database == database);
     if (existing) return existing.status;
+    const lastClosed = this.closed[`${conid}/${database}`];
+    if (lastClosed) return lastClosed.status;
     return {
       name: 'error',
       message: 'Not connected',
@@ -97,11 +124,18 @@ module.exports = {
 
   ping_meta: 'post',
   async ping({ conid, database }) {
-    const existing = this.opened.find((x) => x.conid == conid && x.database == database);
+    let existing = this.opened.find(x => x.conid == conid && x.database == database);
+
     if (existing) {
       existing.subprocess.send({ msgtype: 'ping' });
+    } else {
+      existing = await this.ensureOpened(conid, database);
     }
-    return { status: 'ok' };
+
+    return {
+      status: 'ok',
+      connectionStatus: existing ? existing.status : null,
+    };
   },
 
   refresh_meta: 'post',
@@ -113,12 +147,12 @@ module.exports = {
   },
 
   close(conid, database, kill = true) {
-    const existing = this.opened.find((x) => x.conid == conid && x.database == database);
+    const existing = this.opened.find(x => x.conid == conid && x.database == database);
     if (existing) {
       existing.disconnected = true;
       if (kill) existing.subprocess.kill();
-      this.opened = this.opened.filter((x) => x.conid != conid || x.database != database);
-      this.closed[conid] = {
+      this.opened = this.opened.filter(x => x.conid != conid || x.database != database);
+      this.closed[`${conid}/${database}`] = {
         status: {
           ...existing.status,
           name: 'error',
@@ -141,6 +175,16 @@ module.exports = {
     // };
   },
 
+  sqlPreview_meta: 'post',
+  async sqlPreview({ conid, database, objects, options }) {
+    // wait for structure
+    await this.structure({ conid, database });
+
+    const opened = await this.ensureOpened(conid, database);
+    const res = await this.sendRequest(opened, { msgtype: 'sqlPreview', objects, options });
+    return res;
+  },
+
   // runCommand_meta: 'post',
   // async runCommand({ conid, database, sql }) {
   //   console.log(`Running SQL command , conid=${conid}, database=${database}, sql=${sql}`);

packages/api/src/controllers/files.js

@@ -23,7 +23,7 @@ module.exports = {
     if (!hasPermission(`files/${folder}/read`)) return [];
     const dir = path.join(filesdir(), folder);
     if (!(await fs.exists(dir))) return [];
-    const files = (await fs.readdir(dir)).map((file) => ({ folder, file }));
+    const files = (await fs.readdir(dir)).map(file => ({ folder, file }));
     return files;
   },
 
@@ -34,7 +34,7 @@ module.exports = {
     for (const folder of folders) {
       if (!hasPermission(`files/${folder}/read`)) continue;
       const dir = path.join(filesdir(), folder);
-      const files = (await fs.readdir(dir)).map((file) => ({ folder, file }));
+      const files = (await fs.readdir(dir)).map(file => ({ folder, file }));
       res.push(...files);
     }
     return res;
@@ -78,6 +78,11 @@ module.exports = {
     }
   },
 
+  saveAs_meta: 'post',
+  async saveAs({ filePath, data, format }) {
+    await fs.writeFile(filePath, serialize(format, data));
+  },
+
   favorites_meta: 'get',
   async favorites() {
     if (!hasPermission(`files/favorites/read`)) return [];

packages/api/src/controllers/jsldata.js

@@ -121,7 +121,13 @@ module.exports = {
   getStats_meta: 'get',
   getStats({ jslid }) {
     const file = `${getJslFileName(jslid)}.stats`;
-    if (fs.existsSync(file)) return JSON.parse(fs.readFileSync(file, 'utf-8'));
+    if (fs.existsSync(file)) {
+      try {
+        return JSON.parse(fs.readFileSync(file, 'utf-8'));
+      } catch (e) {
+        return {};
+      }
+    }
     return {};
   },
 

packages/api/src/controllers/metadata.js

@@ -3,7 +3,7 @@ const fp = require('lodash/fp');
 const databaseConnections = require('./databaseConnections');
 
 function pickObjectNames(array) {
-  return _.sortBy(array, (x) => `${x.schemaName}.${x.pureName}`).map(fp.pick(['pureName', 'schemaName']));
+  return _.sortBy(array, x => `${x.schemaName}.${x.pureName}`).map(fp.pick(['pureName', 'schemaName']));
 }
 
 module.exports = {
@@ -17,7 +17,7 @@ module.exports = {
   listObjects_meta: 'get',
   async listObjects({ conid, database }) {
     const opened = await databaseConnections.ensureOpened(conid, database);
-    const types = ['tables', 'views', 'procedures', 'functions', 'triggers'];
+    const types = ['tables', 'collections', 'views', 'procedures', 'functions', 'triggers'];
     return types.reduce(
       (res, type) => ({
         ...res,
@@ -30,18 +30,18 @@ module.exports = {
   tableInfo_meta: 'get',
   async tableInfo({ conid, database, schemaName, pureName }) {
     const opened = await databaseConnections.ensureOpened(conid, database);
-    const table = opened.structure.tables.find((x) => x.pureName == pureName && x.schemaName == schemaName);
-    const allForeignKeys = _.flatten(opened.structure.tables.map((x) => x.foreignKeys));
+    const table = opened.structure.tables.find(x => x.pureName == pureName && x.schemaName == schemaName);
+    const allForeignKeys = _.flatten(opened.structure.tables.map(x => x.foreignKeys));
     return {
       ...table,
-      dependencies: allForeignKeys.filter((x) => x.refSchemaName == schemaName && x.refTableName == pureName),
+      dependencies: allForeignKeys.filter(x => x.refSchemaName == schemaName && x.refTableName == pureName),
     };
   },
 
   sqlObjectInfo_meta: 'get',
   async sqlObjectInfo({ objectTypeField, conid, database, schemaName, pureName }) {
     const opened = await databaseConnections.ensureOpened(conid, database);
-    const res = opened.structure[objectTypeField].find((x) => x.pureName == pureName && x.schemaName == schemaName);
+    const res = opened.structure[objectTypeField].find(x => x.pureName == pureName && x.schemaName == schemaName);
     return res;
   },
 };

packages/api/src/controllers/plugins.js

@@ -1,42 +1,22 @@
 const fs = require('fs-extra');
 const axios = require('axios');
 const path = require('path');
-const { pluginsdir, datadir } = require('../utility/directories');
+const { extractPackageName } = require('dbgate-tools');
+const { pluginsdir, packagedPluginsDir } = require('../utility/directories');
 const socket = require('../utility/socket');
+const compareVersions = require('compare-versions');
 const requirePlugin = require('../shell/requirePlugin');
 const downloadPackage = require('../utility/downloadPackage');
 const hasPermission = require('../utility/hasPermission');
-
-// async function loadPackageInfo(dir) {
-//   const readmeFile = path.join(dir, 'README.md');
-//   const packageFile = path.join(dir, 'package.json');
-
-//   if (!(await fs.exists(packageFile))) {
-//     return null;
-//   }
-
-//   let readme = null;
-//   let manifest = null;
-//   if (await fs.exists(readmeFile)) readme = await fs.readFile(readmeFile, { encoding: 'utf-8' });
-//   if (await fs.exists(packageFile)) manifest = JSON.parse(await fs.readFile(packageFile, { encoding: 'utf-8' }));
-//   return {
-//     readme,
-//     manifest,
-//   };
-// }
-
-const preinstallPlugins = [
-  'dbgate-plugin-mssql',
-  'dbgate-plugin-mysql',
-  'dbgate-plugin-postgres',
-  'dbgate-plugin-csv',
-  'dbgate-plugin-excel',
-];
+const _ = require('lodash');
 
 module.exports = {
   script_meta: 'get',
   async script({ packageName }) {
-    const file = path.join(pluginsdir(), packageName, 'dist', 'frontend.js');
+    const file1 = path.join(packagedPluginsDir(), packageName, 'dist', 'frontend.js');
+    const file2 = path.join(pluginsdir(), packageName, 'dist', 'frontend.js');
+    // @ts-ignore
+    const file = (await fs.exists(file1)) ? file1 : file2;
     const data = await fs.readFile(file, {
       encoding: 'utf-8',
     });
@@ -50,7 +30,7 @@ module.exports = {
       `http://registry.npmjs.com/-/v1/search?text=${encodeURIComponent(filter)}+keywords:dbgateplugin&size=25&from=0`
     );
     const { objects } = resp.data || {};
-    return (objects || []).map((x) => x.package);
+    return (objects || []).map(x => x.package);
   },
 
   info_meta: 'get',
@@ -60,10 +40,13 @@ module.exports = {
       const { latest } = infoResp.data['dist-tags'];
       const manifest = infoResp.data.versions[latest];
       const { readme } = infoResp.data;
+      // @ts-ignore
+      const isPackaged = await fs.exists(path.join(packagedPluginsDir(), packageName));
 
       return {
         readme,
         manifest,
+        isPackaged,
       };
     } catch (err) {
       return {
@@ -71,48 +54,48 @@ module.exports = {
         error: err.message,
       };
     }
-
-    // const dir = path.join(pluginstmpdir(), packageName);
-    // if (!(await fs.exists(dir))) {
-    //   await downloadPackage(packageName, dir);
-    // }
-    // return await loadPackageInfo(dir);
-    // return await {
-    //   ...loadPackageInfo(dir),
-    //   installed: loadPackageInfo(path.join(pluginsdir(), packageName)),
-    // };
   },
 
   installed_meta: 'get',
   async installed() {
-    const files = await fs.readdir(pluginsdir());
+    const files1 = await fs.readdir(packagedPluginsDir());
+    const files2 = await fs.readdir(pluginsdir());
+
     const res = [];
-    for (const packageName of files) {
+    for (const packageName of _.union(files1, files2)) {
+      if (!/^dbgate-plugin-.*$/.test(packageName)) continue;
+      const isPackaged = files1.includes(packageName);
       const manifest = await fs
-        .readFile(path.join(pluginsdir(), packageName, 'package.json'))
-        .then((x) => JSON.parse(x));
-      const readmeFile = path.join(pluginsdir(), packageName, 'README.md');
+        .readFile(path.join(isPackaged ? packagedPluginsDir() : pluginsdir(), packageName, 'package.json'), {
+          encoding: 'utf-8',
+        })
+        .then(x => JSON.parse(x));
+      const readmeFile = path.join(isPackaged ? packagedPluginsDir() : pluginsdir(), packageName, 'README.md');
+      // @ts-ignore
       if (await fs.exists(readmeFile)) {
         manifest.readme = await fs.readFile(readmeFile, { encoding: 'utf-8' });
       }
+      manifest.isPackaged = isPackaged;
       res.push(manifest);
     }
     return res;
-    // const res = await Promise.all(
-    //   files.map((packageName) =>
-    //     fs.readFile(path.join(pluginsdir(), packageName, 'package.json')).then((x) => JSON.parse(x))
-    //   )
-    // );
   },
 
+  // async saveRemovePlugins() {
+  //   await fs.writeFile(path.join(datadir(), 'removed-plugins'), this.removedPlugins.join('\n'));
+  // },
+
   install_meta: 'post',
   async install({ packageName }) {
     if (!hasPermission(`plugins/install`)) return;
     const dir = path.join(pluginsdir(), packageName);
+    // @ts-ignore
     if (!(await fs.exists(dir))) {
       await downloadPackage(packageName, dir);
     }
     socket.emitChanged(`installed-plugins-changed`);
+    // this.removedPlugins = this.removedPlugins.filter(x => x != packageName);
+    // await this.saveRemovePlugins();
   },
 
   uninstall_meta: 'post',
@@ -121,8 +104,21 @@ module.exports = {
     const dir = path.join(pluginsdir(), packageName);
     await fs.rmdir(dir, { recursive: true });
     socket.emitChanged(`installed-plugins-changed`);
-    this.removedPlugins.push(packageName);
-    await fs.writeFile(path.join(datadir(), 'removed-plugins'), this.removedPlugins.join('\n'));
+    // this.removedPlugins.push(packageName);
+    await this.saveRemovePlugins();
+  },
+
+  upgrade_meta: 'post',
+  async upgrade({ packageName }) {
+    if (!hasPermission(`plugins/install`)) return;
+    const dir = path.join(pluginsdir(), packageName);
+    // @ts-ignore
+    if (await fs.exists(dir)) {
+      await fs.rmdir(dir, { recursive: true });
+      await downloadPackage(packageName, dir);
+    }
+
+    socket.emitChanged(`installed-plugins-changed`);
   },
 
   command_meta: 'post',
@@ -131,24 +127,54 @@ module.exports = {
     return content.commands[command](args);
   },
 
-  async _init() {
-    const installed = await this.installed();
-    try {
-      this.removedPlugins = (await fs.readFile(path.join(datadir(), 'removed-plugins'), { encoding: 'utf-8' })).split(
-        '\n'
-      );
-    } catch (err) {
-      this.removedPlugins = [];
-    }
-    for (const packageName of preinstallPlugins) {
-      if (this.removedPlugins.includes(packageName)) continue;
-      if (installed.find((x) => x.name == packageName)) continue;
-      try {
-        console.log('Preinstalling plugin', packageName);
-        await this.install({ packageName });
-      } catch (err) {
-        console.error('Error preinstalling plugin', packageName, err);
-      }
-    }
+  authTypes_meta: 'get',
+  async authTypes({ engine }) {
+    const packageName = extractPackageName(engine);
+    const content = requirePlugin(packageName);
+    if (!content.driver || content.driver.engine != engine || !content.driver.getAuthTypes) return null;
+    return content.driver.getAuthTypes() || null;
   },
+
+  // async _init() {
+  //   const installed = await this.installed();
+  //   try {
+  //     this.removedPlugins = (await fs.readFile(path.join(datadir(), 'removed-plugins'), { encoding: 'utf-8' })).split(
+  //       '\n'
+  //     );
+  //   } catch (err) {
+  //     this.removedPlugins = [];
+  //   }
+
+  //   for (const packageName of Object.keys(preinstallPluginMinimalVersions)) {
+  //     const installedVersion = installed.find(x => x.name == packageName);
+  //     if (installedVersion) {
+  //       // plugin installed, test, whether upgrade
+  //       const requiredVersion = preinstallPluginMinimalVersions[packageName];
+  //       if (compareVersions(installedVersion.version, requiredVersion) < 0) {
+  //         console.log(
+  //           `Upgrading preinstalled plugin ${packageName}, found ${installedVersion.version}, required version ${requiredVersion}`
+  //         );
+  //         await this.upgrade({ packageName });
+  //       } else {
+  //         console.log(
+  //           `Plugin ${packageName} not upgraded, found ${installedVersion.version}, required version ${requiredVersion}`
+  //         );
+  //       }
+
+  //       continue;
+  //     }
+
+  //     if (this.removedPlugins.includes(packageName)) {
+  //       // plugin was remvoed, don't install again
+  //       continue;
+  //     }
+
+  //     try {
+  //       console.log('Preinstalling plugin', packageName);
+  //       await this.install({ packageName });
+  //     } catch (err) {
+  //       console.error('Error preinstalling plugin', packageName, err);
+  //     }
+  //   }
+  // },
 };

packages/api/src/controllers/runners.js

@@ -5,24 +5,26 @@ const uuidv1 = require('uuid/v1');
 const byline = require('byline');
 const socket = require('../utility/socket');
 const { fork } = require('child_process');
-const { rundir, uploadsdir, pluginsdir } = require('../utility/directories');
+const { rundir, uploadsdir, pluginsdir, getPluginBackendPath, packagedPluginList } = require('../utility/directories');
 const { extractShellApiPlugins, extractShellApiFunctionName } = require('dbgate-tools');
+const { handleProcessCommunication } = require('../utility/processComm');
 
 function extractPlugins(script) {
   const requireRegex = /\s*\/\/\s*@require\s+([^\s]+)\s*\n/g;
   const matches = [...script.matchAll(requireRegex)];
-  return matches.map((x) => x[1]);
+  return matches.map(x => x[1]);
 }
 
-const requirePluginsTemplate = (plugins) =>
+const requirePluginsTemplate = plugins =>
   plugins
     .map(
-      (packageName) => `const ${_.camelCase(packageName)} = require(process.env.PLUGIN_${_.camelCase(packageName)});\n`
+      packageName => `const ${_.camelCase(packageName)} = require(process.env.PLUGIN_${_.camelCase(packageName)});\n`
     )
-    .join('') + `dbgateApi.registerPlugins(${plugins.map((x) => _.camelCase(x)).join(',')});\n`;
+    .join('') + `dbgateApi.registerPlugins(${plugins.map(x => _.camelCase(x)).join(',')});\n`;
 
-const scriptTemplate = (script) => `
+const scriptTemplate = script => `
 const dbgateApi = require(process.env.DBGATE_API);
+dbgateApi.initializeApiEnvironment();
 ${requirePluginsTemplate(extractPlugins(script))}
 require=null;
 async function run() {
@@ -35,6 +37,7 @@ dbgateApi.runScript(run);
 
 const loaderScriptTemplate = (functionName, props, runid) => `
 const dbgateApi = require(process.env.DBGATE_API);
+dbgateApi.initializeApiEnvironment();
 ${requirePluginsTemplate(extractShellApiPlugins(functionName, props))}
 require=null;
 async function run() {
@@ -89,28 +92,29 @@ module.exports = {
     const scriptFile = path.join(uploadsdir(), runid + '.js');
     fs.writeFileSync(`${scriptFile}`, scriptText);
     fs.mkdirSync(directory);
-    const pluginNames = fs.readdirSync(pluginsdir());
+    const pluginNames = _.union(fs.readdirSync(pluginsdir()), packagedPluginList);
     console.log(`RUNNING SCRIPT ${scriptFile}`);
     // const subprocess = fork(scriptFile, ['--checkParent', '--max-old-space-size=8192'], {
-    const subprocess = fork(scriptFile, ['--checkParent'], {
+    const subprocess = fork(scriptFile, ['--checkParent', ...process.argv.slice(3)], {
       cwd: directory,
       stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
       env: {
-        DBGATE_API: process.argv[1],
-        ..._.fromPairs(pluginNames.map((name) => [`PLUGIN_${_.camelCase(name)}`, path.join(pluginsdir(), name)])),
+        ...process.env,
+        DBGATE_API: global['dbgateApiModulePath'] || process.argv[1],
+        ..._.fromPairs(pluginNames.map(name => [`PLUGIN_${_.camelCase(name)}`, getPluginBackendPath(name)])),
       },
     });
-    const pipeDispatcher = (severity) => (data) =>
+    const pipeDispatcher = severity => data =>
       this.dispatchMessage(runid, { severity, message: data.toString().trim() });
 
     byline(subprocess.stdout).on('data', pipeDispatcher('info'));
     byline(subprocess.stderr).on('data', pipeDispatcher('error'));
-    subprocess.on('exit', (code) => {
+    subprocess.on('exit', code => {
       this.rejectRequest(runid, { message: 'No data retured, maybe input data source is too big' });
       console.log('... EXIT process', code);
       socket.emit(`runner-done-${runid}`, code);
     });
-    subprocess.on('error', (error) => {
+    subprocess.on('error', error => {
       this.rejectRequest(runid, { message: error && (error.message || error.toString()) });
       console.error('... ERROR subprocess', error);
       this.dispatchMessage({
@@ -123,8 +127,10 @@ module.exports = {
       subprocess,
     };
     this.opened.push(newOpened);
-    // @ts-ignore
-    subprocess.on('message', ({ msgtype, ...message }) => {
+    subprocess.on('message', message => {
+      // @ts-ignore
+      const { msgtype } = message;
+      if (handleProcessCommunication(message, subprocess)) return;
       this[`handle_${msgtype}`](runid, message);
     });
     return newOpened;
@@ -138,7 +144,7 @@ module.exports = {
 
   cancel_meta: 'post',
   async cancel({ runid }) {
-    const runner = this.opened.find((x) => x.runid == runid);
+    const runner = this.opened.find(x => x.runid == runid);
     if (!runner) {
       throw new Error('Invalid runner');
     }

packages/api/src/controllers/scheduler.js

@@ -11,7 +11,7 @@ module.exports = {
   tasks: [],
 
   async unload() {
-    this.tasks.forEach((x) => x.destroy());
+    this.tasks.forEach(x => x.destroy());
     this.tasks = [];
   },
 

packages/api/src/controllers/serverConnections.js

@@ -2,19 +2,23 @@ const connections = require('./connections');
 const socket = require('../utility/socket');
 const { fork } = require('child_process');
 const _ = require('lodash');
+const AsyncLock = require('async-lock');
+const { handleProcessCommunication } = require('../utility/processComm');
+const lock = new AsyncLock();
 
 module.exports = {
   opened: [],
   closed: {},
+  lastPinged: {},
 
   handle_databases(conid, { databases }) {
-    const existing = this.opened.find((x) => x.conid == conid);
+    const existing = this.opened.find(x => x.conid == conid);
     if (!existing) return;
     existing.databases = databases;
     socket.emitChanged(`database-list-changed-${conid}`);
   },
   handle_status(conid, { status }) {
-    const existing = this.opened.find((x) => x.conid == conid);
+    const existing = this.opened.find(x => x.conid == conid);
     if (!existing) return;
     existing.status = status;
     socket.emitChanged(`server-status-changed`);
@@ -22,42 +26,51 @@ module.exports = {
   handle_ping() {},
 
   async ensureOpened(conid) {
-    const existing = this.opened.find((x) => x.conid == conid);
-    if (existing) return existing;
-    const connection = await connections.get({ conid });
-    const subprocess = fork(process.argv[1], ['serverConnectionProcess']);
-    const newOpened = {
-      conid,
-      subprocess,
-      databases: [],
-      connection,
-      status: {
-        name: 'pending',
-      },
-      disconnected: false,
-    };
-    this.opened.push(newOpened);
-    delete this.closed[conid];
-    socket.emitChanged(`server-status-changed`);
-    // @ts-ignore
-    subprocess.on('message', ({ msgtype, ...message }) => {
-      if (newOpened.disconnected) return;
-      this[`handle_${msgtype}`](conid, message);
+    const res = await lock.acquire(conid, async () => {
+      const existing = this.opened.find(x => x.conid == conid);
+      if (existing) return existing;
+      const connection = await connections.get({ conid });
+      const subprocess = fork(process.argv[1], [
+        '--start-process',
+        'serverConnectionProcess',
+        ...process.argv.slice(3),
+      ]);
+      const newOpened = {
+        conid,
+        subprocess,
+        databases: [],
+        connection,
+        status: {
+          name: 'pending',
+        },
+        disconnected: false,
+      };
+      this.opened.push(newOpened);
+      delete this.closed[conid];
+      socket.emitChanged(`server-status-changed`);
+      subprocess.on('message', message => {
+        // @ts-ignore
+        const { msgtype } = message;
+        if (handleProcessCommunication(message, subprocess)) return;
+        if (newOpened.disconnected) return;
+        this[`handle_${msgtype}`](conid, message);
+      });
+      subprocess.on('exit', () => {
+        if (newOpened.disconnected) return;
+        this.close(conid, false);
+      });
+      subprocess.send({ msgtype: 'connect', ...connection });
+      return newOpened;
     });
-    subprocess.on('exit', () => {
-      if (newOpened.disconnected) return;
-      this.close(conid, false);
-    });
-    subprocess.send({ msgtype: 'connect', ...connection });
-    return newOpened;
+    return res;
   },
 
   close(conid, kill = true) {
-    const existing = this.opened.find((x) => x.conid == conid);
+    const existing = this.opened.find(x => x.conid == conid);
     if (existing) {
       existing.disconnected = true;
       if (kill) existing.subprocess.kill();
-      this.opened = this.opened.filter((x) => x.conid != conid);
+      this.opened = this.opened.filter(x => x.conid != conid);
       this.closed[conid] = {
         ...existing.status,
         name: 'error',
@@ -82,10 +95,17 @@ module.exports = {
 
   ping_meta: 'post',
   async ping({ connections }) {
-    for (const conid of connections) {
-      const opened = await this.ensureOpened(conid);
-      opened.subprocess.send({ msgtype: 'ping' });
-    }
+    await Promise.all(
+      _.uniq(connections).map(async conid => {
+        const last = this.lastPinged[conid];
+        if (last && new Date().getTime() - last < 30 * 1000) {
+          return Promise.resolve();
+        }
+        this.lastPinged[conid] = new Date().getTime();
+        const opened = await this.ensureOpened(conid);
+        opened.subprocess.send({ msgtype: 'ping' });
+      })
+    );
     return { status: 'ok' };
   },
 

packages/api/src/controllers/sessions.js

@@ -4,6 +4,7 @@ const connections = require('./connections');
 const socket = require('../utility/socket');
 const { fork } = require('child_process');
 const jsldata = require('./jsldata');
+const { handleProcessCommunication } = require('../utility/processComm');
 
 module.exports = {
   /** @type {import('dbgate-types').OpenedSession[]} */
@@ -64,7 +65,7 @@ module.exports = {
   async create({ conid, database }) {
     const sesid = uuidv1();
     const connection = await connections.get({ conid });
-    const subprocess = fork(process.argv[1], ['sessionProcess']);
+    const subprocess = fork(process.argv[1], ['--start-process', 'sessionProcess', ...process.argv.slice(3)]);
     const newOpened = {
       conid,
       database,
@@ -73,8 +74,10 @@ module.exports = {
       sesid,
     };
     this.opened.push(newOpened);
-    // @ts-ignore
-    subprocess.on('message', ({ msgtype, ...message }) => {
+    subprocess.on('message', message => {
+      // @ts-ignore
+      const { msgtype } = message;
+      if (handleProcessCommunication(message, subprocess)) return;
       this[`handle_${msgtype}`](sesid, message);
     });
     subprocess.send({ msgtype: 'connect', ...connection, database });
@@ -83,7 +86,7 @@ module.exports = {
 
   executeQuery_meta: 'post',
   async executeQuery({ sesid, sql }) {
-    const session = this.opened.find((x) => x.sesid == sesid);
+    const session = this.opened.find(x => x.sesid == sesid);
     if (!session) {
       throw new Error('Invalid session');
     }
@@ -107,7 +110,7 @@ module.exports = {
 
   kill_meta: 'post',
   async kill({ sesid }) {
-    const session = this.opened.find((x) => x.sesid == sesid);
+    const session = this.opened.find(x => x.sesid == sesid);
     if (!session) {
       throw new Error('Invalid session');
     }

packages/api/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '3.8.6',
-  buildTime: '2020-12-10T11:14:01.053Z'
+  version: '4.1.1',
+  buildTime: '2021-04-17T07:22:49.702Z'
 };

packages/api/src/index.js

@@ -1,21 +1,17 @@
 const shell = require('./shell');
-// require('socket.io-client');
+const processArgs = require('./utility/processArgs');
 
-// "socket.io-client": "^2.3.0",
-// "utf-8-validate": "^5.0.2",
-// "uuid": "^3.4.0",
-// "uws": "10.148.1"
-
-const argument = process.argv[2];
-if (argument && argument.endsWith('Process')) {
+if (processArgs.startProcess) {
   const proc = require('./proc');
-
-  const module = proc[argument];
+  const module = proc[processArgs.startProcess];
   module.start();
-} else if (!module['parent'] && !process.argv.includes('--checkParent')) {
+} else if (!module['parent'] && !processArgs.checkParent) {
   const main = require('./main');
 
-  main.start(argument);
+  main.start();
 }
 
-module.exports = shell;
+module.exports = {
+  ...shell,
+  getMainModule: () => require('./main'),
+};

packages/api/src/main.js

@@ -6,8 +6,10 @@ const http = require('http');
 const cors = require('cors');
 const io = require('socket.io');
 const fs = require('fs');
-const findFreePort = require('find-free-port');
+const getPort = require('get-port');
 const childProcessChecker = require('./utility/childProcessChecker');
+const path = require('path');
+const crypto = require('crypto');
 
 const useController = require('./utility/useController');
 const socket = require('./utility/socket');
@@ -27,8 +29,12 @@ const files = require('./controllers/files');
 const scheduler = require('./controllers/scheduler');
 
 const { rundir } = require('./utility/directories');
+const platformInfo = require('./utility/platformInfo');
+const processArgs = require('./utility/processArgs');
 
-function start(argument = null) {
+let authorization = null;
+
+function start() {
   // console.log('process.argv', process.argv);
 
   const app = express();
@@ -48,6 +54,13 @@ function start(argument = null) {
     );
   }
 
+  app.use(function (req, res, next) {
+    if (authorization && req.headers.authorization != authorization) {
+      return res.status(403).json({ error: 'Not authorized!' });
+    }
+    next();
+  });
+
   app.use(cors());
   app.use(bodyParser.json({ limit: '50mb' }));
 
@@ -78,22 +91,33 @@ function start(argument = null) {
 
   app.use('/runners/data', express.static(rundir()));
 
-  if (fs.existsSync('/home/dbgate-docker/build')) {
+  if (platformInfo.isDocker) {
     // server static files inside docker container
-    app.use(express.static('/home/dbgate-docker/build'));
+    app.use(express.static('/home/dbgate-docker/public'));
   } else {
-    app.get('/', (req, res) => {
-      res.send('DbGate API');
-    });
+    if (!platformInfo.isNpmDist) {
+      app.get('/', (req, res) => {
+        res.send('DbGate API');
+      });
+    }
   }
 
-  if (argument == '--dynport') {
+  if (processArgs.dynport) {
     childProcessChecker();
 
-    findFreePort(53911, function (err, port) {
+    authorization = crypto.randomBytes(32).toString('hex');
+
+    getPort().then(port => {
+      server.listen(port, () => {
+        console.log(`DbGate API listening on port ${port}`);
+        process.send({ msgtype: 'listening', port, authorization });
+      });
+    });
+  } else if (platformInfo.isNpmDist) {
+    app.use(express.static(path.join(__dirname, '../../dbgate-web/public')));
+    getPort({ port: 5000 }).then(port => {
       server.listen(port, () => {
         console.log(`DbGate API listening on port ${port}`);
-        process.send({ msgtype: 'listening', port });
       });
     });
   } else {

packages/api/src/nativeModules.js

@@ -0,0 +1,5 @@
+const argIndex = process.argv.indexOf('--native-modules');
+const redirectFile = argIndex > 0 ? process.argv[argIndex + 1] : null;
+
+// @ts-ignore
+module.exports = redirectFile ? __non_webpack_require__(redirectFile) : require('./nativeModulesContent');

packages/api/src/proc/connectProcess.js

@@ -1,12 +1,15 @@
 const childProcessChecker = require('../utility/childProcessChecker');
 const requireEngineDriver = require('../utility/requireEngineDriver');
+const connectUtility = require('../utility/connectUtility');
+const { handleProcessCommunication } = require('../utility/processComm');
 
 function start() {
   childProcessChecker();
-  process.on('message', async (connection) => {
+  process.on('message', async connection => {
+    if (handleProcessCommunication(connection)) return;
     try {
       const driver = requireEngineDriver(connection);
-      const conn = await driver.connect(connection);
+      const conn = await connectUtility(driver, connection);
       const res = await driver.getVersion(conn);
       process.send({ msgtype: 'connected', ...res });
     } catch (e) {

packages/api/src/proc/databaseConnectionProcess.js

@@ -1,6 +1,9 @@
 const stableStringify = require('json-stable-stringify');
 const childProcessChecker = require('../utility/childProcessChecker');
 const requireEngineDriver = require('../utility/requireEngineDriver');
+const connectUtility = require('../utility/connectUtility');
+const { handleProcessCommunication } = require('../utility/processComm');
+const { SqlGenerator } = require('dbgate-tools');
 
 let systemConnection;
 let storedConnection;
@@ -38,6 +41,7 @@ async function handleIncrementalRefresh() {
     analysedStructure = newStructure;
     process.send({ msgtype: 'structure', structure: analysedStructure });
   }
+  setStatusName('ok');
 }
 
 function setStatus(status) {
@@ -58,7 +62,7 @@ async function handleConnect({ connection, structure }) {
 
   if (!structure) setStatusName('pending');
   const driver = requireEngineDriver(storedConnection);
-  systemConnection = await checkedAsyncCall(driver.connect(storedConnection));
+  systemConnection = await checkedAsyncCall(connectUtility(driver, storedConnection));
   if (structure) {
     analysedStructure = structure;
     handleIncrementalRefresh();
@@ -90,6 +94,49 @@ async function handleQueryData({ msgid, sql }) {
   }
 }
 
+async function handleCollectionData({ msgid, options }) {
+  await waitConnected();
+  const driver = requireEngineDriver(storedConnection);
+  try {
+    const result = await driver.readCollection(systemConnection, options);
+    process.send({ msgtype: 'response', msgid, result });
+  } catch (err) {
+    process.send({ msgtype: 'response', msgid, errorMessage: err.message });
+  }
+}
+
+async function handleUpdateCollection({ msgid, changeSet }) {
+  await waitConnected();
+  const driver = requireEngineDriver(storedConnection);
+  try {
+    const result = await driver.updateCollection(systemConnection, changeSet);
+    process.send({ msgtype: 'response', msgid, result });
+  } catch (err) {
+    process.send({ msgtype: 'response', msgid, errorMessage: err.message });
+  }
+}
+
+async function handleSqlPreview({ msgid, objects, options }) {
+  await waitConnected();
+  const driver = requireEngineDriver(storedConnection);
+
+  try {
+    const dmp = driver.createDumper();
+    const generator = new SqlGenerator(analysedStructure, options, objects, dmp, driver, systemConnection);
+
+    await generator.dump();
+    process.send({ msgtype: 'response', msgid, sql: dmp.s, isTruncated: generator.isTruncated });
+    if (generator.isUnhandledException) {
+      setTimeout(() => {
+        console.log('Exiting because of unhandled exception');
+        process.exit(0);
+      }, 500);
+    }
+  } catch (err) {
+    process.send({ msgtype: 'response', msgid, isError: true, errorMessage: err.message });
+  }
+}
+
 // async function handleRunCommand({ msgid, sql }) {
 //   await waitConnected();
 //   const driver = engines(storedConnection);
@@ -104,6 +151,9 @@ function handlePing() {
 const messageHandlers = {
   connect: handleConnect,
   queryData: handleQueryData,
+  updateCollection: handleUpdateCollection,
+  collectionData: handleCollectionData,
+  sqlPreview: handleSqlPreview,
   ping: handlePing,
   // runCommand: handleRunCommand,
 };
@@ -118,12 +168,14 @@ function start() {
 
   setInterval(() => {
     const time = new Date().getTime();
-    if (time - lastPing > 60 * 1000) {
+    if (time - lastPing > 120 * 1000) {
+      console.log('Database connection not alive, exiting');
       process.exit(0);
     }
   }, 60 * 1000);
 
-  process.on('message', async (message) => {
+  process.on('message', async message => {
+    if (handleProcessCommunication(message)) return;
     try {
       await handleMessage(message);
     } catch (e) {

packages/api/src/proc/jslDatastoreProcess.js

@@ -1,5 +1,6 @@
 const childProcessChecker = require('../utility/childProcessChecker');
 const JsonLinesDatastore = require('../utility/JsonLinesDatastore');
+const { handleProcessCommunication } = require('../utility/processComm');
 
 let lastPing = null;
 let datastore = new JsonLinesDatastore();
@@ -46,7 +47,8 @@ function start() {
     }
   }, 60 * 1000);
 
-  process.on('message', async (message) => {
+  process.on('message', async message => {
+    if (handleProcessCommunication(message)) return;
     try {
       await handleMessage(message);
     } catch (e) {

packages/api/src/proc/serverConnectionProcess.js

@@ -1,6 +1,9 @@
 const stableStringify = require('json-stable-stringify');
 const childProcessChecker = require('../utility/childProcessChecker');
 const requireEngineDriver = require('../utility/requireEngineDriver');
+const { decryptConnection } = require('../utility/crypting');
+const connectUtility = require('../utility/connectUtility');
+const { handleProcessCommunication } = require('../utility/processComm');
 
 let systemConnection;
 let storedConnection;
@@ -47,7 +50,7 @@ async function handleConnect(connection) {
 
   const driver = requireEngineDriver(storedConnection);
   try {
-    systemConnection = await driver.connect(storedConnection);
+    systemConnection = await connectUtility(driver, storedConnection);
     handleRefresh();
     setInterval(handleRefresh, 30 * 1000);
   } catch (err) {
@@ -66,9 +69,13 @@ function handlePing() {
 
 async function handleCreateDatabase({ name }) {
   const driver = requireEngineDriver(storedConnection);
-  systemConnection = await driver.connect(storedConnection);
+  systemConnection = await connectUtility(driver, storedConnection);
   console.log(`RUNNING SCRIPT: CREATE DATABASE ${driver.dialect.quoteIdentifier(name)}`);
-  await driver.query(systemConnection, `CREATE DATABASE ${driver.dialect.quoteIdentifier(name)}`);
+  if (driver.createDatabase) {
+    await driver.createDatabase(systemConnection, name);
+  } else {
+    await driver.query(systemConnection, `CREATE DATABASE ${driver.dialect.quoteIdentifier(name)}`);
+  }
   await handleRefresh();
 }
 
@@ -88,12 +95,14 @@ function start() {
 
   setInterval(() => {
     const time = new Date().getTime();
-    if (time - lastPing > 60 * 1000) {
+    if (time - lastPing > 120 * 1000) {
+      console.log('Server connection not alive, exiting');
       process.exit(0);
     }
   }, 60 * 1000);
 
-  process.on('message', async (message) => {
+  process.on('message', async message => {
+    if (handleProcessCommunication(message)) return;
     try {
       await handleMessage(message);
     } catch (err) {

packages/api/src/proc/sessionProcess.js

@@ -7,6 +7,9 @@ const goSplit = require('../utility/goSplit');
 
 const { jsldir } = require('../utility/directories');
 const requireEngineDriver = require('../utility/requireEngineDriver');
+const { decryptConnection } = require('../utility/crypting');
+const connectUtility = require('../utility/connectUtility');
+const { handleProcessCommunication } = require('../utility/processComm');
 
 let systemConnection;
 let storedConnection;
@@ -14,12 +17,18 @@ let afterConnectCallbacks = [];
 // let currentHandlers = [];
 
 class TableWriter {
-  constructor(columns, resultIndex) {
+  constructor(structure, resultIndex) {
     this.jslid = uuidv1();
     this.currentFile = path.join(jsldir(), `${this.jslid}.jsonl`);
     this.currentRowCount = 0;
     this.currentChangeIndex = 1;
-    fs.writeFileSync(this.currentFile, JSON.stringify({ columns }) + '\n');
+    fs.writeFileSync(
+      this.currentFile,
+      JSON.stringify({
+        ...structure,
+        __isStreamHeader: true,
+      }) + '\n'
+    );
     this.currentStream = fs.createWriteStream(this.currentFile, { flags: 'a' });
     this.writeCurrentStats(false, false);
     this.resultIndex = resultIndex;
@@ -73,7 +82,7 @@ class StreamHandler {
 
     // use this for cancelling - not implemented
     // this.stream = null;
-    
+
     this.plannedStats = false;
     this.resultIndexHolder = resultIndexHolder;
     this.resolve = resolve;
@@ -89,7 +98,7 @@ class StreamHandler {
 
   recordset(columns) {
     this.closeCurrentWriter();
-    this.currentWriter = new TableWriter(columns, this.resultIndexHolder.value);
+    this.currentWriter = new TableWriter(Array.isArray(columns) ? { columns } : columns, this.resultIndexHolder.value);
     this.resultIndexHolder.value += 1;
 
     // this.writeCurrentStats();
@@ -130,7 +139,7 @@ async function handleConnect(connection) {
   storedConnection = connection;
 
   const driver = requireEngineDriver(storedConnection);
-  systemConnection = await driver.connect(storedConnection);
+  systemConnection = await connectUtility(driver, storedConnection);
   for (const [resolve] of afterConnectCallbacks) {
     resolve();
   }
@@ -180,7 +189,8 @@ async function handleMessage({ msgtype, ...other }) {
 
 function start() {
   childProcessChecker();
-  process.on('message', async (message) => {
+  process.on('message', async message => {
+    if (handleProcessCommunication(message)) return;
     try {
       await handleMessage(message);
     } catch (e) {

packages/api/src/shell/copyStream.js

@@ -1,9 +1,13 @@
+const EnsureStreamHeaderStream = require('../utility/EnsureStreamHeaderStream');
+
 function copyStream(input, output) {
   return new Promise((resolve, reject) => {
+    const ensureHeader = new EnsureStreamHeaderStream();
     const finisher = output['finisher'] || output;
     finisher.on('finish', resolve);
     finisher.on('error', reject);
-    input.pipe(output);
+    input.pipe(ensureHeader);
+    ensureHeader.pipe(output);
   });
 }
 

packages/api/src/shell/executeQuery.js

@@ -1,11 +1,13 @@
 const goSplit = require('../utility/goSplit');
 const requireEngineDriver = require('../utility/requireEngineDriver');
+const { decryptConnection } = require('../utility/crypting');
+const connectUtility = require('../utility/connectUtility');
 
 async function executeQuery({ connection, sql }) {
   console.log(`Execute query ${sql}`);
 
   const driver = requireEngineDriver(connection);
-  const pool = await driver.connect(connection);
+  const pool = await connectUtility(driver, connection);
   console.log(`Connected.`);
 
   for (const sqlItem of goSplit(sql)) {

packages/api/src/shell/index.js

@@ -17,6 +17,7 @@ const requirePlugin = require('./requirePlugin');
 const download = require('./download');
 const executeQuery = require('./executeQuery');
 const loadFile = require('./loadFile');
+const initializeApiEnvironment = require('./initializeApiEnvironment');
 
 const dbgateApi = {
   queryReader,
@@ -37,8 +38,9 @@ const dbgateApi = {
   registerPlugins,
   executeQuery,
   loadFile,
+  initializeApiEnvironment,
 };
 
-requirePlugin.initialize(dbgateApi);
+requirePlugin.initializeDbgateApi(dbgateApi);
 
 module.exports = dbgateApi;

packages/api/src/shell/initializeApiEnvironment.js

@@ -0,0 +1,9 @@
+const { handleProcessCommunication } = require('../utility/processComm');
+
+async function initializeApiEnvironment() {
+  process.on('message', async message => {
+    handleProcessCommunication(message);
+  });
+}
+
+module.exports = initializeApiEnvironment;

packages/api/src/shell/jsonLinesReader.js

@@ -3,9 +3,8 @@ const stream = require('stream');
 const byline = require('byline');
 
 class ParseStream extends stream.Transform {
-  constructor({ header, limitRows }) {
+  constructor({ limitRows }) {
     super({ objectMode: true });
-    this.header = header;
     this.wasHeader = false;
     this.limitRows = limitRows;
     this.rowsWritten = 0;
@@ -13,7 +12,14 @@ class ParseStream extends stream.Transform {
   _transform(chunk, encoding, done) {
     const obj = JSON.parse(chunk);
     if (!this.wasHeader) {
-      if (!this.header) this.push({ columns: Object.keys(obj).map((columnName) => ({ columnName })) });
+      if (
+        !obj.__isStreamHeader &&
+        // TODO remove isArray test
+        !Array.isArray(obj.columns)
+      ) {
+        this.push({ columns: Object.keys(obj).map(columnName => ({ columnName })) });
+      }
+      
       this.wasHeader = true;
     }
     if (!this.limitRows || this.rowsWritten < this.limitRows) {
@@ -24,12 +30,12 @@ class ParseStream extends stream.Transform {
   }
 }
 
-async function jsonLinesReader({ fileName, encoding = 'utf-8', header = true, limitRows = undefined }) {
+async function jsonLinesReader({ fileName, encoding = 'utf-8', limitRows = undefined }) {
   console.log(`Reading file ${fileName}`);
 
   const fileStream = fs.createReadStream(fileName, encoding);
   const liner = byline(fileStream);
-  const parser = new ParseStream({ header, limitRows });
+  const parser = new ParseStream({ limitRows });
   liner.pipe(parser);
   return parser;
 }

packages/api/src/shell/jsonLinesWriter.js

@@ -8,10 +8,16 @@ class StringifyStream extends stream.Transform {
     this.wasHeader = false;
   }
   _transform(chunk, encoding, done) {
+    let skip = false;
     if (!this.wasHeader) {
-      if (this.header) this.push(JSON.stringify(chunk) + '\n');
+      skip =
+        (chunk.__isStreamHeader ||
+          // TODO remove isArray test
+          Array.isArray(chunk.columns)) &&
+        !this.header;
       this.wasHeader = true;
-    } else {
+    }
+    if (!skip) {
       this.push(JSON.stringify(chunk) + '\n');
     }
     done();

packages/api/src/shell/queryReader.js

@@ -1,10 +1,12 @@
-const requireEngineDriver = require("../utility/requireEngineDriver");
+const requireEngineDriver = require('../utility/requireEngineDriver');
+const { decryptConnection } = require('../utility/crypting');
+const connectUtility = require('../utility/connectUtility');
 
 async function queryReader({ connection, sql }) {
   console.log(`Reading query ${sql}`);
 
   const driver = requireEngineDriver(connection);
-  const pool = await driver.connect(connection);
+  const pool = await connectUtility(driver, connection);
   console.log(`Connected.`);
   return await driver.readQuery(pool, sql);
 }

packages/api/src/shell/requirePlugin.js

@@ -1,25 +1,28 @@
 const path = require('path');
-const { pluginsdir } = require('../utility/directories');
+const fs = require('fs');
+const { pluginsdir, packagedPluginsDir, getPluginBackendPath } = require('../utility/directories');
+const nativeModules = require('../nativeModules');
+const platformInfo = require('../utility/platformInfo');
 
 const loadedPlugins = {};
 
 const dbgateEnv = {
   dbgateApi: null,
+  nativeModules,
 };
-
 function requirePlugin(packageName, requiredPlugin = null) {
   if (!packageName) throw new Error('Missing packageName in plugin');
   if (loadedPlugins[packageName]) return loadedPlugins[packageName];
 
   if (requiredPlugin == null) {
     let module;
-    const modulePath = path.join(pluginsdir(), packageName, 'dist', 'backend.js');
+    const modulePath = getPluginBackendPath(packageName);
     console.log(`Loading module ${packageName} from ${modulePath}`);
     try {
       // @ts-ignore
       module = __non_webpack_require__(modulePath);
     } catch (err) {
-      console.error('Failed load webpacked module', err);
+      console.log('Failed load webpacked module', err.message);
       module = require(modulePath);
     }
     requiredPlugin = module.__esModule ? module.default : module;
@@ -30,7 +33,7 @@ function requirePlugin(packageName, requiredPlugin = null) {
   return requiredPlugin;
 }
 
-requirePlugin.initialize = (value) => {
+requirePlugin.initializeDbgateApi = value => {
   dbgateEnv.dbgateApi = value;
 };
 

packages/api/src/shell/runScript.js

@@ -1,7 +1,8 @@
 const childProcessChecker = require('../utility/childProcessChecker');
+const processArgs = require('../utility/processArgs');
 
 async function runScript(func) {
-  if (process.argv.includes('--checkParent')) {
+  if (processArgs.checkParent) {
     childProcessChecker();
   }
   try {

packages/api/src/shell/tableReader.js

@@ -1,13 +1,21 @@
 const { quoteFullName, fullNameToString } = require('dbgate-tools');
 const requireEngineDriver = require('../utility/requireEngineDriver');
+const connectUtility = require('../utility/connectUtility');
 
 async function tableReader({ connection, pureName, schemaName }) {
   const driver = requireEngineDriver(connection);
-  const pool = await driver.connect(connection);
+  const pool = await connectUtility(driver, connection);
   console.log(`Connected.`);
 
   const fullName = { pureName, schemaName };
 
+  if (driver.dialect.nosql) {
+    // @ts-ignore
+    console.log(`Reading collection ${fullNameToString(fullName)}`);
+    // @ts-ignore
+    return await driver.readQuery(pool, JSON.stringify(fullName));
+  }
+
   const table = await driver.analyseSingleObject(pool, fullName, 'tables');
   const query = `select * from ${quoteFullName(driver.dialect, fullName)}`;
   if (table) {

packages/api/src/shell/tableWriter.js

@@ -1,11 +1,13 @@
 const { fullNameToString } = require('dbgate-tools');
 const requireEngineDriver = require('../utility/requireEngineDriver');
+const { decryptConnection } = require('../utility/crypting');
+const connectUtility = require('../utility/connectUtility');
 
 async function tableWriter({ connection, schemaName, pureName, ...options }) {
   console.log(`Writing table ${fullNameToString({ schemaName, pureName })}`);
 
   const driver = requireEngineDriver(connection);
-  const pool = await driver.connect(connection);
+  const pool = await connectUtility(driver, connection);
   console.log(`Connected.`);
   return await driver.writeTable(pool, { schemaName, pureName }, options);
 }

packages/api/src/utility/DatastoreProxy.js

@@ -1,5 +1,6 @@
 const { fork } = require('child_process');
 const uuidv1 = require('uuid/v1');
+const { handleProcessCommunication } = require('./processComm');
 
 class DatastoreProxy {
   constructor(file) {
@@ -28,10 +29,13 @@ class DatastoreProxy {
 
   async ensureSubprocess() {
     if (!this.subprocess) {
-      this.subprocess = fork(process.argv[1], ['jslDatastoreProcess']);
+      this.subprocess = fork(process.argv[1], ['--start-process', 'jslDatastoreProcess', ...process.argv.slice(3)]);
+
+      this.subprocess.on('message', message => {
+        // @ts-ignore
+        const { msgtype } = message;
+        if (handleProcessCommunication(message, this.subprocess)) return;
 
-      // @ts-ignore
-      this.subprocess.on('message', ({ msgtype, ...message }) => {
         // if (this.disconnected) return;
         this[`handle_${msgtype}`](message);
       });

packages/api/src/utility/EnsureStreamHeaderStream.js

@@ -0,0 +1,35 @@
+const stream = require('stream');
+
+class EnsureStreamHeaderStream extends stream.Transform {
+  constructor() {
+    super({ objectMode: true });
+    this.wasHeader = false;
+  }
+  _transform(chunk, encoding, done) {
+    if (!this.wasHeader) {
+      if (chunk.__isDynamicStructure) {
+        // ignore dynamic structure header
+        done();
+        return;
+      }
+
+      if (
+        !chunk.__isStreamHeader &&
+        // TODO remove isArray test
+        !Array.isArray(chunk.columns)
+      ) {
+        this.push({
+          __isStreamHeader: true,
+          __isComputedStructure: true,
+          columns: Object.keys(chunk).map(columnName => ({ columnName })),
+        });
+      }
+
+      this.wasHeader = true;
+    }
+    this.push(chunk);
+    done();
+  }
+}
+
+module.exports = EnsureStreamHeaderStream;

packages/api/src/utility/childProcessChecker.js

@@ -1,5 +1,5 @@
 let counter = 0;
- 
+
 function childProcessChecker() {
   setInterval(() => {
     try {

packages/api/src/utility/connectUtility.js

@@ -0,0 +1,63 @@
+const { SSHConnection } = require('node-ssh-forward');
+const portfinder = require('portfinder');
+const fs = require('fs-extra');
+const { decryptConnection } = require('./crypting');
+const { getSshTunnel } = require('./sshTunnel');
+const { getSshTunnelProxy } = require('./sshTunnelProxy');
+
+async function connectUtility(driver, storedConnection) {
+  const connection = {
+    ...decryptConnection(storedConnection),
+  };
+
+  if (!connection.port && driver.defaultPort) connection.port = driver.defaultPort.toString();
+
+  if (connection.useSshTunnel) {
+    const tunnel = await getSshTunnelProxy(connection);
+    if (tunnel.state == 'error') {
+      throw new Error(tunnel.message);
+    }
+
+    connection.server = '127.0.0.1';
+    connection.port = tunnel.localPort;
+  }
+
+  // SSL functionality - copied from https://github.com/beekeeper-studio/beekeeper-studio
+  if (connection.useSsl) {
+    connection.ssl = {};
+
+    if (connection.sslCaFile) {
+      connection.ssl.ca = await fs.readFile(connection.sslCaFile);
+    }
+
+    if (connection.sslCertFile) {
+      connection.ssl.cert = await fs.readFile(connection.sslCertFile);
+    }
+
+    if (connection.sslKeyFile) {
+      connection.ssl.key = await fs.readFile(connection.sslKeyFile);
+    }
+
+    if (connection.sslCertFilePassword) {
+      connection.ssl.password = connection.sslCertFilePassword;
+    }
+
+    if (!connection.ssl.key && !connection.ssl.ca && !connection.ssl.cert) {
+      // TODO: provide this as an option in settings
+      // or per-connection as 'reject self-signed certs'
+      // How it works:
+      // if false, cert can be self-signed
+      // if true, has to be from a public CA
+      // Heroku certs are self-signed.
+      // if you provide ca/cert/key files, it overrides this
+      connection.ssl.rejectUnauthorized = false;
+    } else {
+      connection.ssl.rejectUnauthorized = connection.sslRejectUnauthorized;
+    }
+  }
+
+  const conn = await driver.connect(connection);
+  return conn;
+}
+
+module.exports = connectUtility;

packages/api/src/utility/crypting.js

@@ -0,0 +1,88 @@
+const crypto = require('crypto');
+const simpleEncryptor = require('simple-encryptor');
+const fs = require('fs');
+const path = require('path');
+
+const { datadir } = require('./directories');
+
+const defaultEncryptionKey = 'mQAUaXhavRGJDxDTXSCg7Ej0xMmGCrx6OKA07DIMBiDcYYkvkaXjTAzPUEHEHEf9';
+
+let _encryptionKey = null;
+
+function loadEncryptionKey() {
+  if (_encryptionKey) {
+    return _encryptionKey;
+  }
+  const encryptor = simpleEncryptor.createEncryptor(defaultEncryptionKey);
+
+  const keyFile = path.join(datadir(), '.key');
+
+  if (!fs.existsSync(keyFile)) {
+    const generatedKey = crypto.randomBytes(32);
+    const newKey = generatedKey.toString('hex');
+    const result = {
+      encryptionKey: newKey,
+    };
+    fs.writeFileSync(keyFile, encryptor.encrypt(result), 'utf-8');
+  }
+
+  const encryptedData = fs.readFileSync(keyFile, 'utf-8');
+  const data = encryptor.decrypt(encryptedData);
+  _encryptionKey = data['encryptionKey'];
+  return _encryptionKey;
+}
+
+let _encryptor = null;
+
+function getEncryptor() {
+  if (_encryptor) {
+    return _encryptor;
+  }
+  _encryptor = simpleEncryptor.createEncryptor(loadEncryptionKey());
+  return _encryptor;
+}
+
+function encryptPasswordField(connection, field) {
+  if (
+    connection &&
+    connection[field] &&
+    !connection[field].startsWith('crypt:') &&
+    connection.passwordMode != 'saveRaw'
+  ) {
+    return {
+      ...connection,
+      [field]: 'crypt:' + getEncryptor().encrypt(connection[field]),
+    };
+  }
+return connection;
+}
+
+function decryptPasswordField(connection, field) {
+  if (connection && connection[field] && connection[field].startsWith('crypt:')) {
+    return {
+      ...connection,
+      [field]: getEncryptor().decrypt(connection[field].substring('crypt:'.length)),
+    };
+  }
+  return connection;
+}
+
+function encryptConnection(connection) {
+  connection = encryptPasswordField(connection, 'password');
+  connection = encryptPasswordField(connection, 'sshPassword');
+  connection = encryptPasswordField(connection, 'sshKeyFilePassword');
+  return connection;
+}
+
+function decryptConnection(connection) {
+  connection = decryptPasswordField(connection, 'password');
+  connection = decryptPasswordField(connection, 'sshPassword');
+  connection = decryptPasswordField(connection, 'sshKeyFilePassword');
+  return connection;
+}
+
+module.exports = {
+  loadEncryptionKey,
+  encryptConnection,
+  decryptConnection,
+};

packages/api/src/utility/directories.js

@@ -2,6 +2,7 @@ const os = require('os');
 const path = require('path');
 const fs = require('fs');
 const cleanDirectory = require('./cleanDirectory');
+const platformInfo = require('./platformInfo');
 
 const createDirectories = {};
 const ensureDirectory = (dir, clean) => {
@@ -39,6 +40,37 @@ const pluginsdir = dirFunc('plugins');
 const archivedir = dirFunc('archive');
 const filesdir = dirFunc('files');
 
+function packagedPluginsDir() {
+  if (platformInfo.isDevMode) {
+    return path.resolve(__dirname, '../../../../plugins');
+  }
+  if (platformInfo.isDocker) {
+    return '/home/dbgate-docker/plugins';
+  }
+  if (platformInfo.isNpmDist) {
+    // node_modules
+    return global['dbgateApiPackagedPluginsPath'];
+  }
+  if (platformInfo.isElectronBundle) {
+    return path.resolve(__dirname, '../../plugins');
+  }
+  return null;
+}
+
+const packagedPluginList =
+  packagedPluginsDir() != null ? fs.readdirSync(packagedPluginsDir()).filter(x => x.startsWith('dbgate-plugin-')) : [];
+
+function getPluginBackendPath(packageName) {
+  if (packagedPluginList.includes(packageName)) {
+    if (platformInfo.isDevMode) {
+      return path.join(packagedPluginsDir(), packageName, 'src', 'backend', 'index.js');
+    }
+    return path.join(packagedPluginsDir(), packageName, 'dist', 'backend.js');
+  }
+
+  return path.join(pluginsdir(), packageName, 'dist', 'backend.js');
+}
+
 module.exports = {
   datadir,
   jsldir,
@@ -48,4 +80,7 @@ module.exports = {
   ensureDirectory,
   pluginsdir,
   filesdir,
+  packagedPluginsDir,
+  packagedPluginList,
+  getPluginBackendPath,
 };

packages/api/src/utility/downloadPackage.js

@@ -15,15 +15,14 @@ function extractTarball(tmpFile, destination) {
     fs.createReadStream(tmpFile)
       .pipe(zlib.createGunzip())
       .pipe(tar.extract({ cwd: destination }))
-      .on('error', (err) => reject(err))
+      .on('error', err => reject(err))
       .on('end', () => resolve());
   });
 }
 
-
 function copyDirectory(source, target) {
   return new Promise((resolve, reject) => {
-    ncp(source, target, (err) => {
+    ncp(source, target, err => {
       if (err) reject(err);
       resolve();
     });

packages/api/src/utility/platformInfo.js

@@ -0,0 +1,43 @@
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const processArgs = require('./processArgs');
+
+const platform = process.env.OS_OVERRIDE ? process.env.OS_OVERRIDE : process.platform;
+const isWindows = platform === 'win32';
+const isMac = platform === 'darwin';
+const isLinux = platform === 'linux';
+const isDocker = fs.existsSync('/home/dbgate-docker/public');
+const isDevMode = process.env.DEVMODE == '1';
+const isNpmDist = !!global['dbgateApiModulePath'];
+
+// function moduleAvailable(name) {
+//   try {
+//     require.resolve(name);
+//     return true;
+//   } catch (e) {
+//     return false;
+//   }
+// }
+
+const isElectronBundle = processArgs.isElectronBundle;
+
+const platformInfo = {
+  isWindows,
+  isMac,
+  isLinux,
+  isDocker,
+  isElectronBundle,
+  isDevMode,
+  isNpmDist,
+  isSnap: process.env.ELECTRON_SNAP == 'true',
+  isPortable: isWindows && process.env.PORTABLE_EXECUTABLE_DIR,
+  isAppImage: process.env.DESKTOPINTEGRATION === 'AppImageLauncher',
+  sshAuthSock: process.env.SSH_AUTH_SOCK,
+  environment: process.env.NODE_ENV,
+  platform,
+  runningInWebpack: !!process.env.WEBPACK_DEV_SERVER_URL,
+  defaultKeyFile: path.join(os.homedir(), '.ssh/id_rsa'),
+};
+
+module.exports = platformInfo;

packages/api/src/utility/processArgs.js

@@ -0,0 +1,21 @@
+function getNamedArg(name) {
+  const argIndex = process.argv.indexOf(name);
+  if (argIndex > 0) {
+    return process.argv[argIndex + 1];
+  }
+  return null;
+}
+
+const checkParent = process.argv.includes('--checkParent');
+const dynport = process.argv.includes('--dynport');
+const nativeModules = getNamedArg('--native-modules');
+const startProcess = getNamedArg('--start-process');
+const isElectronBundle = process.argv.includes('--is-electron-bundle');
+
+module.exports = {
+  checkParent,
+  nativeModules,
+  startProcess,
+  dynport,
+  isElectronBundle,
+};

packages/api/src/utility/processComm.js

@@ -0,0 +1,18 @@
+const { handleGetSshTunnelRequest, handleGetSshTunnelResponse } = require('./sshTunnelProxy');
+
+function handleProcessCommunication(message, subprocess) {
+  const { msgtype } = message;
+  if (msgtype == 'getsshtunnel-request') {
+    handleGetSshTunnelRequest(message, subprocess);
+    return true;
+  }
+  if (msgtype == 'getsshtunnel-response') {
+    handleGetSshTunnelResponse(message, subprocess);
+    return true;
+  }
+  return false;
+}
+
+module.exports = {
+  handleProcessCommunication,
+};

packages/api/src/utility/requireEngineDriver.js

@@ -1,7 +1,6 @@
 const _ = require('lodash');
 const requirePlugin = require('../shell/requirePlugin');
 
-
 /** @returns {import('dbgate-types').EngineDriver} */
 function requireEngineDriver(connection) {
   let engine = null;

packages/api/src/utility/sshTunnel.js

@@ -0,0 +1,82 @@
+const { SSHConnection } = require('node-ssh-forward');
+const fs = require('fs-extra');
+const portfinder = require('portfinder');
+const stableStringify = require('json-stable-stringify');
+const _ = require('lodash');
+const platformInfo = require('./platformInfo');
+
+const sshConnectionCache = {};
+const sshTunnelCache = {};
+
+const CONNECTION_FIELDS = [
+  'sshHost',
+  'sshPort',
+  'sshLogin',
+  'sshPassword',
+  'sshMode',
+  'sshKeyFile',
+  'sshBastionHost',
+  'sshKeyFilePassword',
+];
+const TUNNEL_FIELDS = [...CONNECTION_FIELDS, 'server', 'port'];
+
+async function getSshConnection(connection) {
+  const connectionCacheKey = stableStringify(_.pick(connection, CONNECTION_FIELDS));
+  if (sshConnectionCache[connectionCacheKey]) return sshConnectionCache[connectionCacheKey];
+
+  const sshConfig = {
+    endHost: connection.sshHost || '',
+    endPort: connection.sshPort || 22,
+    bastionHost: connection.sshBastionHost || '',
+    agentForward: connection.sshMode == 'agent',
+    passphrase: connection.sshMode == 'keyFile' ? connection.sshKeyFilePassword : undefined,
+    username: connection.sshLogin,
+    password: connection.sshMode == 'userPassword' ? connection.sshPassword : undefined,
+    agentSocket: connection.sshMode == 'agent' ? platformInfo.sshAuthSock : undefined,
+    privateKey:
+      connection.sshMode == 'keyFile' && connection.sshKeyFile ? await fs.readFile(connection.sshKeyFile) : undefined,
+    skipAutoPrivateKey: true,
+    noReadline: true,
+  };
+
+  const sshConn = new SSHConnection(sshConfig);
+  sshConnectionCache[connectionCacheKey] = sshConn;
+  return sshConn;
+}
+
+async function getSshTunnel(connection) {
+  const sshConn = await getSshConnection(connection);
+  const tunnelCacheKey = stableStringify(_.pick(connection, TUNNEL_FIELDS));
+  if (sshTunnelCache[tunnelCacheKey]) return sshTunnelCache[tunnelCacheKey];
+
+  const localPort = await portfinder.getPortPromise({ port: 10000, stopPort: 60000 });
+  // workaround for `getPortPromise` not releasing the port quickly enough
+  await new Promise(resolve => setTimeout(resolve, 500));
+  const tunnelConfig = {
+    fromPort: localPort,
+    toPort: connection.port,
+    toHost: connection.server,
+  };
+  try {
+    const tunnel = await sshConn.forward(tunnelConfig);
+    console.log(
+      `Created SSH tunnel to ${connection.sshHost}-${connection.server}:${connection.port}, using local port ${localPort}`
+    );
+
+    sshTunnelCache[tunnelCacheKey] = {
+      state: 'ok',
+      localPort,
+    };
+    return sshTunnelCache[tunnelCacheKey];
+  } catch (err) {
+    // error is not cached
+    return {
+      state: 'error',
+      message: err.message,
+    };
+  }
+}
+
+module.exports = {
+  getSshTunnel,
+};

packages/api/src/utility/sshTunnelProxy.js

@@ -0,0 +1,30 @@
+const uuidv1 = require('uuid/v1');
+const { getSshTunnel } = require('./sshTunnel');
+
+const dispatchedMessages = {};
+
+async function handleGetSshTunnelRequest({ msgid, connection }, subprocess) {
+  const response = await getSshTunnel(connection);
+  subprocess.send({ msgtype: 'getsshtunnel-response', msgid, response });
+}
+
+function handleGetSshTunnelResponse({ msgid, response }, subprocess) {
+  const { resolve } = dispatchedMessages[msgid];
+  delete dispatchedMessages[msgid];
+  resolve(response);
+}
+
+async function getSshTunnelProxy(connection) {
+  if (!process.send) return getSshTunnel(connection);
+  const msgid = uuidv1();
+  process.send({ msgtype: 'getsshtunnel-request', msgid, connection });
+  return new Promise((resolve, reject) => {
+    dispatchedMessages[msgid] = { resolve, reject };
+  });
+}
+
+module.exports = {
+  handleGetSshTunnelRequest,
+  handleGetSshTunnelResponse,
+  getSshTunnelProxy,
+};

packages/api/webpack.config.js

@@ -8,24 +8,27 @@ var config = {
     app: './index.js',
   },
   target: 'node',
+  node: {
+    __dirname: false,
+  },  
   output: {
     path: path.resolve(__dirname, 'dist'),
     filename: 'bundle.js',
     libraryTarget: 'commonjs2',
   },
 
-  // optimization: {
-  //   minimize: false,
-  // },
+//   optimization: {
+//     minimize: false,
+//   },
 
-  //   module: {
-  //     rules: [
-  //       {
-  //         test: /\.js$/,
-  //         exclude: /node_modules/
-  //       },
-  //     ],
-  //   },
+  module: {
+    rules: [
+      {
+        test: /\.node$/,
+        use: 'node-loader',
+      },
+    ],
+  },
   plugins: [
     new webpack.IgnorePlugin({
       checkResource(resource) {

packages/datalib/package.json

@@ -1,10 +1,9 @@
 {
-  "version": "1.0.0",
+  "version": "4.1.1",
   "name": "dbgate-datalib",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "scripts": {
-    "prepare": "yarn build",
     "build": "tsc",
     "start": "tsc --watch"
   },
@@ -12,11 +11,11 @@
     "lib"
   ],
   "dependencies": {
-    "dbgate-sqltree": "^1.0.0",
-    "dbgate-filterparser": "^1.0.0"
+    "dbgate-sqltree": "^4.1.1",
+    "dbgate-filterparser": "^4.1.1"
   },
   "devDependencies": {
-    "dbgate-types": "^1.0.0",
+    "dbgate-types": "^4.1.1",
     "@types/node": "^13.7.0",
     "typescript": "^3.7.5"
   }

packages/datalib/src/ChangeSet.ts

@@ -6,6 +6,7 @@ export interface ChangeSetItem {
   pureName: string;
   schemaName?: string;
   insertedRowIndex?: number;
+  document?: any;
   condition?: { [column: string]: string };
   fields?: { [column: string]: string };
 }
@@ -45,7 +46,7 @@ export function findExistingChangeSetItem(
     return [
       'inserts',
       changeSet.inserts.find(
-        (x) =>
+        x =>
           x.pureName == definition.pureName &&
           x.schemaName == definition.schemaName &&
           x.insertedRowIndex == definition.insertedRowIndex
@@ -53,7 +54,7 @@ export function findExistingChangeSetItem(
     ];
   } else {
     const inUpdates = changeSet.updates.find(
-      (x) =>
+      x =>
         x.pureName == definition.pureName &&
         x.schemaName == definition.schemaName &&
         _.isEqual(x.condition, definition.condition)
@@ -61,7 +62,7 @@ export function findExistingChangeSetItem(
     if (inUpdates) return ['updates', inUpdates];
 
     const inDeletes = changeSet.deletes.find(
-      (x) =>
+      x =>
         x.pureName == definition.pureName &&
         x.schemaName == definition.schemaName &&
         _.isEqual(x.condition, definition.condition)
@@ -86,7 +87,7 @@ export function setChangeSetValue(
   if (existingItem) {
     return {
       ...changeSet,
-      [fieldName]: changeSet[fieldName].map((item) =>
+      [fieldName]: changeSet[fieldName].map(item =>
         item == existingItem
           ? {
               ...item,
@@ -117,6 +118,43 @@ export function setChangeSetValue(
   };
 }
 
+export function setChangeSetRowData(changeSet: ChangeSet, definition: ChangeSetRowDefinition, document: any): ChangeSet {
+  if (!changeSet || !definition) return changeSet;
+  let [fieldName, existingItem] = findExistingChangeSetItem(changeSet, definition);
+  if (fieldName == 'deletes') {
+    changeSet = revertChangeSetRowChanges(changeSet, definition);
+    [fieldName, existingItem] = findExistingChangeSetItem(changeSet, definition);
+  }
+  if (existingItem) {
+    return {
+      ...changeSet,
+      [fieldName]: changeSet[fieldName].map(item =>
+        item == existingItem
+          ? {
+              ...item,
+              fields: {},
+              document,
+            }
+          : item
+      ),
+    };
+  }
+
+  return {
+    ...changeSet,
+    [fieldName]: [
+      ...changeSet[fieldName],
+      {
+        pureName: definition.pureName,
+        schemaName: definition.schemaName,
+        condition: definition.condition,
+        insertedRowIndex: definition.insertedRowIndex,
+        document,
+      },
+    ],
+  };
+}
+
 // export function batchUpdateChangeSet(
 //   changeSet: ChangeSet,
 //   rowDefinitions: ChangeSetRowDefinition[],
@@ -167,8 +205,8 @@ export function batchUpdateChangeSet(
 
 function extractFields(item: ChangeSetItem, allowNulls = true): UpdateField[] {
   return _.keys(item.fields)
-    .filter((targetColumn) => allowNulls || item.fields[targetColumn] != null)
-    .map((targetColumn) => ({
+    .filter(targetColumn => allowNulls || item.fields[targetColumn] != null)
+    .map(targetColumn => ({
       targetColumn,
       exprType: 'value',
       value: item.fields[targetColumn],
@@ -183,11 +221,11 @@ function insertToSql(
   if (fields.length == 0) return null;
   let autoInc = false;
   if (dbinfo) {
-    const table = dbinfo.tables.find((x) => x.schemaName == item.schemaName && x.pureName == item.pureName);
+    const table = dbinfo.tables.find(x => x.schemaName == item.schemaName && x.pureName == item.pureName);
     if (table) {
-      const autoIncCol = table.columns.find((x) => x.autoIncrement);
+      const autoIncCol = table.columns.find(x => x.autoIncrement);
       console.log('autoIncCol', autoIncCol);
-      if (autoIncCol && fields.find((x) => x.targetColumn == autoIncCol.columnName)) {
+      if (autoIncCol && fields.find(x => x.targetColumn == autoIncCol.columnName)) {
         autoInc = true;
       }
     }
@@ -222,7 +260,7 @@ function insertToSql(
 function extractCondition(item: ChangeSetItem): Condition {
   return {
     conditionType: 'and',
-    conditions: _.keys(item.condition).map((columnName) => ({
+    conditions: _.keys(item.condition).map(columnName => ({
       conditionType: 'binary',
       operator: '=',
       left: {
@@ -273,7 +311,7 @@ function deleteToSql(item: ChangeSetItem): Delete {
 export function changeSetToSql(changeSet: ChangeSet, dbinfo: DatabaseInfo): Command[] {
   return _.compact(
     _.flatten([
-      ...changeSet.inserts.map((item) => insertToSql(item, dbinfo)) as any,
+      ...(changeSet.inserts.map(item => insertToSql(item, dbinfo)) as any),
       ...changeSet.updates.map(updateToSql),
       ...changeSet.deletes.map(deleteToSql),
     ])
@@ -289,7 +327,7 @@ export function revertChangeSetRowChanges(changeSet: ChangeSet, definition: Chan
   if (item)
     return {
       ...changeSet,
-      [field]: changeSet[field].filter((x) => x != item),
+      [field]: changeSet[field].filter(x => x != item),
     };
   return changeSet;
 }
@@ -321,8 +359,8 @@ export function deleteChangeSetRows(changeSet: ChangeSet, definition: ChangeSetR
 export function getChangeSetInsertedRows(changeSet: ChangeSet, name?: NamedObjectInfo) {
   if (!name) return [];
   if (!changeSet) return [];
-  const rows = changeSet.inserts.filter((x) => x.pureName == name.pureName && x.schemaName == name.schemaName);
-  const maxIndex = _.maxBy(rows, (x) => x.insertedRowIndex)?.insertedRowIndex;
+  const rows = changeSet.inserts.filter(x => x.pureName == name.pureName && x.schemaName == name.schemaName);
+  const maxIndex = _.maxBy(rows, x => x.insertedRowIndex)?.insertedRowIndex;
   if (maxIndex == null) return [];
   const res = Array(maxIndex + 1).fill({});
   for (const row of rows) {
@@ -332,6 +370,7 @@ export function getChangeSetInsertedRows(changeSet: ChangeSet, name?: NamedObjec
 }
 
 export function changeSetInsertNewRow(changeSet: ChangeSet, name?: NamedObjectInfo): ChangeSet {
+  console.log('INSERT', name);
   const insertedRows = getChangeSetInsertedRows(changeSet, name);
   return {
     ...changeSet,
@@ -347,5 +386,6 @@ export function changeSetInsertNewRow(changeSet: ChangeSet, name?: NamedObjectIn
 }
 
 export function changeSetContainsChanges(changeSet: ChangeSet) {
+  if (!changeSet) return false;
   return changeSet.deletes.length > 0 || changeSet.updates.length > 0 || changeSet.inserts.length > 0;
 }

packages/datalib/src/CollectionGridDisplay.ts

@@ -0,0 +1,104 @@
+import _ from 'lodash';
+import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc, DisplayColumn } from './GridDisplay';
+import { EngineDriver, ViewInfo, ColumnInfo, CollectionInfo } from 'dbgate-types';
+import { GridConfig, GridCache } from './GridConfig';
+
+function getObjectKeys(obj) {
+  if (_.isArray(obj)) {
+    return Object.keys(obj)
+      .slice(0, 10)
+      .map(x => parseInt(x));
+  }
+  if (_.isPlainObject(obj)) {
+    return Object.keys(obj);
+  }
+  return [];
+}
+
+function createHeaderText(path) {
+  let res = `${path[0]}`;
+  for (let i = 1; i < path.length; i++) {
+    const name = path[i];
+    if (_.isNumber(name)) res += `[${name}]`;
+    else res += `.${name}`;
+  }
+  return res;
+}
+
+function getColumnsForObject(basePath, obj, res: any[], display) {
+  for (const name of getObjectKeys(obj)) {
+    const uniqueName = [...basePath, name].join('.');
+    let column = res.find(x => x.uniqueName == uniqueName);
+    if (!column) {
+      column = getDisplayColumn(basePath, name, display);
+      if (basePath.length > 0) {
+        const lastIndex1 = _.findLastIndex(res, x => x.parentHeaderText.startsWith(column.parentHeaderText));
+        const lastIndex2 = _.findLastIndex(res, x => x.headerText == column.parentHeaderText);
+        // console.log(uniqueName, lastIndex1, lastIndex2);
+        if (lastIndex1 >= 0) res.splice(lastIndex1 + 1, 0, column);
+        else if (lastIndex2 >= 0) res.splice(lastIndex2 + 1, 0, column);
+        else res.push(column);
+      } else {
+        res.push(column);
+      }
+    }
+    if (_.isPlainObject(obj[name]) || _.isArray(obj[name])) {
+      column.isExpandable = true;
+    }
+
+    if (display.isExpandedColumn(column.uniqueName)) {
+      getColumnsForObject([...basePath, name], obj[name], res, display);
+    }
+  }
+}
+
+function getDisplayColumn(basePath, columnName, display) {
+  const uniquePath = [...basePath, columnName];
+  const uniqueName = uniquePath.join('.');
+  return {
+    columnName,
+    headerText: createHeaderText(uniquePath),
+    uniqueName,
+    uniquePath,
+    isStructured: true,
+    parentHeaderText: createHeaderText(basePath),
+    filterType: 'mongo',
+    pureName: display.collection?.pureName,
+    schemaName: display.collection?.schemaName,
+  };
+}
+
+export function analyseCollectionDisplayColumns(rows, display) {
+  const res = [];
+  for (const row of rows || []) {
+    getColumnsForObject([], row, res, display);
+  }
+  return (
+    res.map(col => ({
+      ...col,
+      isChecked: display.isColumnChecked(col),
+    })) || []
+  );
+}
+
+export class CollectionGridDisplay extends GridDisplay {
+  constructor(
+    public collection: CollectionInfo,
+    driver: EngineDriver,
+    config: GridConfig,
+    setConfig: ChangeConfigFunc,
+    cache: GridCache,
+    setCache: ChangeCacheFunc,
+    loadedRows
+  ) {
+    super(config, setConfig, cache, setCache, driver);
+    this.columns = analyseCollectionDisplayColumns(loadedRows, this);
+    this.filterable = true;
+    this.sortable = true;
+    this.editable = true;
+    this.supportsReload = true;
+    this.isDynamicStructure = true;
+    this.changeSetKeyFields = ['_id'];
+    this.baseCollection = collection;
+  }
+}

packages/datalib/src/FormViewDisplay.ts

@@ -0,0 +1,120 @@
+import _ from 'lodash';
+import { GridConfig, GridCache, GridConfigColumns, createGridCache, GroupFunc } from './GridConfig';
+import { ForeignKeyInfo, TableInfo, ColumnInfo, EngineDriver, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
+import { parseFilter, getFilterType, getFilterValueExpression } from 'dbgate-filterparser';
+import { filterName } from './filterName';
+import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
+import { Expression, Select, treeToSql, dumpSqlSelect, Condition } from 'dbgate-sqltree';
+import { isTypeLogical } from 'dbgate-tools';
+import { ChangeCacheFunc, ChangeConfigFunc, DisplayColumn } from './GridDisplay';
+
+export class FormViewDisplay {
+  isLoadedCorrectly = true;
+  columns: DisplayColumn[];
+  public baseTable: TableInfo;
+
+  constructor(
+    public config: GridConfig,
+    protected setConfig: ChangeConfigFunc,
+    public cache: GridCache,
+    protected setCache: ChangeCacheFunc,
+    public driver?: EngineDriver,
+    public dbinfo: DatabaseInfo = null
+  ) {}
+
+  addFilterColumn(column) {
+    if (!column) return;
+    this.setConfig(cfg => ({
+      ...cfg,
+      formFilterColumns: [...(cfg.formFilterColumns || []), column.uniqueName],
+    }));
+  }
+
+  filterCellValue(column, rowData) {
+    if (!column || !rowData) return;
+    const value = rowData[column.uniqueName];
+    const expr = getFilterValueExpression(value, column.dataType);
+    if (expr) {
+      this.setConfig(cfg => ({
+        ...cfg,
+        filters: {
+          ...cfg.filters,
+          [column.uniqueName]: expr,
+        },
+        addedColumns: cfg.addedColumns.includes(column.uniqueName)
+          ? cfg.addedColumns
+          : [...cfg.addedColumns, column.uniqueName],
+      }));
+      this.reload();
+    }
+  }
+
+  setFilter(uniqueName, value) {
+    this.setConfig(cfg => ({
+      ...cfg,
+      filters: {
+        ...cfg.filters,
+        [uniqueName]: value,
+      },
+    }));
+    this.reload();
+  }
+
+  removeFilter(uniqueName) {
+    const reloadRequired = !!this.config.filters[uniqueName];
+    this.setConfig(cfg => ({
+      ...cfg,
+      formFilterColumns: (cfg.formFilterColumns || []).filter(x => x != uniqueName),
+      filters: _.omit(cfg.filters || [], uniqueName),
+    }));
+    if (reloadRequired) this.reload();
+  }
+
+  reload() {
+    this.setCache(cache => ({
+      // ...cache,
+      ...createGridCache(),
+      refreshTime: new Date().getTime(),
+    }));
+  }
+
+  getKeyValue(columnName) {
+    const { formViewKey, formViewKeyRequested } = this.config;
+    if (formViewKeyRequested && formViewKeyRequested[columnName]) return formViewKeyRequested[columnName];
+    if (formViewKey && formViewKey[columnName]) return formViewKey[columnName];
+    return null;
+  }
+
+  requestKeyValue(columnName, value) {
+    if (this.getKeyValue(columnName) == value) return;
+
+    this.setConfig(cfg => ({
+      ...cfg,
+      formViewKeyRequested: {
+        ...cfg.formViewKey,
+        ...cfg.formViewKeyRequested,
+        [columnName]: value,
+      },
+    }));
+    this.reload();
+  }
+
+  extractKey(row) {
+    if (!row || !this.baseTable || !this.baseTable.primaryKey) {
+      return null;
+    }
+    const formViewKey = _.pick(
+      row,
+      this.baseTable.primaryKey.columns.map(x => x.columnName)
+    );
+    return formViewKey;
+  }
+
+  cancelRequestKey(rowData) {
+    this.setConfig(cfg => ({
+      ...cfg,
+      formViewKeyRequested: null,
+      formViewKey: rowData ? this.extractKey(rowData) : cfg.formViewKey,
+    }));
+  }
+}

packages/datalib/src/FreeTableGridDisplay.ts

@@ -21,15 +21,15 @@ export class FreeTableGridDisplay extends GridDisplay {
   getDisplayColumns(model: FreeTableModel) {
     return (
       model?.structure?.columns
-        ?.map((col) => this.getDisplayColumn(col))
-        ?.map((col) => ({
+        ?.map(col => this.getDisplayColumn(col))
+        ?.map(col => ({
           ...col,
           isChecked: this.isColumnChecked(col),
         })) || []
     );
   }
 
-  getDisplayColumn( col: ColumnInfo) {
+  getDisplayColumn(col: ColumnInfo) {
     const uniquePath = [col.columnName];
     const uniqueName = uniquePath.join('.');
     return {

packages/datalib/src/GridConfig.ts

@@ -29,6 +29,10 @@ export interface GridConfig extends GridConfigColumns {
   grouping: { [uniqueName: string]: GroupFunc };
   childConfig?: GridConfig;
   reference?: GridReferenceDefinition;
+  isFormView?: boolean;
+  formViewKey?: { [uniqueName: string]: string };
+  formViewKeyRequested?: { [uniqueName: string]: string };
+  formFilterColumns: string[];
 }
 
 export interface GridCache {
@@ -45,6 +49,7 @@ export function createGridConfig(): GridConfig {
     sort: [],
     focusedColumn: null,
     grouping: {},
+    formFilterColumns: [],
   };
 }
 

packages/datalib/src/GridDisplay.ts

@@ -1,6 +1,14 @@
 import _ from 'lodash';
 import { GridConfig, GridCache, GridConfigColumns, createGridCache, GroupFunc } from './GridConfig';
-import { ForeignKeyInfo, TableInfo, ColumnInfo, EngineDriver, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
+import {
+  ForeignKeyInfo,
+  TableInfo,
+  ColumnInfo,
+  EngineDriver,
+  NamedObjectInfo,
+  DatabaseInfo,
+  CollectionInfo,
+} from 'dbgate-types';
 import { parseFilter, getFilterType } from 'dbgate-filterparser';
 import { filterName } from './filterName';
 import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
@@ -18,9 +26,12 @@ export interface DisplayColumn {
   autoIncrement?: boolean;
   isPrimaryKey?: boolean;
   foreignKey?: ForeignKeyInfo;
+  isExpandable?: boolean;
   isChecked?: boolean;
   hintColumnName?: string;
   dataType?: string;
+  filterType?: boolean;
+  isStructured?: boolean;
 }
 
 export interface DisplayedColumnEx extends DisplayColumn {
@@ -53,12 +64,17 @@ export abstract class GridDisplay {
   ) {}
   columns: DisplayColumn[];
   baseTable?: TableInfo;
+  baseCollection?: CollectionInfo;
+  get baseTableOrCollection(): NamedObjectInfo {
+    return this.baseTable || this.baseCollection;
+  }
   changeSetKeyFields: string[] = null;
   sortable = false;
   filterable = false;
   editable = false;
   isLoadedCorrectly = true;
   supportsReload = false;
+  isDynamicStructure = false;
 
   setColumnVisibility(uniquePath: string[], isVisible: boolean) {
     const uniqueName = uniquePath.join('.');
@@ -66,12 +82,12 @@ export abstract class GridDisplay {
       this.includeInColumnSet('hiddenColumns', uniqueName, !isVisible);
     } else {
       this.includeInColumnSet('addedColumns', uniqueName, isVisible);
-      this.reload();
+      if (!this.isDynamicStructure) this.reload();
     }
   }
 
   focusColumn(uniqueName: string) {
-    this.setConfig((cfg) => ({
+    this.setConfig(cfg => ({
       ...cfg,
       focusedColumn: uniqueName,
     }));
@@ -90,48 +106,44 @@ export abstract class GridDisplay {
   }
 
   get allColumns() {
-    return this.getColumns(null).filter((col) => col.isChecked || col.uniquePath.length == 1);
+    return this.getColumns(null).filter(col => col.isChecked || col.uniquePath.length == 1);
   }
 
   reload() {
-    this.setCache((cache) => ({
-      // ...cache,
-      ...createGridCache(),
-      refreshTime: new Date().getTime(),
-    }));
+    this.setCache(reloadDataCacheFunc);
   }
 
   includeInColumnSet(field: keyof GridConfigColumns, uniqueName: string, isIncluded: boolean) {
     // console.log('includeInColumnSet', field, uniqueName, isIncluded);
     if (isIncluded) {
-      this.setConfig((cfg) => ({
+      this.setConfig(cfg => ({
         ...cfg,
         [field]: [...(cfg[field] || []), uniqueName],
       }));
     } else {
-      this.setConfig((cfg) => ({
+      this.setConfig(cfg => ({
         ...cfg,
-        [field]: (cfg[field] || []).filter((x) => x != uniqueName),
+        [field]: (cfg[field] || []).filter(x => x != uniqueName),
       }));
     }
   }
 
   showAllColumns() {
-    this.setConfig((cfg) => ({
+    this.setConfig(cfg => ({
       ...cfg,
       hiddenColumns: [],
     }));
   }
 
   hideAllColumns() {
-    this.setConfig((cfg) => ({
+    this.setConfig(cfg => ({
       ...cfg,
-      hiddenColumns: this.columns.map((x) => x.uniqueName),
+      hiddenColumns: this.columns.map(x => x.uniqueName),
     }));
   }
 
   get hiddenColumnIndexes() {
-    return (this.config.hiddenColumns || []).map((x) => _.findIndex(this.columns, (y) => y.uniqueName == x));
+    return (this.config.hiddenColumns || []).map(x => _.findIndex(this.columns, y => y.uniqueName == x));
   }
 
   isColumnChecked(column: DisplayColumn) {
@@ -179,10 +191,10 @@ export abstract class GridDisplay {
   applySortOnSelect(select: Select, displayedColumnInfo: DisplayedColumnInfo) {
     if (this.config.sort?.length > 0) {
       select.orderBy = this.config.sort
-        .map((col) => ({ ...col, dispInfo: displayedColumnInfo[col.uniqueName] }))
-        .map((col) => ({ ...col, expr: select.columns.find((x) => x.alias == col.uniqueName) }))
-        .filter((col) => col.dispInfo && col.expr)
-        .map((col) => ({
+        .map(col => ({ ...col, dispInfo: displayedColumnInfo[col.uniqueName] }))
+        .map(col => ({ ...col, expr: select.columns.find(x => x.alias == col.uniqueName) }))
+        .filter(col => col.dispInfo && col.expr)
+        .map(col => ({
           ...col.expr,
           direction: col.order,
         }));
@@ -194,16 +206,14 @@ export abstract class GridDisplay {
   }
 
   get groupColumns() {
-    return this.isGrouped
-      ? _.keys(_.pickBy(this.config.grouping, (v) => v == 'GROUP' || v.startsWith('GROUP:')))
-      : null;
+    return this.isGrouped ? _.keys(_.pickBy(this.config.grouping, v => v == 'GROUP' || v.startsWith('GROUP:'))) : null;
   }
 
   applyGroupOnSelect(select: Select, displayedColumnInfo: DisplayedColumnInfo) {
     const groupColumns = this.groupColumns;
     if (groupColumns && groupColumns.length > 0) {
       // @ts-ignore
-      select.groupBy = groupColumns.map((col) => {
+      select.groupBy = groupColumns.map(col => {
         const colExpr: Expression = {
           exprType: 'column',
           columnName: displayedColumnInfo[col].columnName,
@@ -257,16 +267,16 @@ export abstract class GridDisplay {
           };
         }
       }
-      select.columns = select.columns.filter((x) => x.alias);
+      select.columns = select.columns.filter(x => x.alias);
     }
   }
 
   getColumns(columnFilter) {
-    return this.columns.filter((col) => filterName(columnFilter, col.columnName));
+    return this.columns.filter(col => filterName(columnFilter, col.columnName));
   }
 
   getGridColumns() {
-    return this.getColumns(null).filter((x) => this.isColumnChecked(x));
+    return this.getColumns(null).filter(x => this.isColumnChecked(x));
   }
 
   isExpandedColumn(uniqueName: string) {
@@ -282,7 +292,7 @@ export abstract class GridDisplay {
   }
 
   setFilter(uniqueName, value) {
-    this.setConfig((cfg) => ({
+    this.setConfig(cfg => ({
       ...cfg,
       filters: {
         ...cfg.filters,
@@ -292,8 +302,30 @@ export abstract class GridDisplay {
     this.reload();
   }
 
+  showFilter(uniqueName) {
+    this.setConfig(cfg => {
+      if (!cfg.filters.uniqueName)
+        return {
+          ...cfg,
+          filters: {
+            ..._.omitBy(cfg.filters, v => !v),
+            [uniqueName]: '',
+          },
+        };
+      return cfg;
+    });
+  }
+
+  removeFilter(uniqueName) {
+    this.setConfig(cfg => ({
+      ...cfg,
+      filters: _.omit(cfg.filters, [uniqueName]),
+    }));
+    this.reload();
+  }
+
   setFilters(dct) {
-    this.setConfig((cfg) => ({
+    this.setConfig(cfg => ({
       ...cfg,
       filters: {
         ...cfg.filters,
@@ -304,7 +336,7 @@ export abstract class GridDisplay {
   }
 
   setSort(uniqueName, order) {
-    this.setConfig((cfg) => ({
+    this.setConfig(cfg => ({
       ...cfg,
       sort: [{ uniqueName, order }],
     }));
@@ -312,7 +344,7 @@ export abstract class GridDisplay {
   }
 
   setGrouping(uniqueName, groupFunc: GroupFunc) {
-    this.setConfig((cfg) => ({
+    this.setConfig(cfg => ({
       ...cfg,
       grouping: groupFunc
         ? {
@@ -327,7 +359,7 @@ export abstract class GridDisplay {
   getGrouping(uniqueName): GroupFunc {
     if (this.isGrouped) {
       if (this.config.grouping[uniqueName]) return this.config.grouping[uniqueName];
-      const column = this.baseTable.columns.find((x) => x.columnName == uniqueName);
+      const column = this.baseTable.columns.find(x => x.columnName == uniqueName);
       if (isTypeLogical(column?.dataType)) return 'COUNT DISTINCT';
       if (column?.autoIncrement) return 'COUNT';
       return 'MAX';
@@ -336,7 +368,7 @@ export abstract class GridDisplay {
   }
 
   clearGrouping() {
-    this.setConfig((cfg) => ({
+    this.setConfig(cfg => ({
       ...cfg,
       grouping: {},
     }));
@@ -344,7 +376,7 @@ export abstract class GridDisplay {
   }
 
   getSortOrder(uniqueName) {
-    return this.config.sort.find((x) => x.uniqueName == uniqueName)?.order;
+    return this.config.sort.find(x => x.uniqueName == uniqueName)?.order;
   }
 
   get filterCount() {
@@ -352,7 +384,7 @@ export abstract class GridDisplay {
   }
 
   clearFilters() {
-    this.setConfig((cfg) => ({
+    this.setConfig(cfg => ({
       ...cfg,
       filters: {},
     }));
@@ -365,10 +397,14 @@ export abstract class GridDisplay {
   }
 
   getChangeSetField(row, uniqueName, insertedRowIndex): ChangeSetFieldDefinition {
-    const col = this.columns.find((x) => x.uniqueName == uniqueName);
+    const col = this.columns.find(x => x.uniqueName == uniqueName);
     if (!col) return null;
-    if (!this.baseTable) return null;
-    if (this.baseTable.pureName != col.pureName || this.baseTable.schemaName != col.schemaName) return null;
+    const baseTableOrCollection = this.baseTableOrCollection;
+    if (!baseTableOrCollection) return null;
+    if (baseTableOrCollection.pureName != col.pureName || baseTableOrCollection.schemaName != col.schemaName) {
+      return null;
+    }
+
     return {
       ...this.getChangeSetRow(row, insertedRowIndex),
       uniqueName: uniqueName,
@@ -377,10 +413,11 @@ export abstract class GridDisplay {
   }
 
   getChangeSetRow(row, insertedRowIndex): ChangeSetRowDefinition {
-    if (!this.baseTable) return null;
+    const baseTableOrCollection = this.baseTableOrCollection;
+    if (!baseTableOrCollection) return null;
     return {
-      pureName: this.baseTable.pureName,
-      schemaName: this.baseTable.schemaName,
+      pureName: baseTableOrCollection.pureName,
+      schemaName: baseTableOrCollection.schemaName,
       insertedRowIndex,
       condition: insertedRowIndex == null ? this.getChangeSetCondition(row) : null,
     };
@@ -398,7 +435,7 @@ export abstract class GridDisplay {
     const select: Select = {
       commandType: 'select',
       from: { name, alias: 'basetbl' },
-      columns: columns.map((col) => ({
+      columns: columns.map(col => ({
         exprType: 'column',
         alias: col.columnName,
         source: { alias: 'basetbl' },
@@ -413,7 +450,7 @@ export abstract class GridDisplay {
       ],
     };
     const displayedColumnInfo = _.keyBy(
-      this.columns.map((col) => ({ ...col, sourceAlias: 'basetbl' })),
+      this.columns.map(col => ({ ...col, sourceAlias: 'basetbl' })),
       'uniqueName'
     );
     this.processReferences(select, displayedColumnInfo, options);
@@ -442,7 +479,7 @@ export abstract class GridDisplay {
   }
 
   resizeColumn(uniqueName: string, computedSize: number, diff: number) {
-    this.setConfig((cfg) => {
+    this.setConfig(cfg => {
       const columnWidths = {
         ...cfg.columnWidths,
       };
@@ -495,7 +532,7 @@ export abstract class GridDisplay {
     if (!filters) return null;
     const conditions = [];
     for (const name in filters) {
-      const column = this.columns.find((x) => (x.columnName = name));
+      const column = this.columns.find(x => (x.columnName = name));
       if (!column) continue;
       const filterType = getFilterType(column.dataType);
       try {
@@ -518,4 +555,38 @@ export abstract class GridDisplay {
       conditions,
     };
   }
+
+  switchToFormView(rowData) {
+    if (!this.baseTable) return;
+    const { primaryKey } = this.baseTable;
+    if (!primaryKey) return;
+    const { columns } = primaryKey;
+
+    this.setConfig(cfg => ({
+      ...cfg,
+      isFormView: true,
+      formViewKey: rowData
+        ? _.pick(
+            rowData,
+            columns.map(x => x.columnName)
+          )
+        : null,
+      formViewKeyRequested: null,
+    }));
+  }
+
+  switchToJsonView() {
+    this.setConfig(cfg => ({
+      ...cfg,
+      isJsonView: true,
+    }));
+  }
+}
+
+export function reloadDataCacheFunc(cache: GridCache): GridCache {
+  return {
+    // ...cache,
+    ...createGridCache(),
+    refreshTime: new Date().getTime(),
+  };
 }

packages/datalib/src/JslGridDisplay.ts

@@ -1,34 +1,44 @@
 import { GridDisplay, ChangeCacheFunc, ChangeConfigFunc } from './GridDisplay';
 import { QueryResultColumn } from 'dbgate-types';
 import { GridConfig, GridCache } from './GridConfig';
+import { analyseCollectionDisplayColumns } from './CollectionGridDisplay';
 
 export class JslGridDisplay extends GridDisplay {
   constructor(
     jslid,
-    columns: QueryResultColumn[],
+    structure,
     config: GridConfig,
     setConfig: ChangeConfigFunc,
     cache: GridCache,
-    setCache: ChangeCacheFunc
+    setCache: ChangeCacheFunc,
+    rows: any
   ) {
     super(config, setConfig, cache, setCache, null);
 
     this.filterable = true;
 
-    this.columns = columns
-      .map((col) => ({
-        columnName: col.columnName,
-        headerText: col.columnName,
-        uniqueName: col.columnName,
-        uniquePath: [col.columnName],
-        notNull: col.notNull,
-        autoIncrement: col.autoIncrement,
-        pureName: null,
-        schemaName: null,
-      }))
-      ?.map((col) => ({
-        ...col,
-        isChecked: this.isColumnChecked(col),
-      }));
+    if (structure.columns) {
+      this.columns = structure.columns
+        .map(col => ({
+          columnName: col.columnName,
+          headerText: col.columnName,
+          uniqueName: col.columnName,
+          uniquePath: [col.columnName],
+          notNull: col.notNull,
+          autoIncrement: col.autoIncrement,
+          pureName: null,
+          schemaName: null,
+        }))
+        ?.map(col => ({
+          ...col,
+          isChecked: this.isColumnChecked(col),
+        }));
+    }
+
+    if (structure.__isDynamicStructure) {
+      this.columns = analyseCollectionDisplayColumns(rows, this);
+    }
+
+    if (!this.columns) this.columns = [];
   }
 }

packages/datalib/src/MacroDefinition.ts

@@ -19,4 +19,6 @@ export interface MacroDefinition {
 export interface MacroSelectedCell {
   column: string;
   row: number;
+  rowData: any;
+  value: any;
 }

packages/datalib/src/TableFormViewDisplay.ts

@@ -0,0 +1,274 @@
+import { FormViewDisplay } from './FormViewDisplay';
+import _ from 'lodash';
+import { GridDisplay, ChangeCacheFunc, DisplayColumn, DisplayedColumnInfo, ChangeConfigFunc } from './GridDisplay';
+import { TableInfo, EngineDriver, ViewInfo, ColumnInfo, NamedObjectInfo, DatabaseInfo } from 'dbgate-types';
+import { GridConfig, GridCache, createGridCache } from './GridConfig';
+import {
+  Expression,
+  Select,
+  treeToSql,
+  dumpSqlSelect,
+  mergeConditions,
+  Condition,
+  OrderByExpression,
+} from 'dbgate-sqltree';
+import { filterName } from './filterName';
+import { TableGridDisplay } from './TableGridDisplay';
+import stableStringify from 'json-stable-stringify';
+import { ChangeSetFieldDefinition, ChangeSetRowDefinition } from './ChangeSet';
+
+export class TableFormViewDisplay extends FormViewDisplay {
+  // use utility functions from GridDisplay and publish result in FromViewDisplay interface
+  private gridDisplay: TableGridDisplay;
+
+  constructor(
+    public tableName: NamedObjectInfo,
+    driver: EngineDriver,
+    config: GridConfig,
+    setConfig: ChangeConfigFunc,
+    cache: GridCache,
+    setCache: ChangeCacheFunc,
+    dbinfo: DatabaseInfo,
+    displayOptions
+  ) {
+    super(config, setConfig, cache, setCache, driver, dbinfo);
+    this.gridDisplay = new TableGridDisplay(
+      tableName,
+      driver,
+      config,
+      setConfig,
+      cache,
+      setCache,
+      dbinfo,
+      displayOptions
+    );
+    this.gridDisplay.addAllExpandedColumnsToSelected = true;
+
+    this.isLoadedCorrectly = this.gridDisplay.isLoadedCorrectly && !!this.driver;
+    this.columns = [];
+    this.addDisplayColumns(this.gridDisplay.columns);
+    this.baseTable = this.gridDisplay.baseTable;
+    this.gridDisplay.hintBaseColumns = this.columns;
+  }
+
+  addDisplayColumns(columns: DisplayColumn[]) {
+    for (const col of columns) {
+      this.columns.push(col);
+      if (this.gridDisplay.isExpandedColumn(col.uniqueName)) {
+        const table = this.gridDisplay.getFkTarget(col);
+        if (table) {
+          const subcolumns = this.gridDisplay.getDisplayColumns(table, col.uniquePath);
+          this.addDisplayColumns(subcolumns);
+        }
+      }
+    }
+  }
+
+  getPrimaryKeyEqualCondition(row = null): Condition {
+    if (!row) row = this.config.formViewKeyRequested || this.config.formViewKey;
+    if (!row) return null;
+    const { primaryKey } = this.gridDisplay.baseTable;
+    if (!primaryKey) return null;
+    return {
+      conditionType: 'and',
+      conditions: primaryKey.columns.map(({ columnName }) => ({
+        conditionType: 'binary',
+        operator: '=',
+        left: {
+          exprType: 'column',
+          columnName,
+          source: {
+            alias: 'basetbl',
+          },
+        },
+        right: {
+          exprType: 'value',
+          value: row[columnName],
+        },
+      })),
+    };
+  }
+
+  getPrimaryKeyOperatorCondition(operator): Condition {
+    if (!this.config.formViewKey) return null;
+    const conditions = [];
+
+    const { primaryKey } = this.gridDisplay.baseTable;
+    if (!primaryKey) return null;
+    for (let index = 0; index < primaryKey.columns.length; index++) {
+      conditions.push({
+        conditionType: 'and',
+        conditions: [
+          ...primaryKey.columns.slice(0, index).map(({ columnName }) => ({
+            conditionType: 'binary',
+            operator: '=',
+            left: {
+              exprType: 'column',
+              columnName,
+              source: {
+                alias: 'basetbl',
+              },
+            },
+            right: {
+              exprType: 'value',
+              value: this.config.formViewKey[columnName],
+            },
+          })),
+          ...primaryKey.columns.slice(index).map(({ columnName }) => ({
+            conditionType: 'binary',
+            operator: operator,
+            left: {
+              exprType: 'column',
+              columnName,
+              source: {
+                alias: 'basetbl',
+              },
+            },
+            right: {
+              exprType: 'value',
+              value: this.config.formViewKey[columnName],
+            },
+          })),
+        ],
+      });
+    }
+
+    if (conditions.length == 1) {
+      return conditions[0];
+    }
+
+    return {
+      conditionType: 'or',
+      conditions,
+    };
+  }
+
+  getSelect() {
+    if (!this.driver) return null;
+    const select = this.gridDisplay.createSelect();
+    if (!select) return null;
+    select.topRecords = 1;
+    return select;
+  }
+
+  getCurrentRowQuery() {
+    const select = this.getSelect();
+    if (!select) return null;
+
+    select.where = mergeConditions(select.where, this.getPrimaryKeyEqualCondition());
+    const sql = treeToSql(this.driver, select, dumpSqlSelect);
+    return sql;
+  }
+
+  getCountSelect() {
+    const select = this.getSelect();
+    if (!select) return null;
+    select.orderBy = null;
+    select.columns = [
+      {
+        exprType: 'raw',
+        sql: 'COUNT(*)',
+        alias: 'count',
+      },
+    ];
+    select.topRecords = null;
+    return select;
+  }
+
+  getCountQuery() {
+    if (!this.driver) return null;
+    const select = this.getCountSelect();
+    if (!select) return null;
+    const sql = treeToSql(this.driver, select, dumpSqlSelect);
+    return sql;
+  }
+
+  getBeforeCountQuery() {
+    if (!this.driver) return null;
+    const select = this.getCountSelect();
+    if (!select) return null;
+    select.where = mergeConditions(select.where, this.getPrimaryKeyOperatorCondition('<'));
+    const sql = treeToSql(this.driver, select, dumpSqlSelect);
+    return sql;
+  }
+
+  navigate(row) {
+    const formViewKey = this.extractKey(row);
+    this.setConfig(cfg => ({
+      ...cfg,
+      formViewKey,
+    }));
+  }
+
+  isLoadedCurrentRow(row) {
+    if (!row) return false;
+    const formViewKey = this.extractKey(row);
+    return stableStringify(formViewKey) == stableStringify(this.config.formViewKey);
+  }
+
+  navigateRowQuery(commmand: 'begin' | 'previous' | 'next' | 'end') {
+    if (!this.driver) return null;
+    const select = this.gridDisplay.createSelect();
+    if (!select) return null;
+    const { primaryKey } = this.gridDisplay.baseTable;
+
+    function getOrderBy(direction): OrderByExpression[] {
+      return primaryKey.columns.map(({ columnName }) => ({
+        exprType: 'column',
+        columnName,
+        direction,
+      }));
+    }
+
+    select.topRecords = 1;
+    switch (commmand) {
+      case 'begin':
+        select.orderBy = getOrderBy('ASC');
+        break;
+      case 'end':
+        select.orderBy = getOrderBy('DESC');
+        break;
+      case 'previous':
+        select.orderBy = getOrderBy('DESC');
+        select.where = mergeConditions(select.where, this.getPrimaryKeyOperatorCondition('<'));
+        break;
+      case 'next':
+        select.orderBy = getOrderBy('ASC');
+        select.where = mergeConditions(select.where, this.getPrimaryKeyOperatorCondition('>'));
+        break;
+    }
+
+    const sql = treeToSql(this.driver, select, dumpSqlSelect);
+    return sql;
+  }
+
+  getChangeSetRow(row): ChangeSetRowDefinition {
+    if (!this.baseTable) return null;
+    return {
+      pureName: this.baseTable.pureName,
+      schemaName: this.baseTable.schemaName,
+      condition: this.extractKey(row),
+    };
+  }
+
+  getChangeSetField(row, uniqueName): ChangeSetFieldDefinition {
+    const col = this.columns.find(x => x.uniqueName == uniqueName);
+    if (!col) return null;
+    if (!this.baseTable) return null;
+    if (this.baseTable.pureName != col.pureName || this.baseTable.schemaName != col.schemaName) return null;
+    return {
+      ...this.getChangeSetRow(row),
+      uniqueName: uniqueName,
+      columnName: col.columnName,
+    };
+  }
+
+  toggleExpandedColumn(uniqueName: string) {
+    this.gridDisplay.toggleExpandedColumn(uniqueName);
+    this.gridDisplay.reload();
+  }
+
+  isExpandedColumn(uniqueName: string) {
+    return this.gridDisplay.isExpandedColumn(uniqueName);
+  }
+}

packages/datalib/src/TableGridDisplay.ts

@@ -7,6 +7,8 @@ import { filterName } from './filterName';
 
 export class TableGridDisplay extends GridDisplay {
   public table: TableInfo;
+  public addAllExpandedColumnsToSelected = false;
+  public hintBaseColumns: DisplayColumn[];
 
   constructor(
     public tableName: NamedObjectInfo,
@@ -15,7 +17,8 @@ export class TableGridDisplay extends GridDisplay {
     setConfig: ChangeConfigFunc,
     cache: GridCache,
     setCache: ChangeCacheFunc,
-    dbinfo: DatabaseInfo
+    dbinfo: DatabaseInfo,
+    public displayOptions: any
   ) {
     super(config, setConfig, cache, setCache, driver, dbinfo);
 
@@ -36,8 +39,8 @@ export class TableGridDisplay extends GridDisplay {
     this.baseTable = this.table;
     if (this.table && this.table.columns) {
       this.changeSetKeyFields = this.table.primaryKey
-        ? this.table.primaryKey.columns.map((x) => x.columnName)
-        : this.table.columns.map((x) => x.columnName);
+        ? this.table.primaryKey.columns.map(x => x.columnName)
+        : this.table.columns.map(x => x.columnName);
     }
   }
 
@@ -45,18 +48,19 @@ export class TableGridDisplay extends GridDisplay {
     return (
       this.dbinfo &&
       this.dbinfo.tables &&
-      this.dbinfo.tables.find((x) => x.pureName == pureName && x.schemaName == schemaName)
+      this.dbinfo.tables.find(x => x.pureName == pureName && x.schemaName == schemaName)
     );
   }
 
   getDisplayColumns(table: TableInfo, parentPath: string[]) {
     return (
       table?.columns
-        ?.map((col) => this.getDisplayColumn(table, col, parentPath))
-        ?.map((col) => ({
+        ?.map(col => this.getDisplayColumn(table, col, parentPath))
+        ?.map(col => ({
           ...col,
           isChecked: this.isColumnChecked(col),
           hintColumnName: col.foreignKey ? `hint_${col.uniqueName}` : null,
+          isExpandable: !!col.foreignKey,
         })) || []
     );
   }
@@ -80,7 +84,7 @@ export class TableGridDisplay extends GridDisplay {
 
   addReferenceToSelect(select: Select, parentAlias: string, column: DisplayColumn) {
     const childAlias = `${column.uniqueName}_ref`;
-    if ((select.from.relations || []).find((x) => x.alias == childAlias)) return;
+    if ((select.from.relations || []).find(x => x.alias == childAlias)) return;
     const table = this.getFkTarget(column);
     if (table && table.primaryKey) {
       select.from.relations = [
@@ -113,14 +117,14 @@ export class TableGridDisplay extends GridDisplay {
   addHintsToSelect(select: Select): boolean {
     let res = false;
     const groupColumns = this.groupColumns;
-    for (const column of this.getGridColumns()) {
+    for (const column of this.hintBaseColumns || this.getGridColumns()) {
       if (column.foreignKey) {
         if (groupColumns && !groupColumns.includes(column.uniqueName)) {
           continue;
         }
         const table = this.getFkTarget(column);
         if (table && table.columns && table.columns.length > 0 && table.primaryKey) {
-          const hintColumn = table.columns.find((x) => x?.dataType?.toLowerCase()?.includes('char'));
+          const hintColumn = table.columns.find(x => x?.dataType?.toLowerCase()?.includes('char'));
           if (hintColumn) {
             const parentUniqueName = column.uniquePath.slice(0, -1).join('.');
             this.addReferenceToSelect(select, parentUniqueName ? `${parentUniqueName}_ref` : 'basetbl', column);
@@ -165,7 +169,7 @@ export class TableGridDisplay extends GridDisplay {
 
   processReferences(select: Select, displayedColumnInfo: DisplayedColumnInfo, options) {
     this.addJoinsFromExpandedColumns(select, this.columns, 'basetbl', displayedColumnInfo);
-    if (!options.isExport) {
+    if (!options.isExport && this.displayOptions.showHintColumns) {
       this.addHintsToSelect(select);
     }
   }
@@ -177,7 +181,7 @@ export class TableGridDisplay extends GridDisplay {
   }
 
   getColumns(columnFilter) {
-    return this.enrichExpandedColumns(this.columns.filter((col) => filterName(columnFilter, col.columnName)));
+    return this.enrichExpandedColumns(this.columns.filter(col => filterName(columnFilter, col.columnName)));
   }
 
   getDisplayColumn(table: TableInfo, col: ColumnInfo, parentPath: string[]) {
@@ -191,10 +195,10 @@ export class TableGridDisplay extends GridDisplay {
       headerText: uniquePath.length == 1 ? col.columnName : `${table.pureName}.${col.columnName}`,
       uniqueName,
       uniquePath,
-      isPrimaryKey: table.primaryKey && !!table.primaryKey.columns.find((x) => x.columnName == col.columnName),
+      isPrimaryKey: table.primaryKey && !!table.primaryKey.columns.find(x => x.columnName == col.columnName),
       foreignKey:
         table.foreignKeys &&
-        table.foreignKeys.find((fk) => fk.columns.length == 1 && fk.columns[0].columnName == col.columnName),
+        table.foreignKeys.find(fk => fk.columns.length == 1 && fk.columns[0].columnName == col.columnName),
     };
   }
 
@@ -205,7 +209,7 @@ export class TableGridDisplay extends GridDisplay {
     displayedColumnInfo: DisplayedColumnInfo
   ) {
     for (const column of columns) {
-      if (this.config.addedColumns.includes(column.uniqueName)) {
+      if (this.addAllExpandedColumnsToSelected || this.config.addedColumns.includes(column.uniqueName)) {
         select.columns.push({
           exprType: 'column',
           columnName: column.columnName,

packages/datalib/src/ViewGridDisplay.ts

@@ -23,8 +23,8 @@ export class ViewGridDisplay extends GridDisplay {
   getDisplayColumns(view: ViewInfo) {
     return (
       view?.columns
-        ?.map((col) => this.getDisplayColumn(view, col))
-        ?.map((col) => ({
+        ?.map(col => this.getDisplayColumn(view, col))
+        ?.map(col => ({
           ...col,
           isChecked: this.isColumnChecked(col),
         })) || []

packages/datalib/src/index.ts

@@ -1,11 +1,14 @@
-export * from "./GridDisplay";
-export * from "./GridConfig";
-export * from "./TableGridDisplay";
-export * from "./ViewGridDisplay";
-export * from "./JslGridDisplay";
-export * from "./ChangeSet";
-export * from "./filterName";
-export * from "./FreeTableGridDisplay";
-export * from "./FreeTableModel";
-export * from "./MacroDefinition";
-export * from "./runMacro";
+export * from './GridDisplay';
+export * from './GridConfig';
+export * from './TableGridDisplay';
+export * from './ViewGridDisplay';
+export * from './JslGridDisplay';
+export * from './ChangeSet';
+export * from './filterName';
+export * from './FreeTableGridDisplay';
+export * from './FreeTableModel';
+export * from './MacroDefinition';
+export * from './runMacro';
+export * from './FormViewDisplay';
+export * from './TableFormViewDisplay';
+export * from './CollectionGridDisplay';

packages/datalib/src/runMacro.ts

@@ -4,19 +4,21 @@ import uuidv1 from 'uuid/v1';
 import uuidv4 from 'uuid/v4';
 import moment from 'moment';
 import { MacroDefinition, MacroSelectedCell } from './MacroDefinition';
+import { ChangeSet, setChangeSetValue } from './ChangeSet';
+import { GridDisplay } from './GridDisplay';
 
 const getMacroFunction = {
-  transformValue: (code) => `
+  transformValue: code => `
 (value, args, modules, rowIndex, row, columnName) => {
     ${code}
 }
 `,
-  transformRows: (code) => `
+  transformRows: code => `
 (rows, args, modules, selectedCells, cols, columns) => {
   ${code}
 }
 `,
-  transformData: (code) => `
+  transformData: code => `
 (rows, args, modules, selectedCells, cols, columns) => {
   ${code}
 }
@@ -83,8 +85,8 @@ function runTramsformValue(
 }
 
 function removePreviewRowFlags(rows) {
-  rows = rows.filter((row) => row.__rowStatus != 'deleted');
-  rows = rows.map((row) => {
+  rows = rows.filter(row => row.__rowStatus != 'deleted');
+  rows = rows.map(row => {
     if (row.__rowStatus || row.__modifiedFields || row.__insertedFields || row.__deletedFields)
       return _.omit(row, ['__rowStatus', '__modifiedFields', '__insertedFields', '__deletedFields']);
     return row;
@@ -107,7 +109,7 @@ function runTramsformRows(
       macroArgs,
       modules,
       selectedCells,
-      data.structure.columns.map((x) => x.columnName),
+      data.structure.columns.map(x => x.columnName),
       data.structure.columns
     );
     if (!preview) {
@@ -136,11 +138,11 @@ function runTramsformData(
       macroArgs,
       modules,
       selectedCells,
-      data.structure.columns.map((x) => x.columnName),
+      data.structure.columns.map(x => x.columnName),
       data.structure.columns
     );
     if (cols && !columns) {
-      columns = cols.map((columnName) => ({ columnName }));
+      columns = cols.map(columnName => ({ columnName }));
     }
     columns = _.uniqBy(columns, 'columnName');
     if (!preview) {
@@ -183,3 +185,55 @@ export function runMacro(
   }
   return data;
 }
+
+export function compileMacroFunction(macro: MacroDefinition, errors = []) {
+  if (!macro) return null;
+  let func;
+  try {
+    func = eval(getMacroFunction[macro.type](macro.code));
+    return func;
+  } catch (err) {
+    errors.push(`Error compiling macro ${macro.name}: ${err.message}`);
+    return null;
+  }
+}
+
+export function runMacroOnValue(compiledFunc, macroArgs, value, rowIndex, row, column, errors = []) {
+  if (!compiledFunc) return value;
+  try {
+    const res = compiledFunc(value, macroArgs, modules, rowIndex, row, column);
+    return res;
+  } catch (err) {
+    errors.push(`Error processing column ${column} on row ${rowIndex}: ${err.message}`);
+    return value;
+  }
+}
+
+export function runMacroOnChangeSet(
+  macro: MacroDefinition,
+  macroArgs: {},
+  selectedCells: MacroSelectedCell[],
+  changeSet: ChangeSet,
+  display: GridDisplay
+): ChangeSet {
+  const errors = [];
+  const compiledMacroFunc = compileMacroFunction(macro, errors);
+  if (!compiledMacroFunc) return null;
+
+  let res = changeSet;
+  for (const cell of selectedCells) {
+    const definition = display.getChangeSetField(cell.rowData, cell.column, undefined);
+    const macroResult = runMacroOnValue(
+      compiledMacroFunc,
+      macroArgs,
+      cell.value,
+      cell.row,
+      cell.rowData,
+      cell.column,
+      errors
+    );
+    res = setChangeSetValue(res, definition, macroResult);
+  }
+
+  return res;
+}

packages/dbgate/README.md

@@ -0,0 +1,27 @@
+[![styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
+[![NPM version](https://img.shields.io/npm/v/dbgate.svg)](https://www.npmjs.com/package/dbgate)
+
+# DbGate - database administration tool
+DbGate is fast and easy to use database administration tool for MySQL, PostgreSQL, SQL Server.
+
+## Install using npm
+```sh
+npm install -g dbgate
+```
+
+After installing, you can run dbgate with command:
+```sh
+dbgate
+```
+
+Then open http://localhost:5000 in your browser
+
+## Download electron app
+You can also download binary packages from https://dbgate.org . Or run from source code, as described on [github](https://github.com/dbgate/dbgate)
+
+## Other dbgate packages
+You can use some functionality of dbgate from your JavaScript code. See [dbgate-api](https://npmjs.com/dbgate-api) package.
+
+## Screenshot
+
+![Screenshot](https://raw.githubusercontent.com/dbgate/dbgate/master/screenshot.png)

packages/dbgate/bin/dbgate.js

@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+
+const path = require('path');
+
+global.dbgateApiModulePath = path.dirname(path.dirname(require.resolve('dbgate-api')));
+global.dbgateApiPackagedPluginsPath = path.dirname(global.dbgateApiModulePath);
+
+const dbgateApi = require('dbgate-api');
+
+dbgateApi.getMainModule().start();

packages/dbgate/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "dbgate",
+  "version": "4.1.1",
+  "homepage": "https://dbgate.org/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dbgate/dbgate.git"
+  },
+  "description": "Opensource database administration tool - web interface",
+  "author": "Jan Prochazka",
+  "license": "MIT",
+  "bin": {
+    "dbgate": "./bin/dbgate.js"
+  },
+  "keywords": [
+    "sql",
+    "dbgate",
+    "web"
+  ],
+  "dependencies": {
+    "dbgate-api": "^4.1.1",
+    "dbgate-web": "^4.1.1",
+    "dbgate-plugin-csv": "^4.1.1",
+    "dbgate-plugin-excel": "^4.1.1",
+    "dbgate-plugin-mongo": "^4.1.1",
+    "dbgate-plugin-mysql": "^4.1.1",
+    "dbgate-plugin-mssql": "^4.1.1",
+    "dbgate-plugin-postgres": "^4.1.1"
+  }
+}

packages/filterparser/package.json

@@ -1,10 +1,9 @@
 {
-  "version": "1.0.0",
+  "version": "4.1.1",
   "name": "dbgate-filterparser",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "scripts": {
-    "prepare": "yarn build",
     "build": "tsc",
     "start": "tsc --watch",
     "test": "jest"
@@ -13,7 +12,7 @@
     "lib"
   ],
   "devDependencies": {
-    "dbgate-types": "^1.0.0",
+    "dbgate-types": "^4.1.1",
     "@types/jest": "^25.1.4",
     "@types/node": "^13.7.0",
     "jest": "^24.9.0",
@@ -22,9 +21,9 @@
   },
   "dependencies": {
     "@types/parsimmon": "^1.10.1",
-    "dbgate-tools": "^1.0.0",
+    "dbgate-tools": "^4.1.1",
     "lodash": "^4.17.15",
     "moment": "^2.24.0",
     "parsimmon": "^1.13.0"
   }
-}
+}

packages/filterparser/src/common.ts

@@ -0,0 +1,32 @@
+import P from 'parsimmon';
+
+export const whitespace = P.regexp(/\s*/m);
+
+export function token(parser) {
+  return parser.skip(whitespace);
+}
+
+export function word(str) {
+  return P.string(str).thru(token);
+}
+
+export function interpretEscapes(str) {
+  let escapes = {
+    b: '\b',
+    f: '\f',
+    n: '\n',
+    r: '\r',
+    t: '\t',
+  };
+  return str.replace(/\\(u[0-9a-fA-F]{4}|[^u])/, (_, escape) => {
+    let type = escape.charAt(0);
+    let hex = escape.slice(1);
+    if (type === 'u') {
+      return String.fromCharCode(parseInt(hex, 16));
+    }
+    if (escapes.hasOwnProperty(type)) {
+      return escapes[type];
+    }
+    return type;
+  });
+}

packages/filterparser/src/filterTool.ts

@@ -1,10 +1,11 @@
 import { isTypeDateTime } from 'dbgate-tools';
+import moment from 'moment';
 
 export type FilterMultipleValuesMode = 'is' | 'is_not' | 'contains' | 'begins' | 'ends';
 
 export function getFilterValueExpression(value, dataType) {
   if (value == null) return 'NULL';
-  if (isTypeDateTime(dataType)) return value;
+  if (isTypeDateTime(dataType)) return moment(value).format('YYYY-MM-DD HH:mm:ss');
   return `="${value}"`;
 }
 

packages/filterparser/src/mongoParser.ts

@@ -0,0 +1,121 @@
+import P from 'parsimmon';
+import { interpretEscapes, token, word, whitespace } from './common';
+
+const operatorCondition = operator => value => ({
+  __placeholder__: {
+    [operator]: value,
+  },
+});
+
+const regexCondition = regexString => value => ({
+  __placeholder__: {
+    $regex: regexString.replace('#VALUE#', value),
+    $options: 'i',
+  },
+});
+
+const numberTestCondition = () => value => ({
+  $or: [
+    {
+      __placeholder__: {
+        $regex: `.*${value}.*`,
+        $options: 'i',
+      },
+    },
+    {
+      __placeholder__: value,
+    },
+  ],
+});
+
+const testCondition = (operator, value) => () => ({
+  __placeholder__: {
+    [operator]: value,
+  },
+});
+
+const compoudCondition = conditionType => conditions => {
+  if (conditions.length == 1) return conditions[0];
+  return {
+    [conditionType]: conditions,
+  };
+};
+
+const negateCondition = condition => ({
+  __placeholder__: {
+    $not: condition.__placeholder__,
+  },
+});
+
+const createParser = () => {
+  const langDef = {
+    string1: () =>
+      token(P.regexp(/"((?:\\.|.)*?)"/, 1))
+        .map(interpretEscapes)
+        .desc('string quoted'),
+
+    string2: () =>
+      token(P.regexp(/'((?:\\.|.)*?)'/, 1))
+        .map(interpretEscapes)
+        .desc('string quoted'),
+
+    number: () =>
+      token(P.regexp(/-?(0|[1-9][0-9]*)([.][0-9]+)?([eE][+-]?[0-9]+)?/))
+        .map(Number)
+        .desc('number'),
+
+    noQuotedString: () => P.regexp(/[^\s^,^'^"]+/).desc('string unquoted'),
+
+    value: r => P.alt(r.string1, r.string2, r.number, r.noQuotedString),
+    valueTestNum: r => r.number.map(numberTestCondition()),
+    valueTest: r => r.value.map(regexCondition('.*#VALUE#.*')),
+
+    comma: () => word(','),
+    not: () => word('NOT'),
+    notExists: r => r.not.then(r.exists).map(testCondition('$exists', false)),
+    exists: () => word('EXISTS').map(testCondition('$exists', true)),
+    true: () => word('TRUE').map(testCondition('$eq', true)),
+    false: () => word('FALSE').map(testCondition('$eq', false)),
+
+    eq: r => word('=').then(r.value).map(operatorCondition('$eq')),
+    ne: r => word('!=').then(r.value).map(operatorCondition('$ne')),
+    lt: r => word('<').then(r.value).map(operatorCondition('$lt')),
+    gt: r => word('>').then(r.value).map(operatorCondition('$gt')),
+    le: r => word('<=').then(r.value).map(operatorCondition('$lte')),
+    ge: r => word('>=').then(r.value).map(operatorCondition('$gte')),
+    startsWith: r => word('^').then(r.value).map(regexCondition('#VALUE#.*')),
+    endsWith: r => word('$').then(r.value).map(regexCondition('.*#VALUE#')),
+    contains: r => word('+').then(r.value).map(regexCondition('.*#VALUE#.*')),
+    startsWithNot: r => word('!^').then(r.value).map(regexCondition('#VALUE#.*')).map(negateCondition),
+    endsWithNot: r => word('!$').then(r.value).map(regexCondition('.*#VALUE#')).map(negateCondition),
+    containsNot: r => word('~').then(r.value).map(regexCondition('.*#VALUE#.*')).map(negateCondition),
+
+    element: r =>
+      P.alt(
+        r.exists,
+        r.notExists,
+        r.true,
+        r.false,
+        r.eq,
+        r.ne,
+        r.lt,
+        r.gt,
+        r.le,
+        r.ge,
+        r.startsWith,
+        r.endsWith,
+        r.contains,
+        r.startsWithNot,
+        r.endsWithNot,
+        r.containsNot,
+        r.valueTestNum,
+        r.valueTest
+      ).trim(whitespace),
+    factor: r => r.element.sepBy(whitespace).map(compoudCondition('$and')),
+    list: r => r.factor.sepBy(r.comma).map(compoudCondition('$or')),
+  };
+
+  return P.createLanguage(langDef);
+};
+
+export const mongoParser = createParser();

packages/filterparser/src/parseFilter.ts

@@ -1,40 +1,12 @@
 import P from 'parsimmon';
+import moment from 'moment';
 import { FilterType } from './types';
 import { Condition } from 'dbgate-sqltree';
 import { TransformType } from 'dbgate-types';
+import { interpretEscapes, token, word, whitespace } from './common';
+import { mongoParser } from './mongoParser';
 
-const whitespace = P.regexp(/\s*/m);
-
-function token(parser) {
-  return parser.skip(whitespace);
-}
-
-function word(str) {
-  return P.string(str).thru(token);
-}
-
-function interpretEscapes(str) {
-  let escapes = {
-    b: '\b',
-    f: '\f',
-    n: '\n',
-    r: '\r',
-    t: '\t',
-  };
-  return str.replace(/\\(u[0-9a-fA-F]{4}|[^u])/, (_, escape) => {
-    let type = escape.charAt(0);
-    let hex = escape.slice(1);
-    if (type === 'u') {
-      return String.fromCharCode(parseInt(hex, 16));
-    }
-    if (escapes.hasOwnProperty(type)) {
-      return escapes[type];
-    }
-    return type;
-  });
-}
-
-const binaryCondition = (operator) => (value) => ({
+const binaryCondition = operator => value => ({
   conditionType: 'binary',
   operator,
   left: {
@@ -46,7 +18,7 @@ const binaryCondition = (operator) => (value) => ({
   },
 });
 
-const likeCondition = (conditionType, likeString) => (value) => ({
+const likeCondition = (conditionType, likeString) => value => ({
   conditionType,
   left: {
     exprType: 'placeholder',
@@ -57,7 +29,7 @@ const likeCondition = (conditionType, likeString) => (value) => ({
   },
 });
 
-const compoudCondition = (conditionType) => (conditions) => {
+const compoudCondition = conditionType => conditions => {
   if (conditions.length == 1) return conditions[0];
   return {
     conditionType,
@@ -65,7 +37,7 @@ const compoudCondition = (conditionType) => (conditions) => {
   };
 };
 
-const unaryCondition = (conditionType) => () => {
+const unaryCondition = conditionType => () => {
   return {
     conditionType,
     expr: {
@@ -74,7 +46,7 @@ const unaryCondition = (conditionType) => () => {
   };
 };
 
-const binaryFixedValueCondition = (value) => () => {
+const binaryFixedValueCondition = value => () => {
   return {
     conditionType: 'binary',
     operator: '=',
@@ -88,7 +60,7 @@ const binaryFixedValueCondition = (value) => () => {
   };
 };
 
-const negateCondition = (condition) => {
+const negateCondition = condition => {
   return {
     conditionType: 'not',
     condition,
@@ -113,11 +85,11 @@ function getTransformCondition(transform: TransformType, value) {
   };
 }
 
-const yearCondition = () => (value) => {
+const yearCondition = () => value => {
   return getTransformCondition('YEAR', value);
 };
 
-const yearMonthCondition = () => (value) => {
+const yearMonthCondition = () => value => {
   const m = value.match(/(\d\d\d\d)-(\d\d?)/);
 
   return {
@@ -126,7 +98,7 @@ const yearMonthCondition = () => (value) => {
   };
 };
 
-const yearMonthDayCondition = () => (value) => {
+const yearMonthDayCondition = () => value => {
   const m = value.match(/(\d\d\d\d)-(\d\d?)-(\d\d?)/);
 
   return {
@@ -139,6 +111,72 @@ const yearMonthDayCondition = () => (value) => {
   };
 };
 
+const createIntervalCondition = (start, end) => {
+  return {
+    conditionType: 'and',
+    conditions: [
+      {
+        conditionType: 'binary',
+        operator: '>=',
+        left: {
+          exprType: 'placeholder',
+        },
+        right: {
+          exprType: 'value',
+          value: start,
+        },
+      },
+      {
+        conditionType: 'binary',
+        operator: '<=',
+        left: {
+          exprType: 'placeholder',
+        },
+        right: {
+          exprType: 'value',
+          value: end,
+        },
+      },
+    ],
+  };
+};
+
+const createDateIntervalCondition = (start, end) => {
+  return createIntervalCondition(start.format('YYYY-MM-DDTHH:mm:ss.SSS'), end.format('YYYY-MM-DDTHH:mm:ss.SSS'));
+};
+
+const fixedMomentIntervalCondition = (intervalType, diff) => () => {
+  return createDateIntervalCondition(
+    moment().add(intervalType, diff).startOf(intervalType),
+    moment().add(intervalType, diff).endOf(intervalType)
+  );
+};
+
+const yearMonthDayMinuteCondition = () => value => {
+  const m = value.match(/(\d\d\d\d)-(\d\d?)-(\d\d?)\s+(\d\d?):(\d\d?)/);
+  const year = m[1];
+  const month = m[2];
+  const day = m[3];
+  const hour = m[4];
+  const minute = m[5];
+  const dateObject = new Date(year, month - 1, day, hour, minute);
+
+  return createDateIntervalCondition(moment(dateObject).startOf('minute'), moment(dateObject).endOf('minute'));
+};
+
+const yearMonthDaySecondCondition = () => value => {
+  const m = value.match(/(\d\d\d\d)-(\d\d?)-(\d\d?)(T|\s+)(\d\d?):(\d\d?):(\d\d?)/);
+  const year = m[1];
+  const month = m[2];
+  const day = m[3];
+  const hour = m[5];
+  const minute = m[6];
+  const second = m[7];
+  const dateObject = new Date(year, month - 1, day, hour, minute, second);
+
+  return createDateIntervalCondition(moment(dateObject).startOf('second'), moment(dateObject).endOf('second'));
+};
+
 const createParser = (filterType: FilterType) => {
   const langDef = {
     string1: () =>
@@ -171,37 +209,64 @@ const createParser = (filterType: FilterType) => {
     yearNum: () => P.regexp(/\d\d\d\d/).map(yearCondition()),
     yearMonthNum: () => P.regexp(/\d\d\d\d-\d\d?/).map(yearMonthCondition()),
     yearMonthDayNum: () => P.regexp(/\d\d\d\d-\d\d?-\d\d?/).map(yearMonthDayCondition()),
+    yearMonthDayMinute: () => P.regexp(/\d\d\d\d-\d\d?-\d\d?\s+\d\d?:\d\d?/).map(yearMonthDayMinuteCondition()),
+    yearMonthDaySecond: () =>
+      P.regexp(/\d\d\d\d-\d\d?-\d\d?(\s+|T)\d\d?:\d\d?:\d\d?/).map(yearMonthDaySecondCondition()),
 
-    value: (r) => P.alt(...allowedValues.map((x) => r[x])),
-    valueTestEq: (r) => r.value.map(binaryCondition('=')),
-    valueTestStr: (r) => r.value.map(likeCondition('like', '%#VALUE#%')),
+    value: r => P.alt(...allowedValues.map(x => r[x])),
+    valueTestEq: r => r.value.map(binaryCondition('=')),
+    valueTestStr: r => r.value.map(likeCondition('like', '%#VALUE#%')),
 
     comma: () => word(','),
     not: () => word('NOT'),
-    notNull: (r) => r.not.then(r.null).map(unaryCondition('isNotNull')),
+    notNull: r => r.not.then(r.null).map(unaryCondition('isNotNull')),
     null: () => word('NULL').map(unaryCondition('isNull')),
     empty: () => word('EMPTY').map(unaryCondition('isEmpty')),
-    notEmpty: (r) => r.not.then(r.empty).map(unaryCondition('isNotEmpty')),
+    notEmpty: r => r.not.then(r.empty).map(unaryCondition('isNotEmpty')),
     true: () => word('TRUE').map(binaryFixedValueCondition(1)),
     false: () => word('FALSE').map(binaryFixedValueCondition(0)),
     trueNum: () => word('1').map(binaryFixedValueCondition(1)),
     falseNum: () => word('0').map(binaryFixedValueCondition(0)),
-    eq: (r) => word('=').then(r.value).map(binaryCondition('=')),
-    ne: (r) => word('!=').then(r.value).map(binaryCondition('<>')),
-    lt: (r) => word('<').then(r.value).map(binaryCondition('<')),
-    gt: (r) => word('>').then(r.value).map(binaryCondition('>')),
-    le: (r) => word('<=').then(r.value).map(binaryCondition('<=')),
-    ge: (r) => word('>=').then(r.value).map(binaryCondition('>=')),
-    startsWith: (r) => word('^').then(r.value).map(likeCondition('like', '#VALUE#%')),
-    endsWith: (r) => word('$').then(r.value).map(likeCondition('like', '%#VALUE#')),
-    contains: (r) => word('+').then(r.value).map(likeCondition('like', '%#VALUE#%')),
-    startsWithNot: (r) => word('!^').then(r.value).map(likeCondition('like', '#VALUE#%')).map(negateCondition),
-    endsWithNot: (r) => word('!$').then(r.value).map(likeCondition('like', '%#VALUE#')).map(negateCondition),
-    containsNot: (r) => word('~').then(r.value).map(likeCondition('like', '%#VALUE#%')).map(negateCondition),
 
-    element: (r) => P.alt(...allowedElements.map((x) => r[x])).trim(whitespace),
-    factor: (r) => r.element.sepBy(whitespace).map(compoudCondition('and')),
-    list: (r) => r.factor.sepBy(r.comma).map(compoudCondition('or')),
+    this: () => word('THIS'),
+    last: () => word('LAST'),
+    next: () => word('NEXT'),
+    week: () => word('WEEK'),
+    month: () => word('MONTH'),
+    year: () => word('YEAR'),
+
+    yesterday: () => word('YESTERDAY').map(fixedMomentIntervalCondition('day', -1)),
+    today: () => word('TODAY').map(fixedMomentIntervalCondition('day', 0)),
+    tomorrow: () => word('TOMORROW').map(fixedMomentIntervalCondition('day', 1)),
+
+    lastWeek: r => r.last.then(r.week).map(fixedMomentIntervalCondition('week', -1)),
+    thisWeek: r => r.this.then(r.week).map(fixedMomentIntervalCondition('week', 0)),
+    nextWeek: r => r.next.then(r.week).map(fixedMomentIntervalCondition('week', 1)),
+
+    lastMonth: r => r.last.then(r.month).map(fixedMomentIntervalCondition('month', -1)),
+    thisMonth: r => r.this.then(r.month).map(fixedMomentIntervalCondition('month', 0)),
+    nextMonth: r => r.next.then(r.month).map(fixedMomentIntervalCondition('month', 1)),
+
+    lastYear: r => r.last.then(r.year).map(fixedMomentIntervalCondition('year', -1)),
+    thisYear: r => r.this.then(r.year).map(fixedMomentIntervalCondition('year', 0)),
+    nextYear: r => r.next.then(r.year).map(fixedMomentIntervalCondition('year', 1)),
+
+    eq: r => word('=').then(r.value).map(binaryCondition('=')),
+    ne: r => word('!=').then(r.value).map(binaryCondition('<>')),
+    lt: r => word('<').then(r.value).map(binaryCondition('<')),
+    gt: r => word('>').then(r.value).map(binaryCondition('>')),
+    le: r => word('<=').then(r.value).map(binaryCondition('<=')),
+    ge: r => word('>=').then(r.value).map(binaryCondition('>=')),
+    startsWith: r => word('^').then(r.value).map(likeCondition('like', '#VALUE#%')),
+    endsWith: r => word('$').then(r.value).map(likeCondition('like', '%#VALUE#')),
+    contains: r => word('+').then(r.value).map(likeCondition('like', '%#VALUE#%')),
+    startsWithNot: r => word('!^').then(r.value).map(likeCondition('like', '#VALUE#%')).map(negateCondition),
+    endsWithNot: r => word('!$').then(r.value).map(likeCondition('like', '%#VALUE#')).map(negateCondition),
+    containsNot: r => word('~').then(r.value).map(likeCondition('like', '%#VALUE#%')).map(negateCondition),
+
+    element: r => P.alt(...allowedElements.map(x => r[x])).trim(whitespace),
+    factor: r => r.element.sepBy(whitespace).map(compoudCondition('and')),
+    list: r => r.factor.sepBy(r.comma).map(compoudCondition('or')),
   };
 
   const allowedValues = []; // 'string1', 'string2', 'number', 'noQuotedString'];
@@ -222,7 +287,26 @@ const createParser = (filterType: FilterType) => {
       'containsNot'
     );
   if (filterType == 'logical') allowedElements.push('true', 'false', 'trueNum', 'falseNum');
-  if (filterType == 'datetime') allowedElements.push('yearMonthDayNum', 'yearMonthNum', 'yearNum');
+  if (filterType == 'datetime')
+    allowedElements.push(
+      'yearMonthDaySecond',
+      'yearMonthDayMinute',
+      'yearMonthDayNum',
+      'yearMonthNum',
+      'yearNum',
+      'yesterday',
+      'today',
+      'tomorrow',
+      'lastWeek',
+      'thisWeek',
+      'nextWeek',
+      'lastMonth',
+      'thisMonth',
+      'nextMonth',
+      'lastYear',
+      'thisYear',
+      'nextYear'
+    );
 
   // must be last
   if (filterType == 'string') allowedElements.push('valueTestStr');
@@ -236,9 +320,12 @@ const parsers = {
   string: createParser('string'),
   datetime: createParser('datetime'),
   logical: createParser('logical'),
+  mongo: mongoParser,
 };
 
 export function parseFilter(value: string, filterType: FilterType): Condition {
+  // console.log('PARSING', value, 'WITH', filterType);
   const ast = parsers[filterType].list.tryParse(value);
+  // console.log('AST', ast);
   return ast;
 }

packages/filterparser/src/types.ts

@@ -1,3 +1,3 @@
 // import types from 'dbgate-types';
 
-export type FilterType = 'number' | 'string' | 'datetime' | 'logical';
+export type FilterType = 'number' | 'string' | 'datetime' | 'logical' | 'mongo';

packages/sqltree/README.md

@@ -37,7 +37,7 @@ console.log("Generated query:", sql);
 
 ```
 
-See [TypeScript definitions](https://github.com/dbshell/dbgate/blob/master/packages/sqltree/src/types.ts) for complete list of available SQL command options.
+See [TypeScript definitions](https://github.com/dbgate/dbgate/blob/master/packages/sqltree/src/types.ts) for complete list of available SQL command options.
 
 ## Installation