提交 822f3b06 authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov

Fix bad identation and remove trailing whitespace

上级 15e348ea
...@@ -23,7 +23,7 @@ Change Log ...@@ -23,7 +23,7 @@ Change Log
<ul> <ul>
<li>Make ALL a reserved keyword <li>Make ALL a reserved keyword
</li> </li>
<li>Issue #311: Avoid calling list.toArray(new X[list.size()]) for performance <li>Issue #311: Avoid calling list.toArray(new X[list.size()]) for performance
</li> </li>
<li>PR #715: Better getObject error message <li>PR #715: Better getObject error message
</li> </li>
...@@ -43,11 +43,11 @@ Change Log ...@@ -43,11 +43,11 @@ Change Log
</li> </li>
<li>Issue #699: When using an index for sorting, the index is ignored when also using NULLS LAST/FIRST <li>Issue #699: When using an index for sorting, the index is ignored when also using NULLS LAST/FIRST
</li> </li>
<li>Issue #697: FilePathDisk.newInputStream fails for contextual class loading <li>Issue #697: FilePathDisk.newInputStream fails for contextual class loading
</li> </li>
<li>Issue #695: jdbc:postgresql protocol connection issue in H2 Console Application in case of redshift driver in classpath <li>Issue #695: jdbc:postgresql protocol connection issue in H2 Console Application in case of redshift driver in classpath
</li> </li>
<li>Fix 'file not closed' when using FILE_READ <li>Fix 'file not closed' when using FILE_READ
</li> </li>
<li>Fix bug in LinkSchema tool when object exists with same name in different schemas <li>Fix bug in LinkSchema tool when object exists with same name in different schemas
</li> </li>
...@@ -57,9 +57,9 @@ Change Log ...@@ -57,9 +57,9 @@ Change Log
</li> </li>
<li>Issue #654: List ENUM type values in INFORMATION_SCHEMA.COLUMNS <li>Issue #654: List ENUM type values in INFORMATION_SCHEMA.COLUMNS
</li> </li>
<li>Issue #650: Simple nested SELECT causes error for table with TIMESTAMP WITH TIMEZONE column <li>Issue #650: Simple nested SELECT causes error for table with TIMESTAMP WITH TIMEZONE column
</li> </li>
<li>Issue #654: List ENUM type values in INFORMATION_SCHEMA.COLUMNS <li>Issue #654: List ENUM type values in INFORMATION_SCHEMA.COLUMNS
</li> </li>
<li>Issue #668: Fail of an update command on large table with ENUM column <li>Issue #668: Fail of an update command on large table with ENUM column
</li> </li>
......
...@@ -554,13 +554,13 @@ public class TestGeneralCommonTableQueries extends AbstractBaseForCommonTableExp ...@@ -554,13 +554,13 @@ public class TestGeneralCommonTableQueries extends AbstractBaseForCommonTableExp
config = backupConfig; config = backupConfig;
} }
} }
private void testSimple3RowRecursiveQueryDropAllObjects() throws Exception { private void testSimple3RowRecursiveQueryDropAllObjects() throws Exception {
String[] expectedRowData = new String[]{"|6"}; String[] expectedRowData = new String[]{"|6"};
String[] expectedColumnTypes = new String[]{"BIGINT"}; String[] expectedColumnTypes = new String[]{"BIGINT"};
String[] expectedColumnNames = new String[]{"SUM(N)"}; String[] expectedColumnNames = new String[]{"SUM(N)"};
String setupSQL = "DROP ALL OBJECTS;"; String setupSQL = "DROP ALL OBJECTS;";
String withQuery = "select sum(n) from (" String withQuery = "select sum(n) from ("
+" with recursive r(n) as (" +" with recursive r(n) as ("
...@@ -574,8 +574,8 @@ public class TestGeneralCommonTableQueries extends AbstractBaseForCommonTableExp ...@@ -574,8 +574,8 @@ public class TestGeneralCommonTableQueries extends AbstractBaseForCommonTableExp
int maxRetries = 10; int maxRetries = 10;
int expectedNumberOfRows = expectedRowData.length; int expectedNumberOfRows = expectedRowData.length;
testRepeatedQueryWithSetup(maxRetries, expectedRowData, expectedColumnNames, expectedNumberOfRows, setupSQL, testRepeatedQueryWithSetup(maxRetries, expectedRowData, expectedColumnNames, expectedNumberOfRows, setupSQL,
withQuery, maxRetries - 1, expectedColumnTypes); withQuery, maxRetries - 1, expectedColumnTypes);
} }
} }
...@@ -28,7 +28,7 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT ...@@ -28,7 +28,7 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT
testPersistentNonRecursiveTableInCreateView(); testPersistentNonRecursiveTableInCreateView();
testPersistentRecursiveTableInCreateView(); testPersistentRecursiveTableInCreateView();
testPersistentNonRecursiveTableInCreateViewDropAllObjects(); testPersistentNonRecursiveTableInCreateViewDropAllObjects();
testPersistentRecursiveTableInCreateViewDropAllObjects(); testPersistentRecursiveTableInCreateViewDropAllObjects();
} }
private void testRecursiveTable() throws Exception { private void testRecursiveTable() throws Exception {
...@@ -181,8 +181,8 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT ...@@ -181,8 +181,8 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT
testRepeatedQueryWithSetup(maxRetries, expectedRowData, expectedColumnNames, expectedNumberOfRows, setupSQL, testRepeatedQueryWithSetup(maxRetries, expectedRowData, expectedColumnNames, expectedNumberOfRows, setupSQL,
withQuery, maxRetries - 1, expectedColumnTypes); withQuery, maxRetries - 1, expectedColumnTypes);
} }
private void testPersistentNonRecursiveTableInCreateViewDropAllObjects() throws Exception { private void testPersistentNonRecursiveTableInCreateViewDropAllObjects() throws Exception {
String setupSQL = "" String setupSQL = ""
+"DROP ALL OBJECTS; \n" +"DROP ALL OBJECTS; \n"
+"CREATE TABLE my_table ( \n" +"CREATE TABLE my_table ( \n"
...@@ -203,7 +203,7 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT ...@@ -203,7 +203,7 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT
+"), \n" +"), \n"
+"unused_cte AS ( SELECT 1 AS unUsedColumn ) \n" +"unused_cte AS ( SELECT 1 AS unUsedColumn ) \n"
+"SELECT sub_tree_root_id, tree_level, parent_fk, child_fk FROM tree_cte_nr; \n"; +"SELECT sub_tree_root_id, tree_level, parent_fk, child_fk FROM tree_cte_nr; \n";
String withQuery = "SELECT * FROM v_my_nr_tree"; String withQuery = "SELECT * FROM v_my_nr_tree";
int maxRetries = 6; int maxRetries = 6;
String[] expectedRowData = new String[]{ String[] expectedRowData = new String[]{
...@@ -214,13 +214,13 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT ...@@ -214,13 +214,13 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT
"|121|0|12|121", "|121|0|12|121",
}; };
String[] expectedColumnNames = new String[]{"SUB_TREE_ROOT_ID", "TREE_LEVEL", "PARENT_FK", "CHILD_FK"}; String[] expectedColumnNames = new String[]{"SUB_TREE_ROOT_ID", "TREE_LEVEL", "PARENT_FK", "CHILD_FK"};
String[] expectedColumnTypes = new String[]{"INTEGER", "INTEGER", "INTEGER", "INTEGER"}; String[] expectedColumnTypes = new String[]{"INTEGER", "INTEGER", "INTEGER", "INTEGER"};
int expectedNumberOfRows = 5; int expectedNumberOfRows = 5;
testRepeatedQueryWithSetup(maxRetries, expectedRowData, expectedColumnNames, expectedNumberOfRows, setupSQL, testRepeatedQueryWithSetup(maxRetries, expectedRowData, expectedColumnNames, expectedNumberOfRows, setupSQL,
withQuery, maxRetries - 1, expectedColumnTypes); withQuery, maxRetries - 1, expectedColumnTypes);
} }
private void testPersistentRecursiveTableInCreateViewDropAllObjects() throws Exception { private void testPersistentRecursiveTableInCreateViewDropAllObjects() throws Exception {
String setuoSQL = "--SET TRACE_LEVEL_SYSTEM_OUT 3;\n" String setuoSQL = "--SET TRACE_LEVEL_SYSTEM_OUT 3;\n"
+"DROP ALL OBJECTS; \n" +"DROP ALL OBJECTS; \n"
+"CREATE TABLE my_tree ( \n" +"CREATE TABLE my_tree ( \n"
...@@ -245,7 +245,7 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT ...@@ -245,7 +245,7 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT
+"), \n" +"), \n"
+"unused_cte AS ( SELECT 1 AS unUsedColumn ) \n" +"unused_cte AS ( SELECT 1 AS unUsedColumn ) \n"
+"SELECT sub_tree_root_id, tree_level, parent_fk, child_fk FROM tree_cte; \n"; +"SELECT sub_tree_root_id, tree_level, parent_fk, child_fk FROM tree_cte; \n";
String withQuery = "SELECT * FROM v_my_tree"; String withQuery = "SELECT * FROM v_my_tree";
int maxRetries = 4; int maxRetries = 4;
String[] expectedRowData = new String[]{"|1|0|null|1", String[] expectedRowData = new String[]{"|1|0|null|1",
...@@ -261,9 +261,9 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT ...@@ -261,9 +261,9 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT
"|1|2|null|121" "|1|2|null|121"
}; };
String[] expectedColumnNames = new String[]{"SUB_TREE_ROOT_ID", "TREE_LEVEL", "PARENT_FK", "CHILD_FK"}; String[] expectedColumnNames = new String[]{"SUB_TREE_ROOT_ID", "TREE_LEVEL", "PARENT_FK", "CHILD_FK"};
String[] expectedColumnTypes = new String[]{"INTEGER", "INTEGER", "INTEGER", "INTEGER"}; String[] expectedColumnTypes = new String[]{"INTEGER", "INTEGER", "INTEGER", "INTEGER"};
int expectedNumberOfRows = 11; int expectedNumberOfRows = 11;
testRepeatedQueryWithSetup(maxRetries, expectedRowData, expectedColumnNames, expectedNumberOfRows, setuoSQL, testRepeatedQueryWithSetup(maxRetries, expectedRowData, expectedColumnNames, expectedNumberOfRows, setuoSQL,
withQuery, maxRetries - 1, expectedColumnTypes); withQuery, maxRetries - 1, expectedColumnTypes);
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论