提交 afdb83ee authored 作者: Noel Grandin's avatar Noel Grandin

some @Override annotations

上级 dc8b67b8
...@@ -9,7 +9,6 @@ import java.util.ArrayList; ...@@ -9,7 +9,6 @@ import java.util.ArrayList;
import org.h2.api.ErrorCode; import org.h2.api.ErrorCode;
import org.h2.command.CommandInterface; import org.h2.command.CommandInterface;
import org.h2.command.dml.Query; import org.h2.command.dml.Query;
import org.h2.engine.Constants;
import org.h2.engine.Database; import org.h2.engine.Database;
import org.h2.engine.Session; import org.h2.engine.Session;
import org.h2.expression.Parameter; import org.h2.expression.Parameter;
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
*/ */
package org.h2.mvstore.db; package org.h2.mvstore.db;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
......
...@@ -343,6 +343,7 @@ public abstract class Table extends SchemaObjectBase { ...@@ -343,6 +343,7 @@ public abstract class Table extends SchemaObjectBase {
return null; return null;
} }
@Override
public String getCreateSQLForCopy(Table table, String quotedName) { public String getCreateSQLForCopy(Table table, String quotedName) {
throw DbException.throwInternalError(toString()); throw DbException.throwInternalError(toString());
} }
......
...@@ -9,7 +9,6 @@ import java.sql.PreparedStatement; ...@@ -9,7 +9,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.sql.Statement; import java.sql.Statement;
import org.h2.test.utils.SelfDestructor; import org.h2.test.utils.SelfDestructor;
/** /**
...@@ -38,6 +37,7 @@ public class TestHaltApp extends TestHalt { ...@@ -38,6 +37,7 @@ public class TestHaltApp extends TestHalt {
} }
} }
@Override
protected void execute(Statement stat, String sql) throws SQLException { protected void execute(Statement stat, String sql) throws SQLException {
traceOperation("execute: " + sql); traceOperation("execute: " + sql);
super.execute(stat, sql); super.execute(stat, sql);
......
...@@ -6,7 +6,7 @@ import org.h2.expression.ValueExpression; ...@@ -6,7 +6,7 @@ import org.h2.expression.ValueExpression;
import org.h2.test.TestBase; import org.h2.test.TestBase;
public class TestColumnNamer extends TestBase { public class TestColumnNamer extends TestBase {
private String[] ids = new String[]{ private String[] ids = new String[]{
"ABC" "ABC"
,"123" ,"123"
...@@ -24,7 +24,7 @@ public class TestColumnNamer extends TestBase { ...@@ -24,7 +24,7 @@ public class TestColumnNamer extends TestBase {
,"col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2" ,"col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2"
,"col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2" ,"col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2col2"
}; };
private String[] expectedColumnName= {"ABC" private String[] expectedColumnName= {"ABC"
,"123" ,"123"
,"a2" ,"a2"
...@@ -39,12 +39,13 @@ public class TestColumnNamer extends TestBase { ...@@ -39,12 +39,13 @@ public class TestColumnNamer extends TestBase {
,"col1_2" ,"col1_2"
,"col1_3" ,"col1_3"
,"col2col2col2col2col2col2col2co" ,"col2col2col2col2col2col2col2co"
,"col2col2col2col2col2col2col2_2"}; ,"col2col2col2col2col2col2col2_2"};
public static void main(String[] args){ public static void main(String[] args){
new TestColumnNamer().test(); new TestColumnNamer().test();
} }
@Override
public void test() { public void test() {
ColumnNamer columnNamer = new ColumnNamer(null); ColumnNamer columnNamer = new ColumnNamer(null);
columnNamer.getConfiguration().configure("MAX_IDENTIFIER_LENGTH = 30"); columnNamer.getConfiguration().configure("MAX_IDENTIFIER_LENGTH = 30");
...@@ -52,7 +53,7 @@ public class TestColumnNamer extends TestBase { ...@@ -52,7 +53,7 @@ public class TestColumnNamer extends TestBase {
columnNamer.getConfiguration().configure("REGULAR_EXPRESSION_MATCH_DISALLOWED = '[^A-Za-z0-9_]+'"); columnNamer.getConfiguration().configure("REGULAR_EXPRESSION_MATCH_DISALLOWED = '[^A-Za-z0-9_]+'");
columnNamer.getConfiguration().configure("DEFAULT_COLUMN_NAME_PATTERN = 'colName$$'"); columnNamer.getConfiguration().configure("DEFAULT_COLUMN_NAME_PATTERN = 'colName$$'");
columnNamer.getConfiguration().configure("GENERATE_UNIQUE_COLUMN_NAMES = 1"); columnNamer.getConfiguration().configure("GENERATE_UNIQUE_COLUMN_NAMES = 1");
int index =0; int index =0;
for(String id : ids){ for(String id : ids){
Expression columnExp = ValueExpression.getDefault(); Expression columnExp = ValueExpression.getDefault();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论