Skip to content

D
dbeaver

一剑流云 / dbeaver
与 Fork 源项目一致

从无法访问的项目Fork

通知 7
Star 0
Fork 0
D
dbeaver

体验新版 GitCode，发现更多精彩内容 >>

提交 58bb4055 编写于 作者: S Serge Rider
浏览文件
操作

Merge branches 'devel' and 'master' of https://github.com/serge-rider/dbeaver

上级 0402c616 b9cffbbd
隐藏空白更改
内联 并排
Showing with 235 addition and 8 deletion
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorSourceViewer.java
浏览文件 @ 58bb4055
......@@ -19,6 +19,7 @@
package org.jkiss.dbeaver.ui.editors.sql;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.text.hyperlink.IHyperlinkPresenter;
import org.eclipse.jface.text.source.IOverviewRuler;
import org.eclipse.jface.text.source.IVerticalRuler;
import org.eclipse.jface.text.source.projection.ProjectionViewer;
......@@ -54,4 +55,13 @@ public class SQLEditorSourceViewer extends ProjectionViewer {
return textWidget;
}
// Let source viewer reconfiguration possible (http://dbeaver.jkiss.org/forum/viewtopic.php?f=2&t=2939)
public void setHyperlinkPresenter(IHyperlinkPresenter hyperlinkPresenter) throws IllegalStateException {
if (fHyperlinkManager != null) {
fHyperlinkManager.uninstall();
fHyperlinkManager= null;
}
super.setHyperlinkPresenter(hyperlinkPresenter);
}
}
\ No newline at end of file
plugins/org.jkiss.dbeaver.ext.mysql/plugin.xml
浏览文件 @ 58bb4055
......@@ -157,7 +157,7 @@
class="org.mariadb.jdbc.Driver"
sampleURL="jdbc:mariadb://{host}[:{port}]/[{database}]"
defaultPort="3306"
webURL="http://www.mysql.com/products/connector/"
webURL="https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/"
description="MySQL standard driver">
<file type="jar" path="maven:/org.mariadb.jdbc:mariadb-java-client:RELEASE"/>
</driver>
......
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleDataSource.java
浏览文件 @ 58bb4055
......@@ -287,6 +287,11 @@ public class OracleDataSource extends JDBCDataSource
// Get active schema
this.activeSchemaName = OracleUtils.getCurrentSchema(session);
if (this.activeSchemaName != null) {
if (this.activeSchemaName.isEmpty()) {
this.activeSchemaName = null;
}
}
} catch (SQLException e) {
//throw new DBException(e);
......
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleSQLDialect.java
浏览文件 @ 58bb4055
......@@ -26,12 +26,12 @@ import java.util.Collection;
import java.util.Collections;
/**
* Oracle SQL dialect
*/
* Oracle SQL dialect
*/
class OracleSQLDialect extends JDBCSQLDialect {
private static final String[] ORACLE_LINE_COMMENTS = {
"--",
//"^rem"
"--",
//"^rem"
};
public OracleSQLDialect(JDBCDatabaseMetaData metaData) {
......@@ -41,10 +41,219 @@ class OracleSQLDialect extends JDBCSQLDialect {
addSQLKeyword("STRUCTURE");
addSQLKeyword("COMPUTE");
addSQLKeyword("STATISTICS");
addSQLKeyword("NULLS");
addSQLKeyword("FIRST");
addSQLKeyword("LAST");
addFunctions(
Arrays.asList(
"SUBSTR", "APPROX_COUNT_DISTINCT",
"REGEXP_SUBSTR", "REGEXP_INSTR", "REGEXP_REPLACE", "REGEXP_LIKE"));
"REGEXP_SUBSTR", "REGEXP_INSTR", "REGEXP_REPLACE", "REGEXP_LIKE",
// Additions from #323
//Number Functions:
"BITAND",
"COSH",
"NANVL",
"REMAINDER",
"SINH",
"TANH",
"TRUNC",
//Character Functions Returning Character Values:
"CHR",
"INITCAP",
"LPAD",
"NLS_INITCAP",
"NLS_LOWER",
"NLSSORT",
"NLS_UPPER",
"RPAD",
// NLS Character Functions:
"NLS_CHARSET_DECL_LEN",
"NLS_CHARSET_ID",
"NLS_CHARSET_NAME",
//Character Functions Returning Number VALUES:
"INSTR",
//Datetime Functions:
"ADD_MONTHS",
"DBTIMEZONE",
"FROM_TZ",
"LAST_DAY",
"MONTHS_BETWEEN",
"NEW_TIME",
"NEXT_DAY",
"NUMTODSINTERVAL",
"NUMTOYMINTERVAL",
"SESSIONTIMEZONE",
"SYS_EXTRACT_UTC",
"SYSDATE",
"SYSTIMESTAMP",
"TO_CHAR",
"TO_TIMESTAMP",
"TO_TIMESTAMP_TZ",
"TO_DSINTERVAL",
"TO_YMINTERVAL",
"TRUNC",
"TZ_OFFSET",
//General Comparison Functions:
"GREATEST",
"LEAST",
//Conversion Functions:
"ASCIISTR",
"BIN_TO_NUM",
"CHARTOROWID",
"COMPOSE",
"DECOMPOSE",
"HEXTORAW",
"NUMTODSINTERVAL",
"NUMTOYMINTERVAL",
"RAWTOHEX",
"RAWTONHEX",
"ROWIDTOCHAR",
"ROWIDTONCHAR",
"SCN_TO_TIMESTAMP",
"TIMESTAMP_TO_SCN",
"TO_BINARY_DOUBLE",
"TO_BINARY_FLOAT",
"TO_CHAR",
"TO_CLOB",
"TO_DATE",
"TO_DSINTERVAL",
"TO_LOB",
"TO_MULTI_BYTE",
"TO_NCHAR",
"TO_NCLOB",
"TO_NUMBER",
"TO_DSINTERVAL",
"TO_SINGLE_BYTE",
"TO_TIMESTAMP",
"TO_TIMESTAMP_TZ",
"TO_YMINTERVAL",
"TO_YMINTERVAL",
"UNISTR",
//Large Object Functions:
"BFILENAME",
"EMPTY_BLOB",
"EMPTY_CLOB",
//Collection Functions:
"POWERMULTISET",
"POWERMULTISET_BY_CARDINALITY",
//Hierarchical FUNCTION:
"SYS_CONNECT_BY_PATH",
//Data Mining Functions:
"CLUSTER_ID",
"CLUSTER_PROBABILITY",
"CLUSTER_SET",
"FEATURE_ID",
"FEATURE_SET",
"FEATURE_VALUE",
"PREDICTION",
"PREDICTION_COST",
"PREDICTION_DETAILS",
"PREDICTION_PROBABILITY",
"PREDICTION_SET",
//XML Functions:
"APPENDCHILDXML",
"DELETEXML",
"DEPTH",
"EXISTSNODE",
"EXTRACTVALUE",
"INSERTCHILDXML",
"INSERTXMLBEFORE",
"PATH",
"SYS_DBURIGEN",
"SYS_XMLAGG",
"SYS_XMLGEN",
"UPDATEXML",
"XMLAGG",
"XMLCDATA",
"XMLCOLATTVAL",
"XMLCOMMENT",
"XMLCONCAT",
"XMLFOREST",
"XMLPARSE",
"XMLPI",
"XMLQUERY",
"XMLROOT",
"XMLSEQUENCE",
"XMLSERIALIZE",
"XMLTABLE",
"XMLTRANSFORM",
//Encoding and Decoding Functions:
"DECODE",
"DUMP",
"ORA_HASH",
"VSIZE",
//NULL-Related Functions:
"LNNVL",
"NVL",
"NVL2",
//Environment and Identifier Functions:
"SYS_CONTEXT",
"SYS_GUID",
"SYS_TYPEID",
"UID",
"USERENV",
//Aggregate Functions:
"CORR_S",
"CORR_K",
"FIRST",
"GROUP_ID",
"GROUPING_ID",
"LAST",
"MEDIAN",
"STATS_BINOMIAL_TEST",
"STATS_CROSSTAB",
"STATS_F_TEST",
"STATS_KS_TEST",
"STATS_MODE",
"STATS_MW_TEST",
"STATS_ONE_WAY_ANOVA",
"STATS_T_TEST_ONE",
"STATS_T_TEST_PAIRED",
"STATS_T_TEST_INDEP",
"STATS_T_TEST_INDEPU",
"STATS_WSR_TEST",
"STDDEV",
"VARIANCE",
//Analytic Functions:
"FIRST",
"FIRST_VALUE",
"LAG",
"LAST",
"LAST_VALUE",
"LEAD",
"NTILE",
"RATIO_TO_REPORT",
"STDDEV",
"VARIANCE",
//Object Reference Functions:
"MAKE_REF",
"REFTOHEX",
//Model Functions:
"CV",
"ITERATION_NUMBER",
"PRESENTNNV",
"PRESENTV",
"PREVIOUS"
));
}
@NotNull
......
plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/model/OracleUtils.java
浏览文件 @ 58bb4055
......@@ -305,7 +305,7 @@ public class OracleUtils {
if (body) {
sourceType += " BODY";
}
Pattern srcPattern = Pattern.compile("(" + sourceType + ")\\s+(\\w+)", Pattern.CASE_INSENSITIVE);
Pattern srcPattern = Pattern.compile("^(" + sourceType + ")\\s+(\"{0,1}\\w+\"{0,1})", Pattern.CASE_INSENSITIVE);
Matcher matcher = srcPattern.matcher(source);
if (matcher.find()) {
return
......
plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/edit/PostgreForeignKeyManager.java
浏览文件 @ 58bb4055
......@@ -85,7 +85,7 @@ public class PostgreForeignKeyManager extends SQLForeignKeyManager<PostgreTableF
@Override
protected String getDropForeignKeyPattern(PostgreTableForeignKey foreignKey)
{
return "ALTER TABLE " + PATTERN_ITEM_TABLE + " DROP FOREIGN KEY " + PATTERN_ITEM_CONSTRAINT; //$NON-NLS-1$ //$NON-NLS-2$
return "ALTER TABLE " + PATTERN_ITEM_TABLE + " DROP CONSTRAINT " + PATTERN_ITEM_CONSTRAINT; //$NON-NLS-1$ //$NON-NLS-2$
}
}
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/handlers/JDBCNumberValueHandler.java
浏览文件 @ 58bb4055
......@@ -63,6 +63,9 @@ public class JDBCNumberValueHandler extends JDBCAbstractValueHandler {
return DBUtils.getDefaultValueDisplayString(null, format);
}
if (format == DBDDisplayFormat.NATIVE || format == DBDDisplayFormat.EDIT) {
if (value instanceof BigDecimal) {
return ((BigDecimal) value).toPlainString();
}
return value.toString();
}
return formatter.formatValue(value);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或