patch_2.1.214.patch
| new/src/com/goldencode/p2j/convert/db/DBHelper.java 2022-09-07 11:36:09 +0000 | ||
|---|---|---|
| 221 | 221 |
+ "DB_CLOSE_DELAY=-1;" |
| 222 | 222 |
+ "AUTOCOMMIT=OFF;" |
| 223 | 223 |
+ "LOCK_MODE=3;" |
| 224 |
+ "MV_STORE=FALSE;" |
|
| 225 | 224 |
+ "DB_CLOSE_ON_EXIT=TRUE;"; |
| 226 | 225 |
|
| 227 | 226 |
if (cacheSize > -1) |
| new/src/com/goldencode/p2j/persist/dialect/H2Helper.java 2022-09-07 11:36:05 +0000 | ||
|---|---|---|
| 175 | 175 |
boolean inMem = "jdbc:h2:mem:".equals(JDBC_PREFIX); |
| 176 | 176 |
StringBuilder url = new StringBuilder(); |
| 177 | 177 |
url.append(JDBC_PREFIX).append(database); |
| 178 |
url.append(";db_close_delay=-1;mv_store=false;query_cache_size=1024;db_close_on_exit=false;");
|
|
| 178 |
url.append(";db_close_delay=-1;query_cache_size=1024;db_close_on_exit=false;"); // can remove mv_store
|
|
| 179 | 179 |
if (avoidLogging) |
| 180 | 180 |
{
|
| 181 | 181 |
url.append(";undo_log=0");
|
| 182 | 182 |
} |
| 183 |
if (!inMem) |
|
| 184 |
{
|
|
| 185 |
url.append(";TRACE_LEVEL_FILE=2;TRACE_LEVEL_SYSTEM_OUT=2;TRACE_MAX_FILE_SIZE=4096");
|
|
| 186 |
} |
|
| 187 | 183 |
String uid = RandomWordGenerator.create(128, 16, 16); |
| 188 | 184 |
String pwd = RandomWordGenerator.create(128, 16, 16); |
| 189 | 185 |
|
| ... | ... | |
| 201 | 197 |
) |
| 202 | 198 |
); |
| 203 | 199 |
} |
| 200 |
else |
|
| 201 |
{
|
|
| 202 |
url.append(";TRACE_LEVEL_FILE=2;TRACE_LEVEL_SYSTEM_OUT=2;TRACE_MAX_FILE_SIZE=4096");
|
|
| 203 |
} |
|
| 204 | 204 |
settings.put(Settings.URL, url.toString()); |
| 205 | 205 |
settings.put(Settings.USER, inMem ? uid : "user"); |
| 206 | 206 |
settings.put(Settings.PASSWORD, inMem ? pwd : "pwd"); |
| new/src/com/goldencode/p2j/persist/dialect/P2JH2Dialect.java 2022-09-07 08:01:07 +0000 | ||
|---|---|---|
| 290 | 290 |
String[] keywords = |
| 291 | 291 |
{
|
| 292 | 292 |
"all", |
| 293 |
"and", |
|
| 294 |
"any", |
|
| 293 | 295 |
"array", |
| 296 |
"as", |
|
| 297 |
"asymmetric", |
|
| 298 |
"authorization", |
|
| 299 |
"between", |
|
| 300 |
"both", |
|
| 294 | 301 |
"case", |
| 302 |
"cast", |
|
| 295 | 303 |
"check", |
| 296 | 304 |
"constraint", |
| 297 | 305 |
"cross", |
| 298 | 306 |
"current_catalog", |
| 299 | 307 |
"current_date", |
| 308 |
"current_path", |
|
| 309 |
"current_role", |
|
| 300 | 310 |
"current_schema", |
| 301 | 311 |
"current_time", |
| 302 | 312 |
"current_timestamp", |
| 303 | 313 |
"current_user", |
| 314 |
"day", |
|
| 315 |
"default", |
|
| 304 | 316 |
"distinct", |
| 317 |
"else", |
|
| 318 |
"end", |
|
| 305 | 319 |
"except", |
| 306 | 320 |
"exists", |
| 307 | 321 |
"false", |
| ... | ... | |
| 311 | 325 |
"from", |
| 312 | 326 |
"full", |
| 313 | 327 |
"group", |
| 328 |
"groups", |
|
| 314 | 329 |
"having", |
| 330 |
"hour", |
|
| 315 | 331 |
"if", |
| 332 |
"ilike", |
|
| 333 |
"in", |
|
| 316 | 334 |
"inner", |
| 317 | 335 |
"intersect", |
| 318 |
"intersects", |
|
| 336 |
"intersects", // keyword not available in version 2.1.214
|
|
| 319 | 337 |
"interval", |
| 320 | 338 |
"is", |
| 321 | 339 |
"join", |
| 340 |
"key", |
|
| 341 |
"leading", |
|
| 322 | 342 |
"left", |
| 323 | 343 |
"like", |
| 324 | 344 |
"limit", |
| 325 | 345 |
"localtime", |
| 326 | 346 |
"localtimestamp", |
| 327 | 347 |
"minus", |
| 348 |
"minute", |
|
| 349 |
"month", |
|
| 328 | 350 |
"natural", |
| 329 | 351 |
"not", |
| 330 | 352 |
"null", |
| 331 | 353 |
"offset", |
| 332 | 354 |
"on", |
| 355 |
"or", |
|
| 333 | 356 |
"order", |
| 357 |
"over", |
|
| 358 |
"partition", |
|
| 334 | 359 |
"primary", |
| 335 | 360 |
"qualify", |
| 361 |
"range", |
|
| 362 |
"regexp", |
|
| 336 | 363 |
"right", |
| 337 | 364 |
"row", |
| 338 | 365 |
"rownum", |
| 366 |
"rows", |
|
| 367 |
"second", |
|
| 339 | 368 |
"select", |
| 340 |
"sysdate", |
|
| 341 |
"systime", |
|
| 342 |
"systimestamp", |
|
| 369 |
"session_user", |
|
| 370 |
"set", |
|
| 371 |
"some", |
|
| 372 |
"symmetric", |
|
| 373 |
"sysdate", // keyword not available in version 2.1.214 |
|
| 374 |
"system_user", |
|
| 375 |
"systime", // keyword not available in version 2.1.214 |
|
| 376 |
"systimestamp", // keyword not available in version 2.1.214 |
|
| 343 | 377 |
"table", |
| 344 |
"today", |
|
| 378 |
"to", |
|
| 379 |
"top", |
|
| 380 |
"today", // keyword not available version 2.1.214 |
|
| 381 |
"trailing", |
|
| 345 | 382 |
"true", |
| 383 |
"uescape", |
|
| 346 | 384 |
"union", |
| 347 | 385 |
"unique", |
| 348 | 386 |
"unknown", |
| 387 |
"user", |
|
| 349 | 388 |
"using", |
| 389 |
"value", |
|
| 350 | 390 |
"values", |
| 391 |
"when", |
|
| 351 | 392 |
"where", |
| 352 | 393 |
"window", |
| 353 | 394 |
"with", |
| 395 |
"year", |
|
| 354 | 396 |
"_rowid_" |
| 355 | 397 |
}; |
| 356 | 398 |
|
| new/src/com/goldencode/p2j/persist/hql/DataTypeHelper.java 2022-08-19 08:57:38 +0000 | ||
|---|---|---|
| 96 | 96 |
import java.math.*; |
| 97 | 97 |
import java.sql.*; |
| 98 | 98 |
import java.sql.Date; |
| 99 |
import java.sql.ResultSet; |
|
| 100 | 99 |
import java.sql.Timestamp; |
| 101 | 100 |
import java.util.*; |
| 102 | 101 |
import com.goldencode.ast.*; |
| 103 | 102 |
import com.goldencode.p2j.persist.*; |
| 104 | 103 |
import com.goldencode.p2j.persist.pl.*; |
| 105 | 104 |
import com.goldencode.p2j.util.*; |
| 106 |
import org.h2.api.*;
|
|
| 105 |
import org.h2.value.ValueTimeTimeZone;
|
|
| 107 | 106 | |
| 108 | 107 |
/** |
| 109 | 108 |
* A helper to manage data types of objects referenced by HQL statements |
| ... | ... | |
| 500 | 499 |
classes.put(BigDecimal.class , FqlType.DECIMAL); |
| 501 | 500 |
classes.put(Date.class , FqlType.DATE); |
| 502 | 501 |
classes.put(Timestamp.class , FqlType.DATETIME); |
| 503 |
classes.put(TimestampWithTimeZone.class, FqlType.DATETIMETZ); |
|
| 502 |
//classes.put(TimestampWithTimeZone.class, FqlType.DATETIMETZ); |
|
| 503 |
classes.put(ValueTimeTimeZone.class, FqlType.DATETIMETZ); |
|
| 504 | 504 |
classes.put(String[].class , FqlType.ARRAY); |
| 505 | 505 |
//classes.put(Object[].class , HQLTypes.DATETIMETZ); // datetimetz is represented by a 2-uple (Timestamp, Offset) |
| 506 | 506 |
|
| new/src/com/goldencode/p2j/report/ReportWorker.java 2022-09-07 11:36:14 +0000 | ||
|---|---|---|
| 984 | 984 |
+ "/rptdb/rptdb;" |
| 985 | 985 |
+ "DB_CLOSE_DELAY=-1;" |
| 986 | 986 |
+ "AUTOCOMMIT=OFF;" |
| 987 |
+ "LOCK_MODE=3;" |
|
| 988 |
+ "MV_STORE=FALSE;"; |
|
| 987 |
+ "LOCK_MODE=3;"; |
|
| 989 | 988 |
|
| 990 | 989 |
if (cacheSize > -1) |
| 991 | 990 |
{
|
| new/src/com/goldencode/p2j/report/server/DatabaseService.java 2022-09-07 11:36:18 +0000 | ||
|---|---|---|
| 126 | 126 |
+ "DB_CLOSE_ON_EXIT=FALSE;" |
| 127 | 127 |
+ "AUTOCOMMIT=OFF;" |
| 128 | 128 |
+ "DEFAULT_LOCK_TIMEOUT=10000;" |
| 129 |
+ "LOCK_MODE=3;" |
|
| 130 |
+ "MV_STORE=FALSE"; |
|
| 129 |
+ "LOCK_MODE=3;"; |
|
| 131 | 130 |
if (cacheSize > -1) |
| 132 | 131 |
{
|
| 133 | 132 |
url += (";CACHE_SIZE=" + cacheSize);
|