chore(release): 0.7.3

build(deps): bump @mdi/font from 7.0.96 to 7.1.96

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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.7.3](https://github.com/antares-sql/antares/compare/v0.7.2...v0.7.3) (2023-02-09)
+
+
+### Features
+
+* **SQLite:** added support to INTEGER UNSIGNED ([e7e4913](https://github.com/antares-sql/antares/commit/e7e491340a037b64d6d8e538376415779d54332e))
+
+
+### Bug Fixes
+
+* longtext edit modal opens when it shouldn't, fixes [#524](https://github.com/antares-sql/antares/issues/524) ([6decba3](https://github.com/antares-sql/antares/commit/6decba316ca46106520cb4dba44409ceb4a4af75))
+* select of table type stuck when editing an unknown type ([e8447e5](https://github.com/antares-sql/antares/commit/e8447e56551871a200517bdaa747ae215ad83cf4))
+* **SQLite:** error with integer timestamp fields ([2b5e1e7](https://github.com/antares-sql/antares/commit/2b5e1e7b39c25f536b6139a4d01b9f7f17069ea8))
+* **SQLite:** triggers disappear after editing related table, fixes [#523](https://github.com/antares-sql/antares/issues/523) ([d934ae1](https://github.com/antares-sql/antares/commit/d934ae1e6c0747698b4973d9cad217379076a6cf))
+
 ### [0.7.2](https://github.com/antares-sql/antares/compare/v0.7.1...v0.7.2) (2023-01-22)
 
 

package-lock.json

@@ -1,18 +1,18 @@
 {
   "name": "antares",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "antares",
-      "version": "0.7.2",
+      "version": "0.7.3",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@electron/remote": "~2.0.1",
         "@faker-js/faker": "~6.1.2",
-        "@mdi/font": "~7.0.96",
+        "@mdi/font": "~7.1.96",
         "@turf/helpers": "~6.5.0",
         "@vueuse/core": "~8.7.5",
         "ace-builds": "~1.14.0",
@@ -2160,8 +2160,9 @@
       "license": "MIT"
     },
     "node_modules/@mdi/font": {
-      "version": "7.0.96",
+      "version": "7.1.96",
-      "license": "Apache-2.0"
+      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-7.1.96.tgz",
+      "integrity": "sha512-Imag6npmfkBDi2Ze2jiZVAPTDIKLxhz2Sx82xJ2zctyAU5LYJejLI5ChnDwiD9bMkQfVuzEsI98Q8toHyC+HCg=="
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
@@ -15772,7 +15773,9 @@
       "dev": true
     },
     "@mdi/font": {
-      "version": "7.0.96"
+      "version": "7.1.96",
+      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-7.1.96.tgz",
+      "integrity": "sha512-Imag6npmfkBDi2Ze2jiZVAPTDIKLxhz2Sx82xJ2zctyAU5LYJejLI5ChnDwiD9bMkQfVuzEsI98Q8toHyC+HCg=="
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "antares",
   "productName": "Antares",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "A modern, fast and productivity driven SQL client with a focus in UX.",
   "license": "MIT",
   "repository": "https://github.com/antares-sql/antares.git",
@@ -121,7 +121,7 @@
   "dependencies": {
     "@electron/remote": "~2.0.1",
     "@faker-js/faker": "~6.1.2",
-    "@mdi/font": "~7.0.96",
+    "@mdi/font": "~7.1.96",
     "@turf/helpers": "~6.5.0",
     "@vueuse/core": "~8.7.5",
     "ace-builds": "~1.14.0",

src/common/data-types/sqlite.ts

@@ -18,6 +18,13 @@ export default [
             unsigned: true,
             zerofill: true
          },
+         {
+            name: 'INTEGER UNSIGNED',
+            length: true,
+            collation: false,
+            unsigned: true,
+            zerofill: true
+         },
          {
             name: 'BIGINT',
             length: true,

src/common/interfaces/antares.ts

@@ -85,13 +85,11 @@ export interface TableInfos {
    name: string;
    type: string;
    rows: number;
-   created: Date;
-   updated: Date;
    engine: string;
    comment: string;
    size: number | false;
-   autoIncrement: number;
    collation: string;
+   autoIncrement?: boolean;
 }
 
 export type TableOptions = Partial<TableInfos>;

src/main/libs/clients/MySQLClient.ts

@@ -254,25 +254,15 @@ export class MySQLClient extends AntaresCore {
    async getStructure (schemas: Set<string>) {
       /* eslint-disable camelcase */
       interface ShowTableResult {
-         Db?: string;
+         TABLE_SCHEMA?: string;
-         Name: string;
+         TABLE_NAME: string;
-         Engine: string;
+         TABLE_TYPE: string;
-         Version: number;
+         TABLE_ROWS: number;
-         Row_format: string;
+         ENGINE: string;
-         Rows: number;
+         DATA_LENGTH: number;
-         Avg_row_length: number;
+         INDEX_LENGTH: number;
-         Data_length: number;
+         TABLE_COLLATION: string;
-         Max_data_length: number;
+         TABLE_COMMENT: string;
-         Index_length: number;
-         Data_free: number;
-         Auto_increment: number;
-         Create_time: Date;
-         Update_time: Date;
-         Check_time?: number;
-         Collation: string;
-         Checksum?: number;
-         Create_options: string;
-         Comment: string;
       }
 
       interface ShowTriggersResult {
@@ -309,10 +299,24 @@ export class MySQLClient extends AntaresCore {
       for (const db of filteredDatabases) {
          if (!schemas.has(db.Database)) continue;
 
-         let { rows: tables } = await this.raw<antares.QueryResult<ShowTableResult>>(`SHOW TABLE STATUS FROM \`${db.Database}\``);
+         let { rows: tables } = await this.raw<antares.QueryResult<ShowTableResult>>(`
+            SELECT
+               TABLE_NAME,
+               TABLE_TYPE,
+               ENGINE,
+               DATA_LENGTH,
+               INDEX_LENGTH,
+               TABLE_COMMENT,
+               TABLE_COLLATION, 
+               CREATE_TIME,
+               UPDATE_TIME
+            FROM information_schema.TABLES
+            WHERE TABLE_SCHEMA = "${db.Database}"
+         `);
+
          if (tables.length) {
             tables = tables.map(table => {
-               table.Db = db.Database;
+               table.TABLE_SCHEMA = db.Database;
                return table;
             });
             tablesArr.push(...tables);
@@ -331,9 +335,9 @@ export class MySQLClient extends AntaresCore {
       return filteredDatabases.map(db => {
          if (schemas.has(db.Database)) {
             // TABLES
-            const remappedTables: antares.TableInfos[] = tablesArr.filter(table => table.Db === db.Database).map(table => {
+            const remappedTables: antares.TableInfos[] = tablesArr.filter(table => table.TABLE_SCHEMA === db.Database).map(table => {
                let tableType;
-               switch (table.Comment) {
+               switch (table.TABLE_TYPE) {
                   case 'VIEW':
                      tableType = 'view';
                      break;
@@ -342,20 +346,17 @@ export class MySQLClient extends AntaresCore {
                      break;
                }
 
-               const tableSize = Number(table.Data_length) + Number(table.Index_length);
+               const tableSize = Number(table.DATA_LENGTH) + Number(table.INDEX_LENGTH);
                schemaSize += tableSize;
 
                return {
-                  name: table.Name,
+                  name: table.TABLE_NAME,
                   type: tableType,
-                  rows: table.Rows,
+                  rows: table.TABLE_ROWS,
-                  created: table.Create_time,
+                  engine: table.ENGINE,
-                  updated: table.Update_time,
+                  comment: table.TABLE_COMMENT,
-                  engine: table.Engine,
-                  comment: table.Comment,
                   size: tableSize,
-                  autoIncrement: table.Auto_increment,
+                  collation: table.TABLE_COLLATION
-                  collation: table.Collation
                };
             });
 

src/main/libs/clients/SQLiteClient.ts

@@ -344,6 +344,20 @@ export class SQLiteClient extends AntaresCore {
 
          const tmpName = `Antares_${table}_tmp`;
          await this.raw(`CREATE TABLE "${tmpName}" AS SELECT * FROM "${table}"`);
+
+         // Get table triggers before drop
+         const { rows: triggers } = await this.raw(`SELECT * FROM "${schema}".sqlite_master WHERE type='trigger' AND tbl_name = '${table}'`);
+         const remappedTriggers = triggers.map((row) => {
+            return {
+               schema,
+               sql: row.sql.match(/(BEGIN|begin)(.*)(END|end)/gs)[0],
+               name: row.name,
+               table: row.sql.match(/(?<=ON `).*?(?=`)/gs)[0],
+               activation: row.sql.match(/(BEFORE|AFTER)/gs)[0],
+               event: row.sql.match(/(INSERT|UPDATE|DELETE)/gs)[0]
+            };
+         });
+
          await this.dropTable(params);
 
          const createTableParams = {
@@ -376,6 +390,11 @@ export class SQLiteClient extends AntaresCore {
          await this.raw(`INSERT INTO "${createTableParams.options.name}" (${insertFields.join(',')}) SELECT ${selectFields.join(',')} FROM "${tmpName}"`);
 
          await this.dropTable({ schema: schema, table: tmpName });
+
+         // Recreates triggers
+         for (const trigger of remappedTriggers)
+            await this.createTrigger(trigger);
+
          await this.raw('PRAGMA foreign_keys = 1');
          await this.raw('COMMIT');
       }
@@ -672,8 +691,8 @@ export class SQLiteClient extends AntaresCore {
 
                      if ([...TIME, ...DATETIME].includes(parsedType)) {
                         const firstNotNull = queryAllResult.find(res => res[field.name] !== null);
-                        if (firstNotNull && firstNotNull[field.name].includes('.'))
+                        if (firstNotNull && String(firstNotNull[field.name]).includes('.'))
-                           length = firstNotNull[field.name].split('.').pop().length;
+                           length = String(firstNotNull[field.name]).split('.').pop().length;
                      }
 
                      return {

src/renderer/components/WorkspaceTabPropsTableRow.vue

@@ -410,7 +410,7 @@ const types = computed(() => {
    const types = [...props.dataTypes];
    if (!isInDataTypes.value)
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (types as any).unshift({ name: props.row });
+      (types as any).unshift({ name: props.row.type });
 
    return types;
 });

src/renderer/components/WorkspaceTabQueryTable.vue

@@ -616,11 +616,11 @@ const deselectRows = (e: Event) => {
       if (!isDeleteConfirmModal.value)
          selectedRows.value = [];
 
-      selectedField.value = null;
-
       if (e.type === 'blur')
          hasFocus.value = false;
    }
+
+   selectedField.value = null;
 };
 
 const contextMenu = (event: MouseEvent, cell: any) => {

src/renderer/scss/_data-types.scss

@@ -38,6 +38,7 @@
     "bigint": $number-color,
     "newdecimal": $number-color,
     "integer": $number-color,
+    "integer_unsigned": $number-color,
     "numeric": $number-color,
     "smallserial": $number-color,
     "serial": $number-color,