diff --git a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDialect.java b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDialect.java index a0ee42fded51d82b0051053f4b8793270713eaa9..744347d5c53dcbc63f84cebb98d2c56636656c76 100644 --- a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDialect.java +++ b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLDialect.java @@ -68,6 +68,8 @@ class MySQLDialect extends JDBCSQLDialect { addSQLKeyword(kw); } removeSQLKeyword("SOURCE"); + + addDataTypes(Arrays.asList("GEOMETRY", "POINT")); } @Nullable diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java index 08ed35e7a016ef7805e5087e14c4851da5531a0e..6897a7720f3caa482dc592dfbd8845702771ccfa 100644 --- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java +++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLUtils.java @@ -1041,4 +1041,14 @@ public final class SQLUtils { return ArrayUtils.containsIgnoreCase(dialect.getExecuteKeywords(), word); } + public static String stripColumnTypeModifiers(String type) { + int startPos = type.indexOf("("); + if (startPos != -1) { + int endPos = type.indexOf(")", startPos + 1); + if (endPos != -1) { + return type.substring(0, startPos).trim() + " " + type.substring(endPos + 1).trim(); + } + } + return null; + } } \ No newline at end of file diff --git a/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLContentAssistant.java b/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLContentAssistant.java index 11d3b49ec94864ac5c77201cd8bb45317d7ead3e..c3dd96435f583a407f2a035c46237a16c7e24cd5 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLContentAssistant.java +++ b/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/syntax/SQLContentAssistant.java @@ -22,6 +22,9 @@ import org.eclipse.jface.text.contentassist.ContentAssistant; * SQL Completion proposal */ public class SQLContentAssistant extends ContentAssistant { + public SQLContentAssistant() { + super(false); // Sync. Maybe we should make it async + } @Override protected AutoAssistListener createAutoAssistListener() {