提交 780c79e5 authored 作者: Thomas Mueller's avatar Thomas Mueller

Revert auto-registration of function aliases (tests fail)

上级 09313b51
...@@ -23,7 +23,6 @@ import org.h2.constant.DbSettings; ...@@ -23,7 +23,6 @@ import org.h2.constant.DbSettings;
import org.h2.constant.ErrorCode; import org.h2.constant.ErrorCode;
import org.h2.constant.SysProperties; import org.h2.constant.SysProperties;
import org.h2.constraint.Constraint; import org.h2.constraint.Constraint;
import org.h2.ext.AutoRegisterFunctionAliases;
import org.h2.index.Cursor; import org.h2.index.Cursor;
import org.h2.index.Index; import org.h2.index.Index;
import org.h2.index.IndexType; import org.h2.index.IndexType;
...@@ -175,8 +174,6 @@ public class Database implements DataHandler { ...@@ -175,8 +174,6 @@ public class Database implements DataHandler {
private final DbSettings dbSettings; private final DbSettings dbSettings;
private final int reconnectCheckDelay; private final int reconnectCheckDelay;
private int logMode; private int logMode;
private boolean autoRegisterFnAliases = false;
private String autoRegisterFnModules = "";
public Database(ConnectionInfo ci, String cipher) { public Database(ConnectionInfo ci, String cipher) {
String name = ci.getName(); String name = ci.getName();
...@@ -212,8 +209,6 @@ public class Database implements DataHandler { ...@@ -212,8 +209,6 @@ public class Database implements DataHandler {
} }
this.multiVersion = ci.getProperty("MVCC", false); this.multiVersion = ci.getProperty("MVCC", false);
this.logMode = ci.getProperty("LOG", PageStore.LOG_MODE_SYNC); this.logMode = ci.getProperty("LOG", PageStore.LOG_MODE_SYNC);
this.autoRegisterFnAliases = ci.getProperty("EXT_FN_AUTOREG", false);
this.autoRegisterFnModules = ci.getProperty("EXT_FN_AUTOREG_MODULE", "common");
boolean closeAtVmShutdown = dbSettings.dbCloseOnExit; boolean closeAtVmShutdown = dbSettings.dbCloseOnExit;
int traceLevelFile = ci.getIntProperty(SetTypes.TRACE_LEVEL_FILE, TraceSystem.DEFAULT_TRACE_LEVEL_FILE); int traceLevelFile = ci.getIntProperty(SetTypes.TRACE_LEVEL_FILE, TraceSystem.DEFAULT_TRACE_LEVEL_FILE);
int traceLevelSystemOut = ci.getIntProperty(SetTypes.TRACE_LEVEL_SYSTEM_OUT, int traceLevelSystemOut = ci.getIntProperty(SetTypes.TRACE_LEVEL_SYSTEM_OUT,
...@@ -661,25 +656,6 @@ public class Database implements DataHandler { ...@@ -661,25 +656,6 @@ public class Database implements DataHandler {
getLobStorage().init(); getLobStorage().init();
systemSession.commit(true); systemSession.commit(true);
// load extension functions/aggregates into default schema
try {
if (autoRegisterFnAliases) {
AutoRegisterFunctionAliases.registerFromClasspath(trace, getClass().getClassLoader(), systemSession,
mainSchema, "");
for (String fnMod : this.autoRegisterFnModules.split(",")) {
AutoRegisterFunctionAliases.registerFromClasspath(trace, getClass().getClassLoader(),
systemSession, mainSchema, fnMod.trim());
}
} else if (Boolean.parseBoolean(System.getProperty(AutoRegisterFunctionAliases.SYS_PROP_AUTOREG, "false")
.trim())) {
AutoRegisterFunctionAliases.registerFromClasspath(trace, getClass().getClassLoader(), systemSession,
mainSchema, null);
}
} catch (Exception ex) {
trace.error(ex, "problem with function auto-register");
}
trace.info("opened {0}", databaseName); trace.info("opened {0}", databaseName);
if (checkpointAllowed > 0) { if (checkpointAllowed > 0) {
afterWriting(); afterWriting();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论