Unverified 提交 92708b80 authored 作者: Noel Grandin's avatar Noel Grandin 提交者: GitHub

Merge pull request #775 from katzyn/build

Fix building of documentation and zip
...@@ -566,7 +566,7 @@ public class TestGeneralCommonTableQueries extends AbstractBaseForCommonTableExp ...@@ -566,7 +566,7 @@ public class TestGeneralCommonTableQueries extends AbstractBaseForCommonTableExp
+" with recursive r(n) as (" +" with recursive r(n) as ("
+" (select 1) union all (select n+1 from r where n < 3)" +" (select 1) union all (select n+1 from r where n < 3)"
+" )," +" ),"
+" dummyUnsedCte(n) as (" +" dummyUnusedCte(n) as ("
+" select 1 " +" select 1 "
+" )" +" )"
+" select n from r" +" select n from r"
......
...@@ -228,7 +228,7 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT ...@@ -228,7 +228,7 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT
} }
private void testPersistentRecursiveTableInCreateViewDropAllObjects() throws Exception { private void testPersistentRecursiveTableInCreateViewDropAllObjects() throws Exception {
String setuoSQL = "--SET TRACE_LEVEL_SYSTEM_OUT 3;\n" String setupSQL = "--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"
+" id INTEGER, \n" +" id INTEGER, \n"
...@@ -270,7 +270,7 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT ...@@ -270,7 +270,7 @@ public class TestPersistentCommonTableExpressions extends AbstractBaseForCommonT
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, setupSQL,
withQuery, maxRetries - 1, expectedColumnTypes); withQuery, maxRetries - 1, expectedColumnTypes);
} }
} }
...@@ -374,6 +374,16 @@ public class Build extends BuildBase { ...@@ -374,6 +374,16 @@ public class Build extends BuildBase {
copy("docs", files("../h2web/h2.pdf"), "../h2web"); copy("docs", files("../h2web/h2.pdf"), "../h2web");
} catch (Exception e) { } catch (Exception e) {
print("OpenOffice is not available: " + e); print("OpenOffice is not available: " + e);
try {
if (exec("soffice", args("--convert-to", "pdf", "--outdir", "docs/html",
"docs/html/onePage.html")) == 0) {
File f = new File("docs/html/onePage.pdf");
if (f.exists()) {
f.renameTo(new File("docs/h2.pdf"));
}
}
} catch (Exception ex) {
}
} }
delete("docs/html/onePage.html"); delete("docs/html/onePage.html");
FileList files = files("../h2").keep("../h2/build.*"); FileList files = files("../h2").keep("../h2/build.*");
......
...@@ -754,3 +754,7 @@ joaquim overides altertable novalidate udomain managed rewritten unquote identif ...@@ -754,3 +754,7 @@ joaquim overides altertable novalidate udomain managed rewritten unquote identif
bellotti clemens donators domainusername bellotti clemens donators domainusername
veryveryveryveryveryverylongveryveryveryveryveryverylongveryveryveryveryveryverylong namer veryveryveryveryveryverylongve veryveryveryveryveryverylongveryveryveryveryveryverylongveryveryveryveryveryverylong namer veryveryveryveryveryverylongve
chittanoor carrot chittanoor carrot
contextual unknowns enquote respectively sessionid reconnection selfreferential bbddbb instant subprotocol ddbbbb
zzbbzz cldr booleans maria enquotes mtc cbuf checksummed nreturn despite bbzz readlimit retries cceecc reconnects
unconditionally coco aren eecccc decimals charsets zzbb lsb msb usecount outdir
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论