chore(release): 0.1.10

feat: key shortcuts to change DATA tab page
feat: option to set DATA tab page size
2025-06-05 21:59:22 +02:00 · 2021-05-29 11:41:48 +02:00 · 2021-05-29 11:26:23 +02:00 · 2021-05-29 11:04:02 +02:00 · 2021-05-27 22:13:59 +02:00 · 2021-05-26 17:44:33 +02:00
18 changed files with 320 additions and 48 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,42 @@

 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

+### [0.1.10](https://github.com/Fabio286/antares/compare/v0.1.9...v0.1.10) (2021-05-29)
+
+
+### Features
+
+* key shortcuts to change DATA tab page ([f61d7ee](https://github.com/Fabio286/antares/commit/f61d7eeaf42406eb88b3285ac4606794f56e88d3))
+* option to set DATA tab page size ([e71c756](https://github.com/Fabio286/antares/commit/e71c7568c09bf8ad184753d3d0f14046f1e386d0))
+* prev/next buttons to browse the results pages of data tab ([79f033e](https://github.com/Fabio286/antares/commit/79f033e5245e0e744c35540d25a30b1eadc4d603))
+
+
+### Bug Fixes
+
+* **MySQL:** wrong schema in view data tab select, closes [#71](https://github.com/Fabio286/antares/issues/71) ([310cfaa](https://github.com/Fabio286/antares/commit/310cfaa3c2324b1159a46be566b6af2555dc9732))
+* wrong detection of field default expressions in some cases ([04bdd08](https://github.com/Fabio286/antares/commit/04bdd085a56240273133586d23196e52341d5f27))
+
+### [0.1.9](https://github.com/Fabio286/antares/compare/v0.1.8...v0.1.9) (2021-05-23)
+
+
+### Bug Fixes
+
+* **MySQL:** can't access tables having UNIQUE KEY, closes [#69](https://github.com/Fabio286/antares/issues/69) ([f1636f1](https://github.com/Fabio286/antares/commit/f1636f1528b5765423535f84027fdc853c58ce80))
+
+### [0.1.8](https://github.com/Fabio286/antares/compare/v0.1.7...v0.1.8) (2021-05-22)
+
+
+### Bug Fixes
+
+* internal id not removed before row update ([0f10c9e](https://github.com/Fabio286/antares/commit/0f10c9e824b679cfebd8a31085236da3d38a7953))
+* unable to add new ENUM fields ([1e37f2a](https://github.com/Fabio286/antares/commit/1e37f2a96f660a36f2739fea57ca298059e9c31a))
+* unable to delete table rows ([0d61371](https://github.com/Fabio286/antares/commit/0d6137195da9e0e9afe68f6d3ebcd50e913a888e))
+
+
+### Improvements
+
+* improved the way how field default value are handled ([7a766f0](https://github.com/Fabio286/antares/commit/7a766f04e668868e8844aac1d7d445bc2da21558))
+
 ### [0.1.7](https://github.com/Fabio286/antares/compare/v0.1.6...v0.1.7) (2021-05-16)


--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@

 # Antares SQL Client

-![GitHub package.json version](https://img.shields.io/github/package-json/v/fabio286/antares) ![GitHub All Releases](https://img.shields.io/github/downloads/fabio286/antares/total) ![GitHub](https://img.shields.io/github/license/fabio286/antares) [![antares](https://snapcraft.io/antares/badge.svg)](https://snapcraft.io/antares) [![antares](https://snapcraft.io/antares/trending.svg?name=0)](https://snapcraft.io/antares) [![Plant a Tree](https://raw.githubusercontent.com/Fabio286/treedom-badge/master/svg/plant-a-tree.svg)](https://www.treedom.net/en/user/fabio-di-stasio/event/antares-for-the-planet)
+![GitHub package.json version](https://img.shields.io/github/package-json/v/fabio286/antares) [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Ffabio286%2Fantares%2Fbadge&style=flat)](https://actions-badge.atrox.dev/fabio286/antares/goto) ![GitHub All Releases](https://img.shields.io/github/downloads/fabio286/antares/total) ![GitHub](https://img.shields.io/github/license/fabio286/antares) [![antares](https://snapcraft.io/antares/badge.svg)](https://snapcraft.io/antares) [![antares](https://snapcraft.io/antares/trending.svg?name=0)](https://snapcraft.io/antares) [![Twitter Follow](https://img.shields.io/twitter/follow/AntaresSQL?style=social)](https://twitter.com/AntaresSQL) [![Plant a Tree](https://raw.githubusercontent.com/Fabio286/treedom-badge/master/svg/plant-a-tree.svg)](https://www.treedom.net/en/user/fabio-di-stasio/event/antares-for-the-planet)

 Antares is an SQL client based on [Electron.js](https://github.com/electron/electron) and [Vue.js](https://github.com/vuejs/vue) that aims to become a useful tool, especially for developers.  
 My target is to support as many databases as possible, and all major operating systems, including the ARM versions.  
@@ -25,7 +25,7 @@ A modern application created with minimalism and semplicity in mind, with featur

 ## Download

-[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](https://snapcraft.io/antares) [![Get it from Microsoft Store](https://raw.githubusercontent.com/Fabio286/antares/gh-pages/src/assets/ms-store.png)](https://www.microsoft.com/p/antares-sql-client/9nhtb9sq51r1?cid=storebadge&ocid=badge&rtc=1&activetab=pivot:overviewtab)  
+[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](https://snapcraft.io/antares) [![Get it from AUR](https://raw.githubusercontent.com/Fabio286/antares/3e00c4bae6e036300c752c1a40c5a038fea9c169/docs/aur-badge.svg)](https://aur.archlinux.org/packages/antares-sql/) [![Get it from Microsoft Store](https://raw.githubusercontent.com/Fabio286/antares/gh-pages/src/assets/ms-store.png)](https://www.microsoft.com/p/antares-sql-client/9nhtb9sq51r1?cid=storebadge&ocid=badge&rtc=1&activetab=pivot:overviewtab)  
 🚀 **[Other Downloads](https://github.com/Fabio286/antares/releases/latest)**

 ## How to contribute
@@ -84,7 +84,7 @@ This is a roadmap with major features will come in near future.

 - [ ] Windows
 - [x] Linux
- [x] MacOS
+- [ ] MacOS

 ## Translations

--- a/docs/aur-badge.svg
+++ b/docs/aur-badge.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Gravit.io --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+   style="isolation:isolate" viewBox="0 0 182 56" width="182px" height="56px">
+   <defs>
+      <clipPath id="_clipPath_tR1uglJ1Zei76xP861DY1TsjAiQWS9qF">
+         <rect width="182" height="56" />
+      </clipPath>
+   </defs>
+   <g clip-path="url(#_clipPath_tR1uglJ1Zei76xP861DY1TsjAiQWS9qF)">
+      <path
+         d="M 2.5 0.5 L 180.5 0.5 C 181.604 0.5 182.5 1.396 182.5 2.5 L 182.5 54.5 C 182.5 55.604 181.604 56.5 180.5 56.5 L 2.5 56.5 C 1.396 56.5 0.5 55.604 0.5 54.5 L 0.5 2.5 C 0.5 1.396 1.396 0.5 2.5 0.5 Z"
+         style="stroke:none;fill:#252525;stroke-miterlimit:10;" />
+      <path
+         d="M 2.5 0.5 L 180.5 0.5 C 181.604 0.5 182.5 1.396 182.5 2.5 L 182.5 54.5 C 182.5 55.604 181.604 56.5 180.5 56.5 L 2.5 56.5 C 1.396 56.5 0.5 55.604 0.5 54.5 L 0.5 2.5 C 0.5 1.396 1.396 0.5 2.5 0.5 Z"
+         style="fill:none;stroke:#CDCDCD;stroke-width:1;stroke-miterlimit:2;" />
+      <g>
+         <g>
+            <path
+               d=" M 60.898 13.777 C 58.555 13.774 56.61 14.254 55.858 14.516 L 55.083 18.697 C 55.081 18.712 58.937 17.669 60.635 17.73 C 63.447 17.831 63.706 18.805 63.656 20.119 C 63.704 20.196 62.931 18.931 60.498 18.889 C 57.43 18.836 53.098 19.976 53.104 24.608 C 53.022 29.818 56.997 31.351 59.704 31.379 C 62.138 31.335 63.279 30.458 63.904 29.988 C 64.726 29.129 65.665 28.265 66.561 27.229 C 65.714 28.77 64.978 29.835 64.213 30.651 L 64.213 31.339 L 67.913 30.716 L 67.938 20.66 C 67.901 19.237 68.754 13.791 60.898 13.777 Z  M 60.367 22.533 C 61.9 22.554 63.659 23.31 63.662 25.129 C 63.669 26.784 61.589 27.674 60.235 27.66 C 58.881 27.646 57.085 26.596 57.077 24.982 C 57.103 23.54 58.771 22.496 60.367 22.533 Z "
+               fill-rule="evenodd" fill="rgb(255,255,255)" />
+            <path
+               d=" M 70.378 14.707 L 70.352 31.36 L 74.662 30.529 L 74.67 21.087 C 74.671 19.681 76.679 18.039 79.198 18.065 C 79.733 17.097 80.738 14.625 80.983 14.062 C 75.354 14.049 75.282 15.68 74.303 16.483 C 74.293 14.952 74.3 14.033 74.3 14.033 L 70.378 14.707 L 70.378 14.707 Z "
+               fill-rule="evenodd" fill="rgb(255,255,255)" />
+            <path
+               d=" M 94.632 16.893 C 94.591 16.873 92.385 14.312 87.949 14.292 C 83.795 14.223 79.135 15.834 79.061 22.8 C 79.097 28.925 83.537 31.318 87.973 31.365 C 92.72 31.414 94.609 28.396 94.722 28.322 C 94.156 27.83 92.034 25.728 92.034 25.728 C 92.034 25.728 90.709 27.615 88.138 27.639 C 85.566 27.664 83.331 25.651 83.299 22.844 C 83.266 20.036 85.354 18.515 88.157 18.392 C 90.584 18.392 91.984 19.959 91.984 19.959 L 94.632 16.893 L 94.632 16.893 Z "
+               fill-rule="evenodd" fill="rgb(255,255,255)" />
+            <path
+               d=" M 100.065 8.879 L 95.996 9.835 L 96.026 31.526 L 100.034 30.802 L 100.08 20.595 C 100.089 19.524 101.628 17.88 104.2 17.933 C 106.658 17.958 107.207 19.571 107.201 19.775 L 107.272 31.592 L 111.224 30.894 L 111.239 18.363 C 111.265 17.157 108.598 14.61 104.311 14.592 C 102.273 14.596 101.145 15.057 100.571 15.397 C 99.588 16.156 98.466 16.883 97.362 17.811 C 98.382 16.501 99.239 15.595 100.075 14.921 L 100.065 8.879 L 100.065 8.879 Z "
+               fill-rule="evenodd" fill="rgb(255,255,255)" />
+         </g>
+         <g>
+            <path
+               d=" M 114.673 9.441 L 116.508 8.982 L 116.595 30.85 L 114.73 31.168 L 114.673 9.441 L 114.673 9.441 Z "
+               fill-rule="evenodd" fill="rgb(23,147,209)" />
+            <path
+               d=" M 119.663 15.968 L 121.271 15.252 L 121.285 30.932 L 119.731 31.253 L 119.663 15.968 L 119.663 15.968 Z  M 119.28 10.314 L 120.577 9.255 L 121.655 10.454 L 120.357 11.54 L 119.28 10.314 L 119.28 10.314 Z "
+               fill-rule="evenodd" fill="rgb(23,147,209)" />
+            <path
+               d=" M 124.296 15.682 L 126.131 15.308 L 126.14 18.586 C 126.14 18.727 127.148 14.924 132.008 15.009 C 136.727 15.035 137.499 18.688 137.473 19.507 L 137.531 31.034 L 135.922 31.384 L 135.913 19.998 C 135.932 19.665 135.178 16.853 131.843 16.843 C 128.509 16.833 126.199 19.265 126.203 20.818 L 126.229 30.848 L 124.365 31.335 L 124.296 15.682 L 124.296 15.682 Z "
+               fill-rule="evenodd" fill="rgb(23,147,209)" />
+            <path
+               d=" M 153.547 31.117 L 151.711 31.492 L 151.703 28.214 C 151.703 28.073 150.694 31.876 145.835 31.791 C 141.116 31.765 140.344 28.112 140.37 27.293 L 140.311 15.765 L 142.261 15.372 L 142.292 26.758 C 142.292 27.069 142.665 29.947 145.999 29.957 C 149.334 29.967 151.669 27.949 151.686 24.911 L 151.662 15.928 L 153.477 15.464 L 153.547 31.117 L 153.547 31.117 Z "
+               fill-rule="evenodd" fill="rgb(23,147,209)" />
+            <path
+               d=" M 157.144 15.553 L 155.857 16.56 L 160.792 23.018 L 155.529 30.478 L 156.894 31.492 L 161.841 24.563 L 166.948 31.656 L 168.211 30.649 L 162.738 23.065 L 167.104 16.933 L 165.762 15.797 L 161.785 21.472 L 157.144 15.553 L 157.144 15.553 Z "
+               fill-rule="evenodd" fill="rgb(23,147,209)" />
+         </g>
+         <path
+            d=" M 33.112 3.879 C 30.965 9.143 29.67 12.587 27.279 17.695 C 28.745 19.248 30.544 21.058 33.466 23.101 C 30.325 21.809 28.182 20.511 26.581 19.164 C 23.521 25.549 18.728 34.643 9 52.121 C 16.645 47.707 22.572 44.986 28.095 43.948 C 27.858 42.928 27.723 41.824 27.733 40.673 L 27.742 40.428 C 27.863 35.53 30.411 31.763 33.43 32.019 C 36.448 32.274 38.794 36.455 38.673 41.353 C 38.65 42.275 38.546 43.162 38.364 43.984 C 43.828 45.053 49.691 47.767 57.233 52.121 C 55.746 49.383 54.419 46.915 53.151 44.565 C 51.154 43.017 49.072 41.003 44.823 38.822 C 47.743 39.581 49.834 40.456 51.464 41.435 C 38.575 17.439 37.532 14.251 33.112 3.879 Z "
+            fill-rule="evenodd" fill="rgb(23,147,209)" />
+         <g>
+            <path
+               d=" M 170.614 30.156 L 170.614 28.802 L 170.109 28.802 L 170.109 28.621 L 171.325 28.621 L 171.325 28.802 L 170.817 28.802 L 170.817 30.156 L 170.614 30.156 Z "
+               fill="rgb(23,147,209)" />
+            <path
+               d=" M 171.536 30.156 L 171.536 28.621 L 171.842 28.621 L 172.205 29.708 C 172.238 29.809 172.263 29.884 172.278 29.935 C 172.295 29.879 172.323 29.797 172.36 29.689 L 172.727 28.621 L 173 28.621 L 173 30.156 L 172.804 30.156 L 172.804 28.871 L 172.358 30.156 L 172.175 30.156 L 171.732 28.849 L 171.732 30.156 L 171.536 30.156 Z "
+               fill="rgb(23,147,209)" />
+         </g>
+         <g>
+            <path
+               d=" M 57.471 47.815 L 57.471 46.493 L 56.977 46.493 L 56.977 46.316 L 58.166 46.316 L 58.166 46.493 L 57.67 46.493 L 57.67 47.815 L 57.471 47.815 Z "
+               fill="rgb(23,147,209)" />
+            <path
+               d=" M 58.372 47.815 L 58.372 46.316 L 58.671 46.316 L 59.026 47.377 C 59.059 47.476 59.083 47.55 59.098 47.599 C 59.115 47.545 59.141 47.465 59.177 47.359 L 59.536 46.316 L 59.803 46.316 L 59.803 47.815 L 59.612 47.815 L 59.612 46.56 L 59.176 47.815 L 58.997 47.815 L 58.564 46.539 L 58.564 47.815 L 58.372 47.815"
+               fill="rgb(23,147,209)" />
+         </g>
+      </g>
+      <g clip-path="url(#_clipPath_NvFIpNfWUS6M4fZAtfyVzggsKR3URDoi)"><text transform="matrix(1,0,0,1,87.023,43.899)"
+            style="font-family:'Open Sans';font-weight:700;font-size:11px;font-style:normal;fill:#ffffff;stroke:none;">user
+            repository</text></g>
+      <defs>
+         <clipPath id="_clipPath_NvFIpNfWUS6M4fZAtfyVzggsKR3URDoi">
+            <rect x="0" y="0" width="86" height="14.98" transform="matrix(1,0,0,1,87,32.142)" />
+         </clipPath>
+      </defs>
+   </g>
+</svg>
--- a/package.json
+++ b/package.json
@@ -1,15 +1,16 @@
 {
  "name": "antares",
  "productName": "Antares",
-  "version": "0.1.7",
+  "version": "0.1.10",
  "description": "A cross-platform easy to use SQL client.",
  "license": "MIT",
  "repository": "https://github.com/Fabio286/antares.git",
  "scripts": {
    "dev": "cross-env NODE_ENV=development electron-webpack dev",
    "compile": "electron-webpack",
-    "build": "cross-env NODE_ENV=production npm run compile && electron-builder",
-    "build:appx": "npm run build -- --win appx",
+    "build": "cross-env NODE_ENV=production npm run compile",
+    "build:local": "npm run build && electron-builder",
+    "build:appx": "npm run build:local -- --win appx",
    "release": "standard-version",
    "release:pre": "npm run release -- --prerelease alpha",
    "test": "npm run lint",
@@ -31,8 +32,7 @@
      "target": {
        "target": "default",
        "arch": [
-          "x64",
-          "arm64"
+          "x64"
        ]
      }
    },
@@ -46,7 +46,8 @@
          "target": "AppImage",
          "arch": [
            "x64",
-            "armv7l"
+            "armv7l",
+            "arm64"
          ]
        }
      ],
@@ -92,8 +93,8 @@
    "electron-log": "^4.3.5",
    "electron-store": "^8.0.0",
    "electron-updater": "^4.3.9",
-    "faker": "^5.3.1",
-    "marked": "^2.0.2",
+    "faker": "^5.5.3",
+    "marked": "^2.0.5",
    "moment": "^2.29.1",
    "mysql2": "^2.2.5",
    "pg": "^8.5.1",
@@ -104,23 +105,23 @@
    "v-mask": "^2.2.4",
    "vue-i18n": "^8.24.4",
    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.0"
+    "vuex": "^3.6.2"
  },
  "devDependencies": {
-    "@babel/eslint-parser": "^7.13.14",
+    "@babel/eslint-parser": "^7.14.3",
    "cross-env": "^7.0.2",
-    "electron": "^12.0.7",
+    "electron": "^13.0.0",
    "electron-builder": "22.10.5",
    "electron-devtools-installer": "^3.2.0",
    "electron-webpack": "^2.8.2",
    "electron-webpack-vue": "^2.4.0",
-    "eslint": "^7.26.0",
-    "eslint-config-standard": "^16.0.2",
-    "eslint-plugin-import": "^2.22.1",
+    "eslint": "^7.27.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.23.3",
    "eslint-plugin-node": "^11.1.0",
    "eslint-plugin-promise": "^5.1.0",
    "eslint-plugin-vue": "^7.9.0",
-    "sass": "^1.32.13",
+    "sass": "^1.34.0",
    "sass-loader": "^10.2.0",
    "standard-version": "^9.3.0",
    "stylelint": "^13.13.1",
--- a/src/main/ipc-handlers/tables.js
+++ b/src/main/ipc-handlers/tables.js
@@ -16,13 +16,15 @@ export default (connections) => {
      }
   });

-   ipcMain.handle('get-table-data', async (event, { uid, schema, table, sortParams }) => {
+   ipcMain.handle('get-table-data', async (event, { uid, schema, table, limit, page, sortParams }) => {
      try {
+         const offset = (page - 1) * limit;
         const query = connections[uid]
            .select('*')
            .schema(schema)
            .from(table)
-            .limit(1000);
+            .limit(limit)
+            .offset(offset);

         if (sortParams && sortParams.field && sortParams.dir)
            query.orderBy({ [sortParams.field]: sortParams.dir.toUpperCase() });
--- a/src/main/libs/AntaresCore.js
+++ b/src/main/libs/AntaresCore.js
@@ -26,6 +26,7 @@ export class AntaresCore {
         groupBy: [],
         orderBy: [],
         limit: [],
+         offset: [],
         join: [],
         update: [],
         insert: [],
@@ -109,6 +110,11 @@ export class AntaresCore {
      return this;
   }

+   offset (...args) {
+      this._query.offset = args;
+      return this;
+   }
+
   /**
    * @param {String | Array} args field = value
    * @returns
--- a/src/main/libs/clients/MySQLClient.js
+++ b/src/main/libs/clients/MySQLClient.js
@@ -305,10 +305,55 @@ export class MySQLClient extends AntaresCore {
         .select('*')
         .schema('information_schema')
         .from('COLUMNS')
-         .where({ TABLE_SCHEMA: `= '${schema}'`, TABLE_NAME: `= '${table}'` })
+         .where({ TABLE_SCHEMA: `= '${this._schema || schema}'`, TABLE_NAME: `= '${table}'` })
         .orderBy({ ORDINAL_POSITION: 'ASC' })
         .run();

+      const { rows: fields } = await this.raw(`SHOW CREATE TABLE \`${this._schema || schema}\`.\`${table}\``);
+
+      const remappedFields = fields.map(row => {
+         let n = 0;
+         return row['Create Table']
+            .split('')
+            .reduce((acc, curr) => {
+               if (curr === ')') n--;
+               if (n !== 0) acc += curr;
+               if (curr === '(') n++;
+               return acc;
+            }, '')
+            .replaceAll('\n', '')
+            .split(',')
+            .map(f => {
+               try {
+                  const fieldArr = f.trim().split(' ');
+                  const nameAndType = fieldArr.slice(0, 2);
+                  if (nameAndType[0].charAt(0) !== '`') return false;
+
+                  const details = fieldArr.slice(2).join(' ');
+                  let defaultValue = null;
+                  if (details.includes('DEFAULT'))
+                     defaultValue = details.match(/(?<=DEFAULT ).*?$/gs)[0].split(' COMMENT')[0];
+
+                  const typeAndLength = nameAndType[1].replace(')', '').split('(');
+
+                  return {
+                     name: nameAndType[0].replaceAll('`', ''),
+                     type: typeAndLength[0].toUpperCase(),
+                     length: typeAndLength[1] ? typeAndLength[1] : null,
+                     default: defaultValue
+                  };
+               }
+               catch (err) {
+                  return false;
+               }
+            })
+            .filter(Boolean)
+            .reduce((acc, curr) => {
+               acc[curr.name] = curr;
+               return acc;
+            }, {});
+      })[0];
+
      return rows.map(field => {
         let numLength = field.COLUMN_TYPE.match(/int\(([^)]+)\)/);
         numLength = numLength ? +numLength.pop() : null;
@@ -319,7 +364,7 @@ export class MySQLClient extends AntaresCore {
         return {
            name: field.COLUMN_NAME,
            key: field.COLUMN_KEY.toLowerCase(),
-            type: field.DATA_TYPE.toUpperCase(),
+            type: remappedFields[field.COLUMN_NAME].type,
            schema: field.TABLE_SCHEMA,
            table: field.TABLE_NAME,
            numPrecision: field.NUMERIC_PRECISION,
@@ -331,7 +376,7 @@ export class MySQLClient extends AntaresCore {
            unsigned: field.COLUMN_TYPE.includes('unsigned'),
            zerofill: field.COLUMN_TYPE.includes('zerofill'),
            order: field.ORDINAL_POSITION,
-            default: field.COLUMN_DEFAULT, // TODO: get from show create table
+            default: remappedFields[field.COLUMN_NAME].default,
            charset: field.CHARACTER_SET_NAME,
            collation: field.COLLATION_NAME,
            autoIncrement: field.EXTRA.includes('auto_increment'),
@@ -1084,7 +1129,7 @@ export class MySQLClient extends AntaresCore {
      // ADD FIELDS
      additions.forEach(addition => {
         const typeInfo = this._getTypeInfo(addition.type);
-         const length = typeInfo.length ? addition.numLength || addition.charLength || addition.datePrecision : false;
+         const length = typeInfo.length ? addition.enumValues || addition.numLength || addition.charLength || addition.datePrecision : false;

         alterColumns.push(`ADD COLUMN \`${addition.name}\` 
            ${addition.type.toUpperCase()}${length ? `(${length})` : ''} 
@@ -1262,7 +1307,10 @@ export class MySQLClient extends AntaresCore {
      // LIMIT
      const limitRaw = this._query.limit.length ? `LIMIT ${this._query.limit.join(', ')} ` : '';

-      return `${selectRaw}${updateRaw ? 'UPDATE' : ''}${insertRaw ? 'INSERT ' : ''}${this._query.delete ? 'DELETE ' : ''}${fromRaw}${updateRaw}${whereRaw}${groupByRaw}${orderByRaw}${limitRaw}${insertRaw}`;
+      // OFFSET
+      const offsetRaw = this._query.limit.length ? `OFFSET ${this._query.offset.join(', ')} ` : '';
+
+      return `${selectRaw}${updateRaw ? 'UPDATE' : ''}${insertRaw ? 'INSERT ' : ''}${this._query.delete ? 'DELETE ' : ''}${fromRaw}${updateRaw}${whereRaw}${groupByRaw}${orderByRaw}${limitRaw}${offsetRaw}${insertRaw}`;
   }

   /**
@@ -1351,6 +1399,7 @@ export class MySQLClient extends AntaresCore {
                           });
                        }
                        catch (err) {
+                           if (isPool) connection.release();
                           reject(err);
                        }

@@ -1359,6 +1408,7 @@ export class MySQLClient extends AntaresCore {
                           keysArr = keysArr ? [...keysArr, ...response] : response;
                        }
                        catch (err) {
+                           if (isPool) connection.release();
                           reject(err);
                        }
                     }
--- a/src/main/libs/clients/PostgreSQLClient.js
+++ b/src/main/libs/clients/PostgreSQLClient.js
@@ -1139,7 +1139,10 @@ export class PostgreSQLClient extends AntaresCore {
      // LIMIT
      const limitRaw = selectArray.length && this._query.limit.length ? `LIMIT ${this._query.limit.join(', ')} ` : '';

-      return `${selectRaw}${updateRaw ? 'UPDATE' : ''}${insertRaw ? 'INSERT ' : ''}${this._query.delete ? 'DELETE ' : ''}${fromRaw}${updateRaw}${whereRaw}${groupByRaw}${orderByRaw}${limitRaw}${insertRaw}`;
+      // OFFSET
+      const offsetRaw = selectArray.length && this._query.limit.length ? `OFFSET ${this._query.offset.join(', ')} ` : '';
+
+      return `${selectRaw}${updateRaw ? 'UPDATE' : ''}${insertRaw ? 'INSERT ' : ''}${this._query.delete ? 'DELETE ' : ''}${fromRaw}${updateRaw}${whereRaw}${groupByRaw}${orderByRaw}${limitRaw}${offsetRaw}${insertRaw}`;
   }

   /**
--- a/src/renderer/components/ForeignKeySelect.vue
+++ b/src/renderer/components/ForeignKeySelect.vue
@@ -51,7 +51,8 @@ export default {
      }),
      isValidDefault () {
         if (!this.foreignList.length) return true;
-         return this.value === null || this.foreignList.some(foreign => foreign.foreign_column.toString() === this.value.toString());
+         if (this.value === null) return false;
+         return this.foreignList.some(foreign => foreign.foreign_column.toString() === this.value.toString());
      }
   },
   async created () {
@@ -65,7 +66,7 @@ export default {
      try { // Field data
         const { status, response } = await Tables.getTableColumns(params);
         if (status === 'success') {
-            const textField = response.find(field => [...TEXT, ...LONG_TEXT].includes(field.type));
+            const textField = response.find(field => [...TEXT, ...LONG_TEXT].includes(field.type) && field.name !== this.keyUsage.refField);
            foreignDesc = textField ? textField.name : false;
         }
         else
--- a/src/renderer/components/ModalFakerRows.vue
+++ b/src/renderer/components/ModalFakerRows.vue
@@ -250,10 +250,15 @@ export default {
         if (field.default === 'NULL') fieldDefault = null;
         else {
            if ([...NUMBER, ...FLOAT].includes(field.type))
-               fieldDefault = +field.default;
+               fieldDefault = Number.isNaN(+field.default) ? null : +field.default;

-            if ([...TEXT, ...LONG_TEXT].includes(field.type))
-               fieldDefault = field.default ? field.default.substring(1, field.default.length - 1) : '';
+            if ([...TEXT, ...LONG_TEXT].includes(field.type)) {
+               fieldDefault = field.default
+                  ? field.default.includes('\'')
+                     ? field.default.split('\'')[1]
+                     : field.default
+                  : '';
+            }

            if ([...TIME, ...DATE].includes(field.type))
               fieldDefault = field.default;
--- a/src/renderer/components/ModalSettings.vue
+++ b/src/renderer/components/ModalSettings.vue
@@ -83,6 +83,27 @@
                                 </select>
                              </div>
                           </div>
+                           <div class="form-group">
+                              <div class="col-6 col-sm-12">
+                                 <label class="form-label">
+                                    {{ $t('message.dataTabPageSize') }}
+                                 </label>
+                              </div>
+                              <div class="col-6 col-sm-12">
+                                 <select
+                                    v-model="localPageSize"
+                                    class="form-select"
+                                    @change="changePageSize(+localPageSize)"
+                                 >
+                                    <option
+                                       v-for="size in pageSizes"
+                                       :key="size"
+                                    >
+                                       {{ size }}
+                                    </option>
+                                 </select>
+                              </div>
+                           </div>
                           <div class="form-group">
                              <div class="col-6 col-sm-12">
                                 <label class="form-label">
@@ -227,7 +248,7 @@
                     <h4>{{ appName }}</h4>
                     <p>
                        {{ $t('word.version') }} {{ appVersion }}<br>
-                        <a class="c-hand" @click="openOutside('https://github.com/Fabio286/antares')">GitHub</a> | <a class="c-hand" @click="openOutside('https://antares-sql.app/')">Website</a><br>
+                        <a class="c-hand" @click="openOutside('https://github.com/Fabio286/antares')"><i class="mdi mdi-github d-inline" /> GitHub</a> • <a class="c-hand" @click="openOutside('https://twitter.com/AntaresSQL')"><i class="mdi mdi-twitter d-inline" /> Twitter</a> • <a class="c-hand" @click="openOutside('https://antares-sql.app/')"><i class="mdi mdi-web d-inline" /> Website</a><br>
                        <small>{{ $t('word.author') }} <a class="c-hand" @click="openOutside('https://github.com/Fabio286')">Fabio Di Stasio</a></small><br>
                        <small>{{ $t('message.madeWithJS') }}</small>
                     </p>
@@ -257,9 +278,11 @@ export default {
   data () {
      return {
         localLocale: null,
+         localPageSize: null,
         localTimeout: null,
         localEditorTheme: null,
         selectedTab: 'general',
+         pageSizes: [40, 100, 250, 500, 1000],
         editorThemes: [
            {
               group: this.$t('word.light'),
@@ -317,6 +340,7 @@ export default {
         appVersion: 'application/appVersion',
         selectedSettingTab: 'application/selectedSettingTab',
         selectedLocale: 'settings/getLocale',
+         pageSize: 'settings/getDataTabLimit',
         selectedAutoComplete: 'settings/getAutoComplete',
         selectedLineWrap: 'settings/getLineWrap',
         notificationsTimeout: 'settings/getNotificationsTimeout',
@@ -359,6 +383,7 @@ ORDER BY
   },
   created () {
      this.localLocale = this.selectedLocale;
+      this.localPageSize = this.pageSize;
      this.localTimeout = this.notificationsTimeout;
      this.localEditorTheme = this.editorTheme;
      this.selectedTab = this.selectedSettingTab;
@@ -371,6 +396,7 @@ ORDER BY
      ...mapActions({
         closeModal: 'application/hideSettingModal',
         changeLocale: 'settings/changeLocale',
+         changePageSize: 'settings/changePageSize',
         changeAutoComplete: 'settings/changeAutoComplete',
         changeLineWrap: 'settings/changeLineWrap',
         changeApplicationTheme: 'settings/changeApplicationTheme',
--- a/src/renderer/components/WorkspacePropsTab.vue
+++ b/src/renderer/components/WorkspacePropsTab.vue
@@ -239,11 +239,11 @@ export default {
                     field.defaultType = 'noval';
                  else if (field.default === 'NULL')
                     field.defaultType = 'null';
-                  else if (field.default.match(/^\s*(\w+)\s*\((.*)\)$/))
+                  else if (isNaN(+field.default) && field.default.charAt(0) !== '\'')
                     field.defaultType = 'expression';
                  else {
                     field.defaultType = 'custom';
-                     if (isNaN(field.default) && !field.default.includes('\''))
+                     if (isNaN(+field.default) && !field.default.includes('\''))
                        field.default = `'${field.default}'`;
                  }

--- a/src/renderer/components/WorkspacePropsTableRow.vue
+++ b/src/renderer/components/WorkspacePropsTableRow.vue
@@ -96,7 +96,12 @@
               class="cell-content"
               @dblclick="editON($event, localLength, 'length')"
            >
-               {{ localLength }}
+               <span v-if="localRow.enumValues">
+                  {{ localRow.enumValues }}
+               </span>
+               <span v-else>
+                  {{ localLength }}
+               </span>
            </span>
            <input
               v-else-if="localRow.enumValues"
@@ -361,7 +366,7 @@ export default {
         getWorkspace: 'workspaces/getWorkspace'
      }),
      localLength () {
-         return this.localRow.enumValues || this.localRow.numLength || this.localRow.charLength || this.localRow.datePrecision || this.localRow.numPrecision || 0;
+         return this.localRow.numLength || this.localRow.charLength || this.localRow.datePrecision || this.localRow.numPrecision || 0;
      },
      fieldType () {
         const fieldType = this.dataTypes.reduce((acc, group) => [...acc, ...group.types], []).filter(type =>
@@ -445,8 +450,13 @@ export default {

         this.defaultValue.onUpdate = this.localRow.onUpdate;
         this.defaultValue.type = this.localRow.defaultType;
-         if (this.defaultValue.type === 'custom')
-            this.defaultValue.custom = this.localRow.default;
+         if (this.defaultValue.type === 'custom') {
+            this.defaultValue.custom = this.localRow.default
+               ? this.localRow.default.includes('\'')
+                  ? this.localRow.default.split('\'')[1]
+                  : this.localRow.default
+               : '';
+         }
         if (this.defaultValue.type === 'expression')
            this.defaultValue.expression = this.localRow.default;
      },
@@ -525,7 +535,7 @@ export default {
                  break;
               case 'custom':
                  this.localRow.autoIncrement = false;
-                  this.localRow.default = this.defaultValue.custom;
+                  this.localRow.default = Number.isNaN(+this.defaultValue.custom) ? `'${this.defaultValue.custom}'` : this.defaultValue.custom;
                  break;
               case 'expression':
                  this.localRow.autoIncrement = false;
--- a/src/renderer/components/WorkspaceQueryTable.vue
+++ b/src/renderer/components/WorkspaceQueryTable.vue
@@ -139,7 +139,8 @@ export default {
   },
   computed: {
      ...mapGetters({
-         getWorkspace: 'workspaces/getWorkspace'
+         getWorkspace: 'workspaces/getWorkspace',
+         pageSize: 'settings/getDataTabLimit'
      }),
      workspaceSchema () {
         return this.getWorkspace(this.connUid).breadcrumbs.schema;
@@ -157,7 +158,7 @@ export default {
         return this.fields.every(field => field.name);
      },
      isHardSort () {
-         return this.mode === 'table' && this.localResults.length === 1000;
+         return this.mode === 'table' && this.localResults.length === this.pageSize;
      },
      sortedResults () {
         if (this.currentSort && !this.isHardSort) {
--- a/src/renderer/components/WorkspaceTableTab.vue
+++ b/src/renderer/components/WorkspaceTableTab.vue
@@ -32,6 +32,29 @@
                     </div>
                  </div>
               </div>
+               <div class="btn-group">
+                  <button
+                     class="btn btn-dark btn-sm mr-0"
+                     :disabled="isQuering || page === 1"
+                     title="CTRL+ᐊ"
+                     @click="pageChange('prev')"
+                  >
+                     <i class="mdi mdi-24px mdi-skip-previous" />
+                  </button>
+                  <div class="btn btn-dark btn-sm mr-0 text-bold c-auto px-2">
+                     {{ page }}
+                  </div>
+                  <button
+                     class="btn btn-dark btn-sm mr-0"
+                     :disabled="isQuering || (results.length && results[0].rows.length < limit)"
+                     title="CTRL+ᐅ"
+                     @click="pageChange('next')"
+                  >
+                     <i class="mdi mdi-24px mdi-skip-next" />
+                  </button>
+               </div>
+
+               <div class="divider-vert py-3" />

               <button
                  v-if="isTable"
@@ -74,7 +97,7 @@
               <div v-if="results.length && results[0].rows">
                  {{ $t('word.results') }}: <b>{{ results[0].rows.length.toLocaleString() }}</b>
               </div>
-               <div v-if="hasApproximately">
+               <div v-if="hasApproximately || page > 1">
                  {{ $t('word.total') }}: <b>{{ tableInfo.rows.toLocaleString() }}</b> <small>({{ $t('word.approximately') }})</small>
               </div>
               <div v-if="workspace.breadcrumbs.database">
@@ -149,13 +172,15 @@ export default {
         isFakerModal: false,
         autorefreshTimer: 0,
         refreshInterval: null,
-         sortParams: {}
+         sortParams: {},
+         page: 1
      };
   },
   computed: {
      ...mapGetters({
         getWorkspace: 'workspaces/getWorkspace',
-         selectedWorkspace: 'workspaces/getSelected'
+         selectedWorkspace: 'workspaces/getSelected',
+         limit: 'settings/getDataTabLimit'
      }),
      workspace () {
         return this.getWorkspace(this.connection.uid);
@@ -184,7 +209,7 @@ export default {
         return this.results.length &&
            this.results[0].rows &&
            this.tableInfo &&
-            this.results[0].rows.length === 1000 &&
+            this.results[0].rows.length === this.limit &&
            this.results[0].rows.length < this.tableInfo.rows;
      }
   },
@@ -197,6 +222,9 @@ export default {
            this.$refs.queryTable.resetSort();
         }
      },
+      page () {
+         this.getTableData();
+      },
      isSelected (val) {
         if (val && this.lastTable !== this.table) {
            this.getTableData();
@@ -228,6 +256,8 @@ export default {
            uid: this.connection.uid,
            schema: this.schema,
            table: this.workspace.breadcrumbs.table || this.workspace.breadcrumbs.view,
+            limit: this.limit,
+            page: this.page,
            sortParams
         };

@@ -255,6 +285,14 @@ export default {
         this.sortParams = sortParams;
         this.getTableData(sortParams);
      },
+      pageChange (direction) {
+         if (this.isQuering) return;
+
+         if (direction === 'next' && (this.results.length && this.results[0].rows.length === this.limit))
+            this.page++;
+         else if (direction === 'prev' && this.page > 1)
+            this.page--;
+      },
      showAddModal () {
         this.isAddModal = true;
      },
@@ -273,6 +311,13 @@ export default {
            e.stopPropagation();
            if (e.key === 'F5')
               this.reloadTable();
+
+            if (e.ctrlKey) {
+               if (e.key === 'ArrowRight')
+                  this.pageChange('next');
+               if (e.key === 'ArrowLeft')
+                  this.pageChange('prev');
+            }
         }
      },
      setRefreshInterval () {
--- a/src/renderer/i18n/en-US.js
+++ b/src/renderer/i18n/en-US.js
@@ -210,7 +210,8 @@ module.exports = {
      editSchema: 'Edit schema',
      deleteSchema: 'Delete schema',
      markdownSupported: 'Markdown supported',
-      plantATree: 'Plant a Tree'
+      plantATree: 'Plant a Tree',
+      dataTabPageSize: 'DATA tab page size'
   },
   faker: {
      address: 'Address',
--- a/src/renderer/ipc-api/Tables.js
+++ b/src/renderer/ipc-api/Tables.js
@@ -19,12 +19,11 @@ export default class {
   }

   static updateTableCell (params) {
+      delete params.row._id;
      return ipcRenderer.invoke('update-table-cell', params);
   }

   static deleteTableRows (params) {
-      delete params.row._id;
-      delete params.orgRow._id;
      return ipcRenderer.invoke('delete-table-rows', params);
   }

--- a/src/renderer/store/modules/settings.store.js
+++ b/src/renderer/store/modules/settings.store.js
@@ -11,6 +11,7 @@ export default {
      allow_prerelease: persistentStore.get('allow_prerelease', true),
      explorebar_size: persistentStore.get('explorebar_size', null),
      notifications_timeout: persistentStore.get('notifications_timeout', 5),
+      data_tab_limit: persistentStore.get('data_tab_limit', 1000),
      auto_complete: persistentStore.get('auto_complete', true),
      line_wrap: persistentStore.get('line_wrap', true),
      application_theme: persistentStore.get('application_theme', 'dark'),
@@ -18,6 +19,7 @@ export default {
   },
   getters: {
      getLocale: state => state.locale,
+      getDataTabLimit: state => state.data_tab_limit,
      getAllowPrerelease: state => state.allow_prerelease,
      getExplorebarSize: state => state.explorebar_size,
      getNotificationsTimeout: state => state.notifications_timeout,
@@ -32,6 +34,10 @@ export default {
         i18n.locale = locale;
         persistentStore.set('locale', state.locale);
      },
+      SET_DATA_TAB_LIMIT (state, limit) {
+         state.data_tab_limit = limit;
+         persistentStore.set('data_tab_limit', state.data_tab_limit);
+      },
      SET_ALLOW_PRERELEASE (state, allow) {
         state.allow_prerelease = allow;
         persistentStore.set('allow_prerelease', state.allow_prerelease);
@@ -65,6 +71,9 @@ export default {
      changeLocale ({ commit }, locale) {
         commit('SET_LOCALE', locale);
      },
+      changePageSize ({ commit }, limit) {
+         commit('SET_DATA_TAB_LIMIT', limit);
+      },
      changeAllowPrerelease ({ commit }, allow) {
         commit('SET_ALLOW_PRERELEASE', allow);
      },
Author	SHA1	Message	Date
Fabio Di Stasio	f502620779	chore(release): 0.1.10	2021-05-29 11:41:48 +02:00
Fabio Di Stasio	f61d7eeaf4	feat: key shortcuts to change DATA tab page	2021-05-29 11:26:23 +02:00
Fabio Di Stasio	e71c7568c0	feat: option to set DATA tab page size	2021-05-29 11:04:02 +02:00
Fabio Di Stasio	79f033e524	feat: prev/next buttons to browse the results pages of data tab	2021-05-27 22:13:59 +02:00
Fabio Di Stasio	310cfaa3c2	fix(MySQL): wrong schema in view data tab select, closes #71	2021-05-26 17:44:33 +02:00
Fabio Di Stasio	6f93e1f9ab	chore: AUR badge on README.md	2021-05-26 13:19:48 +02:00
Fabio Di Stasio	04bdd085a5	fix: wrong detection of field default expressions in some cases	2021-05-25 16:54:13 +02:00
Fabio Di Stasio	c568acae14	build: update dependencies	2021-05-25 10:09:09 +02:00
Fabio Di Stasio	7a46a119d8	chore(release): 0.1.9	2021-05-23 11:35:54 +02:00
Fabio Di Stasio	f1636f1528	fix(MySQL): can't access tables having UNIQUE KEY, closes #69	2021-05-23 11:12:09 +02:00
Fabio Di Stasio	f839d5cd3c	chore: Twitter link in about tab	2021-05-23 10:19:56 +02:00
Fabio Di Stasio	8f4f1d393c	chore: update README.md	2021-05-22 17:33:03 +02:00
Fabio Di Stasio	ab17c6d4bf	chore: update README.md	2021-05-22 17:26:32 +02:00
Fabio Di Stasio	b4b2f3d0cf	chore(release): 0.1.8	2021-05-22 16:25:52 +02:00
Fabio Di Stasio	7a766f04e6	perf: improved the way how field default value are handled	2021-05-22 16:24:19 +02:00
Fabio Di Stasio	f6b77d1243	build: update dependencies	2021-05-22 16:12:08 +02:00
Fabio Di Stasio	840241c3cc	refactor: better description in foreign key value select	2021-05-20 15:07:51 +02:00
Fabio Di Stasio	0f10c9e824	fix: internal id not removed before row update	2021-05-20 12:45:49 +02:00
Fabio Di Stasio	1e37f2a96f	fix: unable to add new ENUM fields	2021-05-20 12:38:05 +02:00
Fabio Di Stasio	0d6137195d	fix: unable to delete table rows	2021-05-19 16:55:38 +02:00
Fabio Di Stasio	d26f168250	build: update build script	2021-05-17 19:08:36 +02:00