fix: error joining tables with different schema

antares-sql · Oct 17, 2022 · 88408da · 88408da
1 parent d52b7af
commit 88408da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/common/fieldTypes.ts b/src/common/fieldTypes.ts
@@ -78,6 +78,7 @@ export const BLOB = [
    'TINYBLOB',
    'MEDIUMBLOB',
    'LONGBLOB',
+   'LONG_BLOB',
    'BYTEA'
 ];
 

diff --git a/src/main/libs/clients/MySQLClient.ts b/src/main/libs/clients/MySQLClient.ts
@@ -469,7 +469,12 @@ export class MySQLClient extends AntaresCore {
          .orderBy({ ORDINAL_POSITION: 'ASC' })
          .run<TableColumnsResult>();
 
-      const { rows: fields } = await this.raw<antares.QueryResult<CreateTableResult>>(`SHOW CREATE TABLE \`${schema}\`.\`${table}\``);
+      let fields: CreateTableResult[] = [];
+      try {
+         const { rows } = await this.raw<antares.QueryResult<CreateTableResult>>(`SHOW CREATE TABLE \`${schema}\`.\`${table}\``);
+         fields = rows;
+      }
+      catch (_) {}
 
       const remappedFields = fields.map(row => {
          if (!row['Create Table']) return false;

diff --git a/src/renderer/scss/_data-types.scss b/src/renderer/scss/_data-types.scss
@@ -63,6 +63,7 @@
     "mediumblob": $blob-color,
     "medium_blob": $blob-color,
     "longblob": $blob-color,
+    "long_blob": $blob-color,
     "bytea": $blob-color,
     "enum": $enum-color,
     "set": $enum-color,