diff --git a/h2/src/docsrc/help/information_schema.csv b/h2/src/docsrc/help/information_schema.csv index fc47ab89b4..e6c5d46d9f 100644 --- a/h2/src/docsrc/help/information_schema.csv +++ b/h2/src/docsrc/help/information_schema.csv @@ -1,4 +1,4 @@ -# Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0, +# Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0, # and the EPL 1.0 (https://h2database.com/html/license.html). # Initial Developer: H2 Group @@ -523,6 +523,13 @@ The name of the field of the row value. The type of the index ('PRIMARY KEY', 'UNIQUE INDEX', 'SPATIAL INDEX', etc.) " +"INDEXES","NULLS_DISTINCT"," +'YES' for unique indexes with distinct null values, +'NO' for unique indexes with not distinct null values, +'ALL' for multi-column unique indexes where only rows with null values in all unique columns are distinct, +NULL for other types of indexes. +" + "INDEXES","IS_GENERATED"," Whether index is generated by a constraint and belongs to it. " @@ -760,11 +767,11 @@ The initial start value. " "SEQUENCES","MINIMUM_VALUE"," -The maximum value. +The minimum value. " "SEQUENCES","MAXIMUM_VALUE"," -The minimum value. +The maximum value. " "SEQUENCES","INCREMENT"," @@ -925,6 +932,13 @@ For regular tables contains the total number of rows including the uncommitted r referencing tables and 'NO' when they are disabled. " +"TABLE_CONSTRAINTS","NULLS_DISTINCT"," +'YES' for unique constraints with distinct null values, +'NO' for unique constraints with not distinct null values, +'ALL' for multi-column unique constraints where only rows with null values in all unique columns are distinct, +NULL for other types of constraints. +" + "TABLE_PRIVILEGES","WITH_HIERARCHY"," 'NO'. " diff --git a/h2/src/docsrc/html/advanced.html b/h2/src/docsrc/html/advanced.html index f5189b37e1..c03bd89fef 100644 --- a/h2/src/docsrc/html/advanced.html +++ b/h2/src/docsrc/html/advanced.html @@ -1,6 +1,6 @@ @@ -453,14 +453,17 @@

Keywords / Reserved Words

- - - - - - - - + + + + + + + + + + + @@ -526,8 +529,6 @@

Keywords / Reserved Words

- - @@ -554,8 +555,6 @@

Keywords / Reserved Words

- - @@ -571,13 +570,13 @@

Keywords / Reserved Words

- + - + @@ -635,13 +634,13 @@

Keywords / Reserved Words

- + - + @@ -671,15 +670,30 @@

Keywords / Reserved Words

Keyword	H2	SQL:2016	SQL:2011	SQL:2008	SQL:2003	SQL:1999	SQL-92	Keyword	H2
2016	2011	2008	2003	1999	92			Keyword	H2
+	+	+	+	+	+	+
FETCH	+	+	+	+	+	+	+
FILTER	CS	+	+	+	+
FOR	+	+	+	+	+	+	+
FOREIGN	+	+	+	+	+	+	+
INTERSECT	+	+	+	+	+	+	+
INTERSECTS	+
INTERVAL	+	+	+	+	+	+	+
IS
LIKE	+	+	+	+	+	+	+
LIMIT	+					+
MS					+
LOCALTIME	+	+	+	+	+	+
LOCALTIMESTAMP	+	+	+	+	+	+
MINUS	+
MS
MINUTE	+	+	+	+	+	+	+
MONTH
TO	+	+	+	+	+	+	+
TOP	CS
MS CS
TRAILING	CS	+	+	+	+	+	+
TRUE	+	+	+	+	+	+	+
UESCAPE	+			+	+	+	+
+	+	+	+	+
UNION	+	+	+	+	+	+	+
UNIQUE

-Some keywords in H2 are context-sensitive (CS), such keywords may be used as identifiers in some places, +Mode-sensitive keywords (MS) are keywords only in some compatibility modes. +

LIMIT is a keywords only in Regular, Legacy, DB2, HSQLDB, MariaDB, MySQL, and PostgreSQL compatibility modes. +It is an identifier in Strict, Derby, MSSQLServer, and Oracle compatibility modes. +
MINUS is a keyword only in Regular, Legacy, DB2, HSQLDB, and Oracle compatibility modes. +It is an identifier in Strict, Derby, MSSQLServer, MariaDB, MySQL, and PostgreSQL compatibility modes. +
TOP is a context-sensitive keyword (can be either keyword or identifier) +only in Regular, Legacy, HSQLDB, and MSSQLServer compatibility modes. +It is an identifier unconditionally in Strict, Derby, DB2, MariaDB, MySQL, Oracle, and PostgreSQL compatibility modes. +

+Context-sensitive keywords (CS) can be used as identifiers in some places, but cannot be used as identifiers in others. +Normal keywords (+) are always treated as keywords. +

Most keywords in H2 are also reserved (+) or non-reserved (NR) words in the SQL Standard. Newer versions of H2 may have more keywords than older ones. +Reserved words from the SQL Standard are potential candidates for keywords in future versions.

There is a compatibility setting SET NON_KEYWORDS -that can be used as a temporary workaround for applications that use keywords as unquoted identifiers.

. +that can be used as a temporary workaround for applications that use keywords as unquoted identifiers.

Standards Compliance

@@ -1354,9 +1368,10 @@

Protection against Remote Access

If you enable remote access using -webAllowOthers, please ensure the web server can only be accessed from trusted networks. +If this option is specified, -webExternalNames should be also specified with +comma-separated list of external names or addresses of this server. The options -baseDir don't protect -access to the tools section, prevent remote shutdown of the web server, -changes to the preferences, the saved connection settings, +access to the saved connection settings, or access to other databases accessible from the system.

@@ -1796,9 +1811,9 @@

Limits and Limitations

The actual possible number can be smaller if their definitions are too long.

The maximum length of an identifier (table name, column name, and so on) is 256 characters.

The maximum length of CHARACTER, CHARACTER VARYING and VARCHAR_IGNORECASE values and columns -is 1048576 characters. +is 1_000_000_000 characters.

The maximum length of BINARY, BINARY VARYING, JAVA_OBJECT, GEOMETRY, and JSON values and columns -is 1048576 bytes. +is 1_000_000_000 bytes.

The maximum precision of NUMERIC and DECFLOAT values and columns is 100000.

The maximum length of an ENUM value is 1048576 characters, the maximum number of ENUM values is 65536.

The maximum cardinality of an ARRAY value or column is 65536. diff --git a/h2/src/docsrc/html/architecture.html b/h2/src/docsrc/html/architecture.html index a7603e81c3..d01ba072d7 100644 --- a/h2/src/docsrc/html/architecture.html +++ b/h2/src/docsrc/html/architecture.html @@ -1,6 +1,6 @@ @@ -50,6 +50,7 @@

Introduction

Top-down Overview

Working from the top down, the layers look like this: +

JDBC driver.
Connection/session management.
SQL Parser. @@ -59,7 +60,6 @@
Top-down Overview
B-tree engine and page-based storage allocation.
Filesystem abstraction.

JDBC Driver

@@ -69,6 +69,7 @@

JDBC Driver

Connection/session management

The primary classes of interest are: +

@@ -79,7 +80,6 @@

Connection/session management

Package	Description
org.h2.engine.Database	the root/global class
org.h2.engine.SessionRemote	remote session

Parser

@@ -95,14 +95,15 @@

Command execution and planning

Unlike other databases, we do not have an intermediate step where we generate some kind of IR (intermediate representation) of the query. The parser class directly generates a command execution object. Then we run some optimisation steps over the command to possibly generate a more efficient command. - +

The primary packages of interest are: +

Package	Description
org.h2.command.ddl	Commands that modify schema data structures
org.h2.command.dml	Commands that modify data

Table/Index/Constraints

@@ -110,12 +111,12 @@

Table/Index/Constraints

The primary packages of interest are: +

Package	Description
org.h2.table	Implementations of different kinds of tables
org.h2.index	Implementations of different kinds of indices

Undo log, redo log, and transactions layer

diff --git a/h2/src/docsrc/html/build.html b/h2/src/docsrc/html/build.html index b09c398506..9e7904423f 100644 --- a/h2/src/docsrc/html/build.html +++ b/h2/src/docsrc/html/build.html @@ -1,6 +1,6 @@ @@ -27,6 +27,8 @@

Build

Building the Software
Using Maven 2
+ + Native Image
Using Eclipse
@@ -48,6 +50,8 @@

Portability

Environment

To run this database, a Java Runtime Environment (JRE) version 8 or higher is required. +It it also possible to compile a standalone executable with +experimental native image build.

To create the database executables, the following software stack was used. @@ -148,6 +152,34 @@

Using Snapshot Version

</dependency> +

Native Image

+ +

+There is an experimental support for compilation of native executables with native-image tool. +To build an executable with H2 install GraalVM and use its updater to get the native-image tool: +

+gu install native-image
+

+This tool can be used for compilation of native executables: +

+native-image --no-fallback -jar h2-VERSION.jar h2
+

+ +

Known limitations:

+If --no-fallback parameter was specified, system tray icon may not appear +even if -Djava.awt.headless=false parameter of native-image tool was used, +because native-image doesn't add all necessary configuration for working GUI. +
+If --no-fallback parameter was specified, +user-defined functions and triggers need an additional configuration. +
+JAVA_OBJECT data type wasn't tested and may not work at all. +
+Third-party loggers, ICU4J collators, and fulltext search weren't tested. +

Using Eclipse

To create an Eclipse project for H2, use the following steps: diff --git a/h2/src/docsrc/html/changelog.html b/h2/src/docsrc/html/changelog.html index 32fb19a0a2..916d76e740 100644 --- a/h2/src/docsrc/html/changelog.html +++ b/h2/src/docsrc/html/changelog.html @@ -1,6 +1,6 @@ @@ -25,1221 +25,354 @@

Next Version (unreleased)

Version 2.0.204 (2021-12-21)

Issue #3291: Add Legacy and Strict modes -
Issue #3287: SELECT statement works on 1.4.200 but fails on 2.0.202 with "Column XYZ must be in the GROUP BY list" -
PR #3284: Remove unused UNDO_LOG setting -
Issue #3251: Table with GEOMETRY column can't have a TriggerAdapter-based trigger any more -
PR #3281: DateTimeFormatter-based FORMATDATETIME and PARSEDATETIME and other changes -
Issue #3246: Spatial predicates with comparison are broken in MySQL compatibility mode -
Issue #3270: org.h2.jdbc.JdbcSQLFeatureNotSupportedException: Feature not supported: "Unsafe comparison or cast" -
Issue #3268 / PR #3275: Add TO_DATE and TO_TIMESTAMP to PostgreSQL compatibility mode -
PR #3274: Remove some dead code and unused params -
Issue #3266: Oracle compatibility NUMBER without precision and scale should have variable scale -
Issue #3263: Unable to store BigDecimal with negative scale in NUMERIC(19,6) column -
PR #3261: Small optimization for MIN and MAX -
Issue #3258 / PR #3259: Prevent incorrect optimization of COUNT(*) and other changes -
PR #3255: Throw proper exception when type of argument isn't known -
Issue #3249: Multi-column assignment with subquery throws exception when subquery doesn't return any rows -
PR #3248: Remove redundant uniqueness check, correct version in pom -
PR #3247: Avoid AIOBE exception in TestCrashAPI and in Transaction -
Issue #3241: ResultSetMetaData::getColumnTypeName should produce the correct ARRAY type -
Issue #3204: H2 Tools Web Console: Unicode 32 -
Issue #3227: Regression when referencing outer joined column from correlated subquery -
Issue #3237: Can no longer cast CHAR(n) to BOOLEAN with n > 1 -
Issue #3235: Regression in IN predicate with empty in list -
Issue #3236: NullPointerException in DatabaseMetaData::getIndexInfo when querying the info for views -
Issue #3233: General error when using NULL predicate on _ROWID_ column -
Issue #3223: TRUNC(v, p) with negative precisions no longer works -
Issue #3221: NullPointerException when creating domain -
Issue #3186: ResultSetMetaData.getSchemaName() returns empty string for aliased columns -

- -

Version 2.0.202 (2021-11-25)

Version 2.2.220 (2023-07-04)

Issue #3206: CVE Vulnerability CVE-2018-14335 -
Issue #3174: Add keyword AUTOCOMMIT on create linked table to control the commit mode -
Issue #3130: Precision of NUMERIC values isn't verified in the Oracle compatibility mode -
Issue #3122: Documentation: Syntax diagram for RENAME CONSTRAINT incorrect -
PR #3129: remove LOB compression -
PR #3127: Cleanups post PageStore removal -
PR #3126: Change nested classes to static nested classes where possible -
PR #3125: Strongly typed LobStorageMap -
PR #3124: Remove PageStore engine -
Issue #3118: SHUTDOWN COMPACT causes 2PC to corrupt database in a simulated crash -
Issue #3115: Infinite loop then OOM in org.h2.mvstore.tx.Transaction.waitFor() when deadlock occurs -
Issue #3113: Data lost when 2 threads read/write TransactionStore and close it normally even if MVStore autoCommit -disabled -
PR #3110: Fix possible int overflow and minor doc change -
Issue #3036: A database that contains BLOBs might grow without being able to be compacted -
Issue #3097: Possible MVStore compaction issue -
PR #3096: Add separate LOB data layer for values -
Issue #3093: ROWNUM filter doesn't work with more than one table -
PR #3087: Add "CONVERT TO CHARACTER SET" to compatibility modes -
Issue #3080: Complex Query returns different results depending on the number of arguments in the IN clause -
Issue #3066: Very high DB opening/closing times -
PR #3077: Add CREATE UNIQUE INDEX ... INCLUDE -
Issue #3061 / PR #3074: GROUP BY using column index for MySQL/MariaDB/PostgreSQL compatibility modes -
PR #3067: Restrict identity data types and result limitation clauses to compatibility modes -
PR #3065: Remove duplicate method IOUtils.getBufferedReader -
Issue #3055: Phantom table leftover after INSERT .. WITH -
PR #3062: Add ALTER DOMAIN RENAME CONSTRAINT command -
Issue #3059: ALTER TABLE DROP CONSTRAINT doesn't check owner of constraint -
Issue #3054: Add binary set aggregate functions -
Issue #3049: Java value getters of ValueNull should throw exceptions -
Issue #3046: SYSTEM_RANGE can't handle bind variable as step size and produces wrong error message -
Issue #3033: NPE during BLOB read after 2PC rollback -
PR #3034: Don't evaluate ValueTimestampTimeZone at begin and end of each command -
PR #3029: Optimize row storage in MVStore and other changes -
PR #3028: Remove back compatibility -
PR #3025: Switch from Travis CI to GitHub Workflows -
PR #3024: Add initial version of upgrade utility -
Issue #3017: ROUND() does not set correct precision and scale of result -
Issue #3003: CREATE TABLE ... AS SELECT ... FROM creates invalid column definition when aggregate functions are used -
Issue #3008: TestCrashAPI: Exception in Arrays.sort() called by LocalResult.done() -
Issue #3006 / PR #3007: Unlock meta during query execution in CREATE TABLE AS query -
PR #3001: PostgreSQL compatibility: UPDATE with FROM -
PR #2998: Fix off-by-one error with -webAdminPassword in Server -
PR #2995: Add FETCH_SIZE clause to CREATE LINKED TABLE -
Issue #2907 / PR #2994: Prevent "Chunk not found" on LOB operations -
PR #2993: Update copyright years -
Issue #2991: TestCrashAPI: NPE in ScriptCommand.dumpDomains() -
Issue #2950 / PR #2987: Issue commit() right before "non-transactional" DDL command starts -
PR #2980: Assorted minor changes -
PR #2966: H2 2.0.201: Linked Tables freeze the Database and freeze the Server Process -
Issue #2972: Memory leak due to negative Page memory in the MVStore -
PR #2971: create skeleton of migration to V2 document -
Issue #2967: MVStore: averageSize int overflow in the class ObjectDataType -
Issue #2963: Syntax error for large hexadecimal constants with DATABASE_TO_UPPER=false -
Issue #2961: Accept CREATE PRIMARY KEY only in metadata or in quirks mode -
Issue #2960: Reject invalid CREATE { UNIQUE | HASH } SPATIAL INDEX -
Issue #2958: TableLink is broken for Oracle database after pull request #2903 -
PR #2955: Prevent incorrect index sorting -
PR #2951: Add documentation for INFORMATION_SCHEMA -
PR #2943: some small prep for next release -
PR #2948: Add support of Infinity, -Infinity, and NaN to DECFLOAT data type -
Issue #2947: Encoding of Unicode and special characters in error messages -
Issue #2891: Fix import of unnamed referential constraints from SQL scripts generated by older versions of H2 -
Issue #2812: Unexpected result for query that compares an integer with a string -
Issue #2936: Add data type conversion code from datetime and UUID values to JSON -
Issue #2935: ENUM ARRAY isn't read properly from persisted data -
Issue #2923: Combination of fileName() with fileStore() should throw an exception -
Issue #2928: JSON_ARRAYAGG and all NULL values -
PR #2918: Removal of unnecessary lock -
Issue #2911: org.h2.mvstore.MVStoreException: Transaction was illegally transitioned from ROLLING_BACK to -ROLLED_BACK -
Issue #1022: JdbcDatabaseMetaData.getPseudoColumns() should be implemented -
Issue #2914: (T1.A = T2.B) OR (T1.A = T2.C) should be optimized to T1.A IN(T2.B, T2.C) to allow index conditions -
PR #2903: Assorted changes -
Issue #2901: PgServer returns less rows when fetchSize is set -
Issue #2894: NPE in DROP SCHEMA when unique constraint is removed before linked referential constraint -
Issue #2888: H2 should pass time zone of client to the server -
PR #2890: Fixed possible eternal wait(0) -
Issue #2846: GRANT SELECT, INSERT, UPDATE, DELETE incorrectly gives privileges to drop a table -
Issue #2882: NPE in UPDATE with SELECT UNION -
PR #2881: Store users and roles together and user-defined functions and aggregates together -
Issue #2878: Disallow spatial indexes in PageStore databases -
PR #2874: Use 64-bit row counts in results and other changes -
Issue #2866: New INFORMATION_SCHEMA should not use keywords as column names -
Issue #2867: PageStore + Lazy + INSERT ... SELECT cause infinite loop -
PR #2869: Normalize binary geometry literals and improve EWKB representation of POLYGON EMPTY -
Issue #2860: CHAR columns in PgCatalogTable have incorrect length -
Issue #2848: Add support for standard <listagg overflow clause> -
Issue #2858: Throw 22001 on attempt to use getString() or getBytes() on LOB object longer than 1,048,576 -chars/octets -
Issue #2854: Define limits for identifiers, number of columns, etc. -
PR #2853: Small optimization for Page compression / decompression -
Issue #2832: Define length limits for non-LOB data types -
Issue #2842: Querying view that uses LTRIM/RTRIM results in a syntax error -
Issue #2841: Call to STRINGDECODE results in StringIndexOutOfBoundsException -
Issue #2839: Querying a view that uses the POSITION() function results in an unexpected syntax error -
Issue #2838: INSERT() with NULL arguments for the original string and string to be added results in NPE -
Issue #2837: ROUND() function should reject invalid number of digits immediately -
Issue #2835: Calling math functions with a string argument results in a NullPointerException -
Issue #2833: MERGE INTO causes an unexpected syntax error -
Issue #2831: Restore YEAR data type for MySQL compatibility mode -
Issue #2822: Suspicious logic in Database.closeImpl() -
Issue #2829: Incorrect manifest entries in sources jar -
Issue #2828: Parser can't parse NOT in simple when operand -
Issue #2826: Table with a generated column cycle results in a NullPointerException -
Issue #2825: Query with % operator results in a ClassCastException -
Issue #2818: TableFilter.getValue() can read value of delegated column faster -
Issue #2816: Query on view that uses the BETWEEN operator results in an unexpected syntax error -
PR #2815: Remove BINARY_COLLATION and UUID_COLLATION settings -
Issue #2813: Query with CASE operator unexpectedly results in "Column must be in the GROUP BY list" error -
Issue #2811: Update build numbers and data format versions -
Issue #2674: OPTIMIZE_IN_SELECT shouldn't convert value to incompatible data types -
Issue #2803: Disallow comparison operations between incomparable data types -
Issue #2561: Separate normal functions and table value functions -
Issue #2804: NPE in ConditionNot.getNotIfPossible() -
Issue #2801: Instances of TableView objects leaking -
PR #2799: Additional bit functions BITNAND, BITNOR, BITXNOR, BITCOUNT, ULSHIFT, URSHIFT, ROTATELEFT, ROTATERIGHT, -BIT_NAND_AGG, BIT_NOR_AGG, and BIT_XNOR_AGG. -
PR #2798: Complete separation of Function class -
Issue #2795: Sporadic issues with trigger during concurrent insert in 1.4.199/1.4.200 -
PR #2796: Assorted refactorings -
Issue #2786: Failure in CREATE TABLE AS leaves inconsistent transaction if some rows were successfully inserted -
Issue #2790: Examples in documentation of CREATE ALIAS should use standard literals only -
Issue #2787: CONCAT and CONCAT_WS functions -
PR #2784: Oracle REGEXP_REPLACE support -
Issue #2780: Remove SCOPE_GENERATED_KEYS setting -
PR #2779: Fix incorrect FK restrictions and other changes -
PR #2778: Assorted changes -
Issue #2776: Referential constraint can create a unique constraint in the wrong schema -
Issue #2771: Add documented DEFAULT ON NULL flag for all types of columns -
Issue #2742 / PR #2768: Better separation of MVStore aimed at smaller h2-mvstore jar -
Issue #2764: Identity columns don't accept large numbers -
IDENTITY() function is removed, SCOPE_IDENTITY() is now available only in MSSQLServer compatibility mode. -
Issue #2757: Intermittent TestFileSystem failures -
Issue #2758: Issues with sequences -
PR #2756: Prevent DROP NOT NULL for identity columns -
Issue #2753: UPDATE statement changes value of GENERATED ALWAYS AS IDENTITY columns -
PR #2751: Add comment explaining seemingly dummy operation -
PR #2750: Use RFC 4122 compliant UUID comparison by default -
PR #2748: PgServer set type text to NULL value -
Issue #2746: Old TCP clients with current server -
PR #2745: PgServer can send bool in binary mode -
PR #2744: Remove jarSmall and jarClient targets -
PR #2743: Add IS_TRIGGER_UPDATABLE and other similar fields to INFORMATION_SCHEMA -
PR #2738: Fix VIEWS.VIEW_DEFINITION and support it for other databases in H2 Console -
PR #2737: Assorted changes -
PR #2734: Update dependencies and fix ResultSetMetaData.isSigned() -
PR #2733: Replace h2.sortNullsHigh with DEFAULT_NULL_ORDERING setting -
PR #2731: Fix spelling errors in German translation -
PR #2728: Add and use DATA_TYPE_SQL() function and remove INFORMATION_SCHEMA.PARAMETERS.REMARKS -
Issue #1015: ENUM and arithmetic operators -
Issue #2711: Store normalized names of data types in metadata -
PR #2722: Implement getRowCount() for some INFORMATION_SCHEMA tables -
PR #2721: Improve LOCKS, SESSIONS, and USERS and optimize COUNT(*) on other isolation levels in some cases -
Issue #2655: TestCrashAPI: AssertionError at MVPrimaryIndex.<init> -
Issue #2716: Fix URL of Maven repository -
Issue #2715: Mention `DB_CLOSE_DELAY=-1` flag in JDBC URL on the "Cheat Sheet" page -
PR #2714: fixed few code smells discovered by PVS-Studio -
Issue #2712: `NOT LIKE` to a sub-query doesn't work -
PR #2710: PgServer: set oid and attnum in RowDescription -
Issue #2254: Add standard DECFLOAT data type -
PR #2708: Add declared data type attributes to the INFORMATION_SCHEMA -
Issue #2706: Empty comments / remarks on objects -
PR #2705: Return standard-compliant DATA_TYPE for strings -
PR #2703: Fix case-insensitive comparison issues with national characters -
Issue #2701: Subquery with FETCH should not accept global conditions -
Issue #2699: Remove FUNCTIONS_IN_SCHEMA setting -
Issue #452: Add possibility to use user-defined aggregate functions with schema -
PR #2695: Refactor handling of parentheses in getSQL() methods -
PR #2693: disallow VARCHAR_IGNORECASE in PostgreSQL mode -
Issue #2407: Implement CHAR whitespace handling correctly -
PR #2685: Check existing data in ALTER DOMAIN ADD CONSTRAINT -
PR #2683: Fix data types in Transfer -
PR #2681: Report user functions in standard ROUTINES and PARAMETERS views -
PR #2680: Reimplement remaining DatabaseMetaData methods and fix precision of binary numeric types -
PR #2679: Reimplement getTables(), getTableTypes(), and getColumns() -
PR #2678: Reimplement getPrimaryKeys(), getBestRowIdentifier(), getIndexInfo() and others -
PR #2675: Reimplement getImportedKeys(), getExportedKeys(), and getCrossReferences() -
PR #2673: Reimplement some metadata methods -
PR #2672: Forward DatabaseMetaData calls to server -
Issue #2329: Content of INFORMATION_SCHEMA should be listed as VIEWS -
PR #2668: Sequence generator data type option and length parameter for JSON data type -
PR #2666: Add ALTER DOMAIN RENAME command -
PR #2663: Add ALTER DOMAIN { SET | DROP } { DEFAULT | ON UPDATE } -
PR #2661: Don't allow construction of incomplete ARRAY and ROW data types -
Issue #2659: NULLIF with row values -
PR #2658: Extract date-time and some other groups of functions into own classes -
PR #2656: add `_int2` and `_int4` for PgServer -
PR #2654: Move out JSON, cardinality, ABS, MOD, FLOOR, and CEIL functions from the Function class -
PR #2653: Use full TypeInfo for conversions between PG and H2 data types -
PR #2652: Add "SHOW ALL" -
PR #2651: add `pg_type.typelem` and `pg_type.typdelim` -
PR #2649: Extract some groups of functions from Function class -
PR #2646: Add some PostgreSQL compatibility features -
PR #2645: Add CURRENT_PATH, CURRENT_ROLE, SESSION_USER, and SYSTEM_USER -
Issue #2643: Send PG_TYPE_TEXTARRAY values to ODBC drivers properly -
PR #2642: Throw proper exceptions from array element reference and TRIM_ARRAY -
PR #2640: German translations -
Issue #2108: Add possible candidates in different case to table not found exception -
Issue #2633: Multi-column UPDATE assignment needs to be reimplemented +
PR #3834: Increase database format version
PR #2635: Implement REGEXP_SUBSTR function +
PR #3833: Disallow plain webAdminPassword values to force usage of hashes
PR #2632: Improve ROW data type +
PR #3831: Add Oracle-style NOWAIT, WAIT n, and SKIP LOCKED to FOR UPDATE clause
PR #2630: fix: quoted VALUE in documentation +
PR #3830: Fix time zone of time/timestamp with time zone AT LOCAL
Issue #2628: Cached SQL throws JdbcSQLSyntaxErrorException if executed with different parameter values than before +
PR #3822 / Issue #2671: Add quantified comparison predicates with array
Issue #2611: Add quantified distinct predicate +
PR #3820: Add partial implementation of JSON simplified accessor
Issue #2620: LOBs in triggers +
PR #3818: Add support of underscores in numeric literals
PR #2619: ARRAY_MAX_CARDINALITY and TRIM_ARRAY functions +
PR #3817: Add ANY_VALUE() aggregate function
PR #2617: Add Feature F262: Extended CASE expression +
PR #3814: Fix regression in comparisons with infinities and NaNs
PR #2615: Add feature T461: Symmetric BETWEEN predicate +
Issue #3040: System objectIds are recycled twice when CTE queries are executed.
PR #2614: Fix support of multi-dimensional arrays in Java functions +
PR #3812: UNIQUE null treatment
Issue #2608: Improve concatenation operation for multiple operands +
PR #3811: BTRIM function, octal and binary literals and other changes
PR #2605: Assorted minor changes +
Issue #352: In comparison text values are converted to INT even when they should be converted to BIGINT
Issue #2602: H2 doesn't allow to create trigger from Java source code if there are nested classes +
PR #3797: MSSQL mode: Discard table hints on plain UPDATE statements
PR #2601: Add field SLEEP_SINCE to INFORMATION_SCHEMA.SESSIONS table +
PR #3791: Formatted cast of datetimes to/from character strings
Issue #1973: Standard MERGE statement doesn't work with views +
Issue #3785: CSVRead: Fails to translate empty Numbers, when cells are quoted
Issue #2552: MERGE statement should process each row only once +
Issue #3762: Comparison predicates with row values don't create index conditions
Issue #2548: Wrong update count when MERGE statement visits matched rows more than once +
PR #3761: LAST_DAY function and other changes
Issue #2394: H2 does not accept DCL after source merge table +
Issue #3705: Oracle DATE type: milliseconds (second fractions) rounded in H2 but truncated in Oracle (fixed in SYSDATE only)
Issue #2196: Standard MERGE statement doesn't release the source view +
Issue #3642: AssertionError in mvstore.FileStore.serializeAndStore
Issue #2567: ARRAY-returning Java functions don't return the proper data type +
Issue #3675: H2 2.x cannot read PostgreSQL-style sequence generator start with option without WITH keyword
Issue #2584: Regression in NULL handling in multiple AND or OR conditions +
Issue #3757: FORMATDATETIME function doesn't handle time with time zone properly
PR #2577: PgServer: `array_to_string()` and `set join_collapse_limit` +
PR #3756: Limit the row list allocation based on the row count
PR #2568: Add BIT_XOR_AGG aggregate function +
PR #3753: Add missing NEWSEQUENTIALID function in MSSQLServer mode
PR #2565: Assorted minor changes +
Issue #3730: FILE_READ from JAR filesystem on classpath results in file of length 0
PR #2563: defrag is not contributing much, remove from test run +
PR #3749: Fix min/max description for sequences
PR #2562: new exception MVStoreException +
PR #3739: Fix count(*) for linked table to Oracle
PR #2557: don't throw IllegalStateException in checkOpen +
Issue #3731: Division result exceeds numeric precision constraint
PR #2554: Reenable mvstore TestCrashAPI +
PR #3718: Add test coverage for JDK 17
Issue #2556: TestOutOfMemory: Table "STUFF" not found +
Issue #3580: TestCrashAPI: NPE in ParserUtil.getTokenType() (called by Parser.readIfDataType1())
PR #2555: Move current datetime value functions into own class +
PR #3709: Update copyright years and fix building of documentation
PR #2547: split up the ValueLob classes +
Issue #3701: CLOBs can cause ClassCastExceptions
PR #2542: Pipelining mvstore chunk creation / save +
Issue #3698: MySQL mode show columns from table, if modificationMetaId changed between prepared and execute. +Then error occurred.
Issue #2550: NullPointerException with MERGE containing unknown column in AND condition of WHEN +
PR #3699: Upgrade to the latest OSGi JDBC specification
Issue #2546: Disallow empty CASE specifications and END CASE +
Issue #3659: User-defined variable "sticky" if used in view with join
Issue #2530: Long query with many AND expressions causes StackOverflowError +
Issue #3693: Wrong result when intersecting unnested arrays
PR #2543: Improve case specification support and fix some issues with it +
PR #3691: GitHub Workflows security hardening
Issue #2539: Replace non-standard functions with standard code directly in Parser +
PR #3688: Construct FormatTokenEnum.TOKENS during class initialization
Issue #2521: Disallow untyped arrays +
Issue #3682: MVStoreException at accountForRemovedPage
Issue #2532: Duplicate column names in derived table should be acceptable in the presence of a derived column list -that removes ambiguities +
Issue #3664: [2.1.214] NullPointerException in org.h2.command.query.Select.queryDistinct
PR #2527: Feature: allow @ meta commands from Console +
PR #3650: fix version number in the archives html table
PR #2526: Reduce I/O during database presence check and restrict some compatibility settings to their modes +
PR #3649: Basic implementation of materialized view
PR #2525: Restore support of third-party drivers in the Shell tool +
Issue #3646: org.h2.mvstore.MVStoreException: Chunk metadata too long
Issue #1710: getHigherType() returns incorrect type for some arguments +
Issue #3645: The BITCOUNT function incorrectly counts BINARY/VARBINARY values of >=16 bytes.
PR #2516: SHUTDOWN IMMEDIATELY should be a normal shut down +
Issue #3637: DB content massacred when opening a 2.1.214 DB with current master
PR #2515: Fix nested comments in ScriptReader +
Issue #3636: "This store is closed" after two-phase commit
Issue #2511: Restrict Oracle compatibility functions to Oracle compatibility mode +
PR #3639: Add random_uuid() alias to be compatible with postgres
PR #2508: Minor refactoring around Tx isolation level +
Issue #3640: SOUNDEX function should not be case-sensitive
PR #2505: Assorted changes in DATEADD, DATEDIFF, DATE_TRUNC, and EXTRACT +
Issue #3633: Memory leak in case of in-memory database
Issue #2502: Combination of DML with data change delta table skips subsequent update +
PR #3629 Better separation between MVStore and FileStore
PR #2499: Performance fix for PageStore under concurrent load +
PR #3626: Improve memory estimation of CacheLongKeyLIRS and correct some passed memory sizes
PR #2498: Add some PostgreSQL compatibility features mentioned in issue #2450 +
Issue #3619: PostgreSQL mode: STRING_AGG with prepared statement parameter not working
Issue #2496: Error when using empty JSON_OBJECT() or JSON_ARRAY() functions +
Issue #3615: H2 Console connecting to Oracle DB will not show the list of tables
PR #2495: Fix JSON_OBJECT grammar in documentation +
PR #3613: Fix infinite loop in Tokenizer when special whitespace character is used
Issue #2493 / PR #2494: Replace ColumnNamer with mode-specific generation of column names for views +
Issue #3606: Support for GraalVMs native-image
PR #2492: Assorted changes in parser, keywords, and ILIKE condition +
Issue #3607: [MySQL] UNIX_TIMESTAMP should return NULL
PR #2490: Replace pg_catalog.sql with PgCatalogTable and use DATABASE_TO_LOWER in PG Server +
Issue #3604: Improper FROM_1X implementation corrupts some BLOBs during migration
Issue #2488 / PR #2489: Mark version functions as not deterministic +
Issue #3597: Support array element assignments in UPDATE statements
Issue #2481: Convert TO to keyword +
Issue #3599: [2.1.214][MariaDB] DELETE query failure
PR #2476: Add some PostgreSQL compatibility features mentioned in issue #2450 +
Issue #3600: NPE in MVTable.lock(), version 2.1.214
PR #2479: Recognize absolute path on Windows without drive letter +
Issue #3601: InvalidPathException when saving lock file
Issue #2475: Select order by clause is exported with non-portable SQL +
Issue #3583: lob cleaner issue
Issue #2472: Updating column to empty string in Oracle mode with prepared statement does not result in null +
Issue #3585: Misuse ValueReal.DECIMAL_PRECISION when optimize typeinfo from DOUBLE to DECFLOAT
PR #2468: MVStore scalability improvements +
Issue #3575: Possible syntax mismatch for json_object in MySQL compatibility mode
PR #2466: Add partial support for MySQL COLLATE and CHARACTER statements +
PR #3577: Add support of TINYINT and DECFLOAT to TO_CHAR
Issue #2464: `client_encoding='utf-8'` (single quoted) from `node-postgres` not recognized +
Issue #3567: No AUTO_INCREMENT in DatabaseMetaData.getTypeInfo()
Issue #2461: Support for binary_float and binary_double type aliases +
PR #3555: Add missing check for -webExternalNames flag
Issue #2460: Exception when accessing empty arrays +
Issue #3543: PostgreSQL mode, update with "from", why "NULL not allowed" error?
Issue #2318: Remove incorrect rows from DatabaseMetaData.getTypeInfo() and INFORMATION_SCHEMA.TYPE_INFO -
Issue #2455: `bytea` column incorrectly read by `psycopg2` -
PR #2456: Add standard array value constructor by query -
PR #2451: Add some PostgreSQL compatibility features mentioned in issue #2450 -
Issue #2448: Change default data type name from DOUBLE to DOUBLE PRECISION -
PR #2452: Do not use unsafe and unnecessary FROM DUAL internally -
PR #2449: Add support for standard trigraphs -
Issue #2439: StringIndexOutOfBoundsException when using TO_CHAR -
Issue #2444: WHEN NOT MATCHED THEN INSERT should accept only one row -
Issue #2434: Next value expression should return the same value within a processed row -
PR #2437: Assorted changes in MVStore -
Issue #2430: Postgres `bytea` column should be read with and without `forceBinary` -
Issue #2267: BINARY and VARBINARY should be different -
Issue #2266: CHAR and BINARY should have length 1 by default -
PR #2426: Add MD5 and all SHA-1, SHA-2, and SHA-3 digests to the HASH() function -
Issue #2424: 0 should not be accepted as a length of data type -
Issue #2378: JAVA_OBJECT and TableLink -
Issue #2417: Casts between binary strings and non-string data types -
Issue #2416: OTHER and JAVA_OBJECT -
Issue #2379: SQL export can change data type of a constant -
Issue #2411: ArrayIndexOutOfBoundsException when HAVING and duplicate columns in SELECT -
Issue #2194: Add own enumeration of data types to API -
PR #2408: Descending MVMap and TransactionMap cursor -
Issue #2399: Cast to ARRAY with a nested ARRAY does not check the maximum cardinality of the nested ARRAY -
Issue #2402: Remove old ValueLob and DbUpgrade -
Issue #2400: Inconsistent data type conversion between strings and LOBs -
PR #2398: Add expandable flags for SQL generation methods -
PR #2395: Fix for two recent page format bugs -
PR #2386: Chunk occupancy mask -
PR #2385: Memory estimate -
PR #2381: Follow up REPEATABLE_READ-related changes -
PR #2380: use JIRA tracker URLs for JDK bugs -
PR #2376: Fix IN condition with row value expressions in its right side -
Issue #2367 / PR #2370: fix backward compatibility with 1.4.200 -
Issue #2371: REPEATABLE READ isolation level does not work in MVStore -
Issue #2363: Soft links in -baseDir and database path cause error 90028 -
Issue #2364: TestScript datatypes/timestamp-with-time-zone.sql fails if TZ=Europe/Berlin -
Issue #2359: Complete implementation of generated columns -
PR #2361: Fix unused result -
PR #2353: Push binary search operation from Page to DataType -
Issue #2348: Add USING clause to ALTER COLUMN CHANGE DATA TYPE -
Issue #2350: License Problem in POM -
Issue #2345: Add standard SET TIME ZONE command to set current time zone of the session -
PR #2341: Cleanup file backend sync -
Issue #2343: Domain-based domains: Domain not found after reconnection -
Issue #2338: Domains should not support NULL constraints -
Issue #2334: build target mavenInstallLocal broken since commit 7cbbd55e -
#2335: TestDateTimeUtils fails if system timezone has DST in the future -
Issue #2330: Syntax error with parenthesized expression in GROUP BY clause -
Issue #2256: <interval value expression> with datetime subtraction -
Issue #2325: H2 does not parse nested bracketed comments correctly -
Issue #466: Confusion about INFORMATION_SCHEMA content related to UNIQUE constraints -
PR #2323: Assorted changes -
Issue #2320: Remove SAMPLE_SIZE clause from SELECT -
Issue #2301: Add compatibility setting to accept some keywords as identifiers -
PR #2317: Replace CHECK_COLUMN_USAGE with CONSTRAINT_COLUMN_USAGE and other changes -
Issue #2315: Sequence must remember its original START WITH value -
Issue #2313: DISTINCT does not work in ordered aggregate functions -
PR #2306: Add support for RESTART of sequence without initial value -
Issue #2304: NPE in multiple define commands in one statement after upgrade from H2 4.1.197 -
PR #2303: Assorted minor changes -
Issue #2286: Inline check constraints not in INFORMATION_SCHEMA -
PR #2300: Continue generification of MVStore codebase -
PR #2298: add some minimal security documentation -
PR #2292: synchronize fileBase subclasses use of position -
PR #2238: Some MVStore refactoring -
Issue #2288: ConcurrentModificationException during commit -
Issue #2293: Remove TestClearReferences and workarounds for old versions of Apache Tomcat -
Issue #2288: ConcurrentModificationException during commit -
PR #2284: Remove unrelated information from README and add some information about H2 -
PR #2282: add PostgreSQL compatible variable STATEMENT_TIMEOUT -
PR #2280: little comment -
Issue #2205: H2 1.4.200 split FS issue -
Issue #2272: UpdatableView and obtaining the Generated Keys -
PR #2276: Split up filesystem classes -
PR #2275: improve detection of JAVA_HOME on Mac OS -
Issue #2268: Numeric division needs better algorithm for scale selection -
Issue #2270: IGNORE_UNKNOWN_SETTINGS is ignored -
PR #2269: Fix existence check of non-persistent databases -
Issue #1910: BinaryOperation should evaluate precision and scale properly -
PR #2264: Clean up redundant parts of file system abstraction -
PR #2262: add setting AUTO_COMPACT_FILL_RATE -
Issue #2255 / PR #2259: Use NIO2 in main sources and build -
PR #2257: Catch java.lang.NoClassDefFoundError -
Issue #2241: Mark H2-specific and compatibility only clauses in documentation -
PR #2246: Update third-party drivers -
Issue #2239 / PR #2236: Add NETWORK_TIMEOUT setting for SO_TIMEOUT -
PR #2235: Don't use RandomAccessFile in FilePathNio -
Issue #2233: "Prepared.getObjectId() was called before" when granting on multiple tables -
PR #2230: Add factory methods for Row -
Issue #2226, PR #2227: Remove support of Apache Ignite -
PR #2224: Update some hyperlinks and use https in them where possible -
PR #2223: Fix data change delta tables in views -
Issue #1943: Deadlock in TestTriggersConstraints -
PR #2219: do not retry failed DDL commands -
PR #2214: Fix TRACE_LEVEL_FILE=4 for in-memory databases -
PR #2216: Add FileChannel.lock in the connection URL summary -
PR #2215: Add white-space: pre to tables with query results -
Issue #2213: NUMERIC scale can be larger than a precision -
PR #2212: Get rid of multi-version CurrentTimestamp and fix negative scale of NUMERIC -
PR #2210: Meta table extras -
PR #2209: Add standard expressions with interval qualifier -
PR #2195: Feature abort_session function -
PR #2201: Add padding to negative years and other changes -
PR #2197: Add some additional methods from JDBC 4.2 and return 4.2 as supported version -
PR #2193: Require Java 8 and remove Java 7 support -
Issue #2191: NPE with H2 v1.4.200 repeatable read select queries -
Issue #1390: Add standard-compliant ARRAY data type syntax -
PR #2186: Refactor Parser.parseColumnWithType() and fix some minor issues with CAST -
Issue #2181: SET EXCLUSIVE quirks -
PR #2173: Move snapshots from Transaction to TransactionMap -
Issue #2175: Regression: NPE in ResultSet#getTime(int) -
Issue #2171: Wrong PostgreSQL compatibility syntax for the creation of indexes -
PR #2169: Clean up some find methods of indexes and fix minor issues with them +
PR #3542: Fix failed to delete a readonly file on Windows file systems

Version 1.4.200 (2019-10-14)

Version 2.1.214 (2022-06-13)

PR #2168: Add non-standard SNAPSHOT isolation level to MVStore databases -
Issue #2165: Problem with secondary index on SERIALIZABLE isolation level -
Issue #2161: Remove undocumented PageStore-only FILE_LOCK=SERIALIZED -
PR #2155: Reduce code duplication -
Issue #1894: Confusing error message when database creation is disallowed -
Issue #2123: Random failures in TestTransactionStore -
Issue #2153: Different behavior in SET LOCK_TIMEOUT after 1.4.197 -
Issue #2150: Remove MULTI_THREADED setting and use multi-threaded MVStore and single-threaded PageStore backends -
Issue #216: Support READ UNCOMMITTED isolation level in MVStore mode -
Issue #678: Support REPEATABLE READ isolation level in MVStore mode -
Issue #174: Support SERIALIZABLE isolation level in MVStore mode -
Issue #2144: MVStore: read uncommitted doesn't see committed rows -
Issue #2142: CURRVAL / CURRENT VALUE FOR should return the value for the current session -
Issue #2136: ConstraintCheck concurrency regression +
Issue #3538: In Postgres compatibility mode the NUMERIC type w/o scale should not default to 0
PR #2137: Don't use SYSTEM_RANGE for SELECT without a FROM +
Issue #3534: Subquery has incorrect empty parameters since 2.1.210 that breaks sameResultAsLast()
PR #2134: Assorted fixes and other changes in DateTimeUtils +
Issue #3390: "ROW" cannot be set as a non keyword in 2.x
PR #2133: Optimize COUNT([ALL] constant) and other changes +
Issue #3448: With linked table to postgreSQL, case-sensitive column names not respected in where part
PR #2132: Typo and another bug in MVStore.readStoreHeader() +
Issue #3434: JavaTableFunction is not closing underlying ResultSet when reading column list
Issue #2130: Group-sorted query returns invalid results with duplicate grouped columns in select list +
Issue #3468: Invalid DB format exception (for 1.x DB in 2.x h2) should have a specific SQLException vendorCode
Issue #2120: Add IF EXISTS clause to column name in ALTER TABLE ALTER COLUMN statement +
Issue #3528: Weird syntax error with HAVING clause in Oracle Mode
Issue #521: Add support for the TIME WITH TIME ZONE data type +
Issue #3307: Fix SHUTDOWN DEFRAG for encrypted databases
PR #2127: Fix race condition / performance issue during snapshotting +
Issue #3515: Support for NEXTVAL property in DB2 mode
Issue #2124: MVStore build is broken +
Issue #3444: Conversion 'text' to 'integer' doesn't work anymore
PR #2122: Add support for LMT in time zones and fix large years in datetime values +
Issue #3493: org.h2.tools.DeleteDbFiles won't delete files under certain circumstances
Issue #2067: Incorrect chunk space allocation during chunks movement +
Issue #3486: FilePathDisk.newDirectoryStream() may fail on remote drive on Windows due to AccessDeniedException in Path.toRealPath()
PR #2066: Not so happy path - "four alternatives" implementation +
Issue #3484: LOB issue
PR #2121: Reduce code duplication for datetime API with custom Calendar instances -
PR #2119: SQL: statement read consistency -
Issue #2116: Empty IN() operator should result in error (MSSQL) -
Issue #2036: CAST from TIME to TIMESTAMP returns incorrect result -
PR #2114: Assorted changes -
PR #2113: Add feature F411: Time zone specification -
PR #2111: CURRENT_CATALOG, SET CATALOG and other changes -
Issue #2109: IW date formatting does not produce proper output -
PR #2104: Fix ordinary grouping set with parentheses and empty grouping set in GROUP BY -
Issue #2103: Add QUOTE_IDENT() function to enquote an identifier in SQL -
Issue #2075: Add EXECUTE IMMEDIATE implementation -
PR #2101: Fix infinite loop in Schema.removeChildrenAndResources() -
Issue #2096: Convert LEFT and RIGHT to keywords and disallow comma before closing parenthesis -
PR #2098: Fix typos -
Issue #1305 / PR #2097: Remove unused and outdated website translation infrastructure -
PR #2093: CURRENT VALUE FOR and other sequence-related changes -
PR #2092: Allow to simulate usage of multiple catalogs by one connection -
PR #2091: Oracle mode now uses DECIMAL with NEXTVAL -
Issue #2088: Division by zero caused by evaluation of global conditions before local conditions -
Issue #2086: TCP_QUICKACK on server socket -
Issue #2073: TableLink should not pass queries to DatabaseMetaData.getColumns() -
Issue #2074: MySQL and MSSQLServer Mode: TRUNCATE TABLE should always RESTART IDENTITY -
Issue #2063: MySQL mode: "drop foreign key if exists" support -
PR #2061: Use VirtualTable as a base class for RangeTable -
PR #2059: Parse IN predicate with multiple subqueries correctly -
PR #2057: Fix TestCrashAPI failure with Statement.enquoteIdentifier() -
PR #2056: Happy path: speed up database opening -
Issue #2051: The website shows outdated information about the storage engine -
PR #2049: bugfix - mvstore data lost issue when partial write occurs -
PR #2047: File maintenance -
PR #2046: Recovery mode -
Issue #2044: setTransactionIsolation always call commit() even if transaction is auto-commit -
Issue #2042: Add possibility to specify generated columns for query in web console -
Issue #2040: INFORMATION_SCHEMA.SETTINGS contains irrelevant settings -
PR #2038: MVMap: lock reduction on updates -
PR #2037: Fix SYS_GUID, RAWTOHEX, and HEXTORAW in Oracle mode -
Issue #2016: ExpressionColumn.mapColumns() performance complexity is quadratic -
Issue #2028: Sporadic inconsistent state after concurrent UPDATE in 1.4.199 -
PR #2033: Assorted changes -
Issue #2025: Incorrect query result when (OFFSET + FETCH) > Integer.MAX_VALUE -
PR #2023: traverseDown() code deduplication -
PR #2022: Mvmap minor cleanup -
Issue #2020: Wrong implementation of IN predicate with subquery -
PR #2003: Change dead chunks determination algorithm -
Issue #2013: DECIMAL is casted to double in ROUND function -
PR #2011: ZonedDateTime and (INTERVAL / INTERVAL) -
Issue #1997: TestRandomSQL failure with ClassCastException -
Issue #2007: PostgreSQL compatibility mode: support ON CONFLICT DO NOTHING -
Issue #1927: Do not allow commit() when auto-commit is enabled -
PR #1998: Reduce TxCounter memory footprint -
PR #1999: Make RootReference lock re-entrant -
PR #2001: Test improvements, OOME elimination -
Issue #1995: Obscure condition in MVPrimaryIndex.extractPKFromRow() -
Issue #1975: Add client ip address to information_schema -
PR #1982: Hindi language translation added -
Issue #1985: Add thread number to TCP server thread names -
Do not allow empty password for management DB -
Issue #1978: getGeneratedKeys() can use the same rules as FINAL TABLE -
PR #1977: Change JSON literals and add support for compound character literals -
PR #1974: Use proleptic Gregorian calendar for datetime values -
Issue #1847: Add support for data change delta tables -
PR #1971: Add maximum cardinality parameter to ARRAY data type -
PR #1970: Switch from log map rename to "committed" marker log record -
PR #1969: Add unique predicate -
Issue #1963: Expression.addFilterConditions() with outer joins -
PR #1966: Add standard CURRENT_SCHEMA function -
PR #1964: Add Feature T571: Truth value tests -
PR #1962: Fix data types of optimized conditions -
PR #1961: Failure to open DB after improper shutdown -
Issue #1957: NullPointerException with DISTINCT and ORDER BY CASE -
PR #1956: Fix row value handling in the null predicate -
PR #1955: Add standard UNKNOWN literal -
Issue #1952: Connection.setSchema doesn't work with query cache -
PR #1951: Assorted changes -
PR #1950: Fix NULL handling in ARRAY_AGG -
PR #1949: Extract aggregate and window functions into own pages in documentation -
PR #1948: Add standard LOG() function with two arguments -
Issue #1935: Improve file locking on shared filesystems like SMB -
PR #1946: Reimplement table value constructor on top of Query -
PR #1945: Fix IN (SELECT UNION with OFFSET/FETCH) -
Issue #1942: MySQL Mode: convertInsertNullToZero should be turned off by default? -
Issue #1940: MySQL Mode: Modify column from NOT NULL to NULL syntax -
PR #1941: Extract OFFSET / FETCH handling from Select and SelectUnion to Query -
Issue #1938: Regression with CREATE OR REPLACE VIEW. Causes "Duplicate column name" exception. -
PR #1937: Get rid of FunctionCursorResultSet -
Issue #1932: Incoherence between DbSettings.mvStore and getSettings() -
PR #1931: Fix wildcard expansion for multiple schemas -
PR #1930: Move PageStore table engine into own package +

+ +

Version 2.1.212 (2022-04-09)

Issue #3512: BITNOT(BIT_NAND_AGG(...) OVER ()) produces wrong result
PR #1929: Initial implementation of type predicate and other changes +
Issue #3510: PreparedStatement execution with java.io.tmpdir pointing to a directory symlink results in FileAlreadyExistsException
PR #1926: Assorted improvements for BINARY data type +
PR #3504: Fix TypeInfo.getHigherGeometry() for types with and without SRID
Issue #1925: Support SQL Server binary literal syntax +
PR #3481: Add support for standard interval literals with precision
Issue #1918: MySQL: CREATE TABLE with both CHARSET and COMMENT failed +
Issue #3471: Possibility of corruption after SHUTDOWN DEFRAG
Issue #1913: MySQL: auto_increment changing SQL not supported +
Issue #3473: DROP TABLE/INDEX causes memory leak
Issue #1585: The translate function on DB2 mode could have parameters order changed +
PR #3464 / Issue #3457: increase max length of VAR* types
PR #1914: Change storage and network format of JSON to byte[] +
PR #3460: fix bug in readStoreHeader()
Issue #1911: Foreign key constraint does not prevent table being dropped +
PR #3458: Add performance tests for SQLite
PR #1909: Add JSON_OBJECTAGG and JSON_ARRAYAGG aggregate functions +
Issue #1808: Occasional NPE in concurrent update of LOB
PR #1908: Cast VARCHAR to JSON properly and require FORMAT JSON in literals +
Issue #3439: Cannot use enum values in JSON without explicit casts
PR #1906: Add JSON_OBJECT and JSON_ARRAY functions +
Issue #3426: Regression: BIT(1) is not accepted in MySQL compatibility mode
Issue #1887: Infinite recursion in ConditionAndOr.java +
PR #3422: Allow combination of any geometry types with the same SRID
Issue #1903: MSSQLServer Mode - Support Update TOP(X) +
Issue #3414: H2 2.1.210: Query with Parameters throws NPE
Issue #1900: Support SQLServer stored procedure execution syntax +
Issue #3413: Parser can't parse REFERENCES … NOT NULL
PR #1898: Add IS JSON predicate +
Issue #3410: OOME with nested derived tables
Issue #1896: MSSQLServer compatibility mode - GETDATE() incorrectly omits time +
Issue #3405: Enhance SCRIPT to support operations on STDOUT
PR #1895: Add standard array concatenation operation +
Issue #3406 / PR #3407: FunctionMultiReturn.polar2CartesianArray result set iteration throws ClassCastException
Issue #1892: Window aggregate functions return incorrect result without window ordering and with ROWS unit +
Issue #3400: Regression: ORDER BY ROWNUM fails with General error: "Unexpected code path"
Issue #1890: ArrayIndexOutOfBoundsException in MVSortedTempResult.getKey +
Issue #3387: SYSDATE behavior changed in 2.x
Issue #308: Mode MySQL and LAST_INSERT_ID with argument +
Issue #3394: SYSDATE Considered Identifier when used in inner select
Issue #1883: Suspicious code in Session.getLocks() +
Issue #3391: Hang on merge statement with data change delta table
Issue #1878: OPTIMIZE_REUSE_RESULTS causes incorrect result after rollback since 1.4.198 +
PR #3384: Remove abandoned Java to C converter and fix some warnings from Sonatype Lift
PR #1880: Collation names like CHARSET_* recognition +
PR #3382: Use secure parser in H2AuthConfigXml to avoid future reports
Issue #1844: MySQL Compatibility: create table error when primary key has comment +

+ +

Version 2.1.210 (2022-01-17)

PR #3381: Add IDENTITY() and SCOPE_IDENTITY() to LEGACY mode
PR #1873: Concurrency in database metadata +
Issue #3376: Data cannot be read after insert of clob data > MAX_LENGTH_INPLACE_LOB with data change delta table
Issue #1864: Failing to format NotSerializableException corrupting the database +
PR #3377: Add -webExternalNames setting and fix WebServer.getConnection()
PR #1868: add more checking to TestFileLock +
PR #3367: Use faster checks of dimension systems of geometries
Issue #1819: Trace.db file exceed file size limit (64MB) +
PR #3369: Added v2 changes in migration docs
Issue #1861: Use COALESCE in named columns join for some data types +
Issue #3361: MemoryEstimator.estimateMemory() can return negative size
PR #1860: Additional fix for deadlock on shutdown (exclusively in PageStore mode) +
PR #3362: Use BufferedReader instead of BufferedInputStream to avoid Illegal seek exception
Issue #1855: Wrong qualified asterisked projections in named column join +
Issue #3353: Wrong rownum() scope for DML with change delta table
Issue #1854: Wrong asterisked projection and result in named column right outer join +
PR #3352: make Javadoc happier
Issue #1852: Named column joins doesn't work with the VALUES constructor and derived column lists +
Issue #3344: Changelog could link to github issue
Issue #1851: Wrong asterisked projection in named column joins +
Issue #3340: JDBC index type seems wrong
PR #1850: Duplicate map identifiers +
Issue #3336: FT_INIT error when mode=MySQL
PR #1849: Reimplement MVStore.findOldChunks() with PriorityQueue +
Issue #3334: Regression with CREATE ALIAS - Parameter "#2" is not set
PR #1848: Reimplement MVStore.findChunksToMove() with PriorityQueue +
Issue #3321: Insert Primary Key after import CSV Data does not work
Issue #1843: Named columns join syntax is not supported +
PR #3323: Tokenize SQL before parsing and preserve tokens for recompilation
Issue #1841: Deadlock during concurrent shutdown attempts with 1.4.199 +
PR #3320: Add Servlet 5-compatible servlet for H2 Console
Issue #1834: NUMERIC does not preserve its scale for some values +
Issue #918: Parser fails recognising set operations in correlated subqueries
PR #1838: Implement conversion from JSON to GEOMETRY +
Issue #2050: PostgreSQL with recursive fail with union in the final query
PR #1837: Implement conversion from GEOMETRY to JSON +
PR #3316: Update copyright years
PR #1836: Add LSHIFT and RSHIFT function +
PR #3315: Never put read locks into lockSharedSessions and other minor changes
PR #1833: Add BITNOT function +
Issue #492: H2 does not correctly parse <parenthesized joined table>
PR #1832: JSON validation and normalization +
Issue #3311: Parser creates wrong join graph in some cases and uses wrong tables for column mapping
PR #1829: MVStore chunks occupancy rate calculation fixes +
FORCE_JOIN_ORDER setting is removed
PR #1828: Basis for implementation of SQL/JSON standard +
Issue #1983: Official build script is not compatible with Java 13
PR #1827: Add support for Lucene 8.0.0 +
PR #3305: Add UNIQUE(VALUE) and remove some non-standard keywords
Issue #1820: Performance problem on commit +
PR #3299: Remove useless StringBuilder.toString() call
Issue #1822: Use https:// in h2database.com hyperlinks +
PR #3298: Delete unused sqlTypes array
PR #1817: Assorted minor changes in documentation and other places +

+ +

Version 2.0.206 (2022-01-04)

Issue #3322: Create linked table fails when the table contains a Geometry with a data type specified
PR #1812: An IllegalStateException that wraps EOFException is thrown when partial writes happens +
Issue #3297: Unexpected GROUP BY results with indexed IGNORECASE column

Version 1.4.199 (2019-03-13)

Version 2.0.204 (2021-12-21)

PR #1807: Reduce code duplication and remove h2.mixedGeometries -
PR #1806: Improve SELECT FOR UPDATE documentation +
Issue #3291: Add Legacy and Strict modes
PR #1804: Lift limit of 10 characters on enum value (1.4.198 regression) +
Issue #3287: SELECT statement works on 1.4.200 but fails on 2.0.202 with "Column XYZ must be in the GROUP BY list"
PR #1803: Do not rely on index sorting in SELECT FOR UPDATE +
PR #3284: Remove unused UNDO_LOG setting
Issue #1800: Remove experimental status from window functions +
Issue #3251: Table with GEOMETRY column can't have a TriggerAdapter-based trigger any more
PR #1799: Fire triggers after row locking and remove some leftovers +
PR #3281: DateTimeFormatter-based FORMATDATETIME and PARSEDATETIME and other changes
PR #1798: Reuse some string builders, remove StatementBuilder and other minor changes +
Issue #3246: Spatial predicates with comparison are broken in MySQL compatibility mode
Issue #1795: 1.4.198 regression with batch updates and transactions +
Issue #3270: org.h2.jdbc.JdbcSQLFeatureNotSupportedException: Feature not supported: "Unsafe comparison or cast"
PR #1794: Ask password in Shell in secure way and improve database creation information in tutorial +
Issue #3268 / PR #3275: Add TO_DATE and TO_TIMESTAMP to PostgreSQL compatibility mode
PR #1791: Move commands to commands.html and other changes +
PR #3274: Remove some dead code and unused params
Issue #1774: H2 Browser configuration is unclear and fails on KUbuntu +
Issue #3266: Oracle compatibility NUMBER without precision and scale should have variable scale
PR #1790: Do not convert standard TRIM function to non-standard functions +
Issue #3263: Unable to store BigDecimal with negative scale in NUMERIC(19,6) column
Issue #1787: Non-standard MERGE throws LOCK_TIMEOUT_1 on violation of some constraints +
PR #3261: Small optimization for MIN and MAX
PR #1784: improve database not found error +
Issue #3258 / PR #3259: Prevent incorrect optimization of COUNT(*) and other changes
Issue #1740: Enhancement Request: h2 server: do not swallow exceptions +
PR #3255: Throw proper exception when type of argument isn't known
Issue #1616: Metadata and scripts should be persisted with unconditionally quoted identifiers +
Issue #3249: Multi-column assignment with subquery throws exception when subquery doesn't return any rows
PR #1779: Improve isSimpleIdentifier() and enquoteIdentifier() +
PR #3248: Remove redundant uniqueness check, correct version in pom
PR #1776: Improve DATABASE_TO_LOWER handling +
PR #3247: Avoid AIOBE exception in TestCrashAPI and in Transaction
Issue #1771: NPE in Comparison.createIndexConditions +
Issue #3241: ResultSetMetaData::getColumnTypeName should produce the correct ARRAY type
PR #1772: Fix newlines in test scripts +
Issue #3204: H2 Tools Web Console: Unicode 32
Issue #1762: NullPointerException in Parser. Introduced in 1.4.198 +
Issue #3227: Regression when referencing outer joined column from correlated subquery
PR #1768: Add more context-sensitive keywords +
Issue #3237: Can no longer cast CHAR(n) to BOOLEAN with n > 1
Issue #1758: sequence restart issue with 1.4.198 +
Issue #3235: Regression in IN predicate with empty in list
Issue #1759: SELECT … FOR UPDATE returns old data in 1.4.198 +
Issue #3236: NullPointerException in DatabaseMetaData::getIndexInfo when querying the info for views
PR #1756: Fix DISTINCT ON in presence of ORDER BY +
Issue #3233: General error when using NULL predicate on _ROWID_ column
PR #1754: Fix window functions in JOIN with ON condition +
Issue #3223: TRUNC(v, p) with negative precisions no longer works
Issue #1751: making it easier to open console and create local databases +
Issue #3221: NullPointerException when creating domain
Issue #1750: JOIN t ON t.col IN (SELECT ...) throws AssertionError +
Issue #3186: ResultSetMetaData.getSchemaName() returns empty string for aliased columns

+ diff --git a/h2/src/docsrc/html/cheatSheet.html b/h2/src/docsrc/html/cheatSheet.html index 370d16cb03..de7ccec4ea 100644 --- a/h2/src/docsrc/html/cheatSheet.html +++ b/h2/src/docsrc/html/cheatSheet.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/commands.html b/h2/src/docsrc/html/commands.html index 2cc02d559d..ace151664e 100644 --- a/h2/src/docsrc/html/commands.html +++ b/h2/src/docsrc/html/commands.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/datatypes.html b/h2/src/docsrc/html/datatypes.html index 47fc897f5f..70e5cb8994 100644 --- a/h2/src/docsrc/html/datatypes.html +++ b/h2/src/docsrc/html/datatypes.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/download-archive.html b/h2/src/docsrc/html/download-archive.html index f00961c253..74d2d6762e 100644 --- a/h2/src/docsrc/html/download-archive.html +++ b/h2/src/docsrc/html/download-archive.html @@ -1,6 +1,6 @@ @@ -28,7 +28,31 @@

Distribution

- + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/h2/src/docsrc/html/download.html b/h2/src/docsrc/html/download.html index 280763d5bc..7f7d016b90 100644 --- a/h2/src/docsrc/html/download.html +++ b/h2/src/docsrc/html/download.html @@ -1,6 +1,6 @@ @@ -27,10 +27,12 @@

Version ${version} (${versionDate})

Version ${stableVersion} (${stableVersionDate}), Last Stable

Version 2.1.214 (2022-06-13)

-Windows Installer
-Platform-Independent Zip
+Windows Installer +(SHA1 checksum: 5f7cd83d394df5882ed01553935463a848979f29)
+Platform-Independent Zip +(SHA1 checksum: 5ff027217098bf6c800ef96b98f3a381b320e53d)

Archive Downloads

diff --git a/h2/src/docsrc/html/faq.html b/h2/src/docsrc/html/faq.html index 211e94d4c2..c06180938b 100644 --- a/h2/src/docsrc/html/faq.html +++ b/h2/src/docsrc/html/faq.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/features.html b/h2/src/docsrc/html/features.html index 5fb164503b..ded89b0d49 100644 --- a/h2/src/docsrc/html/features.html +++ b/h2/src/docsrc/html/features.html @@ -1,6 +1,6 @@ @@ -811,7 +811,7 @@

Compatibility

(example: jdbc:h2:~/test;IGNORECASE=TRUE).

Compatibility Modes

For certain features, this database can emulate the behavior of specific databases. However, only a small subset of the differences between databases are implemented in this way. @@ -822,6 +822,14 @@

REGULAR Compatibility mode

This mode is used by default.

Empty IN predicate is allowed. +
TOP clause in SELECT is allowed. +
OFFSET/LIMIT clauses are allowed. +
MINUS can be used instead of EXCEPT. +
IDENTITY can be used as a data type. +
Legacy SERIAL and BIGSERIAL data types are supported. +
AUTO_INCREMENT clause can be used instead of GENERATED { ALWAYS | BY DEFAULT } AS IDENTITY. +

STRICT Compatibility Mode

@@ -829,8 +837,20 @@

STRICT Compatibility Mode

or the SQL statement SET MODE STRICT. In this mode some deprecated features are disabled.

+If your application or library uses only the H2 or it generates different SQL for different database systems +it is recommended to use this compatibility mode in unit tests +to reduce possibility of accidental misuse of such features. +This mode cannot be used as SQL validator, however. +

+It is not recommended to enable this mode in production builds of libraries, +because this mode may become more restrictive in future releases of H2 that may break your library +if it will be used together with newer version of H2. +

Empty IN predicate is disallowed. -
TOP and OFFSET/LIMIT clauses in SELECT are disallowed, only OFFSET/FETCH can be used. +
TOP and OFFSET/LIMIT clauses are disallowed, only OFFSET/FETCH can be used. +
MINUS cannot be used instead of EXCEPT.
IDENTITY cannot be used as a data type and AUTO_INCREMENT clause cannot be specified. Use GENERATED BY DEFAULT AS IDENTITY clause instead.
SERIAL and BIGSERIAL data types are disallowed. @@ -844,7 +864,14 @@
LEGACY Compatibility Mode
In this mode some compatibility features for applications written for H2 1.X are enabled. This mode doesn't provide full compatibility with H2 1.X.
-
- MS SQL Server-style IDENTITY clause is supported. +
  - Empty IN predicate is allowed. +
  - TOP clause in SELECT is allowed. +
  - OFFSET/LIMIT clauses are allowed. +
  - MINUS can be used instead of EXCEPT. +
  - IDENTITY can be used as a data type. +
  - MS SQL Server-style IDENTITY clause is supported. +
  - Legacy SERIAL and BIGSERIAL data types are supported. +
  - AUTO_INCREMENT clause can be used instead of GENERATED { ALWAYS | BY DEFAULT } AS IDENTITY.
  - If a value for identity column was specified in an INSERT command the base value of sequence generator of this column is updated if current value of generator was smaller (larger for generators with negative increment) than the inserted value. @@ -856,6 +883,8 @@
    LEGACY Compatibility Mode
  - Attempt to reference a non-unique set of columns from a referential constraint will create an UNIQUE constraint on them automatically.
  - Unsafe comparison operators between numeric and boolean values are allowed. +
  - IDENTITY() and SCOPE_IDENTITY() are supported, but both are implemented like SCOPE_IDENTITY() +
  - SYSDATE, SYSTIMESTAMP, and TODAY are supported.
  DB2 Compatibility Mode
  @@ -870,7 +899,9 @@
  DB2 Compatibility Mode
- Timestamps with dash between date and time are supported.
- Datetime value functions return the same value within a command.
- Second and third arguments of TRANSLATE() function are swapped. +
- SEQUENCE.NEXTVAL and SEQUENCE.CURRVAL are supported
- LIMIT / OFFSET clauses are supported. +
- MINUS can be used instead of EXCEPT.
- Unsafe comparison operators between numeric and boolean values are allowed.
@@ -898,13 +929,16 @@
HSQLDB Compatibility Mode
Datetime value functions return the same value within a command.
TOP clause in SELECT is supported.
LIMIT / OFFSET clauses are supported. +
MINUS can be used instead of EXCEPT.
Unsafe comparison operators between numeric and boolean values are allowed. +
SYSDATE and TODAY are supported.

MS SQL Server Compatibility Mode

-To use the MS SQL Server mode, use the database URL jdbc:h2:~/test;MODE=MSSQLServer -or the SQL statement SET MODE MSSQLServer. +To use the MS SQL Server mode, use the database URL +jdbc:h2:~/test;MODE=MSSQLServer;DATABASE_TO_UPPER=FALSE;CASE_INSENSITIVE_IDENTIFIERS=TRUE. +Do not change value of DATABASE_TO_LOWER and CASE_INSENSITIVE_IDENTIFIERS after creation of database.

For aliased columns, ResultSetMetaData.getColumnName() returns the alias name and getTableName() returns @@ -957,6 +991,7 @@
MariaDB Compatibility Mode
YEAR data type is treated like SMALLINT data type.
GROUP BY clause can contain 1-based positions of expressions from the SELECT list.
Unsafe comparison operators between numeric and boolean values are allowed. +
Accepts non-standard JSON_OBJECT and JSON_OBJECTAGG syntax using comma as key/value separator.

Text comparison in MariaDB is case insensitive by default, while in H2 it is case sensitive (as in most other databases). @@ -998,6 +1033,7 @@

MySQL Compatibility Mode

YEAR data type is treated like SMALLINT data type.

GROUP BY clause can contain 1-based positions of expressions from the SELECT list.

Unsafe comparison operators between numeric and boolean values are allowed. +

Accepts non-standard JSON_OBJECT and JSON_OBJECTAGG syntax using comma as key/value separator.

Text comparison in MySQL is case insensitive by default, while in H2 it is case sensitive (as in most other databases). @@ -1027,6 +1063,8 @@

Oracle Compatibility Mode

ALTER TABLE MODIFY COLUMN command is partially supported.

SEQUENCE.NEXTVAL and SEQUENCE.CURRVAL are supported and return values with DECIMAL/NUMERIC data type.

Merge when matched clause may have WHERE clause. +

MINUS can be used instead of EXCEPT. +

SYSDATE and SYSTIMESTAMP are supported.

PostgreSQL Compatibility Mode

@@ -1054,11 +1092,12 @@

PostgreSQL Compatibility Mode

ON CONFLICT DO NOTHING is supported in INSERT statements.

Spaces are trimmed from the right side of CHAR values, but CHAR values in result sets are right-padded with spaces to the declared length. +

NUMERIC and DECIMAL/DEC data types without parameters are treated like DECFLOAT data type.

MONEY data type is treated like NUMERIC(19, 2) data type.

Datetime value functions return the same value within a transaction.

ARRAY_SLICE() out of bounds parameters are silently corrected.

EXTRACT function with DOW field returns (0-6), Sunday is 0. -

UPDATE with FROM is supported. +

UPDATE with FROM is partially supported.

GROUP BY clause can contain 1-based positions of expressions from the SELECT list.

diff --git a/h2/src/docsrc/html/fragments.html b/h2/src/docsrc/html/fragments.html index 5cb2deb980..e4bbd55071 100644 --- a/h2/src/docsrc/html/fragments.html +++ b/h2/src/docsrc/html/fragments.html @@ -1,5 +1,5 @@ @@ -99,6 +99,7 @@ Links
MVStore
Architecture
+Migration to 2.0

diff --git a/h2/src/docsrc/html/frame.html b/h2/src/docsrc/html/frame.html index 8bdeb4f594..54a87d7591 100644 --- a/h2/src/docsrc/html/frame.html +++ b/h2/src/docsrc/html/frame.html @@ -1,5 +1,5 @@ diff --git a/h2/src/docsrc/html/functions-aggregate.html b/h2/src/docsrc/html/functions-aggregate.html index 1dc2ed2830..8a91982e61 100644 --- a/h2/src/docsrc/html/functions-aggregate.html +++ b/h2/src/docsrc/html/functions-aggregate.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/functions-window.html b/h2/src/docsrc/html/functions-window.html index f1dac38eb6..fe97656940 100644 --- a/h2/src/docsrc/html/functions-window.html +++ b/h2/src/docsrc/html/functions-window.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/functions.html b/h2/src/docsrc/html/functions.html index d98204fc91..0d417362f7 100644 --- a/h2/src/docsrc/html/functions.html +++ b/h2/src/docsrc/html/functions.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/grammar.html b/h2/src/docsrc/html/grammar.html index 8d664f70d9..4c2ddb46ef 100644 --- a/h2/src/docsrc/html/grammar.html +++ b/h2/src/docsrc/html/grammar.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/history.html b/h2/src/docsrc/html/history.html index a1617ea313..3b5bb9aebe 100644 --- a/h2/src/docsrc/html/history.html +++ b/h2/src/docsrc/html/history.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/installation.html b/h2/src/docsrc/html/installation.html index 896687215d..345649b637 100644 --- a/h2/src/docsrc/html/installation.html +++ b/h2/src/docsrc/html/installation.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/license.html b/h2/src/docsrc/html/license.html index 4ee57c53f0..feeba67d5b 100644 --- a/h2/src/docsrc/html/license.html +++ b/h2/src/docsrc/html/license.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/links.html b/h2/src/docsrc/html/links.html index daddd1df8c..e2c853c881 100644 --- a/h2/src/docsrc/html/links.html +++ b/h2/src/docsrc/html/links.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/main.html b/h2/src/docsrc/html/main.html index d34f218d2e..e62507b3bf 100644 --- a/h2/src/docsrc/html/main.html +++ b/h2/src/docsrc/html/main.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/mainWeb.html b/h2/src/docsrc/html/mainWeb.html index 683ab36be3..e760f01a81 100644 --- a/h2/src/docsrc/html/mainWeb.html +++ b/h2/src/docsrc/html/mainWeb.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/migration-to-v2.html b/h2/src/docsrc/html/migration-to-v2.html index 07325533c0..3a5e9e20cb 100644 --- a/h2/src/docsrc/html/migration-to-v2.html +++ b/h2/src/docsrc/html/migration-to-v2.html @@ -1,6 +1,6 @@ @@ -25,31 +25,42 @@

Upgrading
File Format
- - Date / Time / Timestamp
+ + Data types
+ + Identity columns and sequences
+ + INFORMATION_SCHEMA
General

Introduction

-Between version 1.4.198 and version 2.0.0 there have been considerable changes, such that a simple update is +Between version 1.4.200 and version 2.0.202 there have been considerable changes, such that a simple update is not possible.

It would have been nice to write some kind of migration tool, or auto-detect the file and upgrade. Unfortunately, this -is purely a volunteer-run project, so this is just the way it has to be. +is purely a volunteer-run project, so this is just the way it has to be. There exists a migration tool H2MigrationTool available +in GitHub, but it hasn't been tested by our team. Use at +your own risk.

Upgrading

-The official way to upgrade is to do a BACKUP of your existing database USING YOUR CURRENT VERSION OF H2. +The official way to upgrade is to export it into SQL script with the +SCRIPT command +USING YOUR CURRENT VERSION OF H2.

-Then create a fresh database USING THE NEW VERSION OF H2, then perform a SCRIPT to load your data. +Then create a fresh database USING THE NEW VERSION OF H2, then perform a +RUNSCRIPT to load your data. +You may need to specify FROM_1X flag, see documentation of this command for details.

MVStore file format

@@ -60,17 +71,117 @@

MVStore file format

for the purposes of improving crash safety and also read/write performance.

Date / Time / Timestamp

Data types

-TODO - Correctness. +The maximum length of CHARACTER +and CHARACTER VARYING data types +is 1_000_000_000 characters. For larger values use +CHARACTER LARGE OBJECT. +

+ +

+BINARY +and BINARY VARYING +are now different data types. BINARY means fixed-length data type and its default length is 1. +The maximum length of binary strings is 1_000_000_000 bytes. For larger values use +BINARY LARGE OBJECT +

+ +

+NUMERIC / DECIMAL / DEC without parameters +now have scale 0. For a variable-scale data type see +DECFLOAT. +Negative scale isn't allowed for these data types any more. +The maximum precision is now 100,000. +

+ +

+ENUM values now have 1-based ordinal numbers. +

+ +

+Arrays are now typed. +Arrays with mixed types of elements aren't supported. +In some cases they can be replaced with a new ROW +data type. +

+ +

+All non-standard data types, with exception for TINYINT, JAVA_OBJECT, ENUM, GEOMETRY, JSON, and UUID are deprecated. +

+ +

Identity columns and sequences

+ +

+Various legacy vendor-specific declarations and expressions are deprecated +and may not work at all depending on compatibility mode. +

+ +

+Identity columns should be normally declared with GENERATED BY DEFAULT AS IDENTITY or GENERATED ALWAYS AS IDENTITY +clauses, options may also be specified. +GENERATED ALWAYS AS IDENTITY columns cannot be assigned to a user-provided value +unless OVERRIDING SYSTEM VALUE is specified. +

+ +

+NULL cannot be specified as a value for IDENTITY column to force identity generation +(with exception for some compatibility modes). +Use DEFAULT or simply exclude this column from insert column list. +

+ +

+IDENTITY() and SCOPE_IDENTITY() aren't available in Regular mode. If you need to get a generated value, +you need to use data change delta tables +or Statement.getGeneratedKeys(). +

+ +

+Undocumented Oracle-style .NEXTVAL and .CURRVAL expressions are restricted to Oracle compatibility mode. +Other functions are deprecated for Regular mode. +Use sequence value expression instead. +

+ +

INFORMATION_SCHEMA

+ +

+INFORMATION_SCHEMA in H2 is now compliant with the SQL Standard and other database systems, +but it isn't compliant with previous versions of H2. +You may need to update your queries.

General

There are a lot more SQL keywords now. Many SQL statements feature far better support of SQL-Standard behaviour. -Some old non-standard SQL syntax support has been removed. +There is a NON_KEYWORDS setting that +can be used as a temporary workaround if your application uses them as unquoted identifiers. +

+ +

+Numeric and boolean values aren't comparable. It means you need to use TRUE, FALSE, or UNKNOWN (NULL) +as boolean literals. 1 and 0 don't work any more (with exception for some compatibility modes). +

+ +

+Some other non-standard SQL syntax has been restricted to related compatibility modes. +Since H2 2.0.204 there is a LEGACY compatibility mode that provides some limited compatibility with previous versions. +

+ +

+Various deprecated grammar elements are marked in red in documentation. Please, avoid their usage. +

+ +

+Migrating an old database to the new version works most of the times. However, there are a couple of important changes in the new version to keep in mind:

Oracle-style units were never supported officially without being in Oracle compatibility mode, although some worked before. For example, the length of the VARCHAR datatype cannot be more specified using CHAR but CHARACTERS or OCTETS. CHAR and BYTE need to be used in Oracle compatibility mode. +
IDENTITY syntax changed when type is specified: if the type for IDENTITY is specified, then the clause needs to be expanded as INTEGER GENERATED ALWAYS AS IDENTITY. Using just INTEGER IDENTITY is no more working. +
LOG connection setting removed: PageStore was removed from H2 so the "LOG=0" setting at the end of the URL (like +"jdbc:h2:file:/tmp/test;LOG=0") is no longer available. +

1.4.202
2.2.220	Windows Installer	Platform-Independent Zip
2.1.214	Windows Installer	Platform-Independent Zip
2.1.212	Windows Installer	Platform-Independent Zip
2.1.210	Windows Installer	Platform-Independent Zip
2.0.206	Windows Installer	Platform-Independent Zip
2.0.204	Windows Installer	Platform-Independent Zip
2.0.202	Windows Installer	Platform-Independent Zip

diff --git a/h2/src/docsrc/html/mvstore.html b/h2/src/docsrc/html/mvstore.html index c15b55960d..77deecddeb 100644 --- a/h2/src/docsrc/html/mvstore.html +++ b/h2/src/docsrc/html/mvstore.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/navigation.js b/h2/src/docsrc/html/navigation.js index 660812dab9..9ec242fa51 100644 --- a/h2/src/docsrc/html/navigation.js +++ b/h2/src/docsrc/html/navigation.js @@ -1,5 +1,5 @@ /* - * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0, + * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0, * and the EPL 1.0 (https://h2database.com/html/license.html). * Initial Developer: H2 Group */ diff --git a/h2/src/docsrc/html/performance.html b/h2/src/docsrc/html/performance.html index 4d00a9ac94..ba8a1132b8 100644 --- a/h2/src/docsrc/html/performance.html +++ b/h2/src/docsrc/html/performance.html @@ -1,6 +1,6 @@ @@ -158,9 +158,16 @@

MySQL

SQLite

-SQLite 3.36.0.2 was tested, but the results are not published currently, -because it's about 50 times slower than H2 in embedded mode. -Any tips on how to configure SQLite for higher performance are welcome. +SQLite 3.36.0.3, configured to use WAL and with +synchronous=NORMAL was tested in a +separate, less reliable run. A rough estimate is that SQLite performs approximately 2-5x worse in the simple benchmarks, +which perform simple work in the database, resulting in a low work-per-transaction ratio. SQLite becomes competitive as +the complexity of the database interactions increases. The results seemed to vary drastically across machine, and more +reliable results should be obtained. Benchmark on your production hardware. +

+The benchmarks used include multi-threaded scenarios, and we were not able to get the SQLite JDBC driver we used to work +with them. Help with configuring the driver for multi-threaded usage is welcome.

Firebird

diff --git a/h2/src/docsrc/html/quickstart.html b/h2/src/docsrc/html/quickstart.html index 5298e98402..9089befe88 100644 --- a/h2/src/docsrc/html/quickstart.html +++ b/h2/src/docsrc/html/quickstart.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/search.js b/h2/src/docsrc/html/search.js index 11ba89828c..249c453889 100644 --- a/h2/src/docsrc/html/search.js +++ b/h2/src/docsrc/html/search.js @@ -1,5 +1,5 @@ /* - * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0, + * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0, * and the EPL 1.0 (https://h2database.com/html/license.html). * Initial Developer: H2 Group */ diff --git a/h2/src/docsrc/html/security.html b/h2/src/docsrc/html/security.html index 0a2627c0cf..2f269af87a 100644 --- a/h2/src/docsrc/html/security.html +++ b/h2/src/docsrc/html/security.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/source.html b/h2/src/docsrc/html/source.html index a8a6678847..09c5bc5ce1 100644 --- a/h2/src/docsrc/html/source.html +++ b/h2/src/docsrc/html/source.html @@ -1,5 +1,5 @@ @@ -10,7 +10,10 @@ // @@ -40,6 +40,9 @@ function getVersion(build) { if (build == 64) { return '1.0/version-1.0.' + build; + } else if (build > 200) { + var b = build + 1; + return Math.floor(b / 100) + '.' + Math.floor(b % 100 / 10) + '.' + build; } else if (build >= 177) { return '1.4.' + build; } else if (build >= 146 && build != 147) { @@ -84,7 +87,7 @@ } else { url = 'https://github.com/h2database/h2database/tree/' if (build && build > 0) { - url += 'version-' + getVersion(build) + '/h2'; + url += 'version-' + getVersion(parseInt(build)) + '/h2'; } else { var tag = 'master/h2'; } @@ -114,7 +117,7 @@ hasData = true; idx = errorCode.indexOf("-"); build = parseInt(errorCode.substring(idx + 1)); - get('version').innerHTML = getVersion(build); + get('version').innerHTML = getVersion(parseInt(build)); errorCode = errorCode.substring(0, idx); while (errorCode.length > 1 && errorCode.charAt(0) == '0') { errorCode = errorCode.substring(1); diff --git a/h2/src/docsrc/html/stylesheet.css b/h2/src/docsrc/html/stylesheet.css index 6f866f72d2..513b23b54c 100644 --- a/h2/src/docsrc/html/stylesheet.css +++ b/h2/src/docsrc/html/stylesheet.css @@ -1,5 +1,5 @@ /* - * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0, + * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0, * and the EPL 1.0 (https://h2database.com/html/license.html). * Initial Developer: H2 Group */ diff --git a/h2/src/docsrc/html/stylesheetPdf.css b/h2/src/docsrc/html/stylesheetPdf.css index e30c3f3199..704b699d61 100644 --- a/h2/src/docsrc/html/stylesheetPdf.css +++ b/h2/src/docsrc/html/stylesheetPdf.css @@ -1,5 +1,5 @@ /* - * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0, + * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0, * and the EPL 1.0 (https://h2database.com/html/license.html). * Initial Developer: H2 Group */ diff --git a/h2/src/docsrc/html/systemtables.html b/h2/src/docsrc/html/systemtables.html index 0c90636631..5cf66e85d1 100644 --- a/h2/src/docsrc/html/systemtables.html +++ b/h2/src/docsrc/html/systemtables.html @@ -1,6 +1,6 @@ diff --git a/h2/src/docsrc/html/tutorial.html b/h2/src/docsrc/html/tutorial.html index 721122c22c..ffab47908a 100644 --- a/h2/src/docsrc/html/tutorial.html +++ b/h2/src/docsrc/html/tutorial.html @@ -1,6 +1,6 @@ @@ -443,7 +443,9 @@

Settings of the H2 Console

webAllowOthers: allow other computers to connect.
webPort: the port of the H2 Console
webSSL: use encrypted TLS (HTTPS) connections. -
webAdminPassword: password to access preferences and tools of H2 Console. +
webAdminPassword: hash of password to access preferences and tools of H2 Console, +use org.h2.server.web.WebServer.encodeAdminPassword(String) to generate a hash for your password. +Always use long complex passwords, especially when access from other hosts is enabled.

In addition to those settings, the properties of the last recently used connection @@ -789,6 +791,15 @@

Using a Servlet Listener to Start and Stop a Database

</listener>

+If your servlet container is already Servlet 5-compatible, use the following +snippet instead: +

+<listener>
+    <listener-class>org.h2.server.web.JakartaDbStarter</listener-class>
+</listener>
+

For details on how to access the database, see the file DbStarter.java. By default this tool opens an embedded connection using the database URL jdbc:h2:~/test, @@ -873,6 +884,10 @@

Using the H2 Console Servlet

For details, see also src/tools/WEB-INF/web.xml.

+If your application is already Servlet 5-compatible, use the servlet class +org.h2.server.web.JakartaWebServlet instead. +

To create a web application with just the H2 Console, run the following command:

@@ -1359,30 +1374,35 @@ User-Defined Variables
 
 Date and Time
 
-Date, time and timestamp values support ISO 8601 formatting, including time zone:
+Date, time and timestamp values support standard literals:
 
 -CALL TIMESTAMP '2008-01-01 12:00:00+01:00';
+VALUES (
+    DATE '2008-01-01',
+    TIME '12:00:00',
+    TIME WITH TIME ZONE '12:00:00+01:00',
+    TIMESTAMP '2008-01-01 12:00:00',
+    TIMESTAMP WITH TIME ZONE '2008-01-01 12:00:00+01:00'
+);
 
 
-If the time zone is not set, the value is parsed using the current time zone setting of the system.
-Date and time information is stored in H2 database files with or without time zone information depending on used data type.
+ISO 8601-style datetime formats with T instead of space between date and time parts are also supported.
 
-
-
-With TIMESTAMP data type if the database is opened using another system time zone, the date and time will be the same.
-That means if you store the value '2000-01-01 12:00:00' in one time zone, then close the database
-and open the database again in a different time zone, you will also get '2000-01-01 12:00:00'.
-Please note that changing the time zone after the H2 driver is loaded is not supported.
-
-
-With TIMESTAMP WITH TIME ZONE data type time zone offset is stored and if you store the value
-'2008-01-01 12:00:00+01:00' it remains the same even if you close and reopen the database with a different time zone.
-If you store the value with specified time zone name like '2008-01-01 12:00:00 Europe/Berlin' this name will be
-converted to time zone offset.
+
+TIME and TIMESTAMP values are preserved without time zone information as local time.
+That means if you store the value '2000-01-01 12:00:00' in one time zone, then change time zone of the session
+you will also get '2000-01-01 12:00:00', the value will not be adjusted to the new time zone,
+therefore its absolute value in UTC may be different.
+
+
+TIME WITH TIME ZONE and TIMESTAMP WITH TIME ZONE values preserve the specified time zone offset
+and if you store the value '2008-01-01 12:00:00+01:00' it also remains the same
+even if you change time zone of the session,
+and because it has a time zone offset its absolute value in UTC will be the same.
+TIMESTAMP WITH TIME ZONE values may be also specified with time zone name like '2008-01-01 12:00:00 Europe/Berlin'.
+It that case this name will be converted into time zone offset.
 Names of time zones are not stored.
-
-
+
 
 Using Spring
 Using the TCP Server
diff --git a/h2/src/docsrc/index.html b/h2/src/docsrc/index.html
index c6d5168adc..f8a32f0aef 100644
--- a/h2/src/docsrc/index.html
+++ b/h2/src/docsrc/index.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/docsrc/javadoc/animate.js b/h2/src/docsrc/javadoc/animate.js
deleted file mode 100644
index 825f4b4a7b..0000000000
--- a/h2/src/docsrc/javadoc/animate.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
- * and the EPL 1.0 (https://h2database.com/html/license.html).
- * Initial Developer: H2 Group
- */
-
-function on(id) {
-    return switchTag(id, 'titleOff', 'detailOn');
-}
-
-function off(id) {
-    return switchTag(id, '', 'detail');
-}
-
-function allDetails() {
-    for (i = 0;; i++) {
-        x = document.getElementById('_' + i);
-        if (x == null) {
-            break;
-        }
-        switchTag(i, 'titleOff', 'detailOn');
-    }
-    return false;
-}
-
-function switchTag(id, title, detail) {
-    if (document.getElementById('__' + id) != null) {
-        document.getElementById('__' + id).className = title;
-        document.getElementById('_' + id).className = detail;
-    }
-    return false;
-}
-
-function openLink() {
-    page = new String(self.document.location);
-    var pos = page.lastIndexOf("#") + 1;
-    if (pos == 0) {
-        return;
-    }
-    var ref = page.substr(pos);
-    link = decodeURIComponent(ref);
-    el = document.getElementById(link);
-    if (el.nodeName.toLowerCase() == 'h4') {
-        // constant
-        return true;
-    }
-    el = el.parentNode.parentNode;
-    window.scrollTo(0, el.offsetTop);
-    on(el.id.substr(2));
-    return false;
-}
\ No newline at end of file
diff --git a/h2/src/docsrc/javadoc/classes.html b/h2/src/docsrc/javadoc/classes.html
deleted file mode 100644
index b7a95b1d26..0000000000
--- a/h2/src/docsrc/javadoc/classes.html
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
-    
-    
-    H2 Documentation
-    
-
-
-
-
-    
-    
-    
-
-
-
-Home

-API Overview

-

-
-JDBC

-org.h2.jdbc

-Array

-Blob

-CallableStatement

-Clob

-Connection

-DatabaseMetaData

-ParameterMetaData

-PreparedStatement

-ResultSet

-ResultSetMetaData

-Savepoint

-SQLException

-SQLXML

-Statement

-org.h2.jdbcx

-JdbcConnectionPool

-JdbcDataSource

-JdbcDataSourceFactory

-JdbcXAConnection

-JdbcXid

-

-
-Tools

-org.h2.fulltext

-FullText

-FullTextLucene

-org.h2.tools

-Backup

-ChangeFileEncryption

-CompressTool

-Console

-ConvertTraceFile

-CreateCluster

-Csv

-DeleteDbFiles

-MultiDimension

-Script

-Recover

-Restore

-RunScript

-Server

-Shell

-SimpleResultSet

-SimpleRowSource

-TriggerAdapter

-

-
-Interfaces

-org.h2.api

-Aggregate

-AggregateFunction

-DatabaseEventListener

-ErrorCode

-Interval

-IntervalQualifier

-TableEngine

-Trigger

-

-
-Settings

-org.h2.engine

-DbSettings

-SysProperties

-

-
-
-
-
-
diff --git a/h2/src/docsrc/javadoc/index.html b/h2/src/docsrc/javadoc/index.html
deleted file mode 100644
index 2d7b63b095..0000000000
--- a/h2/src/docsrc/javadoc/index.html
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-    
-    
-    H2 Documentation
-    
-
-
-    
-    
-
-
-<body>
-    Sorry, Lynx is not supported
-</body>
-
-
-
diff --git a/h2/src/docsrc/javadoc/overview.html b/h2/src/docsrc/javadoc/overview.html
deleted file mode 100644
index 5087b7b3c2..0000000000
--- a/h2/src/docsrc/javadoc/overview.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-    
-    
-    API Overview
-    
-
-
-
-    
-    
-    
-
-API Overview
-
-JDBC API
-
-
-Use the JDBC API to connect to a database and execute queries.
-
-
-Tools API
-
-
-The Tools API can be used to do maintenance operations,
-such as deleting database files or changing the database file password,
-that do not require a connection to the database.
-
-
-
-
-
diff --git a/h2/src/docsrc/javadoc/stylesheet.css b/h2/src/docsrc/javadoc/stylesheet.css
deleted file mode 100644
index 8445132e72..0000000000
--- a/h2/src/docsrc/javadoc/stylesheet.css
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
- * and the EPL 1.0 (https://h2database.com/html/license.html).
- * Initial Developer: H2 Group
- */
-
-td, input, select, textarea, body, code, pre, td, th {
-    font: 13px/1.4 Arial, sans-serif;
-    font-weight: normal;
-}
-
-pre {
-    background-color: #ece9d8;
-    border: 1px solid rgb(172, 168, 153);
-    padding: 4px;
-}
-
-body {
-    margin: 0px;
-    max-width: 800px;
-}
-
-h1 {
-    background-color: #0000bb;
-    padding: 2px 4px 2px 4px;
-    margin-top: 11px;
-    color: #fff;
-    font-size: 22px;
-    line-height: normal;
-}
-
-h2 {
-    font-size: 19px;
-}
-
-h3 {
-    font-size: 16px;
-}
-
-h4 {
-    font-size: 13px;
-}
-
-hr {
-    color: #CCC;
-    background-color: #CCC;
-    height: 1px;
-    border: 0px solid blue;
-}
-
-.menu {
-    margin: 10px 10px 10px 10px;
-}
-
-.block {
-    border: 0px;
-}
-
-.titleOff {
-    display: none;
-}
-
-.detail {
-    border: 0px;
-    display: none;
-}
-
-.detailOn {
-    border: 0px;
-}
-
-td.return {
-    white-space:nowrap;
-    width: 1%;
-}
-
-td.method {
-    width: 99%;
-}
-
-.deprecated {
-    text-decoration: line-through;
-}
-
-.methodText {
-    color: #000000;
-    font-weight: normal;
-    margin: 0px 0px 0px 20px;
-}
-
-.method {
-}
-
-.fieldText {
-    margin: 6px 20px 6px 20px;
-}
-
-.methodName {
-    font-weight: bold;
-}
-
-.itemTitle {
-}
-
-.item {
-    margin: 0px 0px 0px 20px;
-}
-
-table {
-    background-color: #ffffff;
-    border-collapse: collapse;
-    border: 1px solid #aca899;
-}
-
-th {
-    text-align: left;
-    background-color: #ece9d8;
-    border: 1px solid #aca899;
-    padding: 2px;
-}
-
-td {
-    background-color: #ffffff;
-    text-align: left;
-    vertical-align:top;
-    border: 1px solid #aca899;
-    padding: 2px;
-}
-
-
-ul, ol {
-    list-style-position: outside;
-    padding-left: 20px;
-}
-
-li {
-    margin-top: 8px;
-    line-height: 100%;
-}
-
-a {
-    text-decoration: none;
-    color: #0000ff;
-}
-
-a:hover {
-    text-decoration: underline;
-}
-
-table.content {
-    width: 100%;
-    height: 100%;
-    border: 0px;
-}
-
-tr.content {
-    border:0px;
-    border-left:1px solid #aca899;
-}
-
-td.content {
-    border:0px;
-    border-left:1px solid #aca899;
-}
-
-.contentDiv {
-    margin:10px;
-}
-
-
-
diff --git a/h2/src/installer/release.txt b/h2/src/installer/release.txt
index ed36488846..54bc01212d 100644
--- a/h2/src/installer/release.txt
+++ b/h2/src/installer/release.txt
@@ -34,9 +34,8 @@ Update org.h2.engine.Constants.java:
         set VERSION_MAJOR / VERSION_MINOR to the new version number
     if the last TCP_PROTOCOL_VERSION_##
         doesn't have a release date set it to current BUILD_DATE
-    set BUILD_DATE_STABLE to BUILD_DATE of the latest stable release
-    set BUILD_ID_STABLE to BUILD_ID of the latest stable release
-    check prefix in VERSION_STABLE and update if necessary
+    check and update if necessary links to the latest releases in previous
+    series of releases and their checksums in download.html
 
 Update README.md.
     set version to the new version
diff --git a/h2/src/java10/src/org/h2/util/Utils10.java b/h2/src/java10/src/org/h2/util/Utils10.java
index b80c4a5118..becb570bf2 100644
--- a/h2/src/java10/src/org/h2/util/Utils10.java
+++ b/h2/src/java10/src/org/h2/util/Utils10.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/java10/src/org/h2/util/package.html b/h2/src/java10/src/org/h2/util/package.html
index 5bf8372b08..58c1d89c2a 100644
--- a/h2/src/java10/src/org/h2/util/package.html
+++ b/h2/src/java10/src/org/h2/util/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/java9/src/org/h2/util/Bits.java b/h2/src/java9/src/org/h2/util/Bits.java
index e70af386d6..bd023d58f3 100644
--- a/h2/src/java9/src/org/h2/util/Bits.java
+++ b/h2/src/java9/src/org/h2/util/Bits.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/java9/src/org/h2/util/package.html b/h2/src/java9/src/org/h2/util/package.html
index 3f0cc7b6ec..4f972f10f2 100644
--- a/h2/src/java9/src/org/h2/util/package.html
+++ b/h2/src/java9/src/org/h2/util/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/main/META-INF/MANIFEST.MF b/h2/src/main/META-INF/MANIFEST.MF
index 087eb4cc2a..e91a7b6560 100644
--- a/h2/src/main/META-INF/MANIFEST.MF
+++ b/h2/src/main/META-INF/MANIFEST.MF
@@ -28,6 +28,8 @@ Import-Package: javax.crypto,
  javax.security.auth.login;resolution:=optional,
  javax.servlet;resolution:=optional,
  javax.servlet.http;resolution:=optional,
+ jakarta.servlet;resolution:=optional,
+ jakarta.servlet.http;resolution:=optional,
  javax.sql,
  javax.tools;resolution:=optional,
  javax.transaction.xa;resolution:=optional,
@@ -51,7 +53,7 @@ Import-Package: javax.crypto,
  org.apache.lucene.util;version="[8.5.2,9.0.0)";resolution:=optional,
  org.locationtech.jts.geom;version="1.17.0";resolution:=optional,
  org.osgi.framework;version="1.5",
- org.osgi.service.jdbc;version="1.0";resolution:=optional,
+ org.osgi.service.jdbc;version="1.1";resolution:=optional,
  org.slf4j;version="[1.7.0,1.8.0)";resolution:=optional
 Export-Package: org.h2;version="${version}",
  org.h2.api;version="${version}",
diff --git a/h2/src/main/META-INF/native-image/reflect-config.json b/h2/src/main/META-INF/native-image/reflect-config.json
new file mode 100644
index 0000000000..934acfc776
--- /dev/null
+++ b/h2/src/main/META-INF/native-image/reflect-config.json
@@ -0,0 +1,530 @@
+[
+	{
+		"condition": {
+			"typeReachable": "org.h2.store.fs.FilePath"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": []
+			}
+		],
+		"name": "org.h2.store.fs.mem.FilePathMem"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.store.fs.FilePath"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": []
+			}
+		],
+		"name": "org.h2.store.fs.mem.FilePathMemLZF"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.store.fs.FilePath"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": []
+			}
+		],
+		"name": "org.h2.store.fs.niomem.FilePathNioMem"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.store.fs.FilePath"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": []
+			}
+		],
+		"name": "org.h2.store.fs.niomem.FilePathNioMemLZF"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.store.fs.FilePath"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": []
+			}
+		],
+		"name": "org.h2.store.fs.split.FilePathSplit"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.store.fs.FilePath"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": []
+			}
+		],
+		"name": "org.h2.store.fs.niomapped.FilePathNioMapped"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.store.fs.FilePath"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": []
+			}
+		],
+		"name": "org.h2.store.fs.async.FilePathAsync"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.store.fs.FilePath"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": []
+			}
+		],
+		"name": "org.h2.store.fs.zip.FilePathZip"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.store.fs.FilePath"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": []
+			}
+		],
+		"name": "org.h2.store.fs.retry.FilePathRetryOnInterrupt"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.mvstore.type.MetaType"
+		},
+		"fields": [
+			{
+				"name": "INSTANCE"
+			}
+		],
+		"name": "org.h2.mvstore.type.ByteArrayDataType"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.mvstore.type.MetaType"
+		},
+		"fields": [
+			{
+				"name": "INSTANCE"
+			}
+		],
+		"name": "org.h2.mvstore.type.LongDataType"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.mvstore.type.MetaType"
+		},
+		"fields": [
+			{
+				"name": "INSTANCE"
+			}
+		],
+		"name": "org.h2.mvstore.type.StringDataType"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.mvstore.type.MetaType"
+		},
+		"fields": [
+			{
+				"name": "INSTANCE"
+			}
+		],
+		"name": "org.h2.mvstore.db.NullValueDataType"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.mvstore.type.MetaType"
+		},
+		"fields": [
+			{
+				"name": "INSTANCE"
+			}
+		],
+		"name": "org.h2.mvstore.db.LobStorageMap$BlobReference$Type"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.mvstore.type.MetaType"
+		},
+		"fields": [
+			{
+				"name": "INSTANCE"
+			}
+		],
+		"name": "org.h2.mvstore.db.LobStorageMap$BlobMeta$Type"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.mvstore.type.MetaType"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": []
+			}
+		],
+		"name": "org.h2.mvstore.tx.VersionedValueType$Factory"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.mvstore.type.MetaType"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": []
+			}
+		],
+		"name": "org.h2.mvstore.db.RowDataType$Factory"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.server.TcpServer"
+		},
+		"methods": [
+			{
+				"name": "stopServer",
+				"parameterTypes": [
+					"int",
+					"java.lang.String",
+					"int"
+				]
+			}
+		],
+		"name": "org.h2.server.TcpServer"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.util.MathUtils"
+		},
+		"methods": [
+			{
+				"name": "getAddress",
+				"parameterTypes": []
+			},
+			{
+				"name": "getAllByName",
+				"parameterTypes": [
+					"java.lang.String"
+				]
+			},
+			{
+				"name": "getHostName",
+				"parameterTypes": []
+			},
+			{
+				"name": "getLocalHost",
+				"parameterTypes": []
+			}
+		],
+		"name": "java.net.InetAddress"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.util.MemoryUnmapper"
+		},
+		"fields": [
+			{
+				"name": "theUnsafe"
+			}
+		],
+		"methods": [
+			{
+				"name": "invokeCleaner",
+				"parameterTypes": [
+					"java.nio.ByteBuffer"
+				]
+			}
+		],
+		"name": "sun.misc.Unsafe"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.engine.Database"
+		},
+		"methods": [
+			{
+				"name": "createIndex",
+				"parameterTypes": [
+					"java.sql.Connection",
+					"java.lang.String",
+					"java.lang.String",
+					"java.lang.String"
+				]
+			},
+			{
+				"name": "dropAll",
+				"parameterTypes": [
+					"java.sql.Connection"
+				]
+			},
+			{
+				"name": "dropIndex",
+				"parameterTypes": [
+					"java.sql.Connection",
+					"java.lang.String",
+					"java.lang.String"
+				]
+			},
+			{
+				"name": "init",
+				"parameterTypes": [
+					"java.sql.Connection"
+				]
+			},
+			{
+				"name": "reindex",
+				"parameterTypes": [
+					"java.sql.Connection"
+				]
+			},
+			{
+				"name": "search",
+				"parameterTypes": [
+					"java.sql.Connection",
+					"java.lang.String",
+					"int",
+					"int"
+				]
+			},
+			{
+				"name": "searchData",
+				"parameterTypes": [
+					"java.sql.Connection",
+					"java.lang.String",
+					"int",
+					"int"
+				]
+			}
+		],
+		"name": "org.h2.fulltext.FullText"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.fulltext.FullText"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": []
+			}
+		],
+		"name": "org.h2.fulltext.FullText$FullTextTrigger"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.engine.Database"
+		},
+		"methods": [
+			{
+				"name": "createIndex",
+				"parameterTypes": [
+					"java.sql.Connection",
+					"java.lang.String",
+					"java.lang.String",
+					"java.lang.String"
+				]
+			},
+			{
+				"name": "dropAll",
+				"parameterTypes": [
+					"java.sql.Connection"
+				]
+			},
+			{
+				"name": "dropIndex",
+				"parameterTypes": [
+					"java.sql.Connection",
+					"java.lang.String",
+					"java.lang.String"
+				]
+			},
+			{
+				"name": "init",
+				"parameterTypes": [
+					"java.sql.Connection"
+				]
+			},
+			{
+				"name": "reindex",
+				"parameterTypes": [
+					"java.sql.Connection"
+				]
+			},
+			{
+				"name": "search",
+				"parameterTypes": [
+					"java.sql.Connection",
+					"java.lang.String",
+					"int",
+					"int"
+				]
+			},
+			{
+				"name": "searchData",
+				"parameterTypes": [
+					"java.sql.Connection",
+					"java.lang.String",
+					"int",
+					"int"
+				]
+			}
+		],
+		"name": "org.h2.fulltext.FullTextLucene"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.fulltext.FullTextLucene"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": []
+			}
+		],
+		"name": "org.h2.fulltext.FullTextLucene$FullTextTrigger"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.slf4j.Logger"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": []
+			}
+		],
+		"name": "org.h2.message.TraceWriterAdapter"
+	},
+	{
+		"condition": {
+			"typeReachable": "com.ibm.icu.text.Collator"
+		},
+		"methods": [
+			{
+				"name": "getAvailableLocales",
+				"parameterTypes": []
+			},
+			{
+				"name": "getInstance",
+				"parameterTypes": [
+					"java.util.Locale"
+				]
+			},
+			{
+				"name": "setStrength",
+				"parameterTypes": [
+					"int"
+				]
+			}
+		],
+		"name": "com.ibm.icu.text.Collator"
+	},
+	{
+		"condition": {
+			"typeReachable": "org.h2.tools.Server"
+		},
+		"methods": [
+			{
+				"name": "browse",
+				"parameterTypes": [
+					"java.net.URI"
+				]
+			},
+			{
+				"name": "getDesktop",
+				"parameterTypes": []
+			},
+			{
+				"name": "isDesktopSupported",
+				"parameterTypes": []
+			}
+		],
+		"name": "java.awt.Desktop"
+	},
+	{
+		"condition": {
+			"typeReachable": "java.awt.SystemTray"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": []
+			}
+		],
+		"name": "org.h2.tools.GUIConsole"
+	},
+	{
+		"condition": {
+			"typeReachable": "java.awt.SystemTray"
+		},
+		"methods": [
+			{
+				"name": "add",
+				"parameterTypes": [
+					"java.awt.TrayIcon"
+				]
+			},
+			{
+				"name": "getSystemTray",
+				"parameterTypes": []
+			},
+			{
+				"name": "getTrayIconSize",
+				"parameterTypes": []
+			},
+			{
+				"name": "isSupported",
+				"parameterTypes": []
+			},
+			{
+				"name": "remove",
+				"parameterTypes": [
+					"java.awt.TrayIcon"
+				]
+			}
+		],
+		"name": "java.awt.SystemTray"
+	},
+	{
+		"condition": {
+			"typeReachable": "java.awt.SystemTray"
+		},
+		"methods": [
+			{
+				"name": "",
+				"parameterTypes": [
+					"java.awt.Image",
+					"java.lang.String"
+				]
+			},
+			{
+				"name": "addMouseListener",
+				"parameterTypes": [
+					"java.awt.event.MouseListener"
+				]
+			}
+		],
+		"name": "java.awt.TrayIcon"
+	}
+]
diff --git a/h2/src/main/META-INF/native-image/resource-config.json b/h2/src/main/META-INF/native-image/resource-config.json
new file mode 100644
index 0000000000..c1246d5ce8
--- /dev/null
+++ b/h2/src/main/META-INF/native-image/resource-config.json
@@ -0,0 +1,12 @@
+{
+	"resources": {
+		"includes": [
+			{
+				"condition": {
+					"typeReachable": "org.h2.util.Utils"
+				},
+				"pattern": "org/h2/util/data.zip"
+			}
+		]
+	}
+}
diff --git a/h2/src/main/org/h2/Driver.java b/h2/src/main/org/h2/Driver.java
index 5790217c62..25279e3abf 100644
--- a/h2/src/main/org/h2/Driver.java
+++ b/h2/src/main/org/h2/Driver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -56,7 +56,7 @@ public Connection connect(String url, Properties info) throws SQLException {
         if (url == null) {
             throw DbException.getJdbcSQLException(ErrorCode.URL_FORMAT_ERROR_2, null, Constants.URL_FORMAT, null);
         } else if (url.startsWith(Constants.START_URL)) {
-            return new JdbcConnection(url, info, null, null);
+            return new JdbcConnection(url, info, null, null, false);
         } else if (url.equals(DEFAULT_URL)) {
             return DEFAULT_CONNECTION.get();
         } else {
diff --git a/h2/src/main/org/h2/JdbcDriverBackwardsCompat.java b/h2/src/main/org/h2/JdbcDriverBackwardsCompat.java
index 228ad29948..0f45cc6077 100644
--- a/h2/src/main/org/h2/JdbcDriverBackwardsCompat.java
+++ b/h2/src/main/org/h2/JdbcDriverBackwardsCompat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/api/Aggregate.java b/h2/src/main/org/h2/api/Aggregate.java
index 6df633f98a..c5bd31f590 100644
--- a/h2/src/main/org/h2/api/Aggregate.java
+++ b/h2/src/main/org/h2/api/Aggregate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/api/AggregateFunction.java b/h2/src/main/org/h2/api/AggregateFunction.java
index 276dd39aa3..1d9ad8aa49 100644
--- a/h2/src/main/org/h2/api/AggregateFunction.java
+++ b/h2/src/main/org/h2/api/AggregateFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/api/CredentialsValidator.java b/h2/src/main/org/h2/api/CredentialsValidator.java
index 786ea4c4ca..2c2ef436fe 100644
--- a/h2/src/main/org/h2/api/CredentialsValidator.java
+++ b/h2/src/main/org/h2/api/CredentialsValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: Alessandro Ventura
  */
diff --git a/h2/src/main/org/h2/api/DatabaseEventListener.java b/h2/src/main/org/h2/api/DatabaseEventListener.java
index 21615f3aca..7fceb24b4c 100644
--- a/h2/src/main/org/h2/api/DatabaseEventListener.java
+++ b/h2/src/main/org/h2/api/DatabaseEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/api/ErrorCode.java b/h2/src/main/org/h2/api/ErrorCode.java
index df1684e3af..680e6c4692 100644
--- a/h2/src/main/org/h2/api/ErrorCode.java
+++ b/h2/src/main/org/h2/api/ErrorCode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -223,6 +223,18 @@ public class ErrorCode {
      */
     public static final int ARRAY_ELEMENT_ERROR_2 = 22034;
 
+    /**
+     * The error with code 22035 is thrown when an
+     * attempt is made to update an element in NULL array.
+     *
+     * Example:
+     * +     * CREATE TABLE TEST(A INTEGER ARRAY) AS VALUES NULL;
+     * UPDATE TEST SET A[1] = 2;
+     * 
+     */
+    public static final int NULL_VALUE_IN_ARRAY_TARGET = 22035;
+
     // 23: constraint violation
 
     /**
@@ -1128,7 +1140,7 @@ public class ErrorCode {
 
     /**
     * The error with code 90056 is thrown when trying to format a
-    * timestamp using TO_DATE and TO_TIMESTAMP  with an invalid format.
+    * timestamp using TO_DATE and TO_TIMESTAMP with an invalid format.
     */
     public static final int INVALID_TO_DATE_FORMAT = 90056;
 
@@ -1714,7 +1726,7 @@ public class ErrorCode {
 
     /**
      * The error with code 90110 is thrown when
-     * trying to compare values of incomparable data types.
+     * trying to compare or combine values of incomparable data types.
      * Example:
      *       * CREATE TABLE test (id INT NOT NULL, name VARCHAR);
@@ -1878,9 +1890,8 @@ public class ErrorCode {
     /**
      * The error with code 90125 is thrown when
      * PreparedStatement.setBigDecimal is called with object that extends the
-     * class BigDecimal, and the system property h2.allowBigDecimalExtensions is
-     * not set. Using extensions of BigDecimal is dangerous because the database
-     * relies on the behavior of BigDecimal. Example of wrong usage:
+     * class BigDecimal. Using extensions of BigDecimal is dangerous because the
+     * database relies on the behavior of BigDecimal. Example of wrong usage:
      *       * BigDecimal bd = new MyDecimal("$10.3");
      * prep.setBigDecimal(1, bd);
@@ -2300,6 +2311,7 @@ public static String getState(int errorCode) {
         case COLUMN_COUNT_DOES_NOT_MATCH: return "21S02";
 
         // 22: data exception
+        case NULL_VALUE_IN_ARRAY_TARGET: return "2200E";
         case ARRAY_ELEMENT_ERROR_2: return "2202E";
 
         // 42: syntax error or access rule violation
diff --git a/h2/src/main/org/h2/api/H2Type.java b/h2/src/main/org/h2/api/H2Type.java
index 3b0dcccdb6..b240420a8a 100644
--- a/h2/src/main/org/h2/api/H2Type.java
+++ b/h2/src/main/org/h2/api/H2Type.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/api/Interval.java b/h2/src/main/org/h2/api/Interval.java
index 761dbfdb7d..1d93bcb692 100644
--- a/h2/src/main/org/h2/api/Interval.java
+++ b/h2/src/main/org/h2/api/Interval.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/api/IntervalQualifier.java b/h2/src/main/org/h2/api/IntervalQualifier.java
index 5c6cd3e75b..6f1a155466 100644
--- a/h2/src/main/org/h2/api/IntervalQualifier.java
+++ b/h2/src/main/org/h2/api/IntervalQualifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/api/JavaObjectSerializer.java b/h2/src/main/org/h2/api/JavaObjectSerializer.java
index b951ebe123..ac9f75e97f 100644
--- a/h2/src/main/org/h2/api/JavaObjectSerializer.java
+++ b/h2/src/main/org/h2/api/JavaObjectSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/api/TableEngine.java b/h2/src/main/org/h2/api/TableEngine.java
index 2b5e02da05..1568e9a6a8 100644
--- a/h2/src/main/org/h2/api/TableEngine.java
+++ b/h2/src/main/org/h2/api/TableEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/api/Trigger.java b/h2/src/main/org/h2/api/Trigger.java
index 58f6f481bc..ae28911bf2 100644
--- a/h2/src/main/org/h2/api/Trigger.java
+++ b/h2/src/main/org/h2/api/Trigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/api/UserToRolesMapper.java b/h2/src/main/org/h2/api/UserToRolesMapper.java
index 26632b8447..9fe0f5c7c1 100644
--- a/h2/src/main/org/h2/api/UserToRolesMapper.java
+++ b/h2/src/main/org/h2/api/UserToRolesMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: Alessandro Ventura
  */
diff --git a/h2/src/main/org/h2/api/package.html b/h2/src/main/org/h2/api/package.html
index 77ca0e4b09..0b77b4cc41 100644
--- a/h2/src/main/org/h2/api/package.html
+++ b/h2/src/main/org/h2/api/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/main/org/h2/bnf/Bnf.java b/h2/src/main/org/h2/bnf/Bnf.java
index 22dabbf57d..774bfeb0d2 100644
--- a/h2/src/main/org/h2/bnf/Bnf.java
+++ b/h2/src/main/org/h2/bnf/Bnf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -9,6 +9,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -52,7 +53,7 @@ public static Bnf getInstance(Reader csv) throws SQLException, IOException {
         Bnf bnf = new Bnf();
         if (csv == null) {
             byte[] data = Utils.getResource("/org/h2/res/help.csv");
-            csv = new InputStreamReader(new ByteArrayInputStream(data));
+            csv = new InputStreamReader(new ByteArrayInputStream(data), StandardCharsets.UTF_8);
         }
         bnf.parse(csv);
         return bnf;
@@ -126,6 +127,8 @@ private void parse(Reader reader) throws SQLException, IOException {
         addFixedRule("anything_except_two_dollar_signs", RuleFixed.ANY_EXCEPT_2_DOLLAR);
         addFixedRule("anything", RuleFixed.ANY_WORD);
         addFixedRule("@hex_start@", RuleFixed.HEX_START);
+        addFixedRule("@octal_start@", RuleFixed.OCTAL_START);
+        addFixedRule("@binary_start@", RuleFixed.BINARY_START);
         addFixedRule("@concat@", RuleFixed.CONCAT);
         addFixedRule("@az_@", RuleFixed.AZ_UNDERSCORE);
         addFixedRule("@af@", RuleFixed.AF);
@@ -133,6 +136,8 @@ private void parse(Reader reader) throws SQLException, IOException {
         addFixedRule("@open_bracket@", RuleFixed.OPEN_BRACKET);
         addFixedRule("@close_bracket@", RuleFixed.CLOSE_BRACKET);
         addFixedRule("json_text", RuleFixed.JSON_TEXT);
+        Rule digit = ruleMap.get("digit").getRule();
+        ruleMap.get("number").setRule(new RuleList(digit, new RuleOptional(new RuleRepeat(digit, false)), false));
     }
 
     /**
@@ -168,7 +173,8 @@ public static boolean startWithSpace(String s) {
      */
     public static String getRuleMapKey(String token) {
         StringBuilder buff = new StringBuilder();
-        for (char ch : token.toCharArray()) {
+        for (int i = 0, l = token.length(); i < l; i++) {
+            char ch = token.charAt(i);
             if (Character.isUpperCase(ch)) {
                 buff.append('_').append(Character.toLowerCase(ch));
             } else {
@@ -307,6 +313,8 @@ private String[] tokenize() {
         syntax = StringUtils.replaceAll(syntax, "nnnnnnnnn", "@nanos@");
         syntax = StringUtils.replaceAll(syntax, "function", "@func@");
         syntax = StringUtils.replaceAll(syntax, "0x", "@hexStart@");
+        syntax = StringUtils.replaceAll(syntax, "0o", "@octalStart@");
+        syntax = StringUtils.replaceAll(syntax, "0b", "@binaryStart@");
         syntax = StringUtils.replaceAll(syntax, ",...", "@commaDots@");
         syntax = StringUtils.replaceAll(syntax, "...", "@dots@");
         syntax = StringUtils.replaceAll(syntax, "||", "@concat@");
diff --git a/h2/src/main/org/h2/bnf/BnfVisitor.java b/h2/src/main/org/h2/bnf/BnfVisitor.java
index 67014a33fb..1b8f85d1ff 100644
--- a/h2/src/main/org/h2/bnf/BnfVisitor.java
+++ b/h2/src/main/org/h2/bnf/BnfVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/bnf/Rule.java b/h2/src/main/org/h2/bnf/Rule.java
index 831784a6b4..35f7c464d3 100644
--- a/h2/src/main/org/h2/bnf/Rule.java
+++ b/h2/src/main/org/h2/bnf/Rule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/bnf/RuleElement.java b/h2/src/main/org/h2/bnf/RuleElement.java
index 6b6d257ed4..6a2a0c9537 100644
--- a/h2/src/main/org/h2/bnf/RuleElement.java
+++ b/h2/src/main/org/h2/bnf/RuleElement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/bnf/RuleExtension.java b/h2/src/main/org/h2/bnf/RuleExtension.java
index 21585a78df..578a2f0edc 100644
--- a/h2/src/main/org/h2/bnf/RuleExtension.java
+++ b/h2/src/main/org/h2/bnf/RuleExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/bnf/RuleFixed.java b/h2/src/main/org/h2/bnf/RuleFixed.java
index f3d210ef0a..b571d27c96 100644
--- a/h2/src/main/org/h2/bnf/RuleFixed.java
+++ b/h2/src/main/org/h2/bnf/RuleFixed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -12,17 +12,25 @@
  */
 public class RuleFixed implements Rule {
 
-    public static final int YMD = 0, HMS = 1, NANOS = 2;
-    public static final int ANY_EXCEPT_SINGLE_QUOTE = 3;
-    public static final int ANY_EXCEPT_DOUBLE_QUOTE = 4;
-    public static final int ANY_UNTIL_EOL = 5;
-    public static final int ANY_UNTIL_END = 6;
-    public static final int ANY_WORD = 7;
-    public static final int ANY_EXCEPT_2_DOLLAR = 8;
-    public static final int HEX_START = 10, CONCAT = 11;
-    public static final int AZ_UNDERSCORE = 12, AF = 13, DIGIT = 14;
-    public static final int OPEN_BRACKET = 15, CLOSE_BRACKET = 16;
-    public static final int JSON_TEXT = 17;
+    public static final int YMD = 0;
+    public static final int HMS = YMD + 1;
+    public static final int NANOS = HMS + 1;
+    public static final int ANY_EXCEPT_SINGLE_QUOTE = NANOS + 1;
+    public static final int ANY_EXCEPT_DOUBLE_QUOTE = ANY_EXCEPT_SINGLE_QUOTE + 1;
+    public static final int ANY_UNTIL_EOL = ANY_EXCEPT_DOUBLE_QUOTE + 1;
+    public static final int ANY_UNTIL_END = ANY_UNTIL_EOL + 1;
+    public static final int ANY_WORD = ANY_UNTIL_END + 1;
+    public static final int ANY_EXCEPT_2_DOLLAR = ANY_WORD + 1;
+    public static final int HEX_START = ANY_EXCEPT_2_DOLLAR + 1;
+    public static final int OCTAL_START = HEX_START + 1;
+    public static final int BINARY_START = OCTAL_START + 1;
+    public static final int CONCAT = BINARY_START + 1;
+    public static final int AZ_UNDERSCORE = CONCAT + 1;
+    public static final int AF = AZ_UNDERSCORE + 1;
+    public static final int DIGIT = AF + 1;
+    public static final int OPEN_BRACKET = DIGIT + 1;
+    public static final int CLOSE_BRACKET = OPEN_BRACKET + 1;
+    public static final int JSON_TEXT = CLOSE_BRACKET + 1;
 
     private final int type;
 
@@ -133,6 +141,24 @@ public boolean autoComplete(Sentence sentence) {
                 sentence.add("0x", "0x", Sentence.KEYWORD);
             }
             break;
+        case OCTAL_START:
+            if (s.startsWith("0O") || s.startsWith("0o")) {
+                s = s.substring(2);
+            } else if ("0".equals(s)) {
+                sentence.add("0o", "o", Sentence.KEYWORD);
+            } else if (s.length() == 0) {
+                sentence.add("0o", "0o", Sentence.KEYWORD);
+            }
+            break;
+        case BINARY_START:
+            if (s.startsWith("0B") || s.startsWith("0b")) {
+                s = s.substring(2);
+            } else if ("0".equals(s)) {
+                sentence.add("0b", "b", Sentence.KEYWORD);
+            } else if (s.length() == 0) {
+                sentence.add("0b", "0b", Sentence.KEYWORD);
+            }
+            break;
         case CONCAT:
             if (s.equals("|")) {
                 sentence.add("||", "|", Sentence.KEYWORD);
diff --git a/h2/src/main/org/h2/bnf/RuleHead.java b/h2/src/main/org/h2/bnf/RuleHead.java
index 464da2f46c..24fb57e762 100644
--- a/h2/src/main/org/h2/bnf/RuleHead.java
+++ b/h2/src/main/org/h2/bnf/RuleHead.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/bnf/RuleList.java b/h2/src/main/org/h2/bnf/RuleList.java
index 76b274d146..79efea23ce 100644
--- a/h2/src/main/org/h2/bnf/RuleList.java
+++ b/h2/src/main/org/h2/bnf/RuleList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/bnf/RuleOptional.java b/h2/src/main/org/h2/bnf/RuleOptional.java
index 1fd560b033..4cf87270ba 100644
--- a/h2/src/main/org/h2/bnf/RuleOptional.java
+++ b/h2/src/main/org/h2/bnf/RuleOptional.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/bnf/RuleRepeat.java b/h2/src/main/org/h2/bnf/RuleRepeat.java
index 226b645b3c..28d018a09c 100644
--- a/h2/src/main/org/h2/bnf/RuleRepeat.java
+++ b/h2/src/main/org/h2/bnf/RuleRepeat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/bnf/Sentence.java b/h2/src/main/org/h2/bnf/Sentence.java
index 7000f26b20..c3bccaad3a 100644
--- a/h2/src/main/org/h2/bnf/Sentence.java
+++ b/h2/src/main/org/h2/bnf/Sentence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/bnf/context/DbColumn.java b/h2/src/main/org/h2/bnf/context/DbColumn.java
index 7891defc35..a8a0168aad 100644
--- a/h2/src/main/org/h2/bnf/context/DbColumn.java
+++ b/h2/src/main/org/h2/bnf/context/DbColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/bnf/context/DbContents.java b/h2/src/main/org/h2/bnf/context/DbContents.java
index a657fc09fe..1d4ae94586 100644
--- a/h2/src/main/org/h2/bnf/context/DbContents.java
+++ b/h2/src/main/org/h2/bnf/context/DbContents.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/bnf/context/DbContextRule.java b/h2/src/main/org/h2/bnf/context/DbContextRule.java
index 39dc9a458c..ebe2b499c8 100644
--- a/h2/src/main/org/h2/bnf/context/DbContextRule.java
+++ b/h2/src/main/org/h2/bnf/context/DbContextRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/bnf/context/DbProcedure.java b/h2/src/main/org/h2/bnf/context/DbProcedure.java
index 28a4cf6ae5..839d0a6fc6 100644
--- a/h2/src/main/org/h2/bnf/context/DbProcedure.java
+++ b/h2/src/main/org/h2/bnf/context/DbProcedure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -71,6 +71,7 @@ public boolean isReturnsResult() {
      * Read the column for this table from the database meta data.
      *
      * @param meta the database meta data
+     * @throws SQLException on failure
      */
     void readParameters(DatabaseMetaData meta) throws SQLException {
         ResultSet rs = meta.getProcedureColumns(null, schema.name, name, null);
diff --git a/h2/src/main/org/h2/bnf/context/DbSchema.java b/h2/src/main/org/h2/bnf/context/DbSchema.java
index 342366a6f7..d95161521d 100644
--- a/h2/src/main/org/h2/bnf/context/DbSchema.java
+++ b/h2/src/main/org/h2/bnf/context/DbSchema.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/bnf/context/DbTableOrView.java b/h2/src/main/org/h2/bnf/context/DbTableOrView.java
index 0d304353c2..4af6d696ad 100644
--- a/h2/src/main/org/h2/bnf/context/DbTableOrView.java
+++ b/h2/src/main/org/h2/bnf/context/DbTableOrView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/bnf/context/package.html b/h2/src/main/org/h2/bnf/context/package.html
index 026e5dd43a..df32b8d1f7 100644
--- a/h2/src/main/org/h2/bnf/context/package.html
+++ b/h2/src/main/org/h2/bnf/context/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/main/org/h2/bnf/package.html b/h2/src/main/org/h2/bnf/package.html
index 7e3889414b..122d8a733c 100644
--- a/h2/src/main/org/h2/bnf/package.html
+++ b/h2/src/main/org/h2/bnf/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/main/org/h2/command/Command.java b/h2/src/main/org/h2/command/Command.java
index ba9bed93df..c9b580fcf0 100644
--- a/h2/src/main/org/h2/command/Command.java
+++ b/h2/src/main/org/h2/command/Command.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -55,7 +55,7 @@ public abstract class Command implements CommandInterface {
     Command(SessionLocal session, String sql) {
         this.session = session;
         this.sql = sql;
-        trace = session.getDatabase().getTrace(Trace.COMMAND);
+        trace = getDatabase().getTrace(Trace.COMMAND);
     }
 
     /**
@@ -129,13 +129,13 @@ public final ResultInterface getMetaData() {
      * Start the stopwatch.
      */
     void start() {
-        if (trace.isInfoEnabled() || session.getDatabase().getQueryStatistics()) {
+        if (trace.isInfoEnabled() || getDatabase().getQueryStatistics()) {
             startTimeNanos = Utils.currentNanoTime();
         }
     }
 
-    void setProgress(int state) {
-        session.getDatabase().setProgress(state, sql, 0, 0);
+    void setProgress(Database database, int state) {
+        database.setProgress(state, sql, 0, 0);
     }
 
     /**
@@ -152,9 +152,11 @@ protected void checkCanceled() {
 
     @Override
     public void stop() {
-        commitIfNonTransactional();
-        if (isTransactional() && session.getAutoCommit()) {
-            session.commit(false);
+        if (session.isOpen()) {
+            commitIfNonTransactional();
+            if (isTransactional() && session.getAutoCommit()) {
+                session.commit(false);
+            }
         }
         if (trace.isInfoEnabled() && startTimeNanos != 0L) {
             long timeMillis = (System.nanoTime() - startTimeNanos) / 1_000_000L;
@@ -176,10 +178,9 @@ public void stop() {
     public ResultInterface executeQuery(long maxrows, boolean scrollable) {
         startTimeNanos = 0L;
         long start = 0L;
-        Database database = session.getDatabase();
+        Database database = getDatabase();
         session.waitIfExclusiveModeEnabled();
         boolean callStop = true;
-        //noinspection SynchronizationOnLocalVariableOrMethodParameter
         synchronized (session) {
             session.startStatementWithinTransaction(this);
             Session oldSession = session.setThreadLocalSession();
@@ -194,8 +195,8 @@ public ResultInterface executeQuery(long maxrows, boolean scrollable) {
                         }
                         return result;
                     } catch (DbException e) {
-                        // cannot retry DDL
-                        if (isCurrentCommandADefineCommand()) {
+                        // cannot retry some commands
+                        if (!isRetryable()) {
                             throw e;
                         }
                         start = filterConcurrentUpdate(e, start);
@@ -235,11 +236,10 @@ public ResultInterface executeQuery(long maxrows, boolean scrollable) {
     @Override
     public ResultWithGeneratedKeys executeUpdate(Object generatedKeysRequest) {
         long start = 0;
-        Database database = session.getDatabase();
-        session.waitIfExclusiveModeEnabled();
         boolean callStop = true;
-        //noinspection SynchronizationOnLocalVariableOrMethodParameter
         synchronized (session) {
+            Database database = getDatabase();
+            session.waitIfExclusiveModeEnabled();
             commitIfNonTransactional();
             SessionLocal.Savepoint rollback = session.setSavepoint();
             session.startStatementWithinTransaction(this);
@@ -251,8 +251,8 @@ public ResultWithGeneratedKeys executeUpdate(Object generatedKeysRequest) {
                     try {
                         return update(generatedKeysRequest);
                     } catch (DbException e) {
-                        // cannot retry DDL
-                        if (isCurrentCommandADefineCommand()) {
+                        // cannot retry some commands
+                        if (!isRetryable()) {
                             throw e;
                         }
                         start = filterConcurrentUpdate(e, start);
@@ -373,9 +373,13 @@ public void setCanReuse(boolean canReuse) {
     public abstract Set getDependencies();
 
     /**
-     * Is the command we just tried to execute a DefineCommand (i.e. DDL).
+     * Returns is this command can be repeated again on locking failure.
      *
-     * @return true if yes
+     * @return is this command can be repeated again on locking failure
      */
-    protected abstract boolean isCurrentCommandADefineCommand();
+    protected abstract boolean isRetryable();
+
+    protected final Database getDatabase() {
+        return session.getDatabase();
+    }
 }
diff --git a/h2/src/main/org/h2/command/CommandContainer.java b/h2/src/main/org/h2/command/CommandContainer.java
index 4776e4b40a..3febf9bc98 100644
--- a/h2/src/main/org/h2/command/CommandContainer.java
+++ b/h2/src/main/org/h2/command/CommandContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -11,7 +11,6 @@
 import java.util.Set;
 import org.h2.api.DatabaseEventListener;
 import org.h2.api.ErrorCode;
-import org.h2.command.ddl.DefineCommand;
 import org.h2.command.dml.DataChangeStatement;
 import org.h2.engine.Database;
 import org.h2.engine.DbObject;
@@ -118,7 +117,11 @@ public CommandContainer(SessionLocal session, String sql, Prepared prepared) {
 
     @Override
     public ArrayList getParameters() {
-        return prepared.getParameters();
+        ArrayList parameters = prepared.getParameters();
+        if (parameters.size() > 0 && prepared.isWithParamValues()) {
+            parameters = new ArrayList<>();
+        }
+        return parameters;
     }
 
     @Override
@@ -136,20 +139,12 @@ private void recompileIfRequired() {
             // TODO test with 'always recompile'
             prepared.setModificationMetaId(0);
             String sql = prepared.getSQL();
-            ArrayList oldParams = prepared.getParameters();
+            ArrayList tokens = prepared.getSQLTokens();
             Parser parser = new Parser(session);
-            prepared = parser.parse(sql);
+            parser.setSuppliedParameters(prepared.getParameters());
+            prepared = parser.parse(sql, tokens);
             long mod = prepared.getModificationMetaId();
             prepared.setModificationMetaId(0);
-            ArrayList newParams = prepared.getParameters();
-            for (int i = 0, size = Math.min(newParams.size(), oldParams.size()); i < size; i++) {
-                Parameter old = oldParams.get(i);
-                if (old.isValueSet()) {
-                    Value v = old.getValue(session);
-                    Parameter p = newParams.get(i);
-                    p.setValue(v);
-                }
-            }
             prepared.prepare();
             prepared.setModificationMetaId(mod);
         }
@@ -158,7 +153,8 @@ private void recompileIfRequired() {
     @Override
     public ResultWithGeneratedKeys update(Object generatedKeysRequest) {
         recompileIfRequired();
-        setProgress(DatabaseEventListener.STATE_STATEMENT_START);
+        Database database = getDatabase();
+        setProgress(database, DatabaseEventListener.STATE_STATEMENT_START);
         start();
         prepared.checkParameters();
         ResultWithGeneratedKeys result;
@@ -172,14 +168,14 @@ public ResultWithGeneratedKeys update(Object generatedKeysRequest) {
         } else {
             result = ResultWithGeneratedKeys.of(prepared.update());
         }
-        prepared.trace(startTimeNanos, result.getUpdateCount());
-        setProgress(DatabaseEventListener.STATE_STATEMENT_END);
+        prepared.trace(database, startTimeNanos, result.getUpdateCount());
+        setProgress(database, DatabaseEventListener.STATE_STATEMENT_END);
         return result;
     }
 
     private ResultWithGeneratedKeys executeUpdateWithGeneratedKeys(DataChangeStatement statement,
             Object generatedKeysRequest) {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         Table table = statement.getTable();
         ArrayList expressionColumns;
         if (Boolean.TRUE.equals(generatedKeysRequest)) {
@@ -249,12 +245,13 @@ private ResultWithGeneratedKeys executeUpdateWithGeneratedKeys(DataChangeStateme
     @Override
     public ResultInterface query(long maxrows) {
         recompileIfRequired();
-        setProgress(DatabaseEventListener.STATE_STATEMENT_START);
+        Database database = getDatabase();
+        setProgress(database, DatabaseEventListener.STATE_STATEMENT_START);
         start();
         prepared.checkParameters();
         ResultInterface result = prepared.query(maxrows);
-        prepared.trace(startTimeNanos, result.isLazy() ? 0 : result.getRowCount());
-        setProgress(DatabaseEventListener.STATE_STATEMENT_END);
+        prepared.trace(database, startTimeNanos, result.isLazy() ? 0 : result.getRowCount());
+        setProgress(database, DatabaseEventListener.STATE_STATEMENT_END);
         return result;
     }
 
@@ -310,7 +307,8 @@ public Set getDependencies() {
     }
 
     @Override
-    protected boolean isCurrentCommandADefineCommand() {
-        return prepared instanceof DefineCommand;
+    protected boolean isRetryable() {
+        return prepared.isRetryable();
     }
+
 }
diff --git a/h2/src/main/org/h2/command/CommandInterface.java b/h2/src/main/org/h2/command/CommandInterface.java
index 90ed593d76..2a10e130df 100644
--- a/h2/src/main/org/h2/command/CommandInterface.java
+++ b/h2/src/main/org/h2/command/CommandInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -541,6 +541,21 @@ public interface CommandInterface extends AutoCloseable {
      */
     int ALTER_DOMAIN_RENAME_CONSTRAINT = 101;
 
+    /**
+     * The type of a CREATE MATERIALIZED VIEW statement.
+     */
+    int CREATE_MATERIALIZED_VIEW = 102;
+
+    /**
+     * The type of a REFRESH MATERIALIZED VIEW statement.
+     */
+    int REFRESH_MATERIALIZED_VIEW = 103;
+
+    /**
+     * The type of a DROP MATERIALIZED VIEW statement.
+     */
+    int DROP_MATERIALIZED_VIEW = 104;
+
     /**
      * Get command type.
      *
diff --git a/h2/src/main/org/h2/command/CommandList.java b/h2/src/main/org/h2/command/CommandList.java
index ddf218124b..9c1d3dc984 100644
--- a/h2/src/main/org/h2/command/CommandList.java
+++ b/h2/src/main/org/h2/command/CommandList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -120,7 +120,16 @@ public Set getDependencies() {
     }
 
     @Override
-    protected boolean isCurrentCommandADefineCommand() {
-        return command.isCurrentCommandADefineCommand();
+    protected boolean isRetryable() {
+        if (!command.isRetryable()) {
+            return false;
+        }
+        for (Prepared prepared : commands) {
+            if (!prepared.isRetryable()) {
+                return false;
+            }
+        }
+        return remainingCommand == null || remainingCommand.isRetryable();
     }
+
 }
diff --git a/h2/src/main/org/h2/command/CommandRemote.java b/h2/src/main/org/h2/command/CommandRemote.java
index 9b0f99f84d..408ddc6577 100644
--- a/h2/src/main/org/h2/command/CommandRemote.java
+++ b/h2/src/main/org/h2/command/CommandRemote.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/Parser.java b/h2/src/main/org/h2/command/Parser.java
index b8f0b26ca3..ff8c28de84 100644
--- a/h2/src/main/org/h2/command/Parser.java
+++ b/h2/src/main/org/h2/command/Parser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  *
@@ -8,6 +8,38 @@
  */
 package org.h2.command;
 
+import static org.h2.command.Token.ASTERISK;
+import static org.h2.command.Token.AT;
+import static org.h2.command.Token.BIGGER;
+import static org.h2.command.Token.BIGGER_EQUAL;
+import static org.h2.command.Token.CLOSE_BRACE;
+import static org.h2.command.Token.CLOSE_BRACKET;
+import static org.h2.command.Token.CLOSE_PAREN;
+import static org.h2.command.Token.COLON;
+import static org.h2.command.Token.COLON_COLON;
+import static org.h2.command.Token.COLON_EQ;
+import static org.h2.command.Token.COMMA;
+import static org.h2.command.Token.CONCATENATION;
+import static org.h2.command.Token.DOT;
+import static org.h2.command.Token.END_OF_INPUT;
+import static org.h2.command.Token.EQUAL;
+import static org.h2.command.Token.LITERAL;
+import static org.h2.command.Token.MINUS_SIGN;
+import static org.h2.command.Token.NOT_EQUAL;
+import static org.h2.command.Token.NOT_TILDE;
+import static org.h2.command.Token.OPEN_BRACE;
+import static org.h2.command.Token.OPEN_BRACKET;
+import static org.h2.command.Token.OPEN_PAREN;
+import static org.h2.command.Token.PARAMETER;
+import static org.h2.command.Token.PERCENT;
+import static org.h2.command.Token.PLUS_SIGN;
+import static org.h2.command.Token.SEMICOLON;
+import static org.h2.command.Token.SLASH;
+import static org.h2.command.Token.SMALLER;
+import static org.h2.command.Token.SMALLER_EQUAL;
+import static org.h2.command.Token.SPATIAL_INTERSECTS;
+import static org.h2.command.Token.TILDE;
+import static org.h2.command.Token.TOKENS;
 import static org.h2.util.ParserUtil.ALL;
 import static org.h2.util.ParserUtil.AND;
 import static org.h2.util.ParserUtil.ANY;
@@ -51,7 +83,6 @@
 import static org.h2.util.ParserUtil.IN;
 import static org.h2.util.ParserUtil.INNER;
 import static org.h2.util.ParserUtil.INTERSECT;
-import static org.h2.util.ParserUtil.INTERSECTS;
 import static org.h2.util.ParserUtil.INTERVAL;
 import static org.h2.util.ParserUtil.IS;
 import static org.h2.util.ParserUtil.JOIN;
@@ -101,9 +132,7 @@
 import static org.h2.util.ParserUtil.YEAR;
 import static org.h2.util.ParserUtil._ROWID_;
 
-import java.io.ByteArrayOutputStream;
 import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.nio.charset.Charset;
 import java.text.Collator;
 import java.util.ArrayList;
@@ -111,18 +140,19 @@
 import java.util.BitSet;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.StringJoiner;
 import java.util.TreeSet;
+
 import org.h2.api.ErrorCode;
 import org.h2.api.IntervalQualifier;
 import org.h2.api.Trigger;
-import org.h2.command.ddl.AlterDomainExpressions;
 import org.h2.command.ddl.AlterDomainAddConstraint;
 import org.h2.command.ddl.AlterDomainDropConstraint;
+import org.h2.command.ddl.AlterDomainExpressions;
 import org.h2.command.ddl.AlterDomainRename;
 import org.h2.command.ddl.AlterDomainRenameConstraint;
 import org.h2.command.ddl.AlterIndexRename;
@@ -144,6 +174,7 @@
 import org.h2.command.ddl.CreateFunctionAlias;
 import org.h2.command.ddl.CreateIndex;
 import org.h2.command.ddl.CreateLinkedTable;
+import org.h2.command.ddl.CreateMaterializedView;
 import org.h2.command.ddl.CreateRole;
 import org.h2.command.ddl.CreateSchema;
 import org.h2.command.ddl.CreateSequence;
@@ -160,6 +191,7 @@
 import org.h2.command.ddl.DropDomain;
 import org.h2.command.ddl.DropFunctionAlias;
 import org.h2.command.ddl.DropIndex;
+import org.h2.command.ddl.DropMaterializedView;
 import org.h2.command.ddl.DropRole;
 import org.h2.command.ddl.DropSchema;
 import org.h2.command.ddl.DropSequence;
@@ -170,6 +202,7 @@
 import org.h2.command.ddl.DropView;
 import org.h2.command.ddl.GrantRevoke;
 import org.h2.command.ddl.PrepareProcedure;
+import org.h2.command.ddl.RefreshMaterializedView;
 import org.h2.command.ddl.SequenceOptions;
 import org.h2.command.ddl.SetComment;
 import org.h2.command.ddl.TruncateTable;
@@ -195,6 +228,7 @@
 import org.h2.command.dml.SetTypes;
 import org.h2.command.dml.TransactionCommand;
 import org.h2.command.dml.Update;
+import org.h2.command.query.ForUpdate;
 import org.h2.command.query.Query;
 import org.h2.command.query.QueryOrderBy;
 import org.h2.command.query.Select;
@@ -209,6 +243,7 @@
 import org.h2.engine.IsolationLevel;
 import org.h2.engine.Mode;
 import org.h2.engine.Mode.ModeEnum;
+import org.h2.engine.NullsDistinct;
 import org.h2.engine.Procedure;
 import org.h2.engine.Right;
 import org.h2.engine.SessionLocal;
@@ -262,7 +297,7 @@
 import org.h2.expression.condition.ConditionAndOr;
 import org.h2.expression.condition.ConditionAndOrN;
 import org.h2.expression.condition.ConditionIn;
-import org.h2.expression.condition.ConditionInParameter;
+import org.h2.expression.condition.ConditionInArray;
 import org.h2.expression.condition.ConditionInQuery;
 import org.h2.expression.condition.ConditionLocalAndGlobal;
 import org.h2.expression.condition.ConditionNot;
@@ -339,6 +374,8 @@
 import org.h2.table.FunctionTable;
 import org.h2.table.IndexColumn;
 import org.h2.table.IndexHints;
+import org.h2.table.MaterializedView;
+import org.h2.table.QueryExpressionTable;
 import org.h2.table.RangeTable;
 import org.h2.table.Table;
 import org.h2.table.TableFilter;
@@ -362,7 +399,6 @@
 import org.h2.value.ValueArray;
 import org.h2.value.ValueBigint;
 import org.h2.value.ValueDate;
-import org.h2.value.ValueDecfloat;
 import org.h2.value.ValueDouble;
 import org.h2.value.ValueGeometry;
 import org.h2.value.ValueInteger;
@@ -376,7 +412,6 @@
 import org.h2.value.ValueTimestamp;
 import org.h2.value.ValueTimestampTimeZone;
 import org.h2.value.ValueUuid;
-import org.h2.value.ValueVarbinary;
 import org.h2.value.ValueVarchar;
 
 /**
@@ -392,434 +427,6 @@ public class Parser {
             "WITH statement supports only SELECT, TABLE, VALUES, " +
             "CREATE TABLE, INSERT, UPDATE, MERGE or DELETE statements";
 
-    // used during the tokenizer phase
-    private static final int CHAR_END = 1, CHAR_VALUE = 2, CHAR_QUOTED = 3;
-    private static final int CHAR_NAME = 4, CHAR_SPECIAL_1 = 5,
-            CHAR_SPECIAL_2 = 6;
-    private static final int CHAR_STRING = 7, CHAR_DOT = 8,
-            CHAR_DOLLAR_QUOTED_STRING = 9;
-
-    // these are token types, see also types in ParserUtil
-
-    /**
-     * Token with parameter.
-     */
-    private static final int PARAMETER = LAST_KEYWORD + 1;
-
-    /**
-     * End of input.
-     */
-    private static final int END_OF_INPUT = PARAMETER + 1;
-
-    /**
-     * Token with literal.
-     */
-    private static final int LITERAL = END_OF_INPUT + 1;
-
-    /**
-     * The token "=".
-     */
-    private static final int EQUAL = LITERAL + 1;
-
-    /**
-     * The token ">=".
-     */
-    private static final int BIGGER_EQUAL = EQUAL + 1;
-
-    /**
-     * The token ">".
-     */
-    private static final int BIGGER = BIGGER_EQUAL + 1;
-
-    /**
-     * The token "<".
-     */
-    private static final int SMALLER = BIGGER + 1;
-
-    /**
-     * The token "<=".
-     */
-    private static final int SMALLER_EQUAL = SMALLER + 1;
-
-    /**
-     * The token "<>" or "!=".
-     */
-    private static final int NOT_EQUAL = SMALLER_EQUAL + 1;
-
-    /**
-     * The token "@".
-     */
-    private static final int AT = NOT_EQUAL + 1;
-
-    /**
-     * The token "-".
-     */
-    private static final int MINUS_SIGN = AT + 1;
-
-    /**
-     * The token "+".
-     */
-    private static final int PLUS_SIGN = MINUS_SIGN + 1;
-
-    /**
-     * The token "||".
-     */
-    private static final int CONCATENATION = PLUS_SIGN + 1;
-
-    /**
-     * The token "(".
-     */
-    private static final int OPEN_PAREN = CONCATENATION + 1;
-
-    /**
-     * The token ")".
-     */
-    private static final int CLOSE_PAREN = OPEN_PAREN + 1;
-
-    /**
-     * The token &.
-     */
-    private static final int AMPERSAND = CLOSE_PAREN + 1;
-
-    /**
-     * The token "&&".
-     */
-    private static final int SPATIAL_INTERSECTS = AMPERSAND + 1;
-
-    /**
-     * The token "*".
-     */
-    private static final int ASTERISK = SPATIAL_INTERSECTS + 1;
-
-    /**
-     * The token ",".
-     */
-    private static final int COMMA = ASTERISK + 1;
-
-    /**
-     * The token ".".
-     */
-    private static final int DOT = COMMA + 1;
-
-    /**
-     * The token "{".
-     */
-    private static final int OPEN_BRACE = DOT + 1;
-
-    /**
-     * The token "}".
-     */
-    private static final int CLOSE_BRACE = OPEN_BRACE + 1;
-
-    /**
-     * The token "/".
-     */
-    private static final int SLASH = CLOSE_BRACE + 1;
-
-    /**
-     * The token "%".
-     */
-    private static final int PERCENT = SLASH + 1;
-
-    /**
-     * The token ";".
-     */
-    private static final int SEMICOLON = PERCENT + 1;
-
-    /**
-     * The token ":".
-     */
-    private static final int COLON = SEMICOLON + 1;
-
-    /**
-     * The token "[".
-     */
-    private static final int OPEN_BRACKET = COLON + 1;
-
-    /**
-     * The token "]".
-     */
-    private static final int CLOSE_BRACKET = OPEN_BRACKET + 1;
-
-    /**
-     * The token "~".
-     */
-    private static final int TILDE = CLOSE_BRACKET + 1;
-
-    /**
-     * The token "::".
-     */
-    private static final int COLON_COLON = TILDE + 1;
-
-    /**
-     * The token ":=".
-     */
-    private static final int COLON_EQ = COLON_COLON + 1;
-
-    /**
-     * The token "!~".
-     */
-    private static final int NOT_TILDE = COLON_EQ + 1;
-
-    private static final String[] TOKENS = {
-            // Unused
-            null,
-            // KEYWORD
-            null,
-            // IDENTIFIER
-            null,
-            // ALL
-            "ALL",
-            // AND
-            "AND",
-            // ANY
-            "ANY",
-            // ARRAY
-            "ARRAY",
-            // AS
-            "AS",
-            // ASYMMETRIC
-            "ASYMMETRIC",
-            // AUTHORIZATION
-            "AUTHORIZATION",
-            // BETWEEN
-            "BETWEEN",
-            // CASE
-            "CASE",
-            // CAST
-            "CAST",
-            // CHECK
-            "CHECK",
-            // CONSTRAINT
-            "CONSTRAINT",
-            // CROSS
-            "CROSS",
-            // CURRENT_CATALOG
-            "CURRENT_CATALOG",
-            // CURRENT_DATE
-            "CURRENT_DATE",
-            // CURRENT_PATH
-            "CURRENT_PATH",
-            // CURRENT_ROLE
-            "CURRENT_ROLE",
-            // CURRENT_SCHEMA
-            "CURRENT_SCHEMA",
-            // CURRENT_TIME
-            "CURRENT_TIME",
-            // CURRENT_TIMESTAMP
-            "CURRENT_TIMESTAMP",
-            // CURRENT_USER
-            "CURRENT_USER",
-            // DAY
-            "DAY",
-            // DEFAULT
-            "DEFAULT",
-            // DISTINCT
-            "DISTINCT",
-            // ELSE
-            "ELSE",
-            // END
-            "END",
-            // EXCEPT
-            "EXCEPT",
-            // EXISTS
-            "EXISTS",
-            // FALSE
-            "FALSE",
-            // FETCH
-            "FETCH",
-            // FOR
-            "FOR",
-            // FOREIGN
-            "FOREIGN",
-            // FROM
-            "FROM",
-            // FULL
-            "FULL",
-            // GROUP
-            "GROUP",
-            // HAVING
-            "HAVING",
-            // HOUR
-            "HOUR",
-            // IF
-            "IF",
-            // IN
-            "IN",
-            // INNER
-            "INNER",
-            // INTERSECT
-            "INTERSECT",
-            // INTERSECTS
-            "INTERSECTS",
-            // INTERVAL
-            "INTERVAL",
-            // IS
-            "IS",
-            // JOIN
-            "JOIN",
-            // KEY
-            "KEY",
-            // LEFT
-            "LEFT",
-            // LIKE
-            "LIKE",
-            // LIMIT
-            "LIMIT",
-            // LOCALTIME
-            "LOCALTIME",
-            // LOCALTIMESTAMP
-            "LOCALTIMESTAMP",
-            // MINUS
-            "MINUS",
-            // MINUTE
-            "MINUTE",
-            // MONTH
-            "MONTH",
-            // NATURAL
-            "NATURAL",
-            // NOT
-            "NOT",
-            // NULL
-            "NULL",
-            // OFFSET
-            "OFFSET",
-            // ON
-            "ON",
-            // OR
-            "OR",
-            // ORDER
-            "ORDER",
-            // PRIMARY
-            "PRIMARY",
-            // QUALIFY
-            "QUALIFY",
-            // RIGHT
-            "RIGHT",
-            // ROW
-            "ROW",
-            // ROWNUM
-            "ROWNUM",
-            // SECOND
-            "SECOND",
-            // SELECT
-            "SELECT",
-            // SESSION_USER
-            "SESSION_USER",
-            // SET
-            "SET",
-            // SOME
-            "SOME",
-            // SYMMETRIC
-            "SYMMETRIC",
-            // SYSTEM_USER
-            "SYSTEM_USER",
-            // TABLE
-            "TABLE",
-            // TO
-            "TO",
-            // TRUE
-            "TRUE",
-            // UESCAPE
-            "UESCAPE",
-            // UNION
-            "UNION",
-            // UNIQUE
-            "UNIQUE",
-            // UNKNOWN
-            "UNKNOWN",
-            // USER
-            "USER",
-            // USING
-            "USING",
-            // VALUE
-            "VALUE",
-            // VALUES
-            "VALUES",
-            // WHEN
-            "WHEN",
-            // WHERE
-            "WHERE",
-            // WINDOW
-            "WINDOW",
-            // WITH
-            "WITH",
-            // YEAR
-            "YEAR",
-            // _ROWID_
-            "_ROWID_",
-            // PARAMETER
-            "?",
-            // END
-            null,
-            // VALUE
-            null,
-            // EQUAL
-            "=",
-            // BIGGER_EQUAL
-            ">=",
-            // BIGGER
-            ">",
-            // SMALLER
-            "<",
-            // SMALLER_EQUAL
-            "<=",
-            // NOT_EQUAL
-            "<>",
-            // AT
-            "@",
-            // MINUS_SIGN
-            "-",
-            // PLUS_SIGN
-            "+",
-            // STRING_CONCAT
-            "||",
-            // OPEN_PAREN
-            "(",
-            // CLOSE_PAREN
-            ")",
-            // SPATIAL_INTERSECTS
-            "&&",
-            // ASTERISK
-            "*",
-            // COMMA
-            ",",
-            // DOT
-            ".",
-            // OPEN_BRACE
-            "{",
-            // CLOSE_BRACE
-            "}",
-            // SLASH
-            "/",
-            // PERCENT
-            "%",
-            // SEMICOLON
-            ";",
-            // COLON
-            ":",
-            // OPEN_BRACKET
-            "[",
-            // CLOSE_BRACKET
-            "]",
-            // TILDE
-            "~",
-            // COLON_COLON
-            "::",
-            // COLON_EQ
-            ":=",
-            // NOT_TILDE
-            "!~",
-            // End
-    };
-
-    private static final Comparator TABLE_FILTER_COMPARATOR = (o1, o2) -> {
-        if (o1 == o2)
-            return 0;
-        assert o1.getOrderInFrom() != o2.getOrderInFrom();
-        return o1.getOrderInFrom() > o2.getOrderInFrom() ? 1 : -1;
-    };
-
     private final Database database;
     private final SessionLocal session;
 
@@ -839,29 +446,18 @@ public class Parser {
 
     private final BitSet nonKeywords;
 
-    /** indicates character-type for each char in sqlCommand */
-    private int[] characterTypes;
+    ArrayList tokens;
+    int tokenIndex;
+    Token token;
     private int currentTokenType;
     private String currentToken;
-    private boolean currentTokenQuoted;
-    private Value currentValue;
-    private String originalSQL;
-    /** copy of originalSQL, with comments blanked out */
     private String sqlCommand;
-    /** cached array if chars from sqlCommand */
-    private char[] sqlCommandChars;
-    /** index into sqlCommand of previous token */
-    private int lastParseIndex;
-    /** index into sqlCommand of current token */
-    private int parseIndex;
     private CreateView createView;
     private Prepared currentPrepared;
     private Select currentSelect;
     private List cteCleanups;
     private ArrayList parameters;
-    private ArrayList indexedParameterList;
-    private ArrayList suppliedParameters;
-    private ArrayList suppliedParameterList;
+    private BitSet usedParameters = new BitSet();
     private String schemaName;
     private ArrayList expectedList;
     private boolean rightsChecked;
@@ -946,7 +542,7 @@ public Parser() {
      * @return the prepared object
      */
     public Prepared prepare(String sql) {
-        Prepared p = parse(sql);
+        Prepared p = parse(sql, null);
         p.prepare();
         if (currentTokenType != END_OF_INPUT) {
             throw getSyntaxError();
@@ -954,6 +550,22 @@ public Prepared prepare(String sql) {
         return p;
     }
 
+    /**
+     * Parse a query and prepare its expressions. Rights and literals must be
+     * already checked.
+     *
+     * @param sql the SQL statement to parse
+     * @return the prepared object
+     */
+    public Query prepareQueryExpression(String sql) {
+        Query q = (Query) parse(sql, null);
+        q.prepareExpressions();
+        if (currentTokenType != END_OF_INPUT) {
+            throw getSyntaxError();
+        }
+        return q;
+    }
+
     /**
      * Parse a statement or a list of statements, and prepare it for execution.
      *
@@ -962,7 +574,7 @@ public Prepared prepare(String sql) {
      */
     public Command prepareCommand(String sql) {
         try {
-            Prepared p = parse(sql);
+            Prepared p = parse(sql, null);
             if (currentTokenType != SEMICOLON && currentTokenType != END_OF_INPUT) {
                 addExpected(SEMICOLON);
                 throw getSyntaxError();
@@ -973,50 +585,57 @@ public Command prepareCommand(String sql) {
                 CommandContainer.clearCTE(session, p);
                 throw t;
             }
-            if (parseIndex < sql.length()) {
-                sql = sql.substring(0, parseIndex);
+            int sqlIndex = token.start();
+            if (sqlIndex < sql.length()) {
+                sql = sql.substring(0, sqlIndex);
             }
             CommandContainer c = new CommandContainer(session, sql, p);
-            if (currentTokenType == SEMICOLON) {
-                String remaining = originalSQL.substring(parseIndex);
-                if (!StringUtils.isWhitespaceOrEmpty(remaining)) {
-                    return prepareCommandList(c, p, sql, remaining);
-                }
+            while (currentTokenType == SEMICOLON) {
+                read();
+            }
+            if (currentTokenType != END_OF_INPUT) {
+                int offset = token.start();
+                return prepareCommandList(c, p, sql, sqlCommand.substring(offset), getRemainingTokens(offset));
             }
             return c;
         } catch (DbException e) {
-            throw e.addSQL(originalSQL);
+            throw e.addSQL(sqlCommand);
         }
     }
 
-    private CommandList prepareCommandList(CommandContainer command, Prepared p, String sql, String remaining) {
+    private CommandList prepareCommandList(CommandContainer command, Prepared p, String sql, String remainingSql,
+            ArrayList remainingTokens) {
         try {
             ArrayList list = Utils.newSmallArrayList();
-            do {
+            for (;;) {
                 if (p instanceof DefineCommand) {
                     // Next commands may depend on results of this command.
-                    return new CommandList(session, sql, command, list, parameters, remaining);
+                    return new CommandList(session, sql, command, list, parameters, remainingSql);
                 }
-                suppliedParameters = parameters;
-                suppliedParameterList = indexedParameterList;
                 try {
-                    p = parse(remaining);
+                    p = parse(remainingSql, remainingTokens);
                 } catch (DbException ex) {
                     // This command may depend on results of previous commands.
                     if (ex.getErrorCode() == ErrorCode.CANNOT_MIX_INDEXED_AND_UNINDEXED_PARAMS) {
                         throw ex;
                     }
-                    return new CommandList(session, sql, command, list, parameters, remaining);
+                    return new CommandList(session, sql, command, list, parameters, remainingSql);
                 }
                 list.add(p);
-                if (currentTokenType == END_OF_INPUT) {
-                    break;
-                }
-                if (currentTokenType != SEMICOLON) {
+                if (currentTokenType != SEMICOLON && currentTokenType != END_OF_INPUT) {
                     addExpected(SEMICOLON);
                     throw getSyntaxError();
                 }
-            } while (!StringUtils.isWhitespaceOrEmpty(remaining = originalSQL.substring(parseIndex)));
+                while (currentTokenType == SEMICOLON) {
+                    read();
+                }
+                if (currentTokenType == END_OF_INPUT) {
+                    break;
+                }
+                int offset = token.start();
+                remainingSql = sqlCommand.substring(offset);
+                remainingTokens = getRemainingTokens(offset);
+            }
             return new CommandList(session, sql, command, list, parameters, null);
         } catch (Throwable t) {
             command.clearCTE();
@@ -1024,44 +643,54 @@ private CommandList prepareCommandList(CommandContainer command, Prepared p, Str
         }
     }
 
+    private ArrayList getRemainingTokens(int offset) {
+        List subList = tokens.subList(tokenIndex, tokens.size());
+        ArrayList remainingTokens = new ArrayList<>(subList);
+        subList.clear();
+        tokens.add(new Token.EndOfInputToken(offset));
+        for (Token token : remainingTokens) {
+            token.subtractFromStart(offset);
+        }
+        return remainingTokens;
+    }
+
     /**
      * Parse the statement, but don't prepare it for execution.
      *
      * @param sql the SQL statement to parse
+     * @param tokens tokens, or null
      * @return the prepared object
      */
-    Prepared parse(String sql) {
+    Prepared parse(String sql, ArrayList tokens) {
+        initialize(sql, tokens, false);
         Prepared p;
         try {
             // first, try the fast variant
-            p = parse(sql, false);
+            p = parse(false);
         } catch (DbException e) {
             if (e.getErrorCode() == ErrorCode.SYNTAX_ERROR_1) {
                 // now, get the detailed exception
-                p = parse(sql, true);
+                resetTokenIndex();
+                p = parse(true);
             } else {
                 throw e.addSQL(sql);
             }
         }
-        p.setPrepareAlways(recompileAlways);
-        p.setParameterList(parameters);
         return p;
     }
 
-    private Prepared parse(String sql, boolean withExpectedList) {
-        initialize(sql);
+    private Prepared parse(boolean withExpectedList) {
         if (withExpectedList) {
             expectedList = new ArrayList<>();
         } else {
             expectedList = null;
         }
-        parameters = suppliedParameters != null ? suppliedParameters : Utils.newSmallArrayList();
-        indexedParameterList = suppliedParameterList;
         currentSelect = null;
         currentPrepared = null;
         createView = null;
         cteCleanups = null;
         recompileAlways = false;
+        usedParameters.clear();
         read();
         Prepared p;
         try {
@@ -1073,11 +702,13 @@ private Prepared parse(String sql, boolean withExpectedList) {
             }
             throw t;
         }
+        p.setPrepareAlways(recompileAlways);
+        p.setParameterList(parameters);
         return p;
     }
 
     private Prepared parsePrepared() {
-        int start = lastParseIndex;
+        int start = tokenIndex;
         Prepared c = null;
         switch (currentTokenType) {
         case END_OF_INPUT:
@@ -1087,10 +718,10 @@ private Prepared parsePrepared() {
             return c;
         case PARAMETER:
             // read the ? as a parameter
-            readTerm();
             // this is an 'out' parameter - set a dummy value
-            parameters.get(0).setValue(ValueNull.INSTANCE);
+            readParameter().setValue(ValueNull.INSTANCE);
             read(EQUAL);
+            start = tokenIndex;
             read("CALL");
             c = parseCall();
             break;
@@ -1109,7 +740,7 @@ private Prepared parsePrepared() {
             c = parseSet();
             break;
         case IDENTIFIER:
-            if (currentTokenQuoted) {
+            if (token.isQuoted()) {
                 break;
             }
             /*
@@ -1212,6 +843,8 @@ private Prepared parsePrepared() {
                     c = parseReleaseSavepoint();
                 } else if (database.getMode().replaceInto && readIf("REPLACE")) {
                     c = parseReplace(start);
+                } else if (readIf("REFRESH")) {
+                    c = parseRefresh(start);
                 }
                 break;
             case 'S':
@@ -1242,15 +875,6 @@ private Prepared parsePrepared() {
         if (c == null) {
             throw getSyntaxError();
         }
-        if (indexedParameterList != null) {
-            for (int i = 0, size = indexedParameterList.size();
-                    i < size; i++) {
-                if (indexedParameterList.get(i) == null) {
-                    indexedParameterList.set(i, new Parameter(i));
-                }
-            }
-            parameters = indexedParameterList;
-        }
         boolean withParamValues = readIf(OPEN_BRACE);
         if (withParamValues) {
             do {
@@ -1271,7 +895,7 @@ private Prepared parsePrepared() {
             for (Parameter p : parameters) {
                 p.checkSet();
             }
-            parameters.clear();
+            c.setWithParamValues(true);
         }
         if (withParamValues || c.getSQL() == null) {
             setSQL(c, start);
@@ -1281,10 +905,9 @@ private Prepared parsePrepared() {
 
     private DbException getSyntaxError() {
         if (expectedList == null || expectedList.isEmpty()) {
-            return DbException.getSyntaxError(sqlCommand, parseIndex);
+            return DbException.getSyntaxError(sqlCommand, token.start());
         }
-        return DbException.getSyntaxError(sqlCommand, parseIndex,
-                StringUtils.join(new StringBuilder(), expectedList, ", ").toString());
+        return DbException.getSyntaxError(sqlCommand, token.start(), String.join(", ", expectedList));
     }
 
     private Prepared parseBackup() {
@@ -1349,8 +972,7 @@ private TransactionCommand parseRollback() {
             return command;
         }
         readIf("WORK");
-        if (readIf(TO)) {
-            read("SAVEPOINT");
+        if (readIf(TO, "SAVEPOINT")) {
             command = new TransactionCommand(session, CommandInterface.ROLLBACK_TO_SAVEPOINT);
             command.setSavepointName(readIdentifier());
         } else {
@@ -1494,7 +1116,7 @@ private String readTableColumn(TableFilter filter, String tableAlias) {
         return columnName;
     }
 
-    private Update parseUpdate(int start) {
+    private DataChangeStatement parseUpdate(int start) {
         Update command = new Update(session);
         currentPrepared = command;
         Expression fetch = null;
@@ -1503,12 +1125,16 @@ private Update parseUpdate(int start) {
             fetch = readTerm().optimize(session);
             read(CLOSE_PAREN);
         }
-        TableFilter filter = readSimpleTableFilter();
-        command.setTableFilter(filter);
-        command.setSetClauseList(readUpdateSetClause(filter));
+        TableFilter targetTableFilter = readSimpleTableFilter();
+        command.setTableFilter(targetTableFilter);
+        int backupIndex = tokenIndex;
+        if (database.getMode().discardWithTableHints) {
+            discardWithTableHints();
+        }
+        command.setSetClauseList(readUpdateSetClause(targetTableFilter));
         if (database.getMode().allowUsingFromClauseInUpdateStatement && readIf(FROM)) {
-            TableFilter fromTable = readTableFilter();
-            command.setFromTableFilter(fromTable);
+            setTokenIndex(backupIndex);
+            return parseUpdateFrom(targetTableFilter, start);
         }
         if (readIf(WHERE)) {
             command.setCondition(readExpression());
@@ -1524,26 +1150,56 @@ private Update parseUpdate(int start) {
         return command;
     }
 
+    private MergeUsing parseUpdateFrom(TableFilter targetTableFilter, int start) {
+        MergeUsing command = new MergeUsing(session, targetTableFilter);
+        currentPrepared = command;
+        SetClauseList updateSetClause = readUpdateSetClause(targetTableFilter);
+        read(FROM);
+        command.setSourceTableFilter(readTableReference());
+        command.setOnCondition(readIf(WHERE) ? readExpression() : ValueExpression.TRUE);
+        MergeUsing.WhenMatchedThenUpdate update = command.new WhenMatchedThenUpdate();
+        update.setSetClauseList(updateSetClause);
+        command.addWhen(update);
+        setSQL(command, start);
+        return command;
+    }
+
     private SetClauseList readUpdateSetClause(TableFilter filter) {
         read(SET);
         SetClauseList list = new SetClauseList(filter.getTable());
         do {
             if (readIf(OPEN_PAREN)) {
                 ArrayList columns = Utils.newSmallArrayList();
+                ArrayList allIndexes = Utils.newSmallArrayList();
                 do {
                     columns.add(readTableColumn(filter));
+                    allIndexes.add(readUpdateSetClauseArrayIndexes());
                 } while (readIfMore());
                 read(EQUAL);
-                list.addMultiple(columns, readExpression());
+                list.addMultiple(columns, allIndexes, readExpression());
             } else {
                 Column column = readTableColumn(filter);
+                Expression[] arrayIndexes = readUpdateSetClauseArrayIndexes();
                 read(EQUAL);
-                list.addSingle(column, readExpressionOrDefault());
+                list.addSingle(column, arrayIndexes,
+                        arrayIndexes == null ? readExpressionOrDefault() : readExpression());
             }
         } while (readIf(COMMA));
         return list;
     }
 
+    private Expression[] readUpdateSetClauseArrayIndexes() {
+        if (readIf(OPEN_BRACKET)) {
+            ArrayList list = Utils.newSmallArrayList();
+            do {
+                list.add(readExpression());
+                read(CLOSE_BRACKET);
+            } while (readIf(OPEN_BRACKET));
+            return list.toArray(new Expression[0]);
+        }
+        return null;
+    }
+
     private TableFilter readSimpleTableFilter() {
         return new TableFilter(session, readTableOrView(), readFromAlias(null), rightsChecked, currentSelect, 0, null);
     }
@@ -1555,7 +1211,7 @@ private Delete parseDelete(int start) {
             fetch = readTerm().optimize(session);
         }
         currentPrepared = command;
-        if (!readIf(FROM) && database.getMode().getEnum() == ModeEnum.MySQL) {
+        if (!readIf(FROM) && database.getMode().deleteIdentifierFrom) {
             readIdentifierWithSchema();
             read(FROM);
         }
@@ -1660,14 +1316,12 @@ private boolean readIfMore() {
     private Prepared parseHelp() {
         HashSet conditions = new HashSet<>();
         while (currentTokenType != END_OF_INPUT) {
-            conditions.add(StringUtils.toUpperEnglish(currentToken));
-            read();
+            conditions.add(StringUtils.toUpperEnglish(readIdentifierOrKeyword()));
         }
         return new Help(session, conditions.toArray(new String[0]));
     }
 
     private Prepared parseShow() {
-        ArrayList paramValues = Utils.newSmallArrayList();
         StringBuilder buff = new StringBuilder("SELECT ");
         if (readIf("CLIENT_ENCODING")) {
             // for PostgreSQL compatibility
@@ -1689,7 +1343,7 @@ private Prepared parseShow() {
             String[] searchPath = session.getSchemaSearchPath();
             StringBuilder searchPathBuff = new StringBuilder();
             if (searchPath != null) {
-                for (int i = 0; i < searchPath.length; i ++) {
+                for (int i = 0; i < searchPath.length; i++) {
                     if (i > 0) {
                         searchPathBuff.append(", ");
                     }
@@ -1715,22 +1369,25 @@ private Prepared parseShow() {
             }
             buff.append("TABLE_NAME, TABLE_SCHEMA FROM "
                     + "INFORMATION_SCHEMA.TABLES "
-                    + "WHERE TABLE_SCHEMA=? ORDER BY TABLE_NAME");
-            paramValues.add(ValueVarchar.get(schema));
+                    + "WHERE TABLE_SCHEMA=");
+            StringUtils.quoteStringSQL(buff, schema).append(" ORDER BY TABLE_NAME");
         } else if (readIf("COLUMNS")) {
             // for MySQL compatibility
             read(FROM);
             String tableName = readIdentifierWithSchema();
             String schemaName = getSchema().getName();
-            paramValues.add(ValueVarchar.get(tableName));
             if (readIf(FROM)) {
                 schemaName = readIdentifier();
             }
             buff.append("C.COLUMN_NAME FIELD, ");
             boolean oldInformationSchema = session.isOldInformationSchema();
-            buff.append(oldInformationSchema
-                    ? "C.COLUMN_TYPE"
-                    : "DATA_TYPE_SQL(?2, ?1, 'TABLE', C.DTD_IDENTIFIER)");
+            if (oldInformationSchema) {
+                buff.append("C.COLUMN_TYPE");
+            } else {
+                buff.append("DATA_TYPE_SQL(");
+                StringUtils.quoteStringSQL(buff, schemaName).append(", ");
+                StringUtils.quoteStringSQL(buff, tableName).append(", 'TABLE', C.DTD_IDENTIFIER)");
+            }
             buff.append(" TYPE, "
                     + "C.IS_NULLABLE \"NULL\", "
                     + "CASE (SELECT MAX(I.INDEX_TYPE_NAME) FROM "
@@ -1754,61 +1411,147 @@ private Prepared parseShow() {
                     + "WHEN 'UNIQUE INDEX' THEN 'UNI' ELSE '' END `KEY`, "
                     + "COALESCE(COLUMN_DEFAULT, 'NULL') `DEFAULT` "
                     + "FROM INFORMATION_SCHEMA.COLUMNS C "
-                    + "WHERE C.TABLE_NAME=?1 AND C.TABLE_SCHEMA=?2 "
-                    + "ORDER BY C.ORDINAL_POSITION");
-            paramValues.add(ValueVarchar.get(schemaName));
+                    + "WHERE C.TABLE_SCHEMA=");
+            StringUtils.quoteStringSQL(buff, schemaName).append(" AND C.TABLE_NAME=");
+            StringUtils.quoteStringSQL(buff, tableName).append(" ORDER BY C.ORDINAL_POSITION");
         } else if (readIf("DATABASES") || readIf("SCHEMAS")) {
             // for MySQL compatibility
             buff.append("SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA");
-        } else if (database.getMode().getEnum() == ModeEnum.PostgreSQL && readIf("ALL")) {
+        } else if (database.getMode().getEnum() == ModeEnum.PostgreSQL && readIf(ALL)) {
             // for PostgreSQL compatibility
             buff.append("NAME, SETTING FROM PG_CATALOG.PG_SETTINGS");
         }
         boolean b = session.getAllowLiterals();
         try {
-            // need to temporarily enable it, in case we are in
-            // ALLOW_LITERALS_NUMBERS mode
+            // need to temporarily enable it
             session.setAllowLiterals(true);
-            return prepare(session, buff.toString(), paramValues);
+            return session.prepare(buff.toString());
         } finally {
             session.setAllowLiterals(b);
         }
     }
 
-    private static Prepared prepare(SessionLocal s, String sql,
-            ArrayList paramValues) {
-        Prepared prep = s.prepare(sql);
-        ArrayList params = prep.getParameters();
-        if (params != null) {
-            for (int i = 0, size = params.size(); i < size; i++) {
-                Parameter p = params.get(i);
-                p.setValue(paramValues.get(i));
+    private boolean isDerivedTable() {
+        int offset = tokenIndex;
+        int level = 0;
+        while (tokens.get(offset).tokenType() == OPEN_PAREN) {
+            level++;
+            offset++;
+        }
+        boolean query = isDirectQuery(offset);
+        s: if (query && level > 0) {
+            offset = scanToCloseParen(offset + 1);
+            if (offset < 0) {
+                query = false;
+                break s;
+            }
+            for (;;) {
+                switch (tokens.get(offset).tokenType()) {
+                case SEMICOLON:
+                case END_OF_INPUT:
+                    query = false;
+                    break s;
+                case OPEN_PAREN:
+                    offset = scanToCloseParen(offset + 1);
+                    if (offset < 0) {
+                        query = false;
+                        break s;
+                    }
+                    break;
+                case CLOSE_PAREN:
+                    if (--level == 0) {
+                        break s;
+                    }
+                    offset++;
+                    break;
+                case JOIN:
+                    query = false;
+                    break s;
+                default:
+                    offset++;
+                }
             }
         }
-        return prep;
+        return query;
     }
 
     private boolean isQuery() {
-        int start = lastParseIndex;
-        while (readIf(OPEN_PAREN)) {
-            // need to read ahead, it could be a nested union:
-            // ((select 1) union (select 1))
+        int offset = tokenIndex;
+        int level = 0;
+        while (tokens.get(offset).tokenType() == OPEN_PAREN) {
+            level++;
+            offset++;
+        }
+        boolean query = isDirectQuery(offset);
+        s: if (query && level > 0) {
+            offset++;
+            do {
+                offset = scanToCloseParen(offset);
+                if (offset < 0) {
+                    query = false;
+                    break s;
+                }
+                switch (tokens.get(offset).tokenType()) {
+                default:
+                    query = false;
+                    break s;
+                case END_OF_INPUT:
+                case SEMICOLON:
+                case CLOSE_PAREN:
+                case ORDER:
+                case OFFSET:
+                case FETCH:
+                case LIMIT:
+                case UNION:
+                case EXCEPT:
+                case MINUS:
+                case INTERSECT:
+                }
+            } while (--level > 0);
+        }
+        return query;
+    }
+
+    private int scanToCloseParen(int offset) {
+        for (int level = 0;;) {
+            switch (tokens.get(offset).tokenType()) {
+            case SEMICOLON:
+            case END_OF_INPUT:
+                return -1;
+            case OPEN_PAREN:
+                level++;
+                break;
+            case CLOSE_PAREN:
+                if (--level < 0) {
+                    return offset + 1;
+                }
+            }
+            offset++;
+        }
+    }
+
+    private boolean isQueryQuick() {
+        int offset = tokenIndex;
+        while (tokens.get(offset).tokenType() == OPEN_PAREN) {
+            offset++;
         }
+        return isDirectQuery(offset);
+    }
+
+    private boolean isDirectQuery(int offset) {
         boolean query;
-        switch (currentTokenType) {
+        switch (tokens.get(offset).tokenType()) {
         case SELECT:
         case VALUES:
         case WITH:
             query = true;
             break;
         case TABLE:
-            read();
-            query = !readIf(OPEN_PAREN);
+            query = tokens.get(offset + 1).tokenType() != OPEN_PAREN;
             break;
         default:
             query = false;
         }
-        reread(start);
         return query;
     }
 
@@ -1827,15 +1570,14 @@ private Prepared parseMergeInto(TableFilter targetTableFilter, int start) {
         command.setTable(targetTableFilter.getTable());
         Table table = command.getTable();
         if (readIf(OPEN_PAREN)) {
-            if (isQuery()) {
+            if (isQueryQuick()) {
                 command.setQuery(parseQuery());
                 read(CLOSE_PAREN);
                 return command;
             }
             command.setColumns(parseColumnList(table));
         }
-        if (readIf(KEY)) {
-            read(OPEN_PAREN);
+        if (readIf(KEY, OPEN_PAREN)) {
             command.setKeys(parseColumnList(table));
         }
         if (readIf(VALUES)) {
@@ -1850,39 +1592,7 @@ private Prepared parseMergeInto(TableFilter targetTableFilter, int start) {
     private MergeUsing parseMergeUsing(TableFilter targetTableFilter, int start) {
         MergeUsing command = new MergeUsing(session, targetTableFilter);
         currentPrepared = command;
-
-        if (isQuery()) {
-            Query query = parseQuery();
-            String queryAlias = readFromAlias(null);
-            ArrayList derivedColumnNames = null;
-            if (queryAlias == null) {
-                queryAlias = Constants.PREFIX_QUERY_ALIAS + parseIndex;
-            } else {
-                derivedColumnNames = readDerivedColumnNames();
-            }
-
-            String[] querySQLOutput = new String[1];
-            List columnTemplateList = TableView.createQueryColumnTemplateList(null, query, querySQLOutput);
-            TableView temporarySourceTableView = createCTEView(
-                    queryAlias, querySQLOutput[0],
-                    columnTemplateList, false/* no recursion */,
-                    false/* do not add to session */,
-                    true /* isTemporary */
-            );
-            TableFilter sourceTableFilter = new TableFilter(session,
-                    temporarySourceTableView, queryAlias,
-                    rightsChecked, null, 0, null);
-            if (derivedColumnNames != null) {
-                sourceTableFilter.setDerivedColumns(derivedColumnNames);
-            }
-            command.setSourceTableFilter(sourceTableFilter);
-            if (cteCleanups == null) {
-                cteCleanups = new ArrayList<>(1);
-            }
-            cteCleanups.add(temporarySourceTableView);
-        } else {
-            command.setSourceTableFilter(readTableFilter());
-        }
+        command.setSourceTableFilter(readTableReference());
         read(ON);
         Expression condition = readExpression();
         command.setOnCondition(condition);
@@ -1954,7 +1664,7 @@ private Insert parseInsert(int start) {
         command.setTable(table);
         Column[] columns = null;
         if (readIf(OPEN_PAREN)) {
-            if (isQuery()) {
+            if (isQueryQuick()) {
                 command.setQuery(parseQuery());
                 read(CLOSE_PAREN);
                 return command;
@@ -1974,8 +1684,7 @@ private Insert parseInsert(int start) {
         }
         readValues: {
             if (!requireQuery) {
-                if (overridingSystem == null && readIf(DEFAULT)) {
-                    read(VALUES);
+                if (overridingSystem == null && readIf(DEFAULT, VALUES)) {
                     command.addRow(new Expression[0]);
                     break readValues;
                 }
@@ -1999,14 +1708,10 @@ private Insert parseInsert(int start) {
 
     private Boolean readIfOverriding() {
         Boolean overridingSystem = null;
-        if (readIf("OVERRIDING")) {
-            if (readIf(USER)) {
-                overridingSystem = Boolean.FALSE;
-            } else {
-                read("SYSTEM");
-                overridingSystem = Boolean.TRUE;
-            }
-            read(VALUE);
+        if (readIf("OVERRIDING", USER, VALUE)) {
+            overridingSystem = Boolean.FALSE;
+        } else if (readIf("OVERRIDING", "SYSTEM", VALUE)) {
+            overridingSystem = Boolean.TRUE;
         }
         return overridingSystem;
     }
@@ -2028,10 +1733,7 @@ private void parseInsertSet(Insert command, Table table, Column[] columns) {
 
     private void parseInsertCompatibility(Insert command, Table table, Mode mode) {
         if (mode.onDuplicateKeyUpdate) {
-            if (readIf(ON)) {
-                read("DUPLICATE");
-                read(KEY);
-                read("UPDATE");
+            if (readIf(ON, "DUPLICATE", KEY, "UPDATE")) {
                 do {
                     String columnName = readIdentifier();
                     if (readIf(DOT)) {
@@ -2057,10 +1759,7 @@ private void parseInsertCompatibility(Insert command, Table table, Mode mode) {
             }
         }
         if (mode.insertOnConflict) {
-            if (readIf(ON)) {
-                read("CONFLICT");
-                read("DO");
-                read("NOTHING");
+            if (readIf(ON, "CONFLICT", "DO", "NOTHING")) {
                 command.setIgnore(true);
             }
         }
@@ -2079,7 +1778,7 @@ private Merge parseReplace(int start) {
         Table table = readTableOrView();
         command.setTable(table);
         if (readIf(OPEN_PAREN)) {
-            if (isQuery()) {
+            if (isQueryQuick()) {
                 command.setQuery(parseQuery());
                 read(CLOSE_PAREN);
                 return command;
@@ -2095,13 +1794,29 @@ private Merge parseReplace(int start) {
         return command;
     }
 
+    /**
+     * REFRESH MATERIALIZED VIEW
+     */
+    private RefreshMaterializedView parseRefresh(int start) {
+        read("MATERIALIZED");
+        read("VIEW");
+        Table table = readTableOrView(/*resolveMaterializedView*/false);
+        if (!(table instanceof MaterializedView)) {
+            throw DbException.get(ErrorCode.VIEW_NOT_FOUND_1, table.getName());
+        }
+        RefreshMaterializedView command = new RefreshMaterializedView(session, getSchema());
+        currentPrepared = command;
+        command.setView((MaterializedView) table);
+        setSQL(command, start);
+        return command;
+    }
+
     private void parseValuesForCommand(CommandWithValues command) {
         ArrayList values = Utils.newSmallArrayList();
         do {
             values.clear();
             boolean multiColumn;
-            if (readIf(ROW)) {
-                read(OPEN_PAREN);
+            if (readIf(ROW, OPEN_PAREN)) {
                 multiColumn = true;
             } else {
                 multiColumn = readIf(OPEN_PAREN);
@@ -2119,43 +1834,37 @@ private void parseValuesForCommand(CommandWithValues command) {
         } while (readIf(COMMA));
     }
 
-    private TableFilter readTableFilter() {
+    private TableFilter readTablePrimary() {
         Table table;
         String alias = null;
         label: if (readIf(OPEN_PAREN)) {
-            if (isQuery()) {
-                return readQueryTableFilter();
+            if (isDerivedTable()) {
+                // Derived table
+                return readDerivedTableWithCorrelation();
             } else {
-                TableFilter top;
-                top = readTableFilter();
-                top = readJoin(top);
+                // Parenthesized joined table
+                TableFilter tableFilter = readTableReference();
                 read(CLOSE_PAREN);
-                alias = readFromAlias(null);
-                if (alias != null) {
-                    top.setAlias(alias);
-                    ArrayList derivedColumnNames = readDerivedColumnNames();
-                    if (derivedColumnNames != null) {
-                        top.setDerivedColumns(derivedColumnNames);
-                    }
-                }
-                return top;
+                return readCorrelation(tableFilter);
             }
         } else if (readIf(VALUES)) {
+            BitSet outerUsedParameters = initParametersScope();
             TableValueConstructor query = parseValues();
             alias = session.getNextSystemIdentifier(sqlCommand);
-            table = query.toTable(alias, null, parameters, createView != null, currentSelect);
-        } else if (readIf(TABLE)) {
-            read(OPEN_PAREN);
+            table = query.toTable(alias, null, getUsedParameters(outerUsedParameters), createView != null,
+                    currentSelect);
+        } else if (readIf(TABLE, OPEN_PAREN)) {
+            // Table function derived table
             ArrayTableFunction function = readTableFunction(ArrayTableFunction.TABLE);
             table = new FunctionTable(database.getMainSchema(), session, function);
         } else {
-            boolean quoted = currentTokenQuoted;
+            boolean quoted = token.isQuoted();
             String tableName = readIdentifier();
-            int backupIndex = parseIndex;
+            int backupIndex = tokenIndex;
             schemaName = null;
             if (readIf(DOT)) {
                 tableName = readIdentifierWithSchema2(tableName);
-            } else if (!quoted && readIf(TABLE)) {
+            } else if (!quoted && readIf(TABLE, OPEN_PAREN)) {
                 table = readDataChangeDeltaTable(upperName(tableName), backupIndex);
                 break label;
             }
@@ -2199,7 +1908,7 @@ private TableFilter readTableFilter() {
                     table = new FunctionTable(mainSchema, session, readTableFunction(tableName, schema));
                 }
             } else {
-                table = readTableOrView(tableName);
+                table = readTableOrView(tableName, /*resolveMaterializedView*/true);
             }
         }
         ArrayList derivedColumnNames = null;
@@ -2218,8 +1927,22 @@ private TableFilter readTableFilter() {
         return buildTableFilter(table, alias, derivedColumnNames, indexHints);
     }
 
-    private TableFilter readQueryTableFilter() {
-        Query query = parseSelectUnion();
+    private TableFilter readCorrelation(TableFilter tableFilter) {
+        String alias = readFromAlias(null);
+        if (alias != null) {
+            tableFilter.setAlias(alias);
+            ArrayList derivedColumnNames = readDerivedColumnNames();
+            if (derivedColumnNames != null) {
+                tableFilter.setDerivedColumns(derivedColumnNames);
+            }
+        }
+        return tableFilter;
+    }
+
+    private TableFilter readDerivedTableWithCorrelation() {
+        BitSet outerUsedParameters = initParametersScope();
+        Query query = parseQueryExpression();
+        ArrayList queryParameters = getUsedParameters(outerUsedParameters);
         read(CLOSE_PAREN);
         Table table;
         String alias;
@@ -2227,7 +1950,7 @@ private TableFilter readQueryTableFilter() {
         IndexHints indexHints = null;
         if (readIfUseIndex()) {
             alias = session.getNextSystemIdentifier(sqlCommand);
-            table = query.toTable(alias, null, parameters, createView != null, currentSelect);
+            table = query.toTable(alias, null, queryParameters, createView != null, currentSelect);
             indexHints = parseIndexHints(table);
         } else {
             alias = readFromAlias(null);
@@ -2236,17 +1959,17 @@ private TableFilter readQueryTableFilter() {
                 Column[] columnTemplates = null;
                 if (derivedColumnNames != null) {
                     query.init();
-                    columnTemplates = TableView.createQueryColumnTemplateList(
+                    columnTemplates = QueryExpressionTable.createQueryColumnTemplateList(
                             derivedColumnNames.toArray(new String[0]), query, new String[1])
                             .toArray(new Column[0]);
                 }
-                table = query.toTable(alias, columnTemplates, parameters, createView != null, currentSelect);
+                table = query.toTable(alias, columnTemplates, queryParameters, createView != null, currentSelect);
                 if (readIfUseIndex()) {
                     indexHints = parseIndexHints(table);
                 }
             } else {
                 alias = session.getNextSystemIdentifier(sqlCommand);
-                table = query.toTable(alias, null, parameters, createView != null, currentSelect);
+                table = query.toTable(alias, null, queryParameters, createView != null, currentSelect);
             }
         }
         return buildTableFilter(table, alias, derivedColumnNames, indexHints);
@@ -2270,8 +1993,7 @@ private TableFilter buildTableFilter(Table table, String alias, ArrayList readDerivedColumnNames() {
     }
 
     private void discardWithTableHints() {
-        if (readIf(WITH)) {
-            read(OPEN_PAREN);
+        if (readIf(WITH, OPEN_PAREN)) {
             do {
                 discardTableHint();
             } while (readIfMore());
@@ -2415,11 +2140,9 @@ private Prepared parseTruncate() {
         read(TABLE);
         Table table = readTableOrView();
         boolean restart = database.getMode().truncateTableRestartIdentity;
-        if (readIf("CONTINUE")) {
-            read("IDENTITY");
+        if (readIf("CONTINUE", "IDENTITY")) {
             restart = false;
-        } else if (readIf("RESTART")) {
-            read("IDENTITY");
+        } else if (readIf("RESTART", "IDENTITY")) {
             restart = true;
         }
         TruncateTable command = new TruncateTable(session);
@@ -2429,8 +2152,7 @@ private Prepared parseTruncate() {
     }
 
     private boolean readIfExists(boolean ifExists) {
-        if (readIf(IF)) {
-            read(EXISTS);
+        if (readIf(IF, EXISTS)) {
             ifExists = true;
         }
         return ifExists;
@@ -2490,7 +2212,7 @@ private Prepared parseComment() {
                 }
             }
             if (columnName == null || objectName == null) {
-                throw DbException.getSyntaxError(sqlCommand, lastParseIndex, "table.column");
+                throw DbException.getSyntaxError(sqlCommand, token.start(), "table.column");
             }
             schemaName = tmpSchemaName != null ? tmpSchemaName : session.getCurrentSchemaName();
             command.setColumn(true);
@@ -2570,6 +2292,15 @@ private Prepared parseDrop() {
             ifExists = readIfExists(ifExists);
             command.setIfExists(ifExists);
             return command;
+        } else if (readIf("MATERIALIZED")) {
+            read("VIEW");
+            boolean ifExists = readIfExists(false);
+            String viewName = readIdentifierWithSchema();
+            DropMaterializedView command = new DropMaterializedView(session, getSchema());
+            command.setViewName(viewName);
+            ifExists = readIfExists(ifExists);
+            command.setIfExists(ifExists);
+            return command;
         } else if (readIf("VIEW")) {
             boolean ifExists = readIfExists(false);
             String viewName = readIdentifierWithSchema();
@@ -2609,12 +2340,10 @@ private Prepared parseDrop() {
                 command.setDropAction(dropAction);
             }
             return command;
-        } else if (readIf(ALL)) {
-            read("OBJECTS");
+        } else if (readIf(ALL, "OBJECTS")) {
             DropDatabase command = new DropDatabase(session);
             command.setDropAllObjects(true);
-            if (readIf("DELETE")) {
-                read("FILES");
+            if (readIf("DELETE", "FILES")) {
                 command.setDeleteFiles(true);
             }
             return command;
@@ -2658,16 +2387,15 @@ private DropAggregate parseDropAggregate() {
         return command;
     }
 
-    private TableFilter readJoin(TableFilter top) {
-        for (TableFilter last = top, join;; last = join) {
+    private TableFilter readTableReference() {
+        for (TableFilter top, last = top = readTablePrimary(), join;; last = join) {
             switch (currentTokenType) {
             case RIGHT: {
                 read();
                 readIf("OUTER");
                 read(JOIN);
                 // the right hand side is the 'inner' table usually
-                join = readTableFilter();
-                join = readJoin(join);
+                join = readTableReference();
                 Expression on = readJoinSpecification(top, join, true);
                 addJoin(join, top, true, on);
                 top = join;
@@ -2677,8 +2405,7 @@ private TableFilter readJoin(TableFilter top) {
                 read();
                 readIf("OUTER");
                 read(JOIN);
-                join = readTableFilter();
-                join = readJoin(join);
+                join = readTableReference();
                 Expression on = readJoinSpecification(top, join, false);
                 addJoin(top, join, true, on);
                 break;
@@ -2689,16 +2416,14 @@ private TableFilter readJoin(TableFilter top) {
             case INNER: {
                 read();
                 read(JOIN);
-                join = readTableFilter();
-                top = readJoin(top);
+                join = readTableReference();
                 Expression on = readJoinSpecification(top, join, false);
                 addJoin(top, join, false, on);
                 break;
             }
             case JOIN: {
                 read();
-                join = readTableFilter();
-                top = readJoin(top);
+                join = readTableReference();
                 Expression on = readJoinSpecification(top, join, false);
                 addJoin(top, join, false, on);
                 break;
@@ -2706,14 +2431,14 @@ private TableFilter readJoin(TableFilter top) {
             case CROSS: {
                 read();
                 read(JOIN);
-                join = readTableFilter();
+                join = readTablePrimary();
                 addJoin(top, join, false, null);
                 break;
             }
             case NATURAL: {
                 read();
                 read(JOIN);
-                join = readTableFilter();
+                join = readTablePrimary();
                 Expression on = null;
                 for (Column column1 : last.getTable().getColumns()) {
                     Column column2 = join.getColumn(last.getColumnName(column1), true);
@@ -2738,8 +2463,7 @@ private Expression readJoinSpecification(TableFilter filter1, TableFilter filter
         Expression on = null;
         if (readIf(ON)) {
             on = readExpression();
-        } else if (readIf(USING)) {
-            read(OPEN_PAREN);
+        } else if (readIf(USING, OPEN_PAREN)) {
             do {
                 String columnName = readIdentifier();
                 on = addJoinColumn(on, filter1, filter2, filter1.getColumn(columnName, false),
@@ -2783,7 +2507,7 @@ private Expression addJoinColumn(Expression on, TableFilter filter1, TableFilter
      */
     private void addJoin(TableFilter top, TableFilter join, boolean outer, Expression on) {
         if (join.getJoin() != null) {
-            String joinTable = Constants.PREFIX_JOIN + parseIndex;
+            String joinTable = Constants.PREFIX_JOIN + token.start();
             TableFilter n = new TableFilter(session, new DualTable(database),
                     joinTable, rightsChecked, currentSelect, join.getOrderInFrom(),
                     null);
@@ -2879,7 +2603,7 @@ private Explain parseExplain() {
             command.setCommand(query);
             break;
         default:
-            int start = lastParseIndex;
+            int start = tokenIndex;
             if (readIf("DELETE")) {
                 command.setCommand(parseDelete(start));
             } else if (readIf("UPDATE")) {
@@ -2896,26 +2620,18 @@ private Explain parseExplain() {
     }
 
     private Query parseQuery() {
-        int paramIndex = parameters.size();
-        Query command = parseSelectUnion();
-        int size = parameters.size();
-        ArrayList params = new ArrayList<>(size);
-        for (int i = paramIndex; i < size; i++) {
-            params.add(parameters.get(i));
-        }
+        BitSet outerUsedParameters = initParametersScope();
+        Query command = parseQueryExpression();
+        ArrayList params = getUsedParameters(outerUsedParameters);
         command.setParameterList(params);
         command.init();
         return command;
     }
 
     private Prepared parseWithStatementOrQuery(int start) {
-        int paramIndex = parameters.size();
+        BitSet outerUsedParameters = initParametersScope();
         Prepared command = parseWith();
-        int size = parameters.size();
-        ArrayList params = new ArrayList<>(size);
-        for (int i = paramIndex; i < size; i++) {
-            params.add(parameters.get(i));
-        }
+        ArrayList params = getUsedParameters(outerUsedParameters);
         command.setParameterList(params);
         if (command instanceof Query) {
             Query query = (Query) command;
@@ -2925,10 +2641,33 @@ private Prepared parseWithStatementOrQuery(int start) {
         return command;
     }
 
-    private Query parseSelectUnion() {
-        int start = lastParseIndex;
-        Query command = parseQuerySub();
-        for (;;) {
+    private Query parseQueryExpression() {
+        Query query;
+        if (readIf(WITH)) {
+            try {
+                query = (Query) parseWith();
+            } catch (ClassCastException e) {
+                throw DbException.get(ErrorCode.SYNTAX_ERROR_1, "WITH statement supports only query in this context");
+            }
+            // recursive can not be lazy
+            query.setNeverLazy(true);
+        } else {
+            query = parseQueryExpressionBodyAndEndOfQuery();
+        }
+        return query;
+    }
+
+    private Query parseQueryExpressionBodyAndEndOfQuery() {
+        int start = tokenIndex;
+        Query command = parseQueryExpressionBody();
+        parseEndOfQuery(command);
+        setSQL(command, start);
+        return command;
+    }
+
+    private Query parseQueryExpressionBody() {
+        Query command = parseQueryTerm();
+        for (;;) {
             SelectUnion.UnionType type;
             if (readIf(UNION)) {
                 if (readIf(ALL)) {
@@ -2939,28 +2678,31 @@ private Query parseSelectUnion() {
                 }
             } else if (readIf(EXCEPT) || readIf(MINUS)) {
                 type = SelectUnion.UnionType.EXCEPT;
-            } else if (readIf(INTERSECT)) {
-                type = SelectUnion.UnionType.INTERSECT;
             } else {
                 break;
             }
-            command = new SelectUnion(session, type, command, parseQuerySub());
+            command = new SelectUnion(session, type, command, parseQueryTerm());
+        }
+        return command;
+    }
+
+    private Query parseQueryTerm() {
+        Query command = parseQueryPrimary();
+        while (readIf(INTERSECT)) {
+            command = new SelectUnion(session, SelectUnion.UnionType.INTERSECT, command, parseQueryPrimary());
         }
-        parseEndOfQuery(command);
-        setSQL(command, start);
         return command;
     }
 
     private void parseEndOfQuery(Query command) {
-        if (readIf(ORDER)) {
-            read("BY");
+        if (readIf(ORDER, "BY")) {
             Select oldSelect = currentSelect;
             if (command instanceof Select) {
                 currentSelect = (Select) command;
             }
             ArrayList orderList = Utils.newSmallArrayList();
             do {
-                boolean canBeNumber = !readIf(EQUAL);
+                boolean canBeNumber = currentTokenType == LITERAL;
                 QueryOrderBy order = new QueryOrderBy();
                 Expression expr = readExpression();
                 if (canBeNumber && expr instanceof ValueExpression && expr.getType().getValueType() == Value.INTEGER) {
@@ -3006,8 +2748,7 @@ private void parseEndOfQuery(Query command) {
                         read("ROWS");
                     }
                 }
-                if (readIf(WITH)) {
-                    read("TIES");
+                if (readIf(WITH, "TIES")) {
                     command.setWithTies(true);
                 } else {
                     read("ONLY");
@@ -3034,10 +2775,25 @@ private void parseEndOfQuery(Query command) {
                     do {
                         readIdentifierWithSchema();
                     } while (readIf(COMMA));
-                } else if (readIf("NOWAIT")) {
-                    // TODO parser: select for update nowait: should not wait
                 }
-                command.setForUpdate(true);
+                ForUpdate forUpdate;
+                if (readIf("NOWAIT")) {
+                    forUpdate = ForUpdate.NOWAIT;
+                } else if (readIf("WAIT")) {
+                    BigDecimal timeout;
+                    if (currentTokenType != LITERAL || (timeout = token.value(session).getBigDecimal()) == null
+                            || timeout.signum() < 0
+                            || timeout.compareTo(BigDecimal.valueOf(Integer.MAX_VALUE, 3)) > 0) {
+                        throw DbException.getSyntaxError(sqlCommand, token.start(), "timeout (0..2147483.647)");
+                    }
+                    read();
+                    forUpdate = ForUpdate.wait(timeout.movePointRight(3).intValue());
+                } else if (readIf("SKIP", "LOCKED")) {
+                    forUpdate = ForUpdate.SKIP_LOCKED;
+                } else {
+                    forUpdate = ForUpdate.DEFAULT;
+                }
+                command.setForUpdate(forUpdate);
             } else if (readIf("READ") || readIf(FETCH)) {
                 read("ONLY");
             }
@@ -3054,9 +2810,7 @@ private void parseIsolationClause() {
         if (readIf(WITH)) {
             if (readIf("RR") || readIf("RS")) {
                 // concurrent-access-resolution clause
-                if (readIf("USE")) {
-                    read(AND);
-                    read("KEEP");
+                if (readIf("USE", AND, "KEEP")) {
                     if (readIf("SHARE") || readIf("UPDATE") ||
                             readIf("EXCLUSIVE")) {
                         // ignore
@@ -3069,25 +2823,13 @@ private void parseIsolationClause() {
         }
     }
 
-    private Query parseQuerySub() {
+    private Query parseQueryPrimary() {
         if (readIf(OPEN_PAREN)) {
-            Query command = parseSelectUnion();
+            Query command = parseQueryExpressionBodyAndEndOfQuery();
             read(CLOSE_PAREN);
             return command;
         }
-        if (readIf(WITH)) {
-            Query query;
-            try {
-                query = (Query) parseWith();
-            } catch (ClassCastException e) {
-                throw DbException.get(ErrorCode.SYNTAX_ERROR_1,
-                        "WITH statement supports only SELECT (query) in this context");
-            }
-            // recursive can not be lazy
-            query.setNeverLazy(true);
-            return query;
-        }
-        int start = lastParseIndex;
+        int start = tokenIndex;
         if (readIf(SELECT)) {
             return parseSelect(start);
         } else if (readIf(TABLE)) {
@@ -3099,52 +2841,41 @@ private Query parseQuerySub() {
 
     private void parseSelectFromPart(Select command) {
         do {
-            TableFilter filter = readTableFilter();
-            parseJoinTableFilter(filter, command);
-        } while (readIf(COMMA));
-
-        // Parser can reorder joined table filters, need to explicitly sort them
-        // to get the order as it was in the original query.
-        if (session.isForceJoinOrder()) {
-            command.getTopFilters().sort(TABLE_FILTER_COMPARATOR);
-        }
-    }
-
-    private void parseJoinTableFilter(TableFilter top, final Select command) {
-        top = readJoin(top);
-        command.addTableFilter(top, true);
-        boolean isOuter = false;
-        while (true) {
-            TableFilter n = top.getNestedJoin();
-            if (n != null) {
-                n.visit(f -> command.addTableFilter(f, false));
-            }
-            TableFilter join = top.getJoin();
-            if (join == null) {
-                break;
-            }
-            isOuter = isOuter | join.isJoinOuter();
-            if (isOuter) {
-                command.addTableFilter(join, false);
-            } else {
-                // make flat so the optimizer can work better
-                Expression on = join.getJoinCondition();
-                if (on != null) {
-                    command.addCondition(on);
+            TableFilter top = readTableReference();
+            command.addTableFilter(top, true);
+            boolean isOuter = false;
+            for (;;) {
+                TableFilter n = top.getNestedJoin();
+                if (n != null) {
+                    n.visit(f -> command.addTableFilter(f, false));
+                }
+                TableFilter join = top.getJoin();
+                if (join == null) {
+                    break;
+                }
+                isOuter = isOuter | join.isJoinOuter();
+                if (isOuter) {
+                    command.addTableFilter(join, false);
+                } else {
+                    // make flat so the optimizer can work better
+                    Expression on = join.getJoinCondition();
+                    if (on != null) {
+                        command.addCondition(on);
+                    }
+                    join.removeJoinCondition();
+                    top.removeJoin();
+                    command.addTableFilter(join, true);
                 }
-                join.removeJoinCondition();
-                top.removeJoin();
-                command.addTableFilter(join, true);
+                top = join;
             }
-            top = join;
-        }
+        } while (readIf(COMMA));
     }
 
     private void parseSelectExpressions(Select command) {
-        Select temp = currentSelect;
-        // make sure aggregate functions will not work in TOP and LIMIT
-        currentSelect = null;
         if (database.getMode().topInSelect && readIf("TOP")) {
+            Select temp = currentSelect;
+            // make sure aggregate functions will not work in TOP and LIMIT
+            currentSelect = null;
             // can't read more complex expressions here because
             // SELECT TOP 1 +? A FROM TEST could mean
             // SELECT TOP (1+?) A FROM TEST or
@@ -3153,15 +2884,13 @@ private void parseSelectExpressions(Select command) {
             if (readIf("PERCENT")) {
                 command.setFetchPercent(true);
             }
-            if (readIf(WITH)) {
-                read("TIES");
+            if (readIf(WITH, "TIES")) {
                 command.setWithTies(true);
             }
+            currentSelect = temp;
         }
-        currentSelect = temp;
         if (readIf(DISTINCT)) {
-            if (readIf(ON)) {
-                read(OPEN_PAREN);
+            if (readIf(ON, OPEN_PAREN)) {
                 ArrayList distinctExpressions = Utils.newSmallArrayList();
                 do {
                     distinctExpressions.add(readExpression());
@@ -3208,6 +2937,7 @@ private Select parseSelect(int start) {
         Select command = new Select(session, currentSelect);
         Select oldSelect = currentSelect;
         Prepared oldPrepared = currentPrepared;
+        BitSet outerUsedParameters = initParametersScope();
         currentSelect = command;
         currentPrepared = command;
         parseSelectExpressions(command);
@@ -3225,8 +2955,7 @@ private Select parseSelect(int start) {
         // the group by is read for the outer select (or not a select)
         // so that columns that are not grouped can be used
         currentSelect = oldSelect;
-        if (readIf(GROUP)) {
-            read("BY");
+        if (readIf(GROUP, "BY")) {
             command.setGroupQuery();
             ArrayList list = Utils.newSmallArrayList();
             do {
@@ -3251,7 +2980,7 @@ private Select parseSelect(int start) {
                             throw DbException.get(ErrorCode.GROUP_BY_NOT_IN_THE_RESULT, Integer.toString(idx),
                                     Integer.toString(expressions.size()));
                         }
-                        list.add(expressions.get(idx-1));
+                        list.add(expressions.get(idx - 1));
                     } else {
                         list.add(expr);
                     }
@@ -3268,12 +2997,12 @@ private Select parseSelect(int start) {
         }
         if (readIf(WINDOW)) {
             do {
-                int index = parseIndex;
+                int sqlIndex = token.start();
                 String name = readIdentifier();
                 read(AS);
                 Window w = readWindowSpecification();
                 if (!currentSelect.addWindow(name, w)) {
-                    throw DbException.getSyntaxError(sqlCommand, index, "unique identifier");
+                    throw DbException.getSyntaxError(sqlCommand, sqlIndex, "unique identifier");
                 }
             } while (readIf(COMMA));
         }
@@ -3281,7 +3010,7 @@ private Select parseSelect(int start) {
             command.setWindowQuery();
             command.setQualify(readExpressionWithGlobalConditions());
         }
-        command.setParameterList(parameters);
+        command.setParameterList(getUsedParameters(outerUsedParameters));
         currentSelect = oldSelect;
         currentPrepared = oldPrepared;
         setSQL(command, start);
@@ -3296,26 +3025,12 @@ private Select parseSelect(int start) {
      *         grouping set
      */
     private boolean isOrdinaryGroupingSet() {
-        int lastIndex = lastParseIndex, index = parseIndex;
-        int level = 1;
-        loop: for (;;) {
-            read();
-            switch (currentTokenType) {
-            case CLOSE_PAREN:
-                if (--level <= 0) {
-                    break loop;
-                }
-                break;
-            case OPEN_PAREN:
-                level++;
-                break;
-            case END_OF_INPUT:
-                addExpected(CLOSE_PAREN);
-                throw getSyntaxError();
-            }
+        int offset = scanToCloseParen(tokenIndex + 1);
+        if (offset < 0) {
+            // Try to parse as expression to get better syntax error
+            return false;
         }
-        read();
-        switch (currentTokenType) {
+        switch (tokens.get(offset).tokenType()) {
         // End of query
         case CLOSE_PAREN:
         case SEMICOLON:
@@ -3337,10 +3052,9 @@ private boolean isOrdinaryGroupingSet() {
         case FETCH:
         case LIMIT:
         case FOR:
-            reread(index);
+            setTokenIndex(tokenIndex + 1);
             return true;
         default:
-            reread(lastIndex);
             return false;
         }
     }
@@ -3356,8 +3070,38 @@ private Query parseExplicitTable(int start) {
         return command;
     }
 
-    private void setSQL(Prepared command, int startIndex) {
-        command.setSQL(StringUtils.trimSubstring(originalSQL, startIndex, lastParseIndex));
+    private void setSQL(Prepared command, int start) {
+        String s = sqlCommand;
+        int beginIndex = tokens.get(start).start();
+        int endIndex = token.start();
+        while (beginIndex < endIndex && s.charAt(beginIndex) <= ' ') {
+            beginIndex++;
+        }
+        while (beginIndex < endIndex && s.charAt(endIndex - 1) <= ' ') {
+            endIndex--;
+        }
+        s = s.substring(beginIndex, endIndex);
+        ArrayList commandTokens;
+        if (start == 0 && currentTokenType == END_OF_INPUT) {
+            commandTokens = tokens;
+            if (beginIndex != 0) {
+                for (int i = 0, l = commandTokens.size() - 1; i < l; i++) {
+                    commandTokens.get(i).subtractFromStart(beginIndex);
+                }
+            }
+            token.setStart(s.length());
+            sqlCommand = s;
+        } else {
+            List subList = tokens.subList(start, tokenIndex);
+            commandTokens = new ArrayList<>(subList.size() + 1);
+            for (int i = start; i < tokenIndex; i++) {
+                Token t = tokens.get(i).clone();
+                t.subtractFromStart(beginIndex);
+                commandTokens.add(t);
+            }
+            commandTokens.add(new Token.EndOfInputToken(s.length()));
+        }
+        command.setSQL(s, commandTokens);
     }
 
     private Expression readExpressionOrDefault() {
@@ -3437,25 +3181,25 @@ private Expression readCondition() {
             read(CLOSE_PAREN);
             return new ExistsPredicate(query);
         }
-        case INTERSECTS: {
-            read();
-            read(OPEN_PAREN);
-            Expression r1 = readConcat();
-            read(COMMA);
-            Expression r2 = readConcat();
-            read(CLOSE_PAREN);
-            return new Comparison(Comparison.SPATIAL_INTERSECTS, r1, r2, false);
-        }
         case UNIQUE: {
             read();
+            NullsDistinct nullsDistinct = readNullsDistinct(NullsDistinct.DISTINCT);
             read(OPEN_PAREN);
             Query query = parseQuery();
             read(CLOSE_PAREN);
-            return new UniquePredicate(query);
+            return new UniquePredicate(query, nullsDistinct);
         }
         default:
+            if (readIf("INTERSECTS", OPEN_PAREN)) {
+                Expression r1 = readConcat();
+                read(COMMA);
+                Expression r2 = readConcat();
+                read(CLOSE_PAREN);
+                return new Comparison(Comparison.SPATIAL_INTERSECTS, r1, r2, false);
+            }
             if (expectedList != null) {
-                addMultipleExpected(NOT, EXISTS, INTERSECTS, UNIQUE);
+                addMultipleExpected(NOT, EXISTS, UNIQUE);
+                addExpected("INTERSECTS");
             }
         }
         Expression l, c = readConcat();
@@ -3463,13 +3207,11 @@ private Expression readCondition() {
             l = c;
             // special case: NOT NULL is not part of an expression (as in CREATE
             // TABLE TEST(ID INT DEFAULT 0 NOT NULL))
-            int backup = parseIndex;
+            int backup = tokenIndex;
             boolean not = readIf(NOT);
             if (not && isToken(NULL)) {
                 // this really only works for NOT NULL!
-                parseIndex = backup;
-                currentToken = "NOT";
-                currentTokenType = NOT;
+                setTokenIndex(backup);
                 break;
             }
             c = readConditionRightHandSide(l, not, false);
@@ -3624,12 +3366,10 @@ private IsJsonPredicate readJsonPredicate(Expression left, boolean not, boolean
             itemType = JSONItemType.VALUE;
         }
         boolean unique = false;
-        if (readIf(WITH)) {
-            read(UNIQUE);
+        if (readIf(WITH, UNIQUE)) {
             readIf("KEYS");
             unique = true;
-        } else if (readIf("WITHOUT")) {
-            read(UNIQUE);
+        } else if (readIf("WITHOUT", UNIQUE)) {
             readIf("KEYS");
         }
         return new IsJsonPredicate(left, not, whenOperand, unique, itemType);
@@ -3643,37 +3383,34 @@ private Expression readLikePredicate(Expression left, LikeType likeType, boolean
     }
 
     private Expression readComparison(Expression left, int compareType, boolean whenOperand) {
-        int start = lastParseIndex;
-        if (readIf(ALL)) {
-            read(OPEN_PAREN);
+        int start = tokenIndex;
+        if (readIf(ALL, OPEN_PAREN)) {
             if (isQuery()) {
-                Query query = parseQuery();
-                left = new ConditionInQuery(left, false, whenOperand, query, true, compareType);
-                read(CLOSE_PAREN);
+                left = new ConditionInQuery(left, false, whenOperand, parseQuery(), true, compareType);
             } else {
-                reread(start);
-                left = new Comparison(compareType, left, readConcat(), whenOperand);
-            }
-        } else if (readIf(ANY) || readIf(SOME)) {
-            read(OPEN_PAREN);
-            if (currentTokenType == PARAMETER && compareType == Comparison.EQUAL) {
-                Parameter p = readParameter();
-                left = new ConditionInParameter(left, false, whenOperand, p);
-                read(CLOSE_PAREN);
-            } else if (isQuery()) {
-                Query query = parseQuery();
-                left = new ConditionInQuery(left, false, whenOperand, query, false, compareType);
-                read(CLOSE_PAREN);
-            } else {
-                reread(start);
-                left = new Comparison(compareType, left, readConcat(), whenOperand);
+                left = new ConditionInArray(left, whenOperand, readExpression(), true, compareType);
             }
+            read(CLOSE_PAREN);
+        } else if (readIf(ANY, OPEN_PAREN)) {
+            left = readAnyComparison(left, compareType, whenOperand, start);
+        } else if (readIf(SOME, OPEN_PAREN)) {
+            left = readAnyComparison(left, compareType, whenOperand, start);
         } else {
             left = new Comparison(compareType, left, readConcat(), whenOperand);
         }
         return left;
     }
 
+    private Expression readAnyComparison(Expression left, int compareType, boolean whenOperand, int start) {
+        if (isQuery()) {
+            left = new ConditionInQuery(left, false, whenOperand, parseQuery(), false, compareType);
+        } else {
+            left = new ConditionInArray(left, whenOperand, readExpression(), false, compareType);
+        }
+        read(CLOSE_PAREN);
+        return left;
+    }
+
     private Expression readConcat() {
         Expression op1 = readSum();
         for (;;) {
@@ -3747,6 +3484,7 @@ private Expression readTildeCondition(Expression r, boolean not) {
 
     private Expression readAggregate(AggregateType aggregateType, String aggregateName) {
         if (currentSelect == null) {
+            expectedList = null;
             throw getSyntaxError();
         }
         Aggregate r;
@@ -3791,23 +3529,23 @@ private Expression readAggregate(AggregateType aggregateType, String aggregateNa
             if ("STRING_AGG".equals(aggregateName)) {
                 // PostgreSQL compatibility: string_agg(expression, delimiter)
                 read(COMMA);
-                extraArguments.setSeparator(readString());
+                extraArguments.setSeparator(readStringOrParameter());
                 orderByList = readIfOrderBy();
             } else if ("GROUP_CONCAT".equals(aggregateName)) {
                 orderByList = readIfOrderBy();
                 if (readIf("SEPARATOR")) {
-                    extraArguments.setSeparator(readString());
+                    extraArguments.setSeparator(readStringOrParameter());
                 }
             } else {
                 if (readIf(COMMA)) {
-                    extraArguments.setSeparator(readString());
+                    extraArguments.setSeparator(readStringOrParameter());
                 }
                 if (readIf(ON)) {
                     read("OVERFLOW");
                     if (readIf("TRUNCATE")) {
                         extraArguments.setOnOverflowTruncate(true);
                         if (currentTokenType == LITERAL) {
-                            extraArguments.setFilter(readString());
+                            extraArguments.setFilter(readStringOrParameter());
                         }
                         if (!readIf(WITH)) {
                             read("WITHOUT");
@@ -3821,12 +3559,12 @@ private Expression readAggregate(AggregateType aggregateType, String aggregateNa
                 orderByList = null;
             }
             Expression[] args = new Expression[] { arg };
-            int index = lastParseIndex;
+            int index = tokenIndex;
             read(CLOSE_PAREN);
             if (orderByList == null && isToken("WITHIN")) {
                 r = readWithinGroup(aggregateType, args, distinct, extraArguments, false, false);
             } else {
-                reread(index);
+                setTokenIndex(index);
                 r = new Aggregate(AggregateType.LISTAGG, args, currentSelect, distinct);
                 r.setExtraArguments(extraArguments);
                 if (orderByList != null) {
@@ -3874,7 +3612,7 @@ private Expression readAggregate(AggregateType aggregateType, String aggregateNa
                     String sql = expr.getSQL(HasSQL.DEFAULT_SQL_FLAGS), sql2 = expr2.getSQL(HasSQL.DEFAULT_SQL_FLAGS);
                     if (!sql.equals(sql2)) {
                         throw DbException.getSyntaxError(ErrorCode.IDENTICAL_EXPRESSIONS_SHOULD_BE_USED, sqlCommand,
-                                lastParseIndex, sql, sql2);
+                                token.start(), sql, sql2);
                     }
                     readAggregateOrder(r, expr, true);
                 } else {
@@ -3888,7 +3626,7 @@ private Expression readAggregate(AggregateType aggregateType, String aggregateNa
             Expression key = readExpression();
             if (withKey) {
                 read(VALUE);
-            } else if (!readIf(VALUE)) {
+            } else if (!(readIf(VALUE) || (database.getMode().acceptsCommaAsJsonKeyValueSeparator && readIf(COMMA)))) {
                 read(COLON);
             }
             Expression value = readExpression();
@@ -3954,8 +3692,7 @@ private void readAggregateOrder(Aggregate r, Expression expr, boolean parseSortT
     }
 
     private ArrayList readIfOrderBy() {
-        if (readIf(ORDER)) {
-            read("BY");
+        if (readIf(ORDER, "BY")) {
             return parseSortSpecificationList();
         }
         return null;
@@ -4012,9 +3749,7 @@ private boolean readDistinctAgg() {
     }
 
     private void readFilterAndOver(AbstractAggregate aggregate) {
-        if (readIf("FILTER")) {
-            read(OPEN_PAREN);
-            read(WHERE);
+        if (readIf("FILTER", OPEN_PAREN, WHERE)) {
             Expression filterCondition = readExpression();
             read(CLOSE_PAREN);
             aggregate.setFilterCondition(filterCondition);
@@ -4041,19 +3776,18 @@ private Window readWindowSpecification() {
         read(OPEN_PAREN);
         String parent = null;
         if (currentTokenType == IDENTIFIER) {
-            String token = currentToken;
-            if (currentTokenQuoted || ( //
-                    !equalsToken(token, "PARTITION") //
-                    && !equalsToken(token, "ROWS") //
-                    && !equalsToken(token, "RANGE") //
-                    && !equalsToken(token, "GROUPS"))) {
-                parent = token;
+            String current = currentToken;
+            if (token.isQuoted() || ( //
+                    !equalsToken(current, "PARTITION") //
+                    && !equalsToken(current, "ROWS") //
+                    && !equalsToken(current, "RANGE") //
+                    && !equalsToken(current, "GROUPS"))) {
+                parent = current;
                 read();
             }
         }
         ArrayList partitionBy = null;
-        if (readIf("PARTITION")) {
-            read("BY");
+        if (readIf("PARTITION", "BY")) {
             partitionBy = Utils.newSmallArrayList();
             do {
                 Expression expr = readExpression();
@@ -4086,11 +3820,10 @@ private WindowFrame readWindowFrame() {
             starting = readWindowFrameStarting();
             following = null;
         }
-        int idx = lastParseIndex;
+        int sqlIndex = token.start();
         WindowFrameExclusion exclusion = WindowFrameExclusion.EXCLUDE_NO_OTHERS;
         if (readIf("EXCLUDE")) {
-            if (readIf("CURRENT")) {
-                read(ROW);
+            if (readIf("CURRENT", ROW)) {
                 exclusion = WindowFrameExclusion.EXCLUDE_CURRENT_ROW;
             } else if (readIf(GROUP)) {
                 exclusion = WindowFrameExclusion.EXCLUDE_GROUP;
@@ -4103,7 +3836,7 @@ private WindowFrame readWindowFrame() {
         }
         WindowFrame frame = new WindowFrame(units, starting, following, exclusion);
         if (!frame.isValid()) {
-            throw DbException.getSyntaxError(sqlCommand, idx);
+            throw DbException.getSyntaxError(sqlCommand, sqlIndex);
         }
         return frame;
     }
@@ -4259,16 +3992,27 @@ private Expression readCompatibilityFunction(String name) {
             return new CurrentGeneralValueSpecification(CurrentGeneralValueSpecification.CURRENT_CATALOG);
         // CURRENT_DATE
         case "CURDATE":
-        case "SYSDATE":
-        case "TODAY":
             return readCurrentDateTimeValueFunction(CurrentDateTimeValueFunction.CURRENT_DATE, true, name);
+        case "TODAY":
+            read(CLOSE_PAREN);
+            return ModeFunction.getCompatibilityDateTimeValueFunction(database, "TODAY", -1);
         // CURRENT_SCHEMA
         case "SCHEMA":
             read(CLOSE_PAREN);
             return new CurrentGeneralValueSpecification(CurrentGeneralValueSpecification.CURRENT_SCHEMA);
         // CURRENT_TIMESTAMP
-        case "SYSTIMESTAMP":
-            return readCurrentDateTimeValueFunction(CurrentDateTimeValueFunction.CURRENT_TIMESTAMP, true, name);
+        case "SYSTIMESTAMP": {
+            int scale = -1;
+            if (!readIf(CLOSE_PAREN)) {
+                scale = readInt();
+                if (scale < 0 || scale > ValueTime.MAXIMUM_SCALE) {
+                    throw DbException.get(ErrorCode.INVALID_VALUE_SCALE, Integer.toString(scale), "0",
+                            /* compile-time constant */ "" + ValueTime.MAXIMUM_SCALE);
+                }
+                read(CLOSE_PAREN);
+            }
+            return ModeFunction.getCompatibilityDateTimeValueFunction(database, "SYSTIMESTAMP", scale);
+        }
         // EXTRACT
         case "DAY":
         case "DAY_OF_MONTH":
@@ -4309,12 +4053,12 @@ private Expression readCompatibilityFunction(String name) {
         // LOCALTIME
         case "CURTIME":
             return readCurrentDateTimeValueFunction(CurrentDateTimeValueFunction.LOCALTIME, true, "CURTIME");
-        case "SYSTIME":
-            read(CLOSE_PAREN);
-            return readCurrentDateTimeValueFunction(CurrentDateTimeValueFunction.LOCALTIME, false, "SYSTIME");
         // LOCALTIMESTAMP
         case "NOW":
             return readCurrentDateTimeValueFunction(CurrentDateTimeValueFunction.LOCALTIMESTAMP, true, "NOW");
+        case "SYSDATE":
+            read(CLOSE_PAREN);
+            return ModeFunction.getCompatibilityDateTimeValueFunction(database, "SYSDATE", -1);
         // LOCATE
         case "INSTR": {
             Expression arg1 = readExpression();
@@ -4334,11 +4078,6 @@ private Expression readCompatibilityFunction(String name) {
         // SUBSTRING
         case "SUBSTR":
             return readSubstringFunction();
-        // TRIM
-        case "LTRIM":
-            return new TrimFunction(readSingleArgument(), null, TrimFunction.LEADING);
-        case "RTRIM":
-            return new TrimFunction(readSingleArgument(), null, TrimFunction.TRAILING);
         // UPPER
         case "UCASE":
             return new StringFunction1(readSingleArgument(), StringFunction1.UPPER);
@@ -4491,6 +4230,8 @@ private Expression readBuiltinFunctionIf(String upperName) {
         case "TIMESTAMPDIFF":
             return new DateTimeFunction(DateTimeFunction.DATEDIFF, readDateTimeField(), readNextArgument(),
                     readLastArgument());
+        case "LAST_DAY":
+            return new DateTimeFunction(DateTimeFunction.LAST_DAY, -1, readSingleArgument(), null);
         case "FORMATDATETIME":
             return readDateTimeFormatFunction(DateTimeFormatFunction.FORMATDATETIME);
         case "PARSEDATETIME":
@@ -4567,6 +4308,15 @@ private Expression readBuiltinFunctionIf(String upperName) {
             return new LengthFunction(readIfSingleArgument(), LengthFunction.BIT_LENGTH);
         case "TRIM":
             return readTrimFunction();
+        case "LTRIM":
+            return new TrimFunction(readExpression(), readIfArgument(),
+                    TrimFunction.LEADING | TrimFunction.MULTI_CHARACTER);
+        case "RTRIM":
+            return new TrimFunction(readExpression(), readIfArgument(),
+                    TrimFunction.TRAILING | TrimFunction.MULTI_CHARACTER);
+        case "BTRIM":
+            return new TrimFunction(readExpression(), readIfArgument(),
+                    TrimFunction.LEADING | TrimFunction.TRAILING | TrimFunction.MULTI_CHARACTER);
         case "REGEXP_LIKE":
             return readParameters(new RegexpFunction(RegexpFunction.REGEXP_LIKE));
         case "REGEXP_REPLACE":
@@ -4608,8 +4358,11 @@ private Expression readBuiltinFunctionIf(String upperName) {
                     function.addParameter(readExpression());
                     if (withKey) {
                         read(VALUE);
-                    } else if (!readIf(VALUE)) {
-                        read(COLON);
+                    } else {
+                        if (!(readIf(VALUE) ||
+                                (database.getMode().acceptsCommaAsJsonKeyValueSeparator && readIf(COMMA)))) {
+                            read(COLON);
+                        }
                     }
                     function.addParameter(readExpression());
                 } while (readIf(COMMA));
@@ -4795,19 +4548,26 @@ private ArrayTableFunction readUnnestFunction() {
             do {
                 Expression expr = readExpression();
                 TypeInfo columnType = TypeInfo.TYPE_NULL;
-                if (expr.isConstant()) {
-                    expr = expr.optimize(session);
+                boolean constant = expr.isConstant();
+                if (constant || expr instanceof CastSpecification) {
+                    if (constant) {
+                        expr = expr.optimize(session);
+                    }
                     TypeInfo exprType = expr.getType();
-                    if (exprType.getValueType() == Value.ARRAY) {
+                    switch (exprType.getValueType()) {
+                    case Value.JSON:
+                        columnType = TypeInfo.TYPE_JSON;
+                        break;
+                    case Value.ARRAY:
                         columnType = (TypeInfo) exprType.getExtTypeInfo();
+                        break;
                     }
                 }
                 f.addParameter(expr);
                 columns.add(new Column("C" + ++i, columnType));
             } while (readIfMore());
         }
-        if (readIf(WITH)) {
-            read("ORDINALITY");
+        if (readIf(WITH, "ORDINALITY")) {
             columns.add(new Column("NORD", TypeInfo.TYPE_INTEGER));
         }
         f.setColumns(columns);
@@ -4921,13 +4681,13 @@ private int readDateTimeField() {
         int field = -1;
         switch (currentTokenType) {
         case IDENTIFIER:
-            if (!currentTokenQuoted) {
+            if (!token.isQuoted()) {
                 field = DateTimeFunction.getField(currentToken);
             }
             break;
         case LITERAL:
-            if (currentValue.getValueType() == Value.VARCHAR) {
-                field = DateTimeFunction.getField(currentValue.getString());
+            if (token.value(session).getValueType() == Value.VARCHAR) {
+                field = DateTimeFunction.getField(token.value(session).getString());
             }
             break;
         case YEAR:
@@ -5014,61 +4774,38 @@ private WindowFunction readWindowFunction(String name) {
     }
 
     private void readFromFirstOrLast(WindowFunction function) {
-        if (readIf(FROM) && !readIf("FIRST")) {
-            read("LAST");
+        if (readIf(FROM, "LAST")) {
             function.setFromLast(true);
+        } else {
+            readIf(FROM, "FIRST");
         }
     }
 
     private void readRespectOrIgnoreNulls(WindowFunction function) {
-        if (readIf("RESPECT")) {
-            read("NULLS");
-        } else if (readIf("IGNORE")) {
-            read("NULLS");
+        if (readIf("IGNORE", "NULLS")) {
             function.setIgnoreNulls(true);
+        } else {
+            readIf("RESPECT", "NULLS");
         }
     }
 
     private boolean readJsonObjectFunctionFlags(ExpressionWithFlags function, boolean forArray) {
-        int start = lastParseIndex;
         boolean result = false;
         int flags = function.getFlags();
-        if (readIf(NULL)) {
-            if (readIf(ON)) {
-                read(NULL);
-                flags &= ~JsonConstructorUtils.JSON_ABSENT_ON_NULL;
-                result = true;
-            } else {
-                reread(start);
-                return false;
-            }
-        } else if (readIf("ABSENT")) {
-            if (readIf(ON)) {
-                read(NULL);
-                flags |= JsonConstructorUtils.JSON_ABSENT_ON_NULL;
-                result = true;
-            } else {
-                reread(start);
-                return false;
-            }
+        if (readIf(NULL, ON, NULL)) {
+            flags &= ~JsonConstructorUtils.JSON_ABSENT_ON_NULL;
+            result = true;
+        } else if (readIf("ABSENT", ON, NULL)) {
+            flags |= JsonConstructorUtils.JSON_ABSENT_ON_NULL;
+            result = true;
         }
         if (!forArray) {
-            if (readIf(WITH)) {
-                read(UNIQUE);
-                read("KEYS");
+            if (readIf(WITH, UNIQUE, "KEYS")) {
                 flags |= JsonConstructorUtils.JSON_WITH_UNIQUE_KEYS;
                 result = true;
-            } else if (readIf("WITHOUT")) {
-                if (readIf(UNIQUE)) {
-                    read("KEYS");
-                    flags &= ~JsonConstructorUtils.JSON_WITH_UNIQUE_KEYS;
-                    result = true;
-                } else if (result) {
-                    throw getSyntaxError();
-                } else {
-                    reread(start);
-                    return false;
-                }
+            } else if (readIf("WITHOUT", UNIQUE, "KEYS")) {
+                flags &= ~JsonConstructorUtils.JSON_WITH_UNIQUE_KEYS;
+                result = true;
             }
         }
         if (result) {
@@ -5128,8 +4865,7 @@ private Expression readIfWildcardRowidOrSequencePseudoColumn(String schema, Stri
 
     private Wildcard parseWildcard(String schema, String objectName) {
         Wildcard wildcard = new Wildcard(schema, objectName);
-        if (readIf(EXCEPT)) {
-            read(OPEN_PAREN);
+        if (readIf(EXCEPT, OPEN_PAREN)) {
             ArrayList exceptColumns = Utils.newSmallArrayList();
             do {
                 String s = null, t = null;
@@ -5164,7 +4900,7 @@ private SequenceValue readIfSequencePseudoColumn(String schema, String objectNam
             Sequence sequence = findSequence(schema, objectName);
             if (sequence != null) {
                 read();
-                return new SequenceValue(sequence, getCurrentSelectOrPrepared());
+                return new SequenceValue(sequence, getCurrentPreparedOrSelect());
             }
         } else if (isToken("CURRVAL")) {
             Sequence sequence = findSequence(schema, objectName);
@@ -5217,54 +4953,78 @@ private void checkDatabaseName(String databaseName) {
     }
 
     private Parameter readParameter() {
-        // there must be no space between ? and the number
-        boolean indexed = Character.isDigit(sqlCommandChars[parseIndex]);
-
-        Parameter p;
-        if (indexed) {
-            readParameterIndex();
-            if (indexedParameterList == null) {
-                if (parameters == null) {
-                    // this can occur when parsing expressions only (for
-                    // example check constraints)
-                    throw getSyntaxError();
-                } else if (!parameters.isEmpty()) {
-                    throw DbException
-                            .get(ErrorCode.CANNOT_MIX_INDEXED_AND_UNINDEXED_PARAMS);
-                }
-                indexedParameterList = Utils.newSmallArrayList();
+        int index = ((Token.ParameterToken) token).index() - 1;
+        read();
+        usedParameters.set(index);
+        return parameters.get(index);
+    }
+
+    private BitSet initParametersScope() {
+        BitSet outerUsedParameters = usedParameters;
+        usedParameters = new BitSet();
+        return outerUsedParameters;
+    }
+
+    private ArrayList getUsedParameters(BitSet outerUsedParameters) {
+        BitSet innerUsedParameters = usedParameters;
+        int size = innerUsedParameters.cardinality();
+        ArrayList params = new ArrayList<>(size);
+        if (size > 0) {
+            for (int i = -1; (i = innerUsedParameters.nextSetBit(i + 1)) >= 0;) {
+                params.add(parameters.get(i));
             }
-            int index = currentValue.getInt() - 1;
-            if (index < 0 || index >= Constants.MAX_PARAMETER_INDEX) {
-                throw DbException.getInvalidValueException(
-                        "parameter index", index + 1);
+        }
+        outerUsedParameters.or(innerUsedParameters);
+        usedParameters = outerUsedParameters;
+        return params;
+    }
+
+    private Expression readTerm() {
+        Expression r = currentTokenType == IDENTIFIER ? readTermWithIdentifier() : readTermWithoutIdentifier();
+        for (;;) {
+            if (readIf(OPEN_BRACKET)) {
+                r = new ArrayElementReference(r, readExpression());
+                read(CLOSE_BRACKET);
+                continue;
             }
-            if (indexedParameterList.size() <= index) {
-                indexedParameterList.ensureCapacity(index + 1);
-                while (indexedParameterList.size() <= index) {
-                    indexedParameterList.add(null);
-                }
+            if (readIf(DOT)) {
+                r = new FieldReference(r, readIdentifier());
+                continue;
             }
-            p = indexedParameterList.get(index);
-            if (p == null) {
-                p = new Parameter(index);
-                indexedParameterList.set(index, p);
-                parameters.add(p);
+            if (readIf(COLON_COLON)) {
+                r = readColonColonAfterTerm(r);
+                continue;
             }
-            read();
-        } else {
-            read();
-            if (indexedParameterList != null) {
-                throw DbException
-                        .get(ErrorCode.CANNOT_MIX_INDEXED_AND_UNINDEXED_PARAMS);
+            TypeInfo ti = readIntervalQualifier();
+            if (ti != null) {
+                r = new CastSpecification(r, ti);
+                continue;
             }
-            p = new Parameter(parameters.size());
-            parameters.add(p);
+            int index = tokenIndex;
+            if (readIf("AT")) {
+                if (readIf("TIME", "ZONE")) {
+                    r = new TimeZoneOperation(r, readExpression());
+                    continue;
+                } else if (readIf("LOCAL")) {
+                    r = new TimeZoneOperation(r, null);
+                    continue;
+                } else {
+                    setTokenIndex(index);
+                }
+            } else if (readIf("FORMAT")) {
+                if (readIf("JSON")) {
+                    r = new Format(r, FormatEnum.JSON);
+                    continue;
+                } else {
+                    setTokenIndex(index);
+                }
+            }
+            break;
         }
-        return p;
+        return r;
     }
 
-    private Expression readTerm() {
+    private Expression readTermWithoutIdentifier() {
         Expression r;
         switch (currentTokenType) {
         case AT:
@@ -5285,7 +5045,7 @@ private Expression readTerm() {
         case MINUS_SIGN:
             read();
             if (currentTokenType == LITERAL) {
-                r = ValueExpression.get(currentValue.negate());
+                r = ValueExpression.get(token.value(session).negate());
                 int rType = r.getType().getValueType();
                 if (rType == Value.BIGINT &&
                         r.getValue(session).getLong() == Integer.MIN_VALUE) {
@@ -5311,6 +5071,9 @@ private Expression readTerm() {
             read();
             if (readIf(CLOSE_PAREN)) {
                 r = ValueExpression.get(ValueRow.EMPTY);
+            } else if (isQuery()) {
+                r = new Subquery(parseQuery());
+                read(CLOSE_PAREN);
             } else {
                 r = readExpression();
                 if (readIfMore()) {
@@ -5330,9 +5093,6 @@ private Expression readTerm() {
                     }
                 }
             }
-            if (readIf(DOT)) {
-                r = new FieldReference(r, readIdentifier());
-            }
             break;
         case ARRAY:
             read();
@@ -5358,20 +5118,21 @@ private Expression readTerm() {
             read();
             r = readInterval();
             break;
-        case ROW: {
-            read();
-            read(OPEN_PAREN);
-            if (readIf(CLOSE_PAREN)) {
-                r = ValueExpression.get(ValueRow.EMPTY);
+        case ROW:
+            if (readIf(ROW, OPEN_PAREN)) {
+                if (readIf(CLOSE_PAREN)) {
+                    r = ValueExpression.get(ValueRow.EMPTY);
+                } else {
+                    ArrayList list = Utils.newSmallArrayList();
+                    do {
+                        list.add(readExpression());
+                    } while (readIfMore());
+                    r = new ExpressionList(list.toArray(new Expression[0]), false);
+                }
             } else {
-                ArrayList list = Utils.newSmallArrayList();
-                do {
-                    list.add(readExpression());
-                } while (readIfMore());
-                r = new ExpressionList(list.toArray(new Expression[0]), false);
+                r = readTermWithIdentifier();
             }
             break;
-        }
         case TRUE:
             read();
             r = ValueExpression.TRUE;
@@ -5392,7 +5153,7 @@ private Expression readTerm() {
             if (currentSelect == null && currentPrepared == null) {
                 throw getSyntaxError();
             }
-            r = new Rownum(getCurrentSelectOrPrepared());
+            r = new Rownum(getCurrentPreparedOrSelect());
             break;
         case NULL:
             read();
@@ -5403,7 +5164,7 @@ private Expression readTerm() {
             r = new ExpressionColumn(database, null, null);
             break;
         case LITERAL:
-            r = ValueExpression.get(currentValue);
+            r = ValueExpression.get(token.value(session));
             read();
             break;
         case VALUES:
@@ -5429,22 +5190,27 @@ private Expression readTerm() {
             Expression arg = readExpression();
             read(AS);
             Column column = parseColumnWithType(null);
+            Expression template = readIf("FORMAT") ? readExpression() : null;
             read(CLOSE_PAREN);
-            r = new CastSpecification(arg, column);
+            r = new CastSpecification(arg, column, template);
             break;
         }
         case CURRENT_CATALOG:
-            return readCurrentGeneralValueSpecification(CurrentGeneralValueSpecification.CURRENT_CATALOG);
+            r = readCurrentGeneralValueSpecification(CurrentGeneralValueSpecification.CURRENT_CATALOG);
+            break;
         case CURRENT_DATE:
             read();
             r = readCurrentDateTimeValueFunction(CurrentDateTimeValueFunction.CURRENT_DATE, readIf(OPEN_PAREN), null);
             break;
         case CURRENT_PATH:
-            return readCurrentGeneralValueSpecification(CurrentGeneralValueSpecification.CURRENT_PATH);
+            r = readCurrentGeneralValueSpecification(CurrentGeneralValueSpecification.CURRENT_PATH);
+            break;
         case CURRENT_ROLE:
-            return readCurrentGeneralValueSpecification(CurrentGeneralValueSpecification.CURRENT_ROLE);
+            r = readCurrentGeneralValueSpecification(CurrentGeneralValueSpecification.CURRENT_ROLE);
+            break;
         case CURRENT_SCHEMA:
-            return readCurrentGeneralValueSpecification(CurrentGeneralValueSpecification.CURRENT_SCHEMA);
+            r = readCurrentGeneralValueSpecification(CurrentGeneralValueSpecification.CURRENT_SCHEMA);
+            break;
         case CURRENT_TIME:
             read();
             r = readCurrentDateTimeValueFunction(CurrentDateTimeValueFunction.CURRENT_TIME, readIf(OPEN_PAREN), null);
@@ -5456,16 +5222,20 @@ private Expression readTerm() {
             break;
         case CURRENT_USER:
         case USER:
-            return readCurrentGeneralValueSpecification(CurrentGeneralValueSpecification.CURRENT_USER);
+            r = readCurrentGeneralValueSpecification(CurrentGeneralValueSpecification.CURRENT_USER);
+            break;
         case SESSION_USER:
-            return readCurrentGeneralValueSpecification(CurrentGeneralValueSpecification.SESSION_USER);
+            r = readCurrentGeneralValueSpecification(CurrentGeneralValueSpecification.SESSION_USER);
+            break;
         case SYSTEM_USER:
-            return readCurrentGeneralValueSpecification(CurrentGeneralValueSpecification.SYSTEM_USER);
+            r = readCurrentGeneralValueSpecification(CurrentGeneralValueSpecification.SYSTEM_USER);
+            break;
         case ANY:
         case SOME:
             read();
             read(OPEN_PAREN);
-            return readAggregate(AggregateType.ANY, "ANY");
+            r = readAggregate(AggregateType.ANY, "ANY");
+            break;
         case DAY:
         case HOUR:
         case MINUTE:
@@ -5512,68 +5282,40 @@ private Expression readTerm() {
             if (!isIdentifier()) {
                 throw getSyntaxError();
             }
-            //$FALL-THROUGH$
-        case IDENTIFIER:
-            String name = currentToken;
-            boolean quoted = currentTokenQuoted;
-            read();
-            if (readIf(OPEN_PAREN)) {
-                r = readFunction(null, name);
-            } else if (readIf(DOT)) {
-                r = readTermObjectDot(name);
-            } else if (quoted) {
-                r = new ExpressionColumn(database, null, null, name);
-            } else {
-                r = readTermWithIdentifier(name, quoted);
-            }
+            r = readTermWithIdentifier();
             break;
         }
-        if (readIf(OPEN_BRACKET)) {
-            r = new ArrayElementReference(r, readExpression());
-            read(CLOSE_BRACKET);
-        }
-        colonColon: if (readIf(COLON_COLON)) {
-            if (database.getMode().getEnum() == ModeEnum.PostgreSQL) {
-                // PostgreSQL compatibility
-                if (isToken("PG_CATALOG")) {
-                    read("PG_CATALOG");
-                    read(DOT);
-                }
-                if (readIf("REGCLASS")) {
-                    r = new Regclass(r);
-                    break colonColon;
-                }
-            }
-            r = new CastSpecification(r, parseColumnWithType(null));
+        return r;
+    }
+
+    private Expression readTermWithIdentifier() {
+        Expression r;
+        String name = currentToken;
+        boolean quoted = token.isQuoted();
+        read();
+        if (readIf(OPEN_PAREN)) {
+            r = readFunction(null, name);
+        } else if (readIf(DOT)) {
+            r = readTermObjectDot(name);
+        } else if (quoted) {
+            r = new ExpressionColumn(database, null, null, name);
+        } else {
+            r = readTermWithIdentifier(name, quoted);
         }
-        for (;;) {
-            TypeInfo ti = readIntervalQualifier();
-            if (ti != null) {
-                r = new CastSpecification(r, ti);
+        return r;
+    }
+
+    private Expression readColonColonAfterTerm(Expression r) {
+        if (database.getMode().getEnum() == ModeEnum.PostgreSQL) {
+            // PostgreSQL compatibility
+            if (readIf("PG_CATALOG")) {
+                read(DOT);
             }
-            int index = lastParseIndex;
-            if (readIf("AT")) {
-                if (readIf("TIME")) {
-                    read("ZONE");
-                    r = new TimeZoneOperation(r, readExpression());
-                    continue;
-                } else if (readIf("LOCAL")) {
-                    r = new TimeZoneOperation(r, null);
-                    continue;
-                } else {
-                    reread(index);
-                }
-            } else if (readIf("FORMAT")) {
-                if (readIf("JSON")) {
-                    r = new Format(r, FormatEnum.JSON);
-                    continue;
-                } else {
-                    reread(index);
-                }
+            if (readIf("REGCLASS")) {
+                return new Regclass(r);
             }
-            break;
         }
-        return r;
+        return new CastSpecification(r, parseColumnWithType(null));
     }
 
     private Expression readCurrentGeneralValueSpecification(int specification) {
@@ -5627,28 +5369,26 @@ private Expression readTermWithIdentifier(String name, boolean quoted) {
         switch (name.charAt(0) & 0xffdf) {
         case 'C':
             if (equalsToken("CURRENT", name)) {
-                int index = lastParseIndex;
-                if (readIf(VALUE) && readIf(FOR)) {
+                if (readIf(VALUE, FOR)) {
                     return new SequenceValue(readSequence());
                 }
-                reread(index);
                 if (database.getMode().getEnum() == ModeEnum.DB2) {
                     return parseDB2SpecialRegisters(name);
                 }
             }
             break;
         case 'D':
-            if (currentTokenType == LITERAL && currentValue.getValueType() == Value.VARCHAR &&
+            if (currentTokenType == LITERAL && token.value(session).getValueType() == Value.VARCHAR &&
                     (equalsToken("DATE", name) || equalsToken("D", name))) {
-                String date = currentValue.getString();
+                String date = token.value(session).getString();
                 read();
                 return ValueExpression.get(ValueDate.parse(date));
             }
             break;
         case 'E':
-            if (currentTokenType == LITERAL && currentValue.getValueType() == Value.VARCHAR //
+            if (currentTokenType == LITERAL && token.value(session).getValueType() == Value.VARCHAR //
                     && equalsToken("E", name)) {
-                String text = currentValue.getString();
+                String text = token.value(session).getString();
                 // the PostgreSQL ODBC driver uses
                 // LIKE E'PROJECT\\_DATA' instead of LIKE
                 // 'PROJECT\_DATA'
@@ -5660,13 +5400,14 @@ && equalsToken("E", name)) {
             break;
         case 'G':
             if (currentTokenType == LITERAL) {
-                int t = currentValue.getValueType();
+                int t = token.value(session).getValueType();
                 if (t == Value.VARCHAR && equalsToken("GEOMETRY", name)) {
-                    ValueExpression v = ValueExpression.get(ValueGeometry.get(currentValue.getString()));
+                    ValueExpression v = ValueExpression.get(ValueGeometry.get(token.value(session).getString()));
                     read();
                     return v;
                 } else if (t == Value.VARBINARY && equalsToken("GEOMETRY", name)) {
-                    ValueExpression v = ValueExpression.get(ValueGeometry.getFromEWKB(currentValue.getBytesNoCopy()));
+                    ValueExpression v = ValueExpression
+                            .get(ValueGeometry.getFromEWKB(token.value(session).getBytesNoCopy()));
                     read();
                     return v;
                 }
@@ -5674,13 +5415,13 @@ && equalsToken("E", name)) {
             break;
         case 'J':
             if (currentTokenType == LITERAL) {
-                int t = currentValue.getValueType();
+                int t = token.value(session).getValueType();
                 if (t == Value.VARCHAR && equalsToken("JSON", name)) {
-                    ValueExpression v = ValueExpression.get(ValueJson.fromJson(currentValue.getString()));
+                    ValueExpression v = ValueExpression.get(ValueJson.fromJson(token.value(session).getString()));
                     read();
                     return v;
                 } else if (t == Value.VARBINARY && equalsToken("JSON", name)) {
-                    ValueExpression v = ValueExpression.get(ValueJson.fromJson(currentValue.getBytesNoCopy()));
+                    ValueExpression v = ValueExpression.get(ValueJson.fromJson(token.value(session).getBytesNoCopy()));
                     read();
                     return v;
                 }
@@ -5688,78 +5429,64 @@ && equalsToken("E", name)) {
             break;
         case 'N':
             if (equalsToken("NEXT", name)) {
-                int index = lastParseIndex;
-                if (readIf(VALUE) && readIf(FOR)) {
-                    return new SequenceValue(readSequence(), getCurrentSelectOrPrepared());
+                if (readIf(VALUE, FOR)) {
+                    return new SequenceValue(readSequence(), getCurrentPreparedOrSelect());
                 }
-                reread(index);
             }
             break;
         case 'T':
             if (equalsToken("TIME", name)) {
-                if (readIf(WITH)) {
-                    read("TIME");
-                    read("ZONE");
-                    if (currentTokenType != LITERAL || currentValue.getValueType() != Value.VARCHAR) {
+                if (readIf(WITH, "TIME", "ZONE")) {
+                    if (currentTokenType != LITERAL || token.value(session).getValueType() != Value.VARCHAR) {
                         throw getSyntaxError();
                     }
-                    String time = currentValue.getString();
+                    String time = token.value(session).getString();
                     read();
-                    return ValueExpression.get(ValueTimeTimeZone.parse(time));
+                    return ValueExpression.get(ValueTimeTimeZone.parse(time, session));
                 } else {
-                    boolean without = readIf("WITHOUT");
-                    if (without) {
-                        read("TIME");
-                        read("ZONE");
-                    }
-                    if (currentTokenType == LITERAL && currentValue.getValueType() == Value.VARCHAR) {
-                        String time = currentValue.getString();
+                    boolean without = readIf("WITHOUT", "TIME", "ZONE");
+                    if (currentTokenType == LITERAL && token.value(session).getValueType() == Value.VARCHAR) {
+                        String time = token.value(session).getString();
                         read();
-                        return ValueExpression.get(ValueTime.parse(time));
+                        return ValueExpression.get(ValueTime.parse(time, session));
                     } else if (without) {
                         throw getSyntaxError();
                     }
                 }
             } else if (equalsToken("TIMESTAMP", name)) {
-                if (readIf(WITH)) {
-                    read("TIME");
-                    read("ZONE");
-                    if (currentTokenType != LITERAL || currentValue.getValueType() != Value.VARCHAR) {
+                if (readIf(WITH, "TIME", "ZONE")) {
+                    if (currentTokenType != LITERAL || token.value(session).getValueType() != Value.VARCHAR) {
                         throw getSyntaxError();
                     }
-                    String timestamp = currentValue.getString();
+                    String timestamp = token.value(session).getString();
                     read();
                     return ValueExpression.get(ValueTimestampTimeZone.parse(timestamp, session));
                 } else {
-                    boolean without = readIf("WITHOUT");
-                    if (without) {
-                        read("TIME");
-                        read("ZONE");
-                    }
-                    if (currentTokenType == LITERAL && currentValue.getValueType() == Value.VARCHAR) {
-                        String timestamp = currentValue.getString();
+                    boolean without = readIf("WITHOUT", "TIME", "ZONE");
+                    if (currentTokenType == LITERAL && token.value(session).getValueType() == Value.VARCHAR) {
+                        String timestamp = token.value(session).getString();
                         read();
                         return ValueExpression.get(ValueTimestamp.parse(timestamp, session));
                     } else if (without) {
                         throw getSyntaxError();
                     }
                 }
-            } else if (currentTokenType == LITERAL && currentValue.getValueType() == Value.VARCHAR) {
+            } else if (currentTokenType == LITERAL && token.value(session).getValueType() == Value.VARCHAR) {
                 if (equalsToken("T", name)) {
-                    String time = currentValue.getString();
+                    String time = token.value(session).getString();
                     read();
-                    return ValueExpression.get(ValueTime.parse(time));
+                    return ValueExpression.get(ValueTime.parse(time, session));
                 } else if (equalsToken("TS", name)) {
-                    String timestamp = currentValue.getString();
+                    String timestamp = token.value(session).getString();
                     read();
                     return ValueExpression.get(ValueTimestamp.parse(timestamp, session));
                 }
             }
             break;
         case 'U':
-            if (currentTokenType == LITERAL && currentValue.getValueType() == Value.VARCHAR
-                    && (equalsToken("UUID", name))) {
-                String uuid = currentValue.getString();
+            if (currentTokenType == LITERAL && token.value(session).getValueType() == Value.VARCHAR
+                    && equalsToken("UUID", name)) {
+                String uuid = token.value(session).getString();
                 read();
                 return ValueExpression.get(ValueUuid.get(uuid));
             }
@@ -5768,8 +5495,9 @@ && equalsToken("E", name)) {
         return new ExpressionColumn(database, null, null, name, quoted);
     }
 
-    private Prepared getCurrentSelectOrPrepared() {
-        return currentSelect == null ? currentPrepared : currentSelect;
+    private Prepared getCurrentPreparedOrSelect() {
+        Prepared p = currentPrepared;
+        return p != null ? p : currentSelect;
     }
 
     private Expression readInterval() {
@@ -5777,84 +5505,20 @@ private Expression readInterval() {
         if (!negative) {
             readIf(PLUS_SIGN);
         }
-        if (currentTokenType != LITERAL || currentValue.getValueType() != Value.VARCHAR) {
+        if (currentTokenType != LITERAL || token.value(session).getValueType() != Value.VARCHAR) {
             addExpected("string");
             throw getSyntaxError();
         }
-        String s = currentValue.getString();
+        String s = token.value(session).getString();
         read();
-        IntervalQualifier qualifier;
-        switch (currentTokenType) {
-        case YEAR:
-            read();
-            if (readIf(TO)) {
-                read(MONTH);
-                qualifier = IntervalQualifier.YEAR_TO_MONTH;
-            } else {
-                qualifier = IntervalQualifier.YEAR;
-            }
-            break;
-        case MONTH:
-            read();
-            qualifier = IntervalQualifier.MONTH;
-            break;
-        case DAY:
-            read();
-            if (readIf(TO)) {
-                switch (currentTokenType) {
-                case HOUR:
-                    qualifier = IntervalQualifier.DAY_TO_HOUR;
-                    break;
-                case MINUTE:
-                    qualifier = IntervalQualifier.DAY_TO_MINUTE;
-                    break;
-                case SECOND:
-                    qualifier = IntervalQualifier.DAY_TO_SECOND;
-                    break;
-                default:
-                    throw intervalDayError();
-                }
-                read();
-            } else {
-                qualifier = IntervalQualifier.DAY;
-            }
-            break;
-        case HOUR:
-            read();
-            if (readIf(TO)) {
-                switch (currentTokenType) {
-                case MINUTE:
-                    qualifier = IntervalQualifier.HOUR_TO_MINUTE;
-                    break;
-                case SECOND:
-                    qualifier = IntervalQualifier.HOUR_TO_SECOND;
-                    break;
-                default:
-                    throw intervalHourError();
-                }
-                read();
-            } else {
-                qualifier = IntervalQualifier.HOUR;
-            }
-            break;
-        case MINUTE:
-            read();
-            if (readIf(TO)) {
-                read(SECOND);
-                qualifier = IntervalQualifier.MINUTE_TO_SECOND;
-            } else {
-                qualifier = IntervalQualifier.MINUTE;
-            }
-            break;
-        case SECOND:
-            read();
-            qualifier = IntervalQualifier.SECOND;
-            break;
-        default:
-            throw intervalQualifierError();
-        }
+        TypeInfo typeInfo = readIntervalQualifier();
         try {
-            return ValueExpression.get(IntervalUtils.parseInterval(qualifier, negative, s));
+            ValueInterval interval = IntervalUtils.parseInterval(
+                    IntervalQualifier.valueOf(typeInfo.getValueType() - Value.INTERVAL_YEAR), negative, s);
+            if (typeInfo.getDeclaredPrecision() != -1L || typeInfo.getDeclaredScale() != -1) {
+                return TypedValueExpression.get(interval.castTo(typeInfo, session), typeInfo);
+            }
+            return ValueExpression.get(interval);
         } catch (Exception e) {
             throw DbException.get(ErrorCode.INVALID_DATETIME_CONSTANT_2, e, "INTERVAL", s);
         }
@@ -5863,9 +5527,7 @@ private Expression readInterval() {
     private Expression parseDB2SpecialRegisters(String name) {
         // Only "CURRENT" name is supported
         if (readIf("TIMESTAMP")) {
-            if (readIf(WITH)) {
-                read("TIME");
-                read("ZONE");
+            if (readIf(WITH, "TIME", "ZONE")) {
                 return readCurrentDateTimeValueFunction(CurrentDateTimeValueFunction.CURRENT_TIMESTAMP,
                         readIf(OPEN_PAREN), null);
             }
@@ -5927,14 +5589,12 @@ private SimpleCase.SimpleWhen readSimpleWhenClause(Expression caseOperand) {
     }
 
     private Expression readWhenOperand(Expression caseOperand) {
-        int backup = parseIndex;
+        int backup = tokenIndex;
         boolean not = readIf(NOT);
         Expression whenOperand = readConditionRightHandSide(caseOperand, not, true);
         if (whenOperand == null) {
             if (not) {
-                parseIndex = backup;
-                currentToken = "NOT";
-                currentTokenType = NOT;
+                setTokenIndex(backup);
             }
             whenOperand = readExpression();
         }
@@ -5958,13 +5618,14 @@ private int readInt() {
             read();
         }
         if (currentTokenType != LITERAL) {
-            throw DbException.getSyntaxError(sqlCommand, parseIndex, "integer");
+            throw DbException.getSyntaxError(sqlCommand, token.start(), "integer");
         }
+        Value value = token.value(session);
         if (minus) {
             // must do that now, otherwise Integer.MIN_VALUE would not work
-            currentValue = currentValue.negate();
+            value = value.negate();
         }
-        int i = currentValue.getInt();
+        int i = value.getInt();
         read();
         return i;
     }
@@ -5986,13 +5647,14 @@ private long readLong() {
             read();
         }
         if (currentTokenType != LITERAL) {
-            throw DbException.getSyntaxError(sqlCommand, parseIndex, "long");
+            throw DbException.getSyntaxError(sqlCommand, token.start(), "long");
         }
+        Value value = token.value(session);
         if (minus) {
             // must do that now, otherwise Long.MIN_VALUE would not work
-            currentValue = currentValue.negate();
+            value = value.negate();
         }
-        long i = currentValue.getLong();
+        long i = value.getLong();
         read();
         return i;
     }
@@ -6007,7 +5669,7 @@ private boolean readBooleanSetting() {
             read();
             return false;
         case LITERAL:
-            boolean result = currentValue.getBoolean();
+            boolean result = token.value(session).getBoolean();
             read();
             return result;
         }
@@ -6022,7 +5684,7 @@ private boolean readBooleanSetting() {
     }
 
     private String readString() {
-        int index = parseIndex;
+        int sqlIndex = token.start();
         Expression expr = readExpression();
         try {
             String s = expr.optimize(session).getValue(session).getString();
@@ -6031,7 +5693,29 @@ private String readString() {
             }
         } catch (DbException e) {
         }
-        throw DbException.getSyntaxError(sqlCommand, index, "character string");
+        throw DbException.getSyntaxError(sqlCommand, sqlIndex, "character string");
+    }
+
+    private Expression readStringOrParameter() {
+        int sqlIndex = token.start();
+        Expression expr = readExpression();
+        try {
+            expr = expr.optimize(session);
+            if (expr instanceof Parameter) {
+                return expr;
+            }
+            Value v = expr.getValue(session);
+            int valueType = v.getValueType();
+            if ((valueType == NULL || valueType == Value.VARCHAR) && expr instanceof ValueExpression) {
+                return expr;
+            }
+            String s = v.getString();
+            if (s == null || s.length() <= Constants.MAX_STRING_LENGTH) {
+                return s == null ? ValueExpression.NULL : ValueExpression.get(ValueVarchar.get(s, database));
+            }
+        } catch (DbException e) {
+        }
+        throw DbException.getSyntaxError(sqlCommand, sqlIndex, "character string");
     }
 
     // TODO: why does this function allow defaultSchemaName=null - which resets
@@ -6077,7 +5761,7 @@ private String readIdentifier() {
              * allow migration from older versions.
              */
             if (!session.isQuirksMode() || !isKeyword(currentTokenType)) {
-                throw DbException.getSyntaxError(sqlCommand, parseIndex, "identifier");
+                throw DbException.getSyntaxError(sqlCommand, token.start(), "identifier");
             }
         }
         String s = currentToken;
@@ -6085,8 +5769,18 @@ private String readIdentifier() {
         return s;
     }
 
+    private String readIdentifierOrKeyword() {
+        if (currentTokenType < IDENTIFIER || currentTokenType > LAST_KEYWORD) {
+            addExpected("identifier or keyword");
+            throw getSyntaxError();
+        }
+        String s = currentToken;
+        read();
+        return s;
+    }
+
     private void read(String expected) {
-        if (currentTokenQuoted || !equalsToken(expected, currentToken)) {
+        if (!testToken(expected, token)) {
             addExpected(expected);
             throw getSyntaxError();
         }
@@ -6101,838 +5795,246 @@ private void read(int tokenType) {
         read();
     }
 
-    private boolean readIf(String token) {
-        if (!currentTokenQuoted && equalsToken(token, currentToken)) {
+    private boolean readIf(String tokenName) {
+        if (testToken(tokenName, token)) {
             read();
             return true;
         }
-        addExpected(token);
+        addExpected(tokenName);
         return false;
     }
 
-    private boolean readIf(int tokenType) {
-        if (tokenType == currentTokenType) {
-            read();
+    private boolean readIf(String tokenName1, String tokenName2) {
+        int i = tokenIndex + 1;
+        if (i + 1 < tokens.size() && testToken(tokenName1, token) && testToken(tokenName2, tokens.get(i))) {
+            setTokenIndex(i + 1);
             return true;
         }
-        addExpected(tokenType);
+        addExpected(tokenName1, tokenName2);
         return false;
     }
 
-    private boolean isToken(String token) {
-        if (!currentTokenQuoted && equalsToken(token, currentToken)) {
+    private boolean readIf(String tokenName1, int tokenType2) {
+        int i = tokenIndex + 1;
+        if (i + 1 < tokens.size() && tokens.get(i).tokenType() == tokenType2 && testToken(tokenName1, token)) {
+            setTokenIndex(i + 1);
             return true;
         }
-        addExpected(token);
+        addExpected(tokenName1, TOKENS[tokenType2]);
         return false;
     }
 
-    private boolean isToken(int tokenType) {
+    private boolean readIf(int tokenType) {
         if (tokenType == currentTokenType) {
+            read();
             return true;
         }
         addExpected(tokenType);
         return false;
     }
 
-    private boolean equalsToken(String a, String b) {
-        if (a == null) {
-            return b == null;
-        } else
-            return a.equals(b) || !identifiersToUpper && a.equalsIgnoreCase(b);
+    private boolean readIf(int tokenType1, int tokenType2) {
+        if (tokenType1 == currentTokenType) {
+            int i = tokenIndex + 1;
+            if (tokens.get(i).tokenType() == tokenType2) {
+                setTokenIndex(i + 1);
+                return true;
+            }
+        }
+        addExpected(tokenType1, tokenType2);
+        return false;
     }
 
-    private boolean isIdentifier() {
-        return currentTokenType == IDENTIFIER || nonKeywords != null && nonKeywords.get(currentTokenType);
+    private boolean readIf(int tokenType1, String tokenName2) {
+        if (tokenType1 == currentTokenType) {
+            int i = tokenIndex + 1;
+            if (testToken(tokenName2, tokens.get(i))) {
+                setTokenIndex(i + 1);
+                return true;
+            }
+        }
+        addExpected(TOKENS[tokenType1], tokenName2);
+        return false;
     }
 
-    private void addExpected(String token) {
-        if (expectedList != null) {
-            expectedList.add(token);
+    private boolean readIf(Object... tokensTypesOrNames) {
+        int count = tokensTypesOrNames.length;
+        int size = tokens.size();
+        int i = tokenIndex;
+        check: if (i + count < size) {
+            for (Object tokenTypeOrName : tokensTypesOrNames) {
+                if (!testToken(tokenTypeOrName, tokens.get(i++))) {
+                    break check;
+                }
+            }
+            setTokenIndex(i);
+            return true;
         }
+        addExpected(tokensTypesOrNames);
+        return false;
     }
 
-    private void addExpected(int tokenType) {
-        if (expectedList != null) {
-            expectedList.add(TOKENS[tokenType]);
+    private boolean isToken(String tokenName) {
+        if (testToken(tokenName, token)) {
+            return true;
         }
+        addExpected(tokenName);
+        return false;
     }
 
-    private void addMultipleExpected(int ... tokenTypes) {
-        for (int tokenType : tokenTypes) {
-            expectedList.add(TOKENS[tokenType]);
-        }
+    private boolean testToken(Object expected, Token token) {
+        return expected instanceof Integer ? (int) expected == token.tokenType() : testToken((String) expected, token);
     }
 
-    private void reread(int index) {
-        if (lastParseIndex != index) {
-            parseIndex = index;
-            read();
+    private boolean testToken(String tokenName, Token token) {
+        if (!token.isQuoted()) {
+            String s = token.asIdentifier();
+            return identifiersToUpper ? tokenName.equals(s) : tokenName.equalsIgnoreCase(s);
         }
+        return false;
     }
 
-    private void read() {
-        currentTokenQuoted = false;
-        if (expectedList != null) {
-            expectedList.clear();
-        }
-        int[] types = characterTypes;
-        lastParseIndex = parseIndex;
-        int i = parseIndex;
-        int type;
-        while ((type = types[i]) == 0) {
-            i++;
-        }
-        int start = i;
-        char[] chars = sqlCommandChars;
-        char c = chars[i++];
-        currentToken = "";
-        switch (type) {
-        case CHAR_NAME:
-            switch (c) {
-            case 'N':
-            case 'n':
-                if (chars[i] == '\'') {
-                    readString(i + 1, chars, types);
-                    return;
-                }
-                break;
-            case 'X':
-            case 'x':
-                if (chars[i] == '\'') {
-                    ByteArrayOutputStream result = new ByteArrayOutputStream();
-                    for (;;) {
-                        int begin = ++i;
-                        while (chars[i] != '\'') {
-                            i++;
-                        }
-                        StringUtils.convertHexWithSpacesToBytes(result, sqlCommandChars, begin, i);
-                        begin = ++i;
-                        while ((type = types[i]) == 0) {
-                            i++;
-                        }
-                        if (begin == i || type != CHAR_STRING) {
-                            break;
-                        }
-                    }
-                    currentToken = "X'";
-                    checkLiterals(true);
-                    currentValue = ValueVarbinary.get(result.toByteArray());
-                    parseIndex = i;
-                    currentTokenType = LITERAL;
-                    return;
-                }
-                break;
-            case 'U':
-            case 'u':
-                if (chars[i] == '&') {
-                    switch (chars[i + 1]) {
-                    case '\'': {
-                        String s = readRawString(i + 2, chars, types);
-                        currentValue = ValueVarchar.get(StringUtils.decodeUnicodeStringSQL(s,
-                                readUescape(parseIndex, chars, types)));
-                        return;
-                    }
-                    case '"': {
-                        readQuotedIdentifier(i + 2, '"', chars, false);
-                        String identifier = currentToken;
-                        i = parseIndex;
-                        while (types[i] == 0) {
-                            i++;
-                        }
-                        identifier = StringUtils.decodeUnicodeStringSQL(identifier, readUescape(i, chars, types));
-                        if (identifier.length() > Constants.MAX_IDENTIFIER_LENGTH) {
-                            throw DbException.get(ErrorCode.NAME_TOO_LONG_2, identifier.substring(0, 32),
-                                    "" + Constants.MAX_IDENTIFIER_LENGTH);
-                        }
-                        currentToken = StringUtils.cache(identifier);
-                        currentTokenQuoted = true;
-                        currentTokenType = IDENTIFIER;
-                        return;
-                    }
-                    }
-                }
-            }
-            while ((type = types[i]) == CHAR_NAME || type == CHAR_VALUE) {
-                i++;
-            }
-            currentTokenType = ParserUtil.getTokenType(sqlCommand, !identifiersToUpper, start, i - start, false);
-            if (isIdentifier()) {
-                currentToken = StringUtils.cache(checkIdentifierLength(start, i));
-            } else {
-                currentToken = TOKENS[currentTokenType];
-            }
-            parseIndex = i;
-            return;
-        case CHAR_QUOTED:
-            readQuotedIdentifier(i, c, chars, true);
-            return;
-        case CHAR_SPECIAL_2:
-            if (types[i] == CHAR_SPECIAL_2) {
-                char c1 = chars[i++];
-                currentTokenType = getSpecialType2(c, c1);
-            } else {
-                currentTokenType = getSpecialType1(c);
-            }
-            parseIndex = i;
-            return;
-        case CHAR_SPECIAL_1:
-            currentTokenType = getSpecialType1(c);
-            parseIndex = i;
-            return;
-        case CHAR_VALUE:
-            if (c == '0' && (chars[i] == 'X' || chars[i] == 'x')) {
-                readHexNumber(i + 1, start + 2, chars, types);
-                return;
-            }
-            long number = c - '0';
-            loop: for (;; i++) {
-                c = chars[i];
-                if (c < '0' || c > '9') {
-                    switch (c) {
-                    case '.':
-                        readNumeric(start, i, false, false);
-                        break loop;
-                    case 'E':
-                    case 'e':
-                        readNumeric(start, i, false, true);
-                        break loop;
-                    case 'L':
-                    case 'l':
-                        readNumeric(start, i, true, false);
-                        break loop;
-                    }
-                    checkLiterals(false);
-                    currentValue = ValueInteger.get((int) number);
-                    currentTokenType = LITERAL;
-                    currentToken = "0";
-                    parseIndex = i;
-                    break;
-                }
-                number = number * 10 + (c - '0');
-                if (number > Integer.MAX_VALUE) {
-                    readNumeric(start, i, true, false);
-                    break;
-                }
-            }
-            return;
-        case CHAR_DOT:
-            if (types[i] != CHAR_VALUE) {
-                currentTokenType = DOT;
-                currentToken = ".";
-                parseIndex = i;
-                return;
-            }
-            readNumeric(i - 1, i, false, false);
-            return;
-        case CHAR_STRING:
-            readString(i, chars, types);
-            return;
-        case CHAR_DOLLAR_QUOTED_STRING: {
-            int begin = i - 1;
-            while (types[i] == CHAR_DOLLAR_QUOTED_STRING) {
-                i++;
-            }
-            String result = sqlCommand.substring(begin, i);
-            currentToken = "'";
-            checkLiterals(true);
-            currentValue = ValueVarchar.get(result, database);
-            parseIndex = i;
-            currentTokenType = LITERAL;
-            return;
-        }
-        case CHAR_END:
-            currentTokenType = END_OF_INPUT;
-            parseIndex = i;
-            return;
-        default:
-            throw getSyntaxError();
+    private boolean isToken(int tokenType) {
+        if (tokenType == currentTokenType) {
+            return true;
         }
+        addExpected(tokenType);
+        return false;
     }
 
-    private void readQuotedIdentifier(int i, char c, char[] chars, boolean checkLength) {
-        int begin = i;
-        while (chars[i] != c) {
-            i++;
-        }
-        String result = checkLength ? checkIdentifierLength(begin, i) : sqlCommand.substring(begin, i);
-        if (chars[++i] == c) {
-            StringBuilder builder = new StringBuilder(result);
-            do {
-                begin = i;
-                while (chars[++i] != c) {}
-                if (checkLength) {
-                    checkIdentifierLength(builder, begin, i);
-                }
-            } while (chars[++i] == c);
-            result = builder.toString();
-        }
-        currentToken = StringUtils.cache(result);
-        parseIndex = i;
-        currentTokenQuoted = true;
-        currentTokenType = IDENTIFIER;
+    private boolean equalsToken(String a, String b) {
+        if (a == null) {
+            return b == null;
+        } else
+            return a.equals(b) || !identifiersToUpper && a.equalsIgnoreCase(b);
     }
 
-    private String checkIdentifierLength(int begin, int end) {
-        if (end - begin > Constants.MAX_IDENTIFIER_LENGTH) {
-            throw DbException.get(ErrorCode.NAME_TOO_LONG_2, sqlCommand.substring(begin, begin + 32),
-                    "" + Constants.MAX_IDENTIFIER_LENGTH);
-        }
-        return sqlCommand.substring(begin, end);
+    private boolean isIdentifier() {
+        return currentTokenType == IDENTIFIER || nonKeywords != null && nonKeywords.get(currentTokenType);
     }
 
-    private void checkIdentifierLength(StringBuilder builder, int begin, int end) {
-        int length = builder.length();
-        if (length + end - begin > Constants.MAX_IDENTIFIER_LENGTH) {
-            if (length < 32) {
-                builder.append(sqlCommand, begin, begin + 32 - length);
-            } else {
-                builder.setLength(32);
-            }
-            throw DbException.get(ErrorCode.NAME_TOO_LONG_2, builder.toString(), "" + Constants.MAX_IDENTIFIER_LENGTH);
+    private void addExpected(String token) {
+        if (expectedList != null) {
+            expectedList.add(token);
         }
-        builder.append(sqlCommand, begin, end);
     }
 
-    private void readParameterIndex() {
-        int i = parseIndex;
-        char[] chars = sqlCommandChars;
-        char c = chars[i++];
-        long number = c - '0';
-        for (; (c = chars[i]) >= '0' && c <= '9'; i++) {
-            number = number * 10 + (c - '0');
-            if (number > Integer.MAX_VALUE) {
-                throw DbException.getInvalidValueException(
-                        "parameter index", number);
-            }
+    private void addExpected(int tokenType) {
+        if (expectedList != null) {
+            expectedList.add(TOKENS[tokenType]);
         }
-        currentValue = ValueInteger.get((int) number);
-        currentTokenType = LITERAL;
-        currentToken = "0";
-        parseIndex = i;
     }
 
-    private void checkLiterals(boolean text) {
-        if (!literalsChecked && session != null && !session.getAllowLiterals()) {
-            int allowed = database.getAllowLiterals();
-            if (allowed == Constants.ALLOW_LITERALS_NONE ||
-                    (text && allowed != Constants.ALLOW_LITERALS_ALL)) {
-                throw DbException.get(ErrorCode.LITERALS_ARE_NOT_ALLOWED);
-            }
+    private void addExpected(int tokenType1, int tokenType2) {
+        if (expectedList != null) {
+            expectedList.add(TOKENS[tokenType1] + ' ' + TOKENS[tokenType2]);
         }
     }
 
-    private void readString(int i, char[] chars, int[] types) {
-        currentValue = ValueVarchar.get(readRawString(i, chars, types), database);
+    private void addExpected(String tokenType1, String tokenType2) {
+        if (expectedList != null) {
+            expectedList.add(tokenType1 + ' ' + tokenType2);
+        }
     }
 
-    private String readRawString(int i, char[] chars, int[] types) {
-        String result = null;
-        StringBuilder builder = null;
-        for (;; i++) {
-            boolean next = false;
-            for (;; i++) {
-                int begin = i;
-                while (chars[i] != '\'') {
-                    i++;
-                }
-                if (result == null) {
-                    result = sqlCommand.substring(begin, i);
-                } else {
-                    if (builder == null) {
-                        builder = new StringBuilder(result);
-                    }
-                    builder.append(sqlCommand, next ? begin - 1 : begin, i);
-                }
-                if (chars[++i] != '\'') {
-                    break;
-                }
-                next = true;
-            }
-            int type;
-            while ((type = types[i]) == 0) {
-                i++;
-            }
-            if (type != CHAR_STRING) {
-                break;
-            }
-        }
-        checkLiterals(true);
-        parseIndex = i;
-        currentToken = "'";
-        currentTokenType = LITERAL;
-        return builder != null ? builder.toString() : result;
-    }
-
-    private int readUescape(int i, char[] chars, int[] types) {
-        int start = i;
-        while (types[i] == CHAR_NAME) {
-            i++;
-        }
-        if (i - start == 7 && "UESCAPE".regionMatches(!identifiersToUpper, 0, sqlCommand, start, 7)) {
-            int type;
-            while ((type = types[i]) == 0) {
-                i++;
-            }
-            if (type == CHAR_STRING) {
-                String s = readRawString(i + 1, chars, types);
-                if (s.codePointCount(0, s.length()) == 1) {
-                    int escape = s.codePointAt(0);
-                    if (!Character.isWhitespace(escape) && (escape < '0' || escape > '9')
-                            && (escape < 'A' || escape > 'F') && (escape < 'a' || escape > 'f')) {
-                        switch (escape) {
-                        default:
-                            return escape;
-                        case '"':
-                        case '\'':
-                        case '+':
-                        }
-                    }
-                }
+    private void addExpected(Object... tokens) {
+        if (expectedList != null) {
+            StringJoiner j = new StringJoiner(" ");
+            for (Object token : tokens) {
+                j.add(token instanceof Integer ? TOKENS[(int) token] : (String) token);
             }
-            addExpected("''");
-            throw getSyntaxError();
+            expectedList.add(j.toString());
         }
-        return '\\';
     }
 
-    private void readHexNumber(int i, int start, char[] chars, int[] types) {
-        if (database.getMode().zeroExLiteralsAreBinaryStrings) {
-            for (char c; (c = chars[i]) >= '0' && c <= '9' || c >= 'A' && c <= 'F' || c >= 'a' && c <= 'z';) {
-                i++;
-            }
-            if (types[i] == CHAR_NAME) {
-                throw DbException.get(ErrorCode.HEX_STRING_WRONG_1, sqlCommand.substring(i, i + 1));
-            }
-            checkLiterals(true);
-            currentValue = ValueVarbinary.getNoCopy(StringUtils.convertHexToBytes(sqlCommand.substring(start, i)));
-            parseIndex = i;
-        } else {
-            long number = 0;
-            for (;; i++) {
-                char c = chars[i];
-                if (c >= '0' && c <= '9') {
-                    number = (number << 4) + c - '0';
-                } else if ((c &= 0xffdf) >= 'A' && c <= 'F') { // Convert a-z to A-Z
-                    number = (number << 4) + c - ('A' - 10);
-                } else if (i == start) {
-                    parseIndex = i;
-                    addExpected("Hex number");
-                    throw getSyntaxError();
-                } else {
-                    currentValue = ValueInteger.get((int) number);
-                    break;
-                }
-                if (number > Integer.MAX_VALUE) {
-                    do {
-                        c = chars[++i];
-                    } while ((c >= '0' && c <= '9') || ((c &= 0xffdf) >= 'A' && c <= 'F')); // Convert a-z to A-Z
-                    String sub = sqlCommand.substring(start, i);
-                    currentValue = ValueNumeric.get(new BigInteger(sub, 16));
-                    break;
-                }
-            }
-            char c = chars[i];
-            if (c == 'L' || c == 'l') {
-                i++;
-            }
-            parseIndex = i;
-            if (types[i] == CHAR_NAME) {
-                addExpected("Hex number");
-                throw getSyntaxError();
-            }
-            checkLiterals(false);
+    private void addMultipleExpected(int ... tokenTypes) {
+        for (int tokenType : tokenTypes) {
+            expectedList.add(TOKENS[tokenType]);
         }
-        currentTokenType = LITERAL;
-        currentToken = "0";
     }
 
-    private void readNumeric(int start, int i, boolean integer, boolean approximate) {
-        char[] chars = sqlCommandChars;
-        int[] types = characterTypes;
-        // go until the first non-number
-        for (;; i++) {
-            int t = types[i];
-            if (t == CHAR_DOT) {
-                integer = false;
-            } else if (t != CHAR_VALUE) {
-                break;
-            }
-        }
-        char c = chars[i];
-        if (c == 'E' || c == 'e') {
-            integer = false;
-            approximate = true;
-            c = chars[++i];
-            if (c == '+' || c == '-') {
-                i++;
-            }
-            if (types[i] != CHAR_VALUE) {
-                throw getSyntaxError();
-            }
-            while (types[++i] == CHAR_VALUE) {
-                // go until the first non-number
-            }
+    private void read() {
+        if (expectedList != null) {
+            expectedList.clear();
         }
-        parseIndex = i;
-        checkLiterals(false);
-        if (integer && i - start <= 19) {
-            BigInteger bi = new BigInteger(sqlCommand.substring(start, i));
-            if (bi.compareTo(ValueBigint.MAX_BI) <= 0) {
-                // parse constants like "10000000L"
-                c = chars[i];
-                if (c == 'L' || c == 'l') {
-                    parseIndex++;
-                }
-                currentValue = ValueBigint.get(bi.longValue());
-                currentTokenType = LITERAL;
-                return;
+        int size = tokens.size();
+        if (tokenIndex + 1 < size) {
+            token = tokens.get(++tokenIndex);
+            currentTokenType = token.tokenType();
+            currentToken = token.asIdentifier();
+            if (currentToken != null && currentToken.length() > Constants.MAX_IDENTIFIER_LENGTH) {
+                throw DbException.get(ErrorCode.NAME_TOO_LONG_2, currentToken.substring(0, 32),
+                        "" + Constants.MAX_IDENTIFIER_LENGTH);
+            } else if (currentTokenType == LITERAL) {
+                checkLiterals();
             }
-            currentValue = ValueNumeric.get(bi);
         } else {
-            BigDecimal bd;
-            try {
-                bd = new BigDecimal(sqlCommandChars, start, i - start);
-            } catch (NumberFormatException e) {
-                throw DbException.get(ErrorCode.DATA_CONVERSION_ERROR_1, e, sqlCommand.substring(start, i));
+            throw getSyntaxError();
+        }
+    }
+
+    private void checkLiterals() {
+        if (!literalsChecked && session != null && !session.getAllowLiterals()) {
+            int allowed = database.getAllowLiterals();
+            if (allowed == Constants.ALLOW_LITERALS_NONE
+                    || ((token instanceof Token.CharacterStringToken || token instanceof Token.BinaryStringToken)
+                            && allowed != Constants.ALLOW_LITERALS_ALL)) {
+                throw DbException.get(ErrorCode.LITERALS_ARE_NOT_ALLOWED);
             }
-            currentValue = approximate ? ValueDecfloat.get(bd) : ValueNumeric.get(bd);
         }
-        currentTokenType = LITERAL;
     }
 
-    private void initialize(String sql) {
+    private void initialize(String sql, ArrayList tokens, boolean stopOnCloseParen) {
         if (sql == null) {
             sql = "";
         }
-        originalSQL = sql;
         sqlCommand = sql;
-        int len = sql.length() + 1;
-        char[] command = new char[len];
-        int[] types = new int[len];
-        len--;
-        sql.getChars(0, len, command, 0);
-        boolean changed = false;
-        command[len] = ' ';
-        int startLoop = 0;
-        int lastType = 0;
-        for (int i = 0; i < len; i++) {
-            char c = command[i];
-            int type = 0;
-            switch (c) {
-            case '/':
-                if (command[i + 1] == '*') {
-                    // block comment
-                    changed = true;
-                    command[i] = ' ';
-                    command[i + 1] = ' ';
-                    startLoop = i;
-                    i += 2;
-                    for (int level = 1; level > 0;) {
-                        for (;;) {
-                            checkRunOver(i, len, startLoop);
-                            char ch = command[i];
-                            command[i++] = ' ';
-                            if (ch == '*') {
-                                if (command[i] == '/') {
-                                    level--;
-                                    break;
-                                }
-                            } else if (ch == '/' && command[i] == '*') {
-                                level++;
-                                command[i++] = ' ';
-                            }
-                        }
-                        command[i] = ' ';
-                    }
-                } else if (command[i + 1] == '/') {
-                    // single line comment
-                    changed = true;
-                    startLoop = i;
-                    while ((c = command[i]) != '\n' && c != '\r' && i < len - 1) {
-                        command[i++] = ' ';
-                        checkRunOver(i, len, startLoop);
-                    }
-                } else {
-                    type = CHAR_SPECIAL_1;
-                }
-                break;
-            case '-':
-                if (command[i + 1] == '-') {
-                    // single line comment
-                    changed = true;
-                    startLoop = i;
-                    while ((c = command[i]) != '\n' && c != '\r' && i < len - 1) {
-                        command[i++] = ' ';
-                        checkRunOver(i, len, startLoop);
-                    }
-                } else {
-                    type = CHAR_SPECIAL_1;
-                }
-                break;
-            case '$':
-                if (command[i + 1] == '$' && (i == 0 || command[i - 1] <= ' ')) {
-                    // dollar quoted string
-                    changed = true;
-                    command[i] = ' ';
-                    command[i + 1] = ' ';
-                    startLoop = i;
-                    i += 2;
-                    checkRunOver(i, len, startLoop);
-                    while (command[i] != '$' || command[i + 1] != '$') {
-                        types[i++] = CHAR_DOLLAR_QUOTED_STRING;
-                        checkRunOver(i, len, startLoop);
-                    }
-                    command[i] = ' ';
-                    command[i + 1] = ' ';
-                    i++;
-                } else {
-                    if (lastType == CHAR_NAME || lastType == CHAR_VALUE) {
-                        // $ inside an identifier is supported
-                        type = CHAR_NAME;
-                    } else {
-                        // but not at the start, to support PostgreSQL $1
-                        type = CHAR_SPECIAL_1;
-                    }
-                }
-                break;
-            case '(':
-            case ')':
-            case '{':
-            case '}':
-            case '*':
-            case ',':
-            case ';':
-            case '+':
-            case '%':
-            case '@':
-            case ']':
-                type = CHAR_SPECIAL_1;
-                break;
-            case '!':
-            case '<':
-            case '>':
-            case '|':
-            case '=':
-            case ':':
-            case '&':
-            case '~':
-                type = CHAR_SPECIAL_2;
-                break;
-            case '.':
-                type = CHAR_DOT;
-                break;
-            case '\'':
-                type = types[i] = CHAR_STRING;
-                startLoop = i;
-                while (command[++i] != '\'') {
-                    checkRunOver(i, len, startLoop);
-                }
-                break;
-            case '?':
-                type = CHAR_SPECIAL_1;
-                if (command[i + 1] == '?') {
-                    char ch = command[i + 2];
-                    if (ch == '(') {
-                        command[i + 1] = command[i] = ' ';
-                        command[i += 2] = '[';
-                        changed = true;
-                    } else if (ch == ')') {
-                        command[i + 1] = command[i] = ' ';
-                        command[i += 2] = ']';
-                        changed = true;
-                    }
-                }
-                break;
-            case '[':
-                if (database.getMode().squareBracketQuotedNames) {
-                    // SQL Server alias for "
-                    command[i] = '"';
-                    changed = true;
-                    type = types[i] = CHAR_QUOTED;
-                    startLoop = i;
-                    while (command[++i] != ']') {
-                        checkRunOver(i, len, startLoop);
-                    }
-                    command[i] = '"';
-                } else {
-                    type = CHAR_SPECIAL_1;
-                }
-                break;
-            case '`':
-                // MySQL alias for ", but not case sensitive
-                type = types[i] = CHAR_QUOTED;
-                startLoop = i;
-                while (command[++i] != '`') {
-                    checkRunOver(i, len, startLoop);
-                    c = command[i];
-                    if (identifiersToUpper || identifiersToLower) {
-                        char u = identifiersToUpper ? Character.toUpperCase(c) : Character.toLowerCase(c);
-                        if (u != c) {
-                            command[i] = u;
-                            changed = true;
-                        }
-                    }
-                }
-                break;
-            case '"':
-                type = types[i] = CHAR_QUOTED;
-                startLoop = i;
-                while (command[++i] != '"') {
-                    checkRunOver(i, len, startLoop);
-                }
-                break;
-            case '_':
-                type = CHAR_NAME;
-                break;
-            case '#':
-                if (database.getMode().supportPoundSymbolForColumnNames) {
-                    type = CHAR_NAME;
-                } else {
-                    type = CHAR_SPECIAL_1;
-                }
-                break;
-            default:
-                if (c >= 'a' && c <= 'z') {
-                    if (identifiersToUpper) {
-                        command[i] = (char) (c - ('a' - 'A'));
-                        changed = true;
-                    }
-                    type = CHAR_NAME;
-                } else if (c >= 'A' && c <= 'Z') {
-                    if (identifiersToLower) {
-                        command[i] = (char) (c + ('a' - 'A'));
-                        changed = true;
+        if (tokens == null) {
+            BitSet usedParameters = new BitSet();
+            this.tokens = new Tokenizer(database, identifiersToUpper, identifiersToLower, nonKeywords)
+                    .tokenize(sql, stopOnCloseParen, usedParameters);
+            if (parameters == null) {
+                int l = usedParameters.length();
+                if (l > Constants.MAX_PARAMETER_INDEX) {
+                    throw DbException.getInvalidValueException("parameter index", l);
+                }
+                if (l > 0) {
+                    parameters = new ArrayList<>(l);
+                    for (int i = 0; i < l; i++) {
+                        /*
+                         * We need to create parameters even when they aren't
+                         * actually used, for example, VALUES ?1, ?3 needs
+                         * parameters ?1, ?2, and ?3.
+                         */
+                        parameters.add(new Parameter(i));
                     }
-                    type = CHAR_NAME;
-                } else if (c >= '0' && c <= '9') {
-                    type = CHAR_VALUE;
                 } else {
-                    if (c <= ' ' || Character.isSpaceChar(c)) {
-                        // whitespace
-                    } else if (Character.isJavaIdentifierPart(c)) {
-                        type = CHAR_NAME;
-                        if (identifiersToUpper || identifiersToLower) {
-                            char u = identifiersToUpper ? Character.toUpperCase(c) : Character.toLowerCase(c);
-                            if (u != c) {
-                                command[i] = u;
-                                changed = true;
-                            }
-                        }
-                    } else {
-                        type = CHAR_SPECIAL_1;
-                    }
+                    parameters = new ArrayList<>();
                 }
             }
-            types[i] = type;
-            lastType = type;
-        }
-        sqlCommandChars = command;
-        types[len] = CHAR_END;
-        characterTypes = types;
-        if (changed) {
-            sqlCommand = new String(command, 0, len);
-        }
-        parseIndex = 0;
-    }
-
-    private void checkRunOver(int i, int len, int startLoop) {
-        if (i >= len) {
-            parseIndex = startLoop;
-            throw getSyntaxError();
+        } else {
+            this.tokens = tokens;
         }
+        resetTokenIndex();
     }
 
-    private int getSpecialType1(char c0) {
-        switch (c0) {
-        case '?':
-        case '$':
-            return PARAMETER;
-        case '@':
-            return AT;
-        case '+':
-            return PLUS_SIGN;
-        case '-':
-            return MINUS_SIGN;
-        case '*':
-            return ASTERISK;
-        case ',':
-            return COMMA;
-        case '{':
-            return OPEN_BRACE;
-        case '}':
-            return CLOSE_BRACE;
-        case '/':
-            return SLASH;
-        case '%':
-            return PERCENT;
-        case '&':
-            return AMPERSAND;
-        case ';':
-            return SEMICOLON;
-        case ':':
-            return COLON;
-        case '[':
-            return OPEN_BRACKET;
-        case ']':
-            return CLOSE_BRACKET;
-        case '~':
-            return TILDE;
-        case '(':
-            return OPEN_PAREN;
-        case ')':
-            return CLOSE_PAREN;
-        case '<':
-            return SMALLER;
-        case '>':
-            return BIGGER;
-        case '=':
-            return EQUAL;
-        default:
-            throw getSyntaxError();
-        }
+    private void resetTokenIndex() {
+        tokenIndex = -1;
+        token = null;
+        currentTokenType = -1;
+        currentToken = null;
     }
 
-    private int getSpecialType2(char c0, char c1) {
-        switch (c0) {
-        case ':':
-            if (c1 == ':') {
-                return COLON_COLON;
-            } else if (c1 == '=') {
-                return COLON_EQ;
-            }
-            break;
-        case '>':
-            if (c1 == '=') {
-                return BIGGER_EQUAL;
-            }
-            break;
-        case '<':
-            if (c1 == '=') {
-                return SMALLER_EQUAL;
-            } else if (c1 == '>') {
-                return NOT_EQUAL;
-            }
-            break;
-        case '!':
-            if (c1 == '=') {
-                return NOT_EQUAL;
-            } else if (c1 == '~') {
-                return NOT_TILDE;
-            }
-            break;
-        case '|':
-            if (c1 == '|') {
-                return CONCATENATION;
-            }
-            break;
-        case '&':
-            if (c1 == '&') {
-                return SPATIAL_INTERSECTS;
+    void setTokenIndex(int index) {
+        if (index != tokenIndex) {
+            if (expectedList != null) {
+                expectedList.clear();
             }
-            break;
+            token = tokens.get(index);
+            tokenIndex = index;
+            currentTokenType = token.tokenType();
+            currentToken = token.asIdentifier();
         }
-        throw getSyntaxError();
     }
 
     private static boolean isKeyword(int tokenType) {
@@ -6974,8 +6076,7 @@ private Column parseColumnForTable(String columnName, boolean defaultNullable) {
             if (readIf(AS)) {
                 column.setGeneratedExpression(readExpression());
             } else if (readIf(DEFAULT)) {
-                if (readIf(ON)) {
-                    read(NULL);
+                if (readIf(ON, NULL)) {
                     defaultOnNull = true;
                     break defaultIdentityGeneration;
                 }
@@ -7001,8 +6102,7 @@ private Column parseColumnForTable(String columnName, boolean defaultNullable) {
                     column.setGeneratedExpression(readExpression());
                 }
             }
-            if (!column.isGenerated() && readIf(ON)) {
-                read("UPDATE");
+            if (!column.isGenerated() && readIf(ON, "UPDATE")) {
                 column.setOnUpdateExpression(session, readExpression());
             }
             nullConstraint = parseNotNullConstraint(nullConstraint);
@@ -7030,9 +6130,7 @@ private Column parseColumnForTable(String columnName, boolean defaultNullable) {
                     "Internal Error - unhandled case: " + nullConstraint.name());
         }
         if (!defaultOnNull) {
-            if (readIf(DEFAULT)) {
-                read(ON);
-                read(NULL);
+            if (readIf(DEFAULT, ON, NULL)) {
                 defaultOnNull = true;
             } else if (readIf("NULL_TO_DEFAULT")) {
                 defaultOnNull = true;
@@ -7049,7 +6147,7 @@ private Column parseColumnForTable(String columnName, boolean defaultNullable) {
         if (readIf("SELECTIVITY")) {
             column.setSelectivity(readNonNegativeInt());
         }
-        if (mode.getEnum() == ModeEnum.MySQL) {
+        if (mode.mySqlTableOptions) {
             if (readIf("CHARACTER")) {
                 readIf(SET);
                 readMySQLCharset();
@@ -7116,7 +6214,7 @@ private TypeInfo readIfDataType() {
     private TypeInfo readIfDataType1() {
         switch (currentTokenType) {
         case IDENTIFIER:
-            if (currentTokenQuoted) {
+            if (token.isQuoted()) {
                 return null;
             }
             break;
@@ -7143,17 +6241,17 @@ private TypeInfo readIfDataType1() {
             addExpected("data type");
             throw getSyntaxError();
         default:
-            if (isKeyword(currentToken)) {
+            if (isKeyword(currentTokenType)) {
                 break;
             }
             addExpected("data type");
             throw getSyntaxError();
         }
-        int index = lastParseIndex;
+        int index = tokenIndex;
         String originalCase = currentToken;
         read();
         if (currentTokenType == DOT) {
-            reread(index);
+            setTokenIndex(index);
             return null;
         }
         String original = upperName(originalCase);
@@ -7184,6 +6282,9 @@ private TypeInfo readIfDataType1() {
                 original = "CHARACTER LARGE OBJECT";
             }
             break;
+        case "DATE":
+            return database.getMode().dateIsTimestamp0 ? TypeInfo.getTypeInfo(Value.TIMESTAMP, -1L, 0, null)
+                    : TypeInfo.TYPE_DATE;
         case "DATETIME":
         case "DATETIME2":
             return parseDateTimeType(false);
@@ -7256,7 +6357,7 @@ private TypeInfo readIfDataType1() {
         if (originalCase.length() == original.length()) {
             Domain domain = database.getSchema(session.getCurrentSchemaName()).findDomain(originalCase);
             if (domain != null) {
-                reread(index);
+                setTokenIndex(index);
                 return null;
             }
         }
@@ -7320,7 +6421,8 @@ private TypeInfo readIfDataType1() {
             }
             read(CLOSE_PAREN);
         }
-        if (mode.allNumericTypesHavePrecision && DataType.isNumericType(dataType.type)) {
+        if (mode.allNumericTypesHavePrecision
+                && (DataType.isNumericType(dataType.type) || dataType.type == Value.BOOLEAN)) {
             if (readIf(OPEN_PAREN)) {
                 // Support for MySQL: INT(11), MEDIUMINT(8) and so on.
                 // Just ignore the precision.
@@ -7330,9 +6432,7 @@ private TypeInfo readIfDataType1() {
             readIf("UNSIGNED");
         }
         if (mode.forBitData && DataType.isStringType(t)) {
-            if (readIf(FOR)) {
-                read("BIT");
-                read("DATA");
+            if (readIf(FOR, "BIT", "DATA")) {
                 dataType = DataType.getDataType(t = Value.VARBINARY);
             }
         }
@@ -7391,6 +6491,8 @@ private TypeInfo parseNumericType(boolean decimal) {
                 }
             }
             read(CLOSE_PAREN);
+        } else if (database.getMode().numericIsDecfloat) {
+            return TypeInfo.TYPE_DECFLOAT;
         }
         return TypeInfo.getTypeInfo(Value.NUMERIC, precision, scale, decimal ? ExtTypeInfoNumeric.DECIMAL : null);
     }
@@ -7423,13 +6525,10 @@ private TypeInfo parseTimeType() {
             read(CLOSE_PAREN);
         }
         int type = Value.TIME;
-        if (readIf(WITH)) {
-            read("TIME");
-            read("ZONE");
+        if (readIf(WITH, "TIME", "ZONE")) {
             type = Value.TIME_TZ;
-        } else if (readIf("WITHOUT")) {
-            read("TIME");
-            read("ZONE");
+        } else {
+            readIf("WITHOUT", "TIME", "ZONE");
         }
         return TypeInfo.getTypeInfo(type, -1L, scale, null);
     }
@@ -7449,13 +6548,10 @@ private TypeInfo parseTimestampType() {
             read(CLOSE_PAREN);
         }
         int type = Value.TIMESTAMP;
-        if (readIf(WITH)) {
-            read("TIME");
-            read("ZONE");
+        if (readIf(WITH, "TIME", "ZONE")) {
             type = Value.TIMESTAMP_TZ;
-        } else if (readIf("WITHOUT")) {
-            read("TIME");
-            read("ZONE");
+        } else {
+            readIf("WITHOUT", "TIME", "ZONE");
         }
         return TypeInfo.getTypeInfo(type, -1L, scale, null);
     }
@@ -7488,8 +6584,7 @@ private TypeInfo readIntervalQualifier() {
                 precision = readNonNegativeInt();
                 read(CLOSE_PAREN);
             }
-            if (readIf(TO)) {
-                read(MONTH);
+            if (readIf(TO, MONTH)) {
                 qualifier = IntervalQualifier.YEAR_TO_MONTH;
             } else {
                 qualifier = IntervalQualifier.YEAR;
@@ -7567,8 +6662,7 @@ private TypeInfo readIntervalQualifier() {
                 precision = readNonNegativeInt();
                 read(CLOSE_PAREN);
             }
-            if (readIf(TO)) {
-                read(SECOND);
+            if (readIf(TO, SECOND)) {
                 if (readIf(OPEN_PAREN)) {
                     scale = readNonNegativeInt();
                     read(CLOSE_PAREN);
@@ -7655,14 +6749,14 @@ private TypeInfo parseGeometryType() {
         ExtTypeInfoGeometry extTypeInfo;
         if (readIf(OPEN_PAREN)) {
             int type = 0;
-            if (currentTokenType != IDENTIFIER || currentTokenQuoted) {
+            if (currentTokenType != IDENTIFIER || token.isQuoted()) {
                 throw getSyntaxError();
             }
             if (!readIf("GEOMETRY")) {
                 try {
                     type = EWKTUtils.parseGeometryType(currentToken);
                     read();
-                    if (type / 1_000 == 0 && currentTokenType == IDENTIFIER && !currentTokenQuoted) {
+                    if (type / 1_000 == 0 && currentTokenType == IDENTIFIER && !token.isQuoted()) {
                         type += EWKTUtils.parseDimensionSystem(currentToken) * 1_000;
                         read();
                     }
@@ -7696,7 +6790,7 @@ private TypeInfo parseRowType() {
 
     private long readPrecision(int valueType) {
         long p = readPositiveLong();
-        if (currentTokenType != IDENTIFIER || currentTokenQuoted) {
+        if (currentTokenType != IDENTIFIER || token.isQuoted()) {
             return p;
         }
         if ((valueType == Value.BLOB || valueType == Value.CLOB) && currentToken.length() == 1) {
@@ -7729,7 +6823,7 @@ private long readPrecision(int valueType) {
             }
             p *= mul;
             read();
-            if (currentTokenType != IDENTIFIER || currentTokenQuoted) {
+            if (currentTokenType != IDENTIFIER || token.isQuoted()) {
                 return p;
             }
         }
@@ -7749,13 +6843,15 @@ private long readPrecision(int valueType) {
 
     private Prepared parseCreate() {
         boolean orReplace = false;
-        if (readIf(OR)) {
-            read("REPLACE");
+        if (readIf(OR, "REPLACE")) {
             orReplace = true;
         }
         boolean force = readIf("FORCE");
         if (readIf("VIEW")) {
             return parseCreateView(force, orReplace);
+        } else if (readIf("MATERIALIZED")) {
+            read("VIEW");
+            return parseCreateMaterializedView(force, orReplace);
         } else if (readIf("ALIAS")) {
             return parseCreateFunctionAlias(force);
         } else if (readIf("SEQUENCE")) {
@@ -7784,15 +6880,13 @@ private Prepared parseCreate() {
         } else if (readIf("CACHED")) {
             cached = true;
         }
-        if (readIf("LOCAL")) {
-            read("TEMPORARY");
+        if (readIf("LOCAL", "TEMPORARY")) {
             if (readIf("LINKED")) {
                 return parseCreateLinkedTable(true, false, force);
             }
             read(TABLE);
             return parseCreateTable(true, false, cached);
-        } else if (readIf("GLOBAL")) {
-            read("TEMPORARY");
+        } else if (readIf("GLOBAL", "TEMPORARY")) {
             if (readIf("LINKED")) {
                 return parseCreateLinkedTable(true, true, force);
             }
@@ -7813,12 +6907,12 @@ private Prepared parseCreate() {
             return parseCreateSynonym(orReplace);
         } else {
             boolean hash = false, primaryKey = false;
-            boolean unique = false, spatial = false;
+            NullsDistinct nullsDistinct = null;
+            boolean spatial = false;
             String indexName = null;
             Schema oldSchema = null;
             boolean ifNotExists = false;
-            if (session.isQuirksMode() && readIf(PRIMARY)) {
-                read(KEY);
+            if (session.isQuirksMode() && readIf(PRIMARY, KEY)) {
                 if (readIf("HASH")) {
                     hash = true;
                 }
@@ -7830,11 +6924,11 @@ private Prepared parseCreate() {
                 }
             } else {
                 if (readIf(UNIQUE)) {
-                    unique = true;
+                    nullsDistinct = readNullsDistinct(database.getMode().nullsDistinct);
                 }
                 if (readIf("HASH")) {
                     hash = true;
-                } else if (!unique && readIf("SPATIAL")) {
+                } else if (nullsDistinct == null && readIf("SPATIAL")) {
                     spatial = true;
                 }
                 read("INDEX");
@@ -7876,13 +6970,13 @@ private Prepared parseCreate() {
             int uniqueColumnCount = 0;
             if (spatial) {
                 columns = new IndexColumn[] { new IndexColumn(readIdentifier()) };
-                if (unique) {
+                if (nullsDistinct != null) {
                     uniqueColumnCount = 1;
                 }
                 read(CLOSE_PAREN);
             } else {
                 columns = parseIndexColumnList();
-                if (unique) {
+                if (nullsDistinct != null) {
                     uniqueColumnCount = columns.length;
                     if (readIf("INCLUDE")) {
                         read(OPEN_PAREN);
@@ -7896,11 +6990,27 @@ private Prepared parseCreate() {
                 }
             }
             command.setIndexColumns(columns);
-            command.setUniqueColumnCount(uniqueColumnCount);
+            command.setUnique(nullsDistinct, uniqueColumnCount);
             return command;
         }
     }
 
+    private NullsDistinct readNullsDistinct(NullsDistinct defaultDistinct) {
+        if (readIf("NULLS")) {
+            if (readIf(DISTINCT)) {
+                return NullsDistinct.DISTINCT;
+            }
+            if (readIf(NOT, DISTINCT)) {
+                return NullsDistinct.NOT_DISTINCT;
+            }
+            if (readIf(ALL, DISTINCT)) {
+                return NullsDistinct.ALL_DISTINCT;
+            }
+            throw getSyntaxError();
+        }
+        return defaultDistinct;
+    }
+
     /**
      * @return true if we expect to see a TABLE clause
      */
@@ -7985,9 +7095,7 @@ private TableValueConstructor parseValues() {
     }
 
     private ArrayList parseValuesRow(ArrayList row) {
-        if (readIf(ROW)) {
-            read(OPEN_PAREN);
-        } else if (!readIf(OPEN_PAREN)) {
+        if (!readIf(ROW, OPEN_PAREN) && !readIf(OPEN_PAREN)) {
             row.add(readExpression());
             return row;
         }
@@ -8000,25 +7108,17 @@ private ArrayList parseValuesRow(ArrayList row) {
     private Call parseCall() {
         Call command = new Call(session);
         currentPrepared = command;
-        int index = lastParseIndex;
-        boolean canBeFunction;
-        switch (currentTokenType) {
-        case IDENTIFIER:
-            canBeFunction = true;
-            break;
-        case TABLE:
-            read();
-            read(OPEN_PAREN);
+        if (readIf(TABLE, OPEN_PAREN)) {
             command.setTableFunction(readTableFunction(ArrayTableFunction.TABLE));
             return command;
-        default:
-            canBeFunction = false;
         }
+        int index = tokenIndex;
+        boolean canBeFunction = isIdentifier();
         try {
             command.setExpression(readExpression());
         } catch (DbException e) {
             if (canBeFunction && e.getErrorCode() == ErrorCode.FUNCTION_NOT_FOUND_1) {
-                reread(index);
+                setTokenIndex(index);
                 String schemaName = null, name = readIdentifier();
                 if (readIf(DOT)) {
                     schemaName = name;
@@ -8090,9 +7190,7 @@ private CreateSequence parseCreateSequence() {
     }
 
     private boolean readIfNotExists() {
-        if (readIf(IF)) {
-            read(NOT);
-            read(EXISTS);
+        if (readIf(IF, NOT, EXISTS)) {
             return true;
         }
         return false;
@@ -8149,8 +7247,7 @@ private CreateDomain parseCreateDomain() {
         if (readIf(DEFAULT)) {
             command.setDefaultExpression(readExpression());
         }
-        if (readIf(ON)) {
-            read("UPDATE");
+        if (readIf(ON, "UPDATE")) {
             command.setOnUpdateExpression(readExpression());
         }
         // Compatibility with 1.4.200 and older versions
@@ -8190,8 +7287,7 @@ private CreateTrigger parseCreateTrigger(boolean force) {
         String triggerName = readIdentifierWithSchema(null);
         Schema schema = getSchema();
         boolean insteadOf, isBefore;
-        if (readIf("INSTEAD")) {
-            read("OF");
+        if (readIf("INSTEAD", "OF")) {
             isBefore = true;
             insteadOf = true;
         } else if (readIf("BEFORE")) {
@@ -8232,8 +7328,7 @@ private CreateTrigger parseCreateTrigger(boolean force) {
         command.setOnRollback(onRollback);
         command.setTypeMask(typeMask);
         command.setTableName(tableName);
-        if (readIf(FOR)) {
-            read("EACH");
+        if (readIf(FOR, "EACH")) {
             if (readIf(ROW)) {
                 command.setRowBased(true);
             } else {
@@ -8280,12 +7375,15 @@ private CreateUser parseCreateUser() {
     private CreateFunctionAlias parseCreateFunctionAlias(boolean force) {
         boolean ifNotExists = readIfNotExists();
         String aliasName;
-        if (currentTokenType != IDENTIFIER) {
+        if (currentTokenType == IDENTIFIER) {
+            aliasName = readIdentifierWithSchema();
+        } else if (isKeyword(currentTokenType)) {
             aliasName = currentToken;
             read();
             schemaName = session.getCurrentSchemaName();
         } else {
-            aliasName = readIdentifierWithSchema();
+            addExpected("identifier");
+            throw getSyntaxError();
         }
         String upperName = upperName(aliasName);
         if (isReservedFunctionName(upperName)) {
@@ -8312,7 +7410,7 @@ private String readStringOrIdentifier() {
     }
 
     private boolean isReservedFunctionName(String name) {
-        int tokenType = ParserUtil.getTokenType(name, false, 0, name.length(), false);
+        int tokenType = ParserUtil.getTokenType(name, false, false);
         if (tokenType != ParserUtil.IDENTIFIER) {
             if (database.isAllowBuiltinAliasOverride()) {
                 switch (tokenType) {
@@ -8364,22 +7462,9 @@ private Prepared parseWith1(List viewsCreated) {
         // used in setCteCleanups.
         Collections.reverse(viewsCreated);
 
-        int parentheses = 0;
-        while (readIf(OPEN_PAREN)) {
-            parentheses++;
-        }
-        int start = lastParseIndex;
-        if (isToken(SELECT) || isToken(VALUES)) {
+        int start = tokenIndex;
+        if (isQueryQuick()) {
             p = parseWithQuery();
-        } else if (isToken(TABLE)) {
-            int index = lastParseIndex;
-            read();
-            if (!isToken(OPEN_PAREN)) {
-                reread(index);
-                p = parseWithQuery();
-            } else {
-                throw DbException.get(ErrorCode.SYNTAX_ERROR_1, WITH_STATEMENT_SUPPORTS_LIMITED_SUB_STATEMENTS);
-            }
         } else if (readIf("INSERT")) {
             p = parseInsert(start);
             p.setPrepareAlways(true);
@@ -8396,7 +7481,6 @@ private Prepared parseWith1(List viewsCreated) {
             if (!isToken(TABLE)) {
                 throw DbException.get(ErrorCode.SYNTAX_ERROR_1,
                         WITH_STATEMENT_SUPPORTS_LIMITED_SUB_STATEMENTS);
-
             }
             p = parseCreate();
             p.setPrepareAlways(true);
@@ -8404,9 +7488,6 @@ private Prepared parseWith1(List viewsCreated) {
             throw DbException.get(ErrorCode.SYNTAX_ERROR_1,
                     WITH_STATEMENT_SUPPORTS_LIMITED_SUB_STATEMENTS);
         }
-        for (; parentheses > 0; parentheses--) {
-            read(CLOSE_PAREN);
-        }
 
         // Clean up temporary views starting with last to first (in case of
         // dependencies) - but only if they are not persistent.
@@ -8420,7 +7501,7 @@ private Prepared parseWith1(List viewsCreated) {
     }
 
     private Prepared parseWithQuery() {
-        Query query = parseSelectUnion();
+        Query query = parseQueryExpressionBodyAndEndOfQuery();
         query.setPrepareAlways(true);
         query.setNeverLazy(true);
         return query;
@@ -8461,7 +7542,7 @@ private TableView parseSingleCommonTableExpression(boolean isTemporary) {
                         cteViewName);
             }
             if (!isTemporary) {
-                oldViewFound.lock(session, true, true);
+                oldViewFound.lock(session, Table.EXCLUSIVE_LOCK);
                 database.removeSchemaObject(session, oldViewFound);
 
             } else {
@@ -8478,6 +7559,8 @@ private TableView parseSingleCommonTableExpression(boolean isTemporary) {
                 isTemporary, session, cteViewName, schema, columns, database);
         List columnTemplateList;
         String[] querySQLOutput = new String[1];
+        BitSet outerUsedParameters = initParametersScope();
+        ArrayList queryParameters;
         try {
             read(AS);
             read(OPEN_PAREN);
@@ -8486,22 +7569,18 @@ private TableView parseSingleCommonTableExpression(boolean isTemporary) {
                 withQuery.session = session;
             }
             read(CLOSE_PAREN);
-            columnTemplateList = TableView.createQueryColumnTemplateList(cols, withQuery, querySQLOutput);
+            columnTemplateList = QueryExpressionTable.createQueryColumnTemplateList(cols, withQuery, querySQLOutput);
 
         } finally {
+            queryParameters = getUsedParameters(outerUsedParameters);
             TableView.destroyShadowTableForRecursiveExpression(isTemporary, session, recursiveTable);
         }
 
-        return createCTEView(cteViewName,
-                querySQLOutput[0], columnTemplateList,
-                true/* allowRecursiveQueryDetection */,
-                true/* add to session */,
-                isTemporary);
+        return createCTEView(cteViewName, querySQLOutput[0], queryParameters, columnTemplateList, isTemporary);
     }
 
-    private TableView createCTEView(String cteViewName, String querySQL,
-                                    List columnTemplateList, boolean allowRecursiveQueryDetection,
-                                    boolean addViewToSession, boolean isTemporary) {
+    private TableView createCTEView(String cteViewName, String querySQL, ArrayList queryParameters,
+                                    List columnTemplateList, boolean isTemporary) {
         Schema schema = getSchemaWithDefault();
         int id = database.allocateObjectId();
         Column[] columnTemplateArray = columnTemplateList.toArray(new Column[0]);
@@ -8512,20 +7591,22 @@ private TableView createCTEView(String cteViewName, String querySQL,
         TableView view;
         synchronized (session) {
             view = new TableView(schema, id, cteViewName, querySQL,
-                    parameters, columnTemplateArray, session,
-                    allowRecursiveQueryDetection, false /* literalsChecked */, true /* isTableExpression */,
+                    queryParameters, columnTemplateArray, session,
+                    true, false, true,
                     isTemporary);
-            if (!view.isRecursiveQueryDetected() && allowRecursiveQueryDetection) {
+            if (!view.isRecursiveQueryDetected()) {
                 if (!isTemporary) {
                     database.addSchemaObject(session, view);
-                    view.lock(session, true, true);
+                    view.lock(session, Table.EXCLUSIVE_LOCK);
                     database.removeSchemaObject(session, view);
                 } else {
+                    session.addLocalTempTable(view);
                     session.removeLocalTempTable(view);
                 }
-                view = new TableView(schema, id, cteViewName, querySQL, parameters,
+                id = database.allocateObjectId();
+                view = new TableView(schema, id, cteViewName, querySQL, queryParameters,
                         columnTemplateArray, session,
-                        false/* assume recursive */, false /* literalsChecked */, true /* isTableExpression */,
+                        false/* assume recursive */, false, true,
                         isTemporary);
             }
             // both removeSchemaObject and removeLocalTempTable hold meta locks
@@ -8535,14 +7616,12 @@ private TableView createCTEView(String cteViewName, String querySQL,
         view.setTemporary(isTemporary);
         view.setHidden(true);
         view.setOnCommitDrop(false);
-        if (addViewToSession) {
-            if (!isTemporary) {
-                database.addSchemaObject(session, view);
-                view.unlock(session);
-                database.unlockMeta(session);
-            } else {
-                session.addLocalTempTable(view);
-            }
+        if (!isTemporary) {
+            database.addSchemaObject(session, view);
+            view.unlock(session);
+            database.unlockMeta(session);
+        } else {
+            session.addLocalTempTable(view);
         }
         return view;
     }
@@ -8563,9 +7642,8 @@ private CreateView parseCreateView(boolean force, boolean orReplace) {
             String[] cols = parseColumnList();
             command.setColumnNames(cols);
         }
-        String select = StringUtils.cache(sqlCommand
-                .substring(parseIndex));
         read(AS);
+        String select = StringUtils.cache(sqlCommand.substring(token.start()));
         try {
             Query query;
             session.setParsingCreateView(true);
@@ -8589,6 +7667,31 @@ private CreateView parseCreateView(boolean force, boolean orReplace) {
         return command;
     }
 
+    private CreateMaterializedView parseCreateMaterializedView(boolean force, boolean orReplace) {
+        boolean ifNotExists = readIfNotExists();
+        String viewName = readIdentifierWithSchema();
+        read(AS);
+        CreateMaterializedView command = new CreateMaterializedView(session, getSchema());
+        command.setViewName(viewName);
+        command.setIfNotExists(ifNotExists);
+        command.setComment(readCommentIf());
+        command.setOrReplace(orReplace);
+        if (force) {
+            throw new UnsupportedOperationException("not yet implemented");
+        }
+        String select = StringUtils.cache(sqlCommand.substring(token.start()));
+        Query query;
+        session.setParsingCreateView(true);
+        try {
+            query = parseQuery();
+        } finally {
+            session.setParsingCreateView(false);
+        }
+        command.setSelect(query);
+        command.setSelectSQL(select);
+        return command;
+    }
+
     private TransactionCommand parseCheckpoint() {
         TransactionCommand command;
         if (readIf("SYNC")) {
@@ -8693,8 +7796,7 @@ private DefineCommand parseAlterDomain() {
                 command.setIfDomainExists(ifDomainExists);
                 command.setExpression(null);
                 return command;
-            } else if (readIf(ON)) {
-                read("UPDATE");
+            } else if (readIf(ON, "UPDATE")) {
                 AlterDomainExpressions command = new AlterDomainExpressions(session, schema,
                         CommandInterface.ALTER_DOMAIN_ON_UPDATE);
                 command.setDomainName(domainName);
@@ -8731,8 +7833,7 @@ private DefineCommand parseAlterDomain() {
                 command.setIfDomainExists(ifDomainExists);
                 command.setExpression(readExpression());
                 return command;
-            } else if (readIf(ON)) {
-                read("UPDATE");
+            } else if (readIf(ON, "UPDATE")) {
                 AlterDomainExpressions command = new AlterDomainExpressions(session, schema,
                         CommandInterface.ALTER_DOMAIN_ON_UPDATE);
                 command.setDomainName(domainName);
@@ -8752,8 +7853,7 @@ private DefineCommand parseAlterView() {
         if (!(tableView instanceof TableView) && !ifExists) {
             throw DbException.get(ErrorCode.VIEW_NOT_FOUND_1, viewName);
         }
-        if (readIf("RENAME")) {
-            read(TO);
+        if (readIf("RENAME", TO)) {
             String newName = readIdentifierWithSchema(schema.getName());
             checkSchema(schema);
             AlterTableRename command = new AlterTableRename(session, getSchema());
@@ -8815,18 +7915,18 @@ private boolean parseSequenceOptions(SequenceOptions options, CreateSequence com
                             .getSQL(new StringBuilder("CREATE SEQUENCE AS "), HasSQL.TRACE_SQL_FLAGS).toString());
                 }
                 options.setDataType(dataType);
-            } else if (readIf("START")) {
-                read(WITH);
+            } else if (readIf("START", WITH)
+                    || (database.getMode().getEnum() == ModeEnum.PostgreSQL && readIf("START"))) {
                 options.setStartValue(readExpression());
             } else if (readIf("RESTART")) {
                 options.setRestartValue(readIf(WITH) ? readExpression() : ValueExpression.DEFAULT);
             } else if (command != null && parseCreateSequenceOption(command)) {
                 //
             } else if (forAlterColumn) {
-                int index = lastParseIndex;
+                int index = tokenIndex;
                 if (readIf(SET)) {
                     if (!parseBasicSequenceOption(options)) {
-                        reread(index);
+                        setTokenIndex(index);
                         break;
                     }
                 } else {
@@ -8853,6 +7953,7 @@ private boolean parseCreateSequenceOption(CreateSequence command) {
 
     private boolean parseBasicSequenceOption(SequenceOptions options) {
         if (readIf("INCREMENT")) {
+            // TODO Why BY is optional?
             readIf("BY");
             options.setIncrement(readExpression());
         } else if (readIf("MINVALUE")) {
@@ -8908,8 +8009,7 @@ private AlterUser parseAlterUser() {
                 throw getSyntaxError();
             }
             return command;
-        } else if (readIf("RENAME")) {
-            read(TO);
+        } else if (readIf("RENAME", TO)) {
             AlterUser command = new AlterUser(session);
             command.setType(CommandInterface.ALTER_USER_RENAME);
             command.setUser(database.getUser(userName));
@@ -9075,11 +8175,7 @@ private Prepared parseSet() {
             ArrayList list = Utils.newSmallArrayList();
             if (currentTokenType != END_OF_INPUT && currentTokenType != SEMICOLON) {
                 do {
-                    if (currentTokenType < IDENTIFIER || currentTokenType > LAST_KEYWORD) {
-                        throw getSyntaxError();
-                    }
-                    list.add(StringUtils.toUpperEnglish(currentToken));
-                    read();
+                    list.add(StringUtils.toUpperEnglish(readIdentifierOrKeyword()));
                 } while (readIf(COMMA));
             }
             command.setStringArray(list.toArray(new String[0]));
@@ -9210,6 +8306,7 @@ private Prepared readSetCompatibility(ModeEnum modeEnum) {
                 return command;
             }
             break;
+        case MariaDB:
         case MySQL:
             if (readIf("FOREIGN_KEY_CHECKS")) {
                 readIfEqualOrTo();
@@ -9387,18 +8484,22 @@ private boolean isDualTable(String tableName) {
     }
 
     private Table readTableOrView() {
-        return readTableOrView(readIdentifierWithSchema(null));
+        return readTableOrView(readIdentifierWithSchema(null), /*resolveMaterializedView*/true);
+    }
+
+    private Table readTableOrView(boolean resolveMaterializedView) {
+        return readTableOrView(readIdentifierWithSchema(null), resolveMaterializedView);
     }
 
-    private Table readTableOrView(String tableName) {
+    private Table readTableOrView(String tableName, boolean resolveMaterializedView) {
         if (schemaName != null) {
-            Table table = getSchema().resolveTableOrView(session, tableName);
+            Table table = getSchema().resolveTableOrView(session, tableName, resolveMaterializedView);
             if (table != null) {
                 return table;
             }
         } else {
             Table table = database.getSchema(session.getCurrentSchemaName())
-                    .resolveTableOrView(session, tableName);
+                    .resolveTableOrView(session, tableName, resolveMaterializedView);
             if (table != null) {
                 return table;
             }
@@ -9406,7 +8507,7 @@ private Table readTableOrView(String tableName) {
             if (schemaNames != null) {
                 for (String name : schemaNames) {
                     Schema s = database.getSchema(name);
-                    table = s.resolveTableOrView(session, tableName);
+                    table = s.resolveTableOrView(session, tableName, resolveMaterializedView);
                     if (table != null) {
                         return table;
                     }
@@ -9538,7 +8639,7 @@ private Prepared parseAlterTable() {
         String tableName = readIdentifierWithSchema();
         Schema schema = getSchema();
         if (readIf("ADD")) {
-            Prepared command = parseAlterTableAddConstraintIf(tableName, schema, ifTableExists);
+            Prepared command = parseTableConstraintIf(tableName, schema, ifTableExists);
             if (command != null) {
                 return command;
             }
@@ -9578,8 +8679,7 @@ private Prepared parseAlterTableAlter(Schema schema, String tableName, boolean i
             return command;
         } else if (readIf("DROP")) {
             if (readIf(DEFAULT)) {
-                if (readIf(ON)) {
-                    read(NULL);
+                if (readIf(ON, NULL)) {
                     AlterTableAlterColumn command = new AlterTableAlterColumn(session, schema);
                     command.setTableName(tableName);
                     command.setIfTableExists(ifTableExists);
@@ -9597,8 +8697,7 @@ private Prepared parseAlterTableAlter(Schema schema, String tableName, boolean i
                 return getAlterTableAlterColumnDropDefaultExpression(schema, tableName, ifTableExists, column,
                         CommandInterface.ALTER_TABLE_ALTER_COLUMN_DROP_IDENTITY);
             }
-            if (readIf(ON)) {
-                read("UPDATE");
+            if (readIf(ON, "UPDATE")) {
                 AlterTableAlterColumn command = new AlterTableAlterColumn(session, schema);
                 command.setTableName(tableName);
                 command.setIfTableExists(ifTableExists);
@@ -9652,9 +8751,8 @@ private Prepared getAlterTableAlterColumnDropDefaultExpression(Schema schema, St
 
     private Prepared parseAlterTableAlterColumnIdentity(Schema schema, String tableName, boolean ifTableExists,
             Column column) {
-        int index = lastParseIndex;
         Boolean always = null;
-        if (readIf(SET) && readIf("GENERATED")) {
+        if (readIf(SET, "GENERATED")) {
             if (readIf("ALWAYS")) {
                 always = true;
             } else {
@@ -9662,8 +8760,6 @@ private Prepared parseAlterTableAlterColumnIdentity(Schema schema, String tableN
                 read(DEFAULT);
                 always = false;
             }
-        } else {
-            reread(index);
         }
         SequenceOptions options = new SequenceOptions();
         if (!parseSequenceOptions(options, null, false, true) && always == null) {
@@ -9692,8 +8788,7 @@ private Prepared parseAlterTableAlterColumnIdentity(Schema schema, String tableN
 
     private Prepared parseAlterTableAlterColumnSet(Schema schema, String tableName, boolean ifTableExists,
             boolean ifExists, String columnName, Column column) {
-        if (readIf("DATA")) {
-            read("TYPE");
+        if (readIf("DATA", "TYPE")) {
             return parseAlterTableAlterColumnDataType(schema, tableName, columnName, ifTableExists, ifExists);
         }
         AlterTableAlterColumn command = new AlterTableAlterColumn(
@@ -9711,8 +8806,7 @@ private Prepared parseAlterTableAlterColumnSet(Schema schema, String tableName,
             break;
         case NO_NULL_CONSTRAINT_FOUND:
             if (readIf(DEFAULT)) {
-                if (readIf(ON)) {
-                    read(NULL);
+                if (readIf(ON, NULL)) {
                     command.setType(CommandInterface.ALTER_TABLE_ALTER_COLUMN_DEFAULT_ON_NULL);
                     command.setBooleanFlag(true);
                     break;
@@ -9720,8 +8814,7 @@ private Prepared parseAlterTableAlterColumnSet(Schema schema, String tableName,
                 Expression defaultExpression = readExpression();
                 command.setType(CommandInterface.ALTER_TABLE_ALTER_COLUMN_DEFAULT);
                 command.setDefaultExpression(defaultExpression);
-            } else if (readIf(ON)) {
-                read("UPDATE");
+            } else if (readIf(ON, "UPDATE")) {
                 Expression onUpdateExpression = readExpression();
                 command.setType(CommandInterface.ALTER_TABLE_ALTER_COLUMN_ON_UPDATE);
                 command.setDefaultExpression(onUpdateExpression);
@@ -9755,8 +8848,7 @@ private Prepared parseAlterTableDrop(Schema schema, String tableName, boolean if
                 command.setDropAction(dropAction);
             }
             return command;
-        } else if (readIf(PRIMARY)) {
-            read(KEY);
+        } else if (readIf(PRIMARY, KEY)) {
             Table table = tableIfTableExists(schema, tableName, ifTableExists);
             if (table == null) {
                 return new NoOperation(session);
@@ -9802,8 +8894,7 @@ private Prepared parseAlterTableDrop(Schema schema, String tableName, boolean if
     }
 
     private Prepared parseAlterTableDropCompatibility(Schema schema, String tableName, boolean ifTableExists) {
-        if (readIf(FOREIGN)) {
-            read(KEY);
+        if (readIf(FOREIGN, KEY)) {
             // For MariaDB
             boolean ifExists = readIfExists(false);
             String constraintName = readIdentifierWithSchema(schema.getName());
@@ -9960,7 +9051,7 @@ private Prepared parseAlterTableCompatibility(Schema schema, String tableName, b
                 break;
             case NO_NULL_CONSTRAINT_FOUND:
                 command = parseAlterTableAlterColumnType(schema, tableName, columnName, ifTableExists, false,
-                        mode.getEnum() != ModeEnum.MySQL);
+                        mode.alterTableModifyColumnPreserveNullability);
                 break;
             default:
                 throw DbException.get(ErrorCode.UNKNOWN_MODE_1,
@@ -10096,8 +9187,7 @@ private ConstraintActionType parseAction() {
         if (result != null) {
             return result;
         }
-        if (readIf("NO")) {
-            read("ACTION");
+        if (readIf("NO", "ACTION")) {
             return ConstraintActionType.RESTRICT;
         }
         read(SET);
@@ -10118,7 +9208,7 @@ private ConstraintActionType parseCascadeOrRestrict() {
         }
     }
 
-    private DefineCommand parseAlterTableAddConstraintIf(String tableName, Schema schema, boolean ifTableExists) {
+    private DefineCommand parseTableConstraintIf(String tableName, Schema schema, boolean ifTableExists) {
         String constraintName = null, comment = null;
         boolean ifNotExists = false;
         if (readIf(CONSTRAINT)) {
@@ -10144,8 +9234,9 @@ private DefineCommand parseAlterTableAddConstraintIf(String tableName, Schema sc
                 command.setIndex(getSchema().findIndex(session, indexName));
             }
             break;
-        case UNIQUE:
+        case UNIQUE: {
             read();
+            NullsDistinct nullsDistinct = readNullsDistinct(database.getMode().nullsDistinct);
             // MySQL compatibility
             boolean compatibility = database.getMode().indexDefinitionInCreateTable;
             if (compatibility) {
@@ -10159,21 +9250,27 @@ private DefineCommand parseAlterTableAddConstraintIf(String tableName, Schema sc
             read(OPEN_PAREN);
             command = new AlterTableAddConstraint(session, schema, CommandInterface.ALTER_TABLE_ADD_CONSTRAINT_UNIQUE,
                     ifNotExists);
-            command.setIndexColumns(parseIndexColumnList());
+            command.setNullsDistinct(nullsDistinct);
+            if (readIf(VALUE, CLOSE_PAREN)) {
+                command.setIndexColumns(null);
+            } else {
+                command.setIndexColumns(parseIndexColumnList());
+            }
             if (readIf("INDEX")) {
                 String indexName = readIdentifierWithSchema();
                 command.setIndex(getSchema().findIndex(session, indexName));
             }
-            if (compatibility && readIf(USING)) {
-                read("BTREE");
+            if (compatibility) {
+                readIf(USING, "BTREE");
             }
             break;
+        }
         case FOREIGN:
             read();
-            command = new AlterTableAddConstraint(session, schema,
-                    CommandInterface.ALTER_TABLE_ADD_CONSTRAINT_REFERENTIAL, ifNotExists);
             read(KEY);
             read(OPEN_PAREN);
+            command = new AlterTableAddConstraint(session, schema,
+                    CommandInterface.ALTER_TABLE_ADD_CONSTRAINT_REFERENTIAL, ifNotExists);
             command.setIndexColumns(parseIndexColumnList());
             if (readIf("INDEX")) {
                 String indexName = readIdentifierWithSchema();
@@ -10192,7 +9289,7 @@ private DefineCommand parseAlterTableAddConstraintIf(String tableName, Schema sc
             if (constraintName == null) {
                 Mode mode = database.getMode();
                 if (mode.indexDefinitionInCreateTable) {
-                    int start = lastParseIndex;
+                    int start = tokenIndex;
                     if (readIf(KEY) || readIf("INDEX")) {
                         // MySQL
                         // need to read ahead, as it could be a column name
@@ -10213,7 +9310,7 @@ private DefineCommand parseAlterTableAddConstraintIf(String tableName, Schema sc
                             return createIndex;
                         } else {
                             // known data type
-                            reread(start);
+                            setTokenIndex(start);
                         }
                     }
                 }
@@ -10264,9 +9361,7 @@ private void parseReferences(AlterTableAddConstraint command,
                 command.setUpdateAction(parseAction());
             }
         }
-        if (readIf(NOT)) {
-            read("DEFERRABLE");
-        } else {
+        if (!readIf(NOT, "DEFERRABLE")) {
             readIf("DEFERRABLE");
         }
     }
@@ -10299,8 +9394,7 @@ private CreateLinkedTable parseCreateLinkedTable(boolean temp,
         }
         command.setOriginalTable(originalTable);
         read(CLOSE_PAREN);
-        if (readIf("EMIT")) {
-            read("UPDATES");
+        if (readIf("EMIT", "UPDATES")) {
             command.setEmitUpdates(true);
         } else if (readIf("READONLY")) {
             command.setReadOnly(true);
@@ -10308,11 +9402,10 @@ private CreateLinkedTable parseCreateLinkedTable(boolean temp,
         if (readIf("FETCH_SIZE")) {
             command.setFetchSize(readNonNegativeInt());
         }
-        if(readIf("AUTOCOMMIT")){
-            if(readIf("ON")) {
+        if (readIf("AUTOCOMMIT")) {
+            if (readIf("ON")) {
                 command.setAutoCommit(true);
-            }
-            else if(readIf("OFF")){
+            } else if (readIf("OFF")) {
                 command.setAutoCommit(false);
             }
         }
@@ -10344,7 +9437,7 @@ private CreateTable parseCreateTable(boolean temp, boolean globalTemp,
                 } while (readIfMore());
             }
         }
-        if (database.getMode().getEnum() == ModeEnum.MySQL) {
+        if (database.getMode().mySqlTableOptions) {
             parseCreateTableMySQLTableOptions(command);
         }
         if (readIf("ENGINE")) {
@@ -10354,8 +9447,7 @@ private CreateTable parseCreateTable(boolean temp, boolean globalTemp,
             command.setTableEngineParams(readTableEngineParams());
         }
         if (temp) {
-            if (readIf(ON)) {
-                read("COMMIT");
+            if (readIf(ON, "COMMIT")) {
                 if (readIf("DROP")) {
                     command.setOnCommitDrop();
                 } else if (readIf("DELETE")) {
@@ -10372,8 +9464,7 @@ private CreateTable parseCreateTable(boolean temp, boolean globalTemp,
             if (readIf("TRANSACTIONAL")) {
                 command.setTransactional(true);
             }
-        } else if (!persistIndexes && readIf(NOT)) {
-            read("PERSISTENT");
+        } else if (!persistIndexes && readIf(NOT, "PERSISTENT")) {
             command.setPersistData(false);
         }
         if (readIf("HIDDEN")) {
@@ -10392,7 +9483,7 @@ private CreateTable parseCreateTable(boolean temp, boolean globalTemp,
 
     private void parseTableColumnDefinition(CommandWithColumns command, Schema schema, String tableName,
             boolean forCreateTable) {
-        DefineCommand c = parseAlterTableAddConstraintIf(tableName, schema, false);
+        DefineCommand c = parseTableConstraintIf(tableName, schema, false);
         if (c != null) {
             command.addConstraintCommand(c);
             return;
@@ -10445,8 +9536,7 @@ private void readColumnConstraints(CommandWithColumns command, Schema schema, St
             } else {
                 constraintName = null;
             }
-            if (!hasPrimaryKey && readIf(PRIMARY)) {
-                read(KEY);
+            if (!hasPrimaryKey && readIf(PRIMARY, KEY)) {
                 hasPrimaryKey = true;
                 boolean hash = readIf("HASH");
                 AlterTableAddConstraint pk = new AlterTableAddConstraint(session, schema,
@@ -10457,9 +9547,11 @@ private void readColumnConstraints(CommandWithColumns command, Schema schema, St
                 pk.setIndexColumns(new IndexColumn[] { new IndexColumn(column.getName()) });
                 command.addConstraintCommand(pk);
             } else if (readIf(UNIQUE)) {
+                NullsDistinct nullsDistinct = readNullsDistinct(database.getMode().nullsDistinct);
                 AlterTableAddConstraint unique = new AlterTableAddConstraint(session, schema,
                         CommandInterface.ALTER_TABLE_ADD_CONSTRAINT_UNIQUE, false);
                 unique.setConstraintName(constraintName);
+                unique.setNullsDistinct(nullsDistinct);
                 unique.setIndexColumns(new IndexColumn[] { new IndexColumn(column.getName()) });
                 unique.setTableName(tableName);
                 command.addConstraintCommand(unique);
@@ -10536,9 +9628,7 @@ private void parseCreateTableMySQLTableOptions(CreateTable command) {
                     throw DbException.get(ErrorCode.COLUMN_NOT_FOUND_1, "AUTO_INCREMENT PRIMARY KEY");
                 }
             } else if (readIf(DEFAULT)) {
-                if (readIf("CHARACTER")) {
-                    read(SET);
-                } else {
+                if (!readIf("CHARACTER", SET)) {
                     readIf("CHARSET");
                     readIf("COLLATE");
                 }
@@ -10589,8 +9679,7 @@ private NullConstraintType parseNotNullConstraint(NullConstraintType nullConstra
 
     private NullConstraintType parseNotNullConstraint() {
         NullConstraintType nullConstraint;
-        if (readIf(NOT)) {
-            read(NULL);
+        if (readIf(NOT, NULL)) {
             nullConstraint = NullConstraintType.NULL_IS_NOT_ALLOWED;
         } else if (readIf(NULL)) {
             nullConstraint = NullConstraintType.NULL_IS_ALLOWED;
@@ -10683,8 +9772,8 @@ public void setRightsChecked(boolean rightsChecked) {
         this.rightsChecked = rightsChecked;
     }
 
-    public void setSuppliedParameterList(ArrayList suppliedParameterList) {
-        this.suppliedParameterList = suppliedParameterList;
+    public void setSuppliedParameters(ArrayList suppliedParameters) {
+        this.parameters = suppliedParameters;
     }
 
     /**
@@ -10694,8 +9783,7 @@ public void setSuppliedParameterList(ArrayList suppliedParameterList)
      * @return the expression object
      */
     public Expression parseExpression(String sql) {
-        parameters = Utils.newSmallArrayList();
-        initialize(sql);
+        initialize(sql, null, false);
         read();
         return readExpression();
     }
@@ -10707,8 +9795,7 @@ public Expression parseExpression(String sql) {
      * @return the expression object
      */
     public Expression parseDomainConstraintExpression(String sql) {
-        parameters = Utils.newSmallArrayList();
-        initialize(sql);
+        initialize(sql, null, false);
         read();
         try {
             parseDomainConstraint = true;
@@ -10725,8 +9812,7 @@ public Expression parseDomainConstraintExpression(String sql) {
      * @return the table object
      */
     public Table parseTableName(String sql) {
-        parameters = Utils.newSmallArrayList();
-        initialize(sql);
+        initialize(sql, null, false);
         read();
         return readTableOrView();
     }
@@ -10741,9 +9827,13 @@ public Table parseTableName(String sql) {
      * @throws DbException on syntax error
      */
     public Object parseColumnList(String sql, int offset) {
-        initialize(sql);
-        parseIndex = offset;
-        read();
+        initialize(sql, null, true);
+        for (int i = 0, l = tokens.size(); i < l; i++) {
+            if (tokens.get(i).start() >= offset) {
+                setTokenIndex(i);
+                break;
+            }
+        }
         read(OPEN_PAREN);
         if (readIf(CLOSE_PAREN)) {
             return Utils.EMPTY_INT_ARRAY;
@@ -10780,11 +9870,11 @@ public Object parseColumnList(String sql, int offset) {
      * @return the last parse index
      */
     public int getLastParseIndex() {
-        return lastParseIndex;
+        return token.start();
     }
 
     @Override
     public String toString() {
-        return StringUtils.addAsterisk(sqlCommand, parseIndex);
+        return StringUtils.addAsterisk(sqlCommand, token.start());
     }
 }
diff --git a/h2/src/main/org/h2/command/Prepared.java b/h2/src/main/org/h2/command/Prepared.java
index bea1473a11..ddcb9f282f 100644
--- a/h2/src/main/org/h2/command/Prepared.java
+++ b/h2/src/main/org/h2/command/Prepared.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -36,6 +36,11 @@ public abstract class Prepared {
      */
     protected String sqlStatement;
 
+    /**
+     * The SQL tokens.
+     */
+    protected ArrayList sqlTokens;
+
     /**
      * Whether to create a new object (for indexes).
      */
@@ -46,6 +51,8 @@ public abstract class Prepared {
      */
     protected ArrayList parameters;
 
+    private boolean withParamValues;
+
     /**
      * If the query should be prepared before each execution. This is set for
      * queries with LIKE ?, because the query plan depends on the parameter
@@ -76,7 +83,7 @@ public abstract class Prepared {
      */
     public Prepared(SessionLocal session) {
         this.session = session;
-        modificationMetaId = session.getDatabase().getModificationMetaId();
+        modificationMetaId = getDatabase().getModificationMetaId();
     }
 
     /**
@@ -117,7 +124,7 @@ public boolean isReadOnly() {
      * @return true if it must
      */
     public boolean needRecompile() {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         if (db == null) {
             throw DbException.get(ErrorCode.CONNECTION_BROKEN_1, "database closed");
         }
@@ -165,6 +172,25 @@ public ArrayList getParameters() {
         return parameters;
     }
 
+    /**
+     * Returns whether values of parameters were specified in SQL.
+     *
+     * @return are values of parameters were specified in SQL
+     */
+    public boolean isWithParamValues() {
+        return withParamValues;
+    }
+
+    /**
+     * Sets whether values of parameters were specified in SQL.
+     *
+     * @param withParamValues
+     *            are values of parameters were specified in SQL
+     */
+    public void setWithParamValues(boolean withParamValues) {
+        this.withParamValues = withParamValues;
+    }
+
     /**
      * Check if all parameters have been set.
      *
@@ -234,9 +260,11 @@ public ResultInterface query(long maxrows) {
      * Set the SQL statement.
      *
      * @param sql the SQL statement
+     * @param sqlTokens the SQL tokens
      */
-    public void setSQL(String sql) {
+    public final void setSQL(String sql, ArrayList sqlTokens) {
         this.sqlStatement = sql;
+        this.sqlTokens = sqlTokens;
     }
 
     /**
@@ -244,10 +272,19 @@ public void setSQL(String sql) {
      *
      * @return the SQL statement
      */
-    public String getSQL() {
+    public final String getSQL() {
         return sqlStatement;
     }
 
+    /**
+     * Get the SQL tokens.
+     *
+     * @return the SQL tokens
+     */
+    public final ArrayList getSQLTokens() {
+        return sqlTokens;
+    }
+
     /**
      * Get the object id to use for the database object that is created in this
      * statement. This id is only set when the object is already persisted.
@@ -270,7 +307,7 @@ public int getPersistedObjectId() {
     protected int getObjectId() {
         int id = persistedObjectId;
         if (id == 0) {
-            id = session.getDatabase().allocateObjectId();
+            id = getDatabase().allocateObjectId();
         } else if (id < 0) {
             throw DbException.getInternalError("Prepared.getObjectId() was called before");
         }
@@ -323,11 +360,11 @@ public void setSession(SessionLocal currentSession) {
     /**
      * Print information about the statement executed if info trace level is
      * enabled.
-     *
+     * @param database to update statistics
      * @param startTimeNanos when the statement was started
      * @param rowCount the query or update row count
      */
-    void trace(long startTimeNanos, long rowCount) {
+    void trace(Database database, long startTimeNanos, long rowCount) {
         if (session.getTrace().isInfoEnabled() && startTimeNanos > 0) {
             long deltaTimeNanos = System.nanoTime() - startTimeNanos;
             String params = Trace.formatParams(parameters);
@@ -335,9 +372,9 @@ void trace(long startTimeNanos, long rowCount) {
         }
         // startTime_nanos can be zero for the command that actually turns on
         // statistics
-        if (session.getDatabase().getQueryStatistics() && startTimeNanos != 0) {
+        if (database != null && database.getQueryStatistics() && startTimeNanos != 0) {
             long deltaTimeNanos = System.nanoTime() - startTimeNanos;
-            session.getDatabase().getQueryStatisticsData().update(toString(), deltaTimeNanos, rowCount);
+            database.getQueryStatisticsData().update(toString(), deltaTimeNanos, rowCount);
         }
     }
 
@@ -378,7 +415,7 @@ public long getCurrentRowNumber() {
      */
     private void setProgress() {
         if ((currentRowNumber & 127) == 0) {
-            session.getDatabase().setProgress(DatabaseEventListener.STATE_STATEMENT_PROGRESS, sqlStatement,
+            getDatabase().setProgress(DatabaseEventListener.STATE_STATEMENT_PROGRESS, sqlStatement,
                     currentRowNumber, 0L);
         }
     }
@@ -411,7 +448,7 @@ public static String getSimpleSQL(Expression[] list) {
      * @param values the values of the row
      * @return the exception
      */
-    protected DbException setRow(DbException e, long rowId, String values) {
+    protected final DbException setRow(DbException e, long rowId, String values) {
         StringBuilder buff = new StringBuilder();
         if (sqlStatement != null) {
             buff.append(sqlStatement);
@@ -444,7 +481,7 @@ public void setCteCleanups(List cteCleanups) {
         this.cteCleanups = cteCleanups;
     }
 
-    public SessionLocal getSession() {
+    public final SessionLocal getSession() {
         return session;
     }
 
@@ -454,4 +491,18 @@ public SessionLocal getSession() {
      * @param dependencies collection of dependencies to populate
      */
     public void collectDependencies(HashSet dependencies) {}
+
+    protected final Database getDatabase() {
+        return session.getDatabase();
+    }
+
+    /**
+     * Returns is this command can be repeated again on locking failure.
+     *
+     * @return is this command can be repeated again on locking failure
+     */
+    public boolean isRetryable() {
+        return true;
+    }
+
 }
diff --git a/h2/src/main/org/h2/command/Token.java b/h2/src/main/org/h2/command/Token.java
new file mode 100644
index 0000000000..44105c028d
--- /dev/null
+++ b/h2/src/main/org/h2/command/Token.java
@@ -0,0 +1,757 @@
+/*
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (https://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.command;
+
+import static org.h2.util.ParserUtil.IDENTIFIER;
+import static org.h2.util.ParserUtil.LAST_KEYWORD;
+
+import org.h2.engine.CastDataProvider;
+import org.h2.message.DbException;
+import org.h2.util.StringUtils;
+import org.h2.value.Value;
+import org.h2.value.ValueBigint;
+import org.h2.value.ValueInteger;
+import org.h2.value.ValueVarbinary;
+import org.h2.value.ValueVarchar;
+
+/**
+ * Token.
+ */
+public abstract class Token implements Cloneable {
+
+    /**
+     * Token with parameter.
+     */
+    static final int PARAMETER = LAST_KEYWORD + 1;
+
+    /**
+     * End of input.
+     */
+    static final int END_OF_INPUT = PARAMETER + 1;
+
+    /**
+     * Token with literal.
+     */
+    static final int LITERAL = END_OF_INPUT + 1;
+
+    /**
+     * The token "=".
+     */
+    static final int EQUAL = LITERAL + 1;
+
+    /**
+     * The token ">=".
+     */
+    static final int BIGGER_EQUAL = EQUAL + 1;
+
+    /**
+     * The token ">".
+     */
+    static final int BIGGER = BIGGER_EQUAL + 1;
+
+    /**
+     * The token "<".
+     */
+    static final int SMALLER = BIGGER + 1;
+
+    /**
+     * The token "<=".
+     */
+    static final int SMALLER_EQUAL = SMALLER + 1;
+
+    /**
+     * The token "<>" or "!=".
+     */
+    static final int NOT_EQUAL = SMALLER_EQUAL + 1;
+
+    /**
+     * The token "@".
+     */
+    static final int AT = NOT_EQUAL + 1;
+
+    /**
+     * The token "-".
+     */
+    static final int MINUS_SIGN = AT + 1;
+
+    /**
+     * The token "+".
+     */
+    static final int PLUS_SIGN = MINUS_SIGN + 1;
+
+    /**
+     * The token "||".
+     */
+    static final int CONCATENATION = PLUS_SIGN + 1;
+
+    /**
+     * The token "(".
+     */
+    static final int OPEN_PAREN = CONCATENATION + 1;
+
+    /**
+     * The token ")".
+     */
+    static final int CLOSE_PAREN = OPEN_PAREN + 1;
+
+    /**
+     * The token "&&".
+     */
+    static final int SPATIAL_INTERSECTS = CLOSE_PAREN + 1;
+
+    /**
+     * The token "*".
+     */
+    static final int ASTERISK = SPATIAL_INTERSECTS + 1;
+
+    /**
+     * The token ",".
+     */
+    static final int COMMA = ASTERISK + 1;
+
+    /**
+     * The token ".".
+     */
+    static final int DOT = COMMA + 1;
+
+    /**
+     * The token "{".
+     */
+    static final int OPEN_BRACE = DOT + 1;
+
+    /**
+     * The token "}".
+     */
+    static final int CLOSE_BRACE = OPEN_BRACE + 1;
+
+    /**
+     * The token "/".
+     */
+    static final int SLASH = CLOSE_BRACE + 1;
+
+    /**
+     * The token "%".
+     */
+    static final int PERCENT = SLASH + 1;
+
+    /**
+     * The token ";".
+     */
+    static final int SEMICOLON = PERCENT + 1;
+
+    /**
+     * The token ":".
+     */
+    static final int COLON = SEMICOLON + 1;
+
+    /**
+     * The token "[".
+     */
+    static final int OPEN_BRACKET = COLON + 1;
+
+    /**
+     * The token "]".
+     */
+    static final int CLOSE_BRACKET = OPEN_BRACKET + 1;
+
+    /**
+     * The token "~".
+     */
+    static final int TILDE = CLOSE_BRACKET + 1;
+
+    /**
+     * The token "::".
+     */
+    static final int COLON_COLON = TILDE + 1;
+
+    /**
+     * The token ":=".
+     */
+    static final int COLON_EQ = COLON_COLON + 1;
+
+    /**
+     * The token "!~".
+     */
+    static final int NOT_TILDE = COLON_EQ + 1;
+
+    static final String[] TOKENS = {
+            // Unused
+            null,
+            // KEYWORD
+            null,
+            // IDENTIFIER
+            null,
+            // ALL
+            "ALL",
+            // AND
+            "AND",
+            // ANY
+            "ANY",
+            // ARRAY
+            "ARRAY",
+            // AS
+            "AS",
+            // ASYMMETRIC
+            "ASYMMETRIC",
+            // AUTHORIZATION
+            "AUTHORIZATION",
+            // BETWEEN
+            "BETWEEN",
+            // CASE
+            "CASE",
+            // CAST
+            "CAST",
+            // CHECK
+            "CHECK",
+            // CONSTRAINT
+            "CONSTRAINT",
+            // CROSS
+            "CROSS",
+            // CURRENT_CATALOG
+            "CURRENT_CATALOG",
+            // CURRENT_DATE
+            "CURRENT_DATE",
+            // CURRENT_PATH
+            "CURRENT_PATH",
+            // CURRENT_ROLE
+            "CURRENT_ROLE",
+            // CURRENT_SCHEMA
+            "CURRENT_SCHEMA",
+            // CURRENT_TIME
+            "CURRENT_TIME",
+            // CURRENT_TIMESTAMP
+            "CURRENT_TIMESTAMP",
+            // CURRENT_USER
+            "CURRENT_USER",
+            // DAY
+            "DAY",
+            // DEFAULT
+            "DEFAULT",
+            // DISTINCT
+            "DISTINCT",
+            // ELSE
+            "ELSE",
+            // END
+            "END",
+            // EXCEPT
+            "EXCEPT",
+            // EXISTS
+            "EXISTS",
+            // FALSE
+            "FALSE",
+            // FETCH
+            "FETCH",
+            // FOR
+            "FOR",
+            // FOREIGN
+            "FOREIGN",
+            // FROM
+            "FROM",
+            // FULL
+            "FULL",
+            // GROUP
+            "GROUP",
+            // HAVING
+            "HAVING",
+            // HOUR
+            "HOUR",
+            // IF
+            "IF",
+            // IN
+            "IN",
+            // INNER
+            "INNER",
+            // INTERSECT
+            "INTERSECT",
+            // INTERVAL
+            "INTERVAL",
+            // IS
+            "IS",
+            // JOIN
+            "JOIN",
+            // KEY
+            "KEY",
+            // LEFT
+            "LEFT",
+            // LIKE
+            "LIKE",
+            // LIMIT
+            "LIMIT",
+            // LOCALTIME
+            "LOCALTIME",
+            // LOCALTIMESTAMP
+            "LOCALTIMESTAMP",
+            // MINUS
+            "MINUS",
+            // MINUTE
+            "MINUTE",
+            // MONTH
+            "MONTH",
+            // NATURAL
+            "NATURAL",
+            // NOT
+            "NOT",
+            // NULL
+            "NULL",
+            // OFFSET
+            "OFFSET",
+            // ON
+            "ON",
+            // OR
+            "OR",
+            // ORDER
+            "ORDER",
+            // PRIMARY
+            "PRIMARY",
+            // QUALIFY
+            "QUALIFY",
+            // RIGHT
+            "RIGHT",
+            // ROW
+            "ROW",
+            // ROWNUM
+            "ROWNUM",
+            // SECOND
+            "SECOND",
+            // SELECT
+            "SELECT",
+            // SESSION_USER
+            "SESSION_USER",
+            // SET
+            "SET",
+            // SOME
+            "SOME",
+            // SYMMETRIC
+            "SYMMETRIC",
+            // SYSTEM_USER
+            "SYSTEM_USER",
+            // TABLE
+            "TABLE",
+            // TO
+            "TO",
+            // TRUE
+            "TRUE",
+            // UESCAPE
+            "UESCAPE",
+            // UNION
+            "UNION",
+            // UNIQUE
+            "UNIQUE",
+            // UNKNOWN
+            "UNKNOWN",
+            // USER
+            "USER",
+            // USING
+            "USING",
+            // VALUE
+            "VALUE",
+            // VALUES
+            "VALUES",
+            // WHEN
+            "WHEN",
+            // WHERE
+            "WHERE",
+            // WINDOW
+            "WINDOW",
+            // WITH
+            "WITH",
+            // YEAR
+            "YEAR",
+            // _ROWID_
+            "_ROWID_",
+            // PARAMETER
+            "?",
+            // END_OF_INPUT
+            null,
+            // LITERAL
+            null,
+            // EQUAL
+            "=",
+            // BIGGER_EQUAL
+            ">=",
+            // BIGGER
+            ">",
+            // SMALLER
+            "<",
+            // SMALLER_EQUAL
+            "<=",
+            // NOT_EQUAL
+            "<>",
+            // AT
+            "@",
+            // MINUS_SIGN
+            "-",
+            // PLUS_SIGN
+            "+",
+            // CONCATENATION
+            "||",
+            // OPEN_PAREN
+            "(",
+            // CLOSE_PAREN
+            ")",
+            // SPATIAL_INTERSECTS
+            "&&",
+            // ASTERISK
+            "*",
+            // COMMA
+            ",",
+            // DOT
+            ".",
+            // OPEN_BRACE
+            "{",
+            // CLOSE_BRACE
+            "}",
+            // SLASH
+            "/",
+            // PERCENT
+            "%",
+            // SEMICOLON
+            ";",
+            // COLON
+            ":",
+            // OPEN_BRACKET
+            "[",
+            // CLOSE_BRACKET
+            "]",
+            // TILDE
+            "~",
+            // COLON_COLON
+            "::",
+            // COLON_EQ
+            ":=",
+            // NOT_TILDE
+            "!~",
+            // End
+    };
+
+    static class IdentifierToken extends Token {
+
+        private String identifier;
+
+        private final boolean quoted;
+
+        private boolean unicode;
+
+        IdentifierToken(int start, String identifier, boolean quoted, boolean unicode) {
+            super(start);
+            this.identifier = identifier;
+            this.quoted = quoted;
+            this.unicode = unicode;
+        }
+
+        @Override
+        int tokenType() {
+            return IDENTIFIER;
+        }
+
+        @Override
+        String asIdentifier() {
+            return identifier;
+        }
+
+        @Override
+        boolean isQuoted() {
+            return quoted;
+        }
+
+        @Override
+        boolean needsUnicodeConversion() {
+            return unicode;
+        }
+
+        @Override
+        void convertUnicode(int uescape) {
+            if (unicode) {
+                identifier = StringUtils.decodeUnicodeStringSQL(identifier, uescape);
+                unicode = false;
+            } else {
+                throw DbException.getInternalError();
+            }
+        }
+
+        @Override
+        public String toString() {
+            return quoted ? StringUtils.quoteIdentifier(identifier) : identifier;
+        }
+
+    }
+
+    static final class KeywordToken extends Token {
+
+        private final int type;
+
+        KeywordToken(int start, int type) {
+            super(start);
+            this.type = type;
+        }
+
+        @Override
+        int tokenType() {
+            return type;
+        }
+
+        @Override
+        String asIdentifier() {
+            return TOKENS[type];
+        }
+
+        @Override
+        public String toString() {
+            return TOKENS[type];
+        }
+
+    }
+
+    static final class KeywordOrIdentifierToken extends Token {
+
+        private final int type;
+
+        private final String identifier;
+
+        KeywordOrIdentifierToken(int start, int type, String identifier) {
+            super(start);
+            this.type = type;
+            this.identifier = identifier;
+        }
+
+        @Override
+        int tokenType() {
+            return type;
+        }
+
+        @Override
+        String asIdentifier() {
+            return identifier;
+        }
+
+        @Override
+        public String toString() {
+            return identifier;
+        }
+
+    }
+
+    static abstract class LiteralToken extends Token {
+
+        Value value;
+
+        LiteralToken(int start) {
+            super(start);
+        }
+
+        @Override
+        final int tokenType() {
+            return LITERAL;
+        }
+
+        @Override
+        public final String toString() {
+            return value(null).getTraceSQL();
+        }
+
+    }
+
+    static final class BinaryStringToken extends LiteralToken {
+
+        private final byte[] string;
+
+        BinaryStringToken(int start, byte[] string) {
+            super(start);
+            this.string = string;
+        }
+
+        @Override
+        Value value(CastDataProvider provider) {
+            if (value == null) {
+                value = ValueVarbinary.getNoCopy(string);
+            }
+            return value;
+        }
+
+    }
+
+    static final class CharacterStringToken extends LiteralToken {
+
+        String string;
+
+        private boolean unicode;
+
+        CharacterStringToken(int start, String string, boolean unicode) {
+            super(start);
+            this.string = string;
+            this.unicode = unicode;
+        }
+
+        @Override
+        Value value(CastDataProvider provider) {
+            if (value == null) {
+                value = ValueVarchar.get(string, provider);
+            }
+            return value;
+        }
+
+        @Override
+        boolean needsUnicodeConversion() {
+            return unicode;
+        }
+
+        @Override
+        void convertUnicode(int uescape) {
+            if (unicode) {
+                string = StringUtils.decodeUnicodeStringSQL(string, uescape);
+                unicode = false;
+            } else {
+                throw DbException.getInternalError();
+            }
+        }
+
+    }
+
+    static final class IntegerToken extends LiteralToken {
+
+        private final int number;
+
+        IntegerToken(int start, int number) {
+            super(start);
+            this.number = number;
+        }
+
+        @Override
+        Value value(CastDataProvider provider) {
+            if (value == null) {
+                value = ValueInteger.get(number);
+            }
+            return value;
+        }
+
+    }
+
+    static final class BigintToken extends LiteralToken {
+
+        private final long number;
+
+        BigintToken(int start, long number) {
+            super(start);
+            this.number = number;
+        }
+
+        @Override
+        Value value(CastDataProvider provider) {
+            if (value == null) {
+                value = ValueBigint.get(number);
+            }
+            return value;
+        }
+
+    }
+
+    static final class ValueToken extends LiteralToken {
+
+        ValueToken(int start, Value value) {
+            super(start);
+            this.value = value;
+        }
+
+        @Override
+        Value value(CastDataProvider provider) {
+            return value;
+        }
+
+    }
+
+    static final class ParameterToken extends Token {
+
+        int index;
+
+        ParameterToken(int start, int index) {
+            super(start);
+            this.index = index;
+        }
+
+        @Override
+        int tokenType() {
+            return PARAMETER;
+        }
+
+        @Override
+        String asIdentifier() {
+            return "?";
+        }
+
+        int index() {
+            return index;
+        }
+
+        @Override
+        public String toString() {
+            return index == 0 ? "?" : "?" + index;
+        }
+
+    }
+
+    static final class EndOfInputToken extends Token {
+
+        EndOfInputToken(int start) {
+            super(start);
+        }
+
+        @Override
+        int tokenType() {
+            return END_OF_INPUT;
+        }
+
+    }
+
+    private int start;
+
+    Token(int start) {
+        this.start = start;
+    }
+
+    final int start() {
+        return start;
+    }
+
+    final void setStart(int offset) {
+        start = offset;
+    }
+
+    final void subtractFromStart(int offset) {
+        start -= offset;
+    }
+
+    abstract int tokenType();
+
+    String asIdentifier() {
+        return null;
+    }
+
+    boolean isQuoted() {
+        return false;
+    }
+
+    Value value(CastDataProvider provider) {
+        return null;
+    }
+
+    boolean needsUnicodeConversion() {
+        return false;
+    }
+
+    void convertUnicode(int uescape) {
+        throw DbException.getInternalError();
+    }
+
+    @Override
+    protected Token clone() {
+        try {
+            return (Token) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw DbException.getInternalError();
+        }
+    }
+
+}
diff --git a/h2/src/main/org/h2/command/Tokenizer.java b/h2/src/main/org/h2/command/Tokenizer.java
new file mode 100644
index 0000000000..8b3e4044e8
--- /dev/null
+++ b/h2/src/main/org/h2/command/Tokenizer.java
@@ -0,0 +1,1521 @@
+/*
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (https://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.command;
+
+import static org.h2.command.Token.ASTERISK;
+import static org.h2.command.Token.AT;
+import static org.h2.command.Token.BIGGER;
+import static org.h2.command.Token.BIGGER_EQUAL;
+import static org.h2.command.Token.CLOSE_BRACE;
+import static org.h2.command.Token.CLOSE_BRACKET;
+import static org.h2.command.Token.CLOSE_PAREN;
+import static org.h2.command.Token.COLON;
+import static org.h2.command.Token.COLON_COLON;
+import static org.h2.command.Token.COLON_EQ;
+import static org.h2.command.Token.COMMA;
+import static org.h2.command.Token.CONCATENATION;
+import static org.h2.command.Token.DOT;
+import static org.h2.command.Token.EQUAL;
+import static org.h2.command.Token.MINUS_SIGN;
+import static org.h2.command.Token.NOT_EQUAL;
+import static org.h2.command.Token.NOT_TILDE;
+import static org.h2.command.Token.OPEN_BRACE;
+import static org.h2.command.Token.OPEN_BRACKET;
+import static org.h2.command.Token.OPEN_PAREN;
+import static org.h2.command.Token.PERCENT;
+import static org.h2.command.Token.PLUS_SIGN;
+import static org.h2.command.Token.SEMICOLON;
+import static org.h2.command.Token.SLASH;
+import static org.h2.command.Token.SMALLER;
+import static org.h2.command.Token.SMALLER_EQUAL;
+import static org.h2.command.Token.SPATIAL_INTERSECTS;
+import static org.h2.command.Token.TILDE;
+import static org.h2.util.ParserUtil.ALL;
+import static org.h2.util.ParserUtil.AND;
+import static org.h2.util.ParserUtil.ANY;
+import static org.h2.util.ParserUtil.ARRAY;
+import static org.h2.util.ParserUtil.AS;
+import static org.h2.util.ParserUtil.ASYMMETRIC;
+import static org.h2.util.ParserUtil.AUTHORIZATION;
+import static org.h2.util.ParserUtil.BETWEEN;
+import static org.h2.util.ParserUtil.CASE;
+import static org.h2.util.ParserUtil.CAST;
+import static org.h2.util.ParserUtil.CHECK;
+import static org.h2.util.ParserUtil.CONSTRAINT;
+import static org.h2.util.ParserUtil.CROSS;
+import static org.h2.util.ParserUtil.CURRENT_CATALOG;
+import static org.h2.util.ParserUtil.CURRENT_DATE;
+import static org.h2.util.ParserUtil.CURRENT_PATH;
+import static org.h2.util.ParserUtil.CURRENT_ROLE;
+import static org.h2.util.ParserUtil.CURRENT_SCHEMA;
+import static org.h2.util.ParserUtil.CURRENT_TIME;
+import static org.h2.util.ParserUtil.CURRENT_TIMESTAMP;
+import static org.h2.util.ParserUtil.CURRENT_USER;
+import static org.h2.util.ParserUtil.DAY;
+import static org.h2.util.ParserUtil.DEFAULT;
+import static org.h2.util.ParserUtil.DISTINCT;
+import static org.h2.util.ParserUtil.ELSE;
+import static org.h2.util.ParserUtil.END;
+import static org.h2.util.ParserUtil.EXCEPT;
+import static org.h2.util.ParserUtil.EXISTS;
+import static org.h2.util.ParserUtil.FALSE;
+import static org.h2.util.ParserUtil.FETCH;
+import static org.h2.util.ParserUtil.FOR;
+import static org.h2.util.ParserUtil.FOREIGN;
+import static org.h2.util.ParserUtil.FROM;
+import static org.h2.util.ParserUtil.FULL;
+import static org.h2.util.ParserUtil.GROUP;
+import static org.h2.util.ParserUtil.HAVING;
+import static org.h2.util.ParserUtil.HOUR;
+import static org.h2.util.ParserUtil.IDENTIFIER;
+import static org.h2.util.ParserUtil.IF;
+import static org.h2.util.ParserUtil.IN;
+import static org.h2.util.ParserUtil.INNER;
+import static org.h2.util.ParserUtil.INTERSECT;
+import static org.h2.util.ParserUtil.INTERVAL;
+import static org.h2.util.ParserUtil.IS;
+import static org.h2.util.ParserUtil.JOIN;
+import static org.h2.util.ParserUtil.KEY;
+import static org.h2.util.ParserUtil.LEFT;
+import static org.h2.util.ParserUtil.LIKE;
+import static org.h2.util.ParserUtil.LIMIT;
+import static org.h2.util.ParserUtil.LOCALTIME;
+import static org.h2.util.ParserUtil.LOCALTIMESTAMP;
+import static org.h2.util.ParserUtil.MINUS;
+import static org.h2.util.ParserUtil.MINUTE;
+import static org.h2.util.ParserUtil.MONTH;
+import static org.h2.util.ParserUtil.NATURAL;
+import static org.h2.util.ParserUtil.NOT;
+import static org.h2.util.ParserUtil.NULL;
+import static org.h2.util.ParserUtil.OFFSET;
+import static org.h2.util.ParserUtil.ON;
+import static org.h2.util.ParserUtil.OR;
+import static org.h2.util.ParserUtil.ORDER;
+import static org.h2.util.ParserUtil.PRIMARY;
+import static org.h2.util.ParserUtil.QUALIFY;
+import static org.h2.util.ParserUtil.RIGHT;
+import static org.h2.util.ParserUtil.ROW;
+import static org.h2.util.ParserUtil.ROWNUM;
+import static org.h2.util.ParserUtil.SECOND;
+import static org.h2.util.ParserUtil.SELECT;
+import static org.h2.util.ParserUtil.SESSION_USER;
+import static org.h2.util.ParserUtil.SET;
+import static org.h2.util.ParserUtil.SOME;
+import static org.h2.util.ParserUtil.SYMMETRIC;
+import static org.h2.util.ParserUtil.SYSTEM_USER;
+import static org.h2.util.ParserUtil.TABLE;
+import static org.h2.util.ParserUtil.TO;
+import static org.h2.util.ParserUtil.TRUE;
+import static org.h2.util.ParserUtil.UESCAPE;
+import static org.h2.util.ParserUtil.UNION;
+import static org.h2.util.ParserUtil.UNIQUE;
+import static org.h2.util.ParserUtil.UNKNOWN;
+import static org.h2.util.ParserUtil.USER;
+import static org.h2.util.ParserUtil.USING;
+import static org.h2.util.ParserUtil.VALUE;
+import static org.h2.util.ParserUtil.VALUES;
+import static org.h2.util.ParserUtil.WHEN;
+import static org.h2.util.ParserUtil.WHERE;
+import static org.h2.util.ParserUtil.WINDOW;
+import static org.h2.util.ParserUtil.WITH;
+import static org.h2.util.ParserUtil.YEAR;
+import static org.h2.util.ParserUtil._ROWID_;
+
+import java.io.ByteArrayOutputStream;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.ListIterator;
+
+import org.h2.api.ErrorCode;
+import org.h2.engine.CastDataProvider;
+import org.h2.message.DbException;
+import org.h2.util.StringUtils;
+import org.h2.value.ValueBigint;
+import org.h2.value.ValueDecfloat;
+import org.h2.value.ValueNumeric;
+
+/**
+ * Tokenizer.
+ */
+public final class Tokenizer {
+
+    private final CastDataProvider provider;
+
+    private final boolean identifiersToUpper;
+
+    private final boolean identifiersToLower;
+
+    private final BitSet nonKeywords;
+
+    Tokenizer(CastDataProvider provider, boolean identifiersToUpper, boolean identifiersToLower, BitSet nonKeywords) {
+        this.provider = provider;
+        this.identifiersToUpper = identifiersToUpper;
+        this.identifiersToLower = identifiersToLower;
+        this.nonKeywords = nonKeywords;
+    }
+
+    ArrayList tokenize(String sql, boolean stopOnCloseParen, BitSet parameters) {
+        ArrayList tokens = new ArrayList<>();
+        int end = sql.length() - 1;
+        boolean foundUnicode = false;
+        int lastParameter = 0;
+        loop: for (int i = 0; i <= end;) {
+            char c = sql.charAt(i);
+            Token token;
+            switch (c) {
+            case '!':
+                if (i < end) {
+                    char c2 = sql.charAt(i + 1);
+                    if (c2 == '=') {
+                        token = new Token.KeywordToken(i++, NOT_EQUAL);
+                        break;
+                    }
+                    if (c2 == '~') {
+                        token = new Token.KeywordToken(i++, NOT_TILDE);
+                        break;
+                    }
+                }
+                throw DbException.getSyntaxError(sql, i);
+            case '"':
+            case '`':
+                i = readQuotedIdentifier(sql, end, i, i, c, false, tokens);
+                continue loop;
+            case '#':
+                if (provider.getMode().supportPoundSymbolForColumnNames) {
+                    i = readIdentifier(sql, end, i, i, tokens);
+                    continue loop;
+                }
+                throw DbException.getSyntaxError(sql, i);
+            case '$':
+                if (i < end) {
+                    char c2 = sql.charAt(i + 1);
+                    if (c2 == '$') {
+                        int stringStart = i + 2;
+                        int stringEnd = sql.indexOf("$$", stringStart);
+                        if (stringEnd < 0) {
+                            throw DbException.getSyntaxError(sql, i);
+                        }
+                        token = new Token.CharacterStringToken(i, sql.substring(stringStart, stringEnd), false);
+                        i = stringEnd + 1;
+                    } else {
+                        i = parseParameterIndex(sql, end, i, tokens);
+                        lastParameter = assignParameterIndex(tokens, lastParameter, parameters);
+                        continue loop;
+                    }
+                } else {
+                    token = new Token.ParameterToken(i, 0);
+                }
+                break;
+            case '%':
+                token = new Token.KeywordToken(i, PERCENT);
+                break;
+            case '&':
+                if (i < end && sql.charAt(i + 1) == '&') {
+                    token = new Token.KeywordToken(i++, SPATIAL_INTERSECTS);
+                    break;
+                }
+                throw DbException.getSyntaxError(sql, i);
+            case '\'':
+                i = readCharacterString(sql, i, end, i, false, tokens);
+                continue loop;
+            case '(':
+                token = new Token.KeywordToken(i, OPEN_PAREN);
+                break;
+            case ')':
+                token = new Token.KeywordToken(i, CLOSE_PAREN);
+                if (stopOnCloseParen) {
+                    tokens.add(token);
+                    end = skipWhitespace(sql, end, i + 1) - 1;
+                    break loop;
+                }
+                break;
+            case '*':
+                token = new Token.KeywordToken(i, ASTERISK);
+                break;
+            case '+':
+                token = new Token.KeywordToken(i, PLUS_SIGN);
+                break;
+            case ',':
+                token = new Token.KeywordToken(i, COMMA);
+                break;
+            case '-':
+                if (i < end && sql.charAt(i + 1) == '-') {
+                    i = skipSimpleComment(sql, end, i);
+                    continue loop;
+                } else {
+                    token = new Token.KeywordToken(i, MINUS_SIGN);
+                }
+                break;
+            case '.':
+                if (i < end) {
+                    char c2 = sql.charAt(i + 1);
+                    if (c2 >= '0' && c2 <= '9') {
+                        i = readFloat(sql, i, end, i + 1, false, tokens);
+                        continue loop;
+                    }
+                }
+                token = new Token.KeywordToken(i, DOT);
+                break;
+            case '/':
+                if (i < end) {
+                    char c2 = sql.charAt(i + 1);
+                    if (c2 == '*') {
+                        i = skipBracketedComment(sql, end, i);
+                        continue loop;
+                    } else if (c2 == '/') {
+                        i = skipSimpleComment(sql, end, i);
+                        continue loop;
+                    }
+                }
+                token = new Token.KeywordToken(i, SLASH);
+                break;
+            case '0':
+                if (i < end) {
+                    switch (sql.charAt(i + 1) & 0xffdf) {
+                    case 'B':
+                        i = readIntegerNumber(sql, i, end, i + 2, tokens, "Binary number", 2);
+                        continue loop;
+                    case 'O':
+                        i = readIntegerNumber(sql, i, end, i + 2, tokens, "Octal number", 8);
+                        continue loop;
+                    case 'X':
+                        if (provider.getMode().zeroExLiteralsAreBinaryStrings) {
+                            i = read0xBinaryString(sql, end, i + 2, tokens);
+                        } else {
+                            i = readIntegerNumber(sql, i, end, i + 2, tokens, "Hex number", 16);
+                        }
+                        continue loop;
+                    }
+                }
+                //$FALL-THROUGH$
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                i = readNumeric(sql, i, end, i + 1, c, tokens);
+                continue loop;
+            case ':':
+                if (i < end) {
+                    char c2 = sql.charAt(i + 1);
+                    if (c2 == ':') {
+                        token = new Token.KeywordToken(i++, COLON_COLON);
+                        break;
+                    } else if (c2 == '=') {
+                        token = new Token.KeywordToken(i++, COLON_EQ);
+                        break;
+                    }
+                }
+                token = new Token.KeywordToken(i, COLON);
+                break;
+            case ';':
+                token = new Token.KeywordToken(i, SEMICOLON);
+                break;
+            case '<':
+                if (i < end) {
+                    char c2 = sql.charAt(i + 1);
+                    if (c2 == '=') {
+                        token = new Token.KeywordToken(i++, SMALLER_EQUAL);
+                        break;
+                    }
+                    if (c2 == '>') {
+                        token = new Token.KeywordToken(i++, NOT_EQUAL);
+                        break;
+                    }
+                }
+                token = new Token.KeywordToken(i, SMALLER);
+                break;
+            case '=':
+                token = new Token.KeywordToken(i, EQUAL);
+                break;
+            case '>':
+                if (i < end && sql.charAt(i + 1) == '=') {
+                    token = new Token.KeywordToken(i++, BIGGER_EQUAL);
+                    break;
+                }
+                token = new Token.KeywordToken(i, BIGGER);
+                break;
+            case '?': {
+                if (i + 1 < end && sql.charAt(i + 1) == '?') {
+                    char c3 = sql.charAt(i + 2);
+                    if (c3 == '(') {
+                        token = new Token.KeywordToken(i, OPEN_BRACKET);
+                        i += 2;
+                        break;
+                    }
+                    if (c3 == ')') {
+                        token = new Token.KeywordToken(i, CLOSE_BRACKET);
+                        i += 2;
+                        break;
+                    }
+                }
+                i = parseParameterIndex(sql, end, i, tokens);
+                lastParameter = assignParameterIndex(tokens, lastParameter, parameters);
+                continue loop;
+            }
+            case '@':
+                token = new Token.KeywordToken(i, AT);
+                break;
+            case 'A':
+            case 'a':
+                i = readA(sql, end, i, tokens);
+                continue loop;
+            case 'B':
+            case 'b':
+                i = readB(sql, end, i, tokens);
+                continue loop;
+            case 'C':
+            case 'c':
+                i = readC(sql, end, i, tokens);
+                continue loop;
+            case 'D':
+            case 'd':
+                i = readD(sql, end, i, tokens);
+                continue loop;
+            case 'E':
+            case 'e':
+                i = readE(sql, end, i, tokens);
+                continue loop;
+            case 'F':
+            case 'f':
+                i = readF(sql, end, i, tokens);
+                continue loop;
+            case 'G':
+            case 'g':
+                i = readG(sql, end, i, tokens);
+                continue loop;
+            case 'H':
+            case 'h':
+                i = readH(sql, end, i, tokens);
+                continue loop;
+            case 'I':
+            case 'i':
+                i = readI(sql, end, i, tokens);
+                continue loop;
+            case 'J':
+            case 'j':
+                i = readJ(sql, end, i, tokens);
+                continue loop;
+            case 'K':
+            case 'k':
+                i = readK(sql, end, i, tokens);
+                continue loop;
+            case 'L':
+            case 'l':
+                i = readL(sql, end, i, tokens);
+                continue loop;
+            case 'M':
+            case 'm':
+                i = readM(sql, end, i, tokens);
+                continue loop;
+            case 'N':
+            case 'n':
+                if (i < end && sql.charAt(i + 1) == '\'') {
+                    i = readCharacterString(sql, i, end, i + 1, false, tokens);
+                } else {
+                    i = readN(sql, end, i, tokens);
+                }
+                continue loop;
+            case 'O':
+            case 'o':
+                i = readO(sql, end, i, tokens);
+                continue loop;
+            case 'P':
+            case 'p':
+                i = readP(sql, end, i, tokens);
+                continue loop;
+            case 'Q':
+            case 'q':
+                i = readQ(sql, end, i, tokens);
+                continue loop;
+            case 'R':
+            case 'r':
+                i = readR(sql, end, i, tokens);
+                continue loop;
+            case 'S':
+            case 's':
+                i = readS(sql, end, i, tokens);
+                continue loop;
+            case 'T':
+            case 't':
+                i = readT(sql, end, i, tokens);
+                continue loop;
+            case 'U':
+            case 'u':
+                if (i + 1 < end && sql.charAt(i + 1) == '&') {
+                    char c3 = sql.charAt(i + 2);
+                    if (c3 == '"') {
+                        i = readQuotedIdentifier(sql, end, i, i + 2, '"', true, tokens);
+                        foundUnicode = true;
+                        continue loop;
+                    } else if (c3 == '\'') {
+                        i = readCharacterString(sql, i, end, i + 2, true, tokens);
+                        foundUnicode = true;
+                        continue loop;
+                    }
+                }
+                i = readU(sql, end, i, tokens);
+                continue loop;
+            case 'V':
+            case 'v':
+                i = readV(sql, end, i, tokens);
+                continue loop;
+            case 'W':
+            case 'w':
+                i = readW(sql, end, i, tokens);
+                continue loop;
+            case 'X':
+            case 'x':
+                if (i < end && sql.charAt(i + 1) == '\'') {
+                    i = readBinaryString(sql, i, end, i + 1, tokens);
+                } else {
+                    i = readIdentifier(sql, end, i, i, tokens);
+                }
+                continue loop;
+            case 'Y':
+            case 'y':
+                i = readY(sql, end, i, tokens);
+                continue loop;
+            case 'Z':
+            case 'z':
+                i = readIdentifier(sql, end, i, i, tokens);
+                continue loop;
+            case '[':
+                if (provider.getMode().squareBracketQuotedNames) {
+                    int identifierStart = i + 1;
+                    int identifierEnd = sql.indexOf(']', identifierStart);
+                    if (identifierEnd < 0) {
+                        throw DbException.getSyntaxError(sql, i);
+                    }
+                    token = new Token.IdentifierToken(i, sql.substring(identifierStart, identifierEnd), true, false);
+                    i = identifierEnd;
+                } else {
+                    token = new Token.KeywordToken(i, OPEN_BRACKET);
+                }
+                break;
+            case ']':
+                token = new Token.KeywordToken(i, CLOSE_BRACKET);
+                break;
+            case '_':
+                i = read_(sql, end, i, tokens);
+                continue loop;
+            case '{':
+                token = new Token.KeywordToken(i, OPEN_BRACE);
+                break;
+            case '|':
+                if (i < end && sql.charAt(i + 1) == '|') {
+                    token = new Token.KeywordToken(i++, CONCATENATION);
+                    break;
+                }
+                throw DbException.getSyntaxError(sql, i);
+            case '}':
+                token = new Token.KeywordToken(i, CLOSE_BRACE);
+                break;
+            case '~':
+                token = new Token.KeywordToken(i, TILDE);
+                break;
+            default:
+                if (c <= ' ') {
+                    i++;
+                    continue loop;
+                } else {
+                    int tokenStart = i;
+                    int cp = Character.isHighSurrogate(c) ? sql.codePointAt(i++) : c;
+                    if (Character.isSpaceChar(cp)) {
+                        i++;
+                        continue loop;
+                    }
+                    if (Character.isJavaIdentifierStart(cp)) {
+                        i = readIdentifier(sql, end, tokenStart, i, tokens);
+                        continue loop;
+                    }
+                    throw DbException.getSyntaxError(sql, tokenStart);
+                }
+            }
+            tokens.add(token);
+            i++;
+        }
+        if (foundUnicode) {
+            processUescape(sql, tokens);
+        }
+        tokens.add(new Token.EndOfInputToken(end + 1));
+        return tokens;
+    }
+
+    private int readIdentifier(String sql, int end, int tokenStart, int i, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, i);
+        tokens.add(new Token.IdentifierToken(tokenStart, extractIdentifier(sql, tokenStart, endIndex), false, false));
+        return endIndex;
+    }
+
+    private int readA(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (length == 2) {
+            type = (sql.charAt(tokenStart + 1) & 0xffdf) == 'S' ? AS : IDENTIFIER;
+        } else {
+            if (eq("ALL", sql, tokenStart, length)) {
+                type = ALL;
+            } else if (eq("AND", sql, tokenStart, length)) {
+                type = AND;
+            } else if (eq("ANY", sql, tokenStart, length)) {
+                type = ANY;
+            } else if (eq("ARRAY", sql, tokenStart, length)) {
+                type = ARRAY;
+            } else if (eq("ASYMMETRIC", sql, tokenStart, length)) {
+                type = ASYMMETRIC;
+            } else if (eq("AUTHORIZATION", sql, tokenStart, length)) {
+                type = AUTHORIZATION;
+            } else {
+                type = IDENTIFIER;
+            }
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readB(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type = eq("BETWEEN", sql, tokenStart, length) ? BETWEEN : IDENTIFIER;
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readC(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (eq("CASE", sql, tokenStart, length)) {
+            type = CASE;
+        } else if (eq("CAST", sql, tokenStart, length)) {
+            type = CAST;
+        } else if (eq("CHECK", sql, tokenStart, length)) {
+            type = CHECK;
+        } else if (eq("CONSTRAINT", sql, tokenStart, length)) {
+            type = CONSTRAINT;
+        } else if (eq("CROSS", sql, tokenStart, length)) {
+            type = CROSS;
+        } else if (length >= 12 && eq("CURRENT_", sql, tokenStart, 8)) {
+            type = getTokenTypeCurrent(sql, tokenStart, length);
+        } else {
+            type = IDENTIFIER;
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private static int getTokenTypeCurrent(String s, int tokenStart, int length) {
+        tokenStart += 8;
+        switch (length) {
+        case 12:
+            if (eqCurrent("CURRENT_DATE", s, tokenStart, length)) {
+                return CURRENT_DATE;
+            } else if (eqCurrent("CURRENT_PATH", s, tokenStart, length)) {
+                return CURRENT_PATH;
+            } else if (eqCurrent("CURRENT_ROLE", s, tokenStart, length)) {
+                return CURRENT_ROLE;
+            } else if (eqCurrent("CURRENT_TIME", s, tokenStart, length)) {
+                return CURRENT_TIME;
+            } else if (eqCurrent("CURRENT_USER", s, tokenStart, length)) {
+                return CURRENT_USER;
+            }
+            break;
+        case 14:
+            if (eqCurrent("CURRENT_SCHEMA", s, tokenStart, length)) {
+                return CURRENT_SCHEMA;
+            }
+            break;
+        case 15:
+            if (eqCurrent("CURRENT_CATALOG", s, tokenStart, length)) {
+                return CURRENT_CATALOG;
+            }
+            break;
+        case 17:
+            if (eqCurrent("CURRENT_TIMESTAMP", s, tokenStart, length)) {
+                return CURRENT_TIMESTAMP;
+            }
+        }
+        return IDENTIFIER;
+    }
+
+    private static boolean eqCurrent(String expected, String s, int start, int length) {
+        for (int i = 8; i < length; i++) {
+            if (expected.charAt(i) != (s.charAt(start++) & 0xffdf)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private int readD(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (eq("DAY", sql, tokenStart, length)) {
+            type = DAY;
+        } else if (eq("DEFAULT", sql, tokenStart, length)) {
+            type = DEFAULT;
+        } else if (eq("DISTINCT", sql, tokenStart, length)) {
+            type = DISTINCT;
+        } else {
+            type = IDENTIFIER;
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readE(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (eq("ELSE", sql, tokenStart, length)) {
+            type = ELSE;
+        } else if (eq("END", sql, tokenStart, length)) {
+            type = END;
+        } else if (eq("EXCEPT", sql, tokenStart, length)) {
+            type = EXCEPT;
+        } else if (eq("EXISTS", sql, tokenStart, length)) {
+            type = EXISTS;
+        } else {
+            type = IDENTIFIER;
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readF(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (eq("FETCH", sql, tokenStart, length)) {
+            type = FETCH;
+        } else if (eq("FROM", sql, tokenStart, length)) {
+            type = FROM;
+        } else if (eq("FOR", sql, tokenStart, length)) {
+            type = FOR;
+        } else if (eq("FOREIGN", sql, tokenStart, length)) {
+            type = FOREIGN;
+        } else if (eq("FULL", sql, tokenStart, length)) {
+            type = FULL;
+        } else if (eq("FALSE", sql, tokenStart, length)) {
+            type = FALSE;
+        } else {
+            type = IDENTIFIER;
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readG(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type = eq("GROUP", sql, tokenStart, length) ? GROUP : IDENTIFIER;
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readH(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (eq("HAVING", sql, tokenStart, length)) {
+            type = HAVING;
+        } else if (eq("HOUR", sql, tokenStart, length)) {
+            type = HOUR;
+        } else {
+            type = IDENTIFIER;
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readI(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (length == 2) {
+            switch ((sql.charAt(tokenStart + 1) & 0xffdf)) {
+            case 'F':
+                type = IF;
+                break;
+            case 'N':
+                type = IN;
+                break;
+            case 'S':
+                type = IS;
+                break;
+            default:
+                type = IDENTIFIER;
+            }
+        } else {
+            if (eq("INNER", sql, tokenStart, length)) {
+                type = INNER;
+            } else if (eq("INTERSECT", sql, tokenStart, length)) {
+                type = INTERSECT;
+            } else if (eq("INTERVAL", sql, tokenStart, length)) {
+                type = INTERVAL;
+            } else {
+                type = IDENTIFIER;
+            }
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readJ(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type = eq("JOIN", sql, tokenStart, length) ? JOIN : IDENTIFIER;
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readK(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type = eq("KEY", sql, tokenStart, length) ? KEY : IDENTIFIER;
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readL(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (eq("LEFT", sql, tokenStart, length)) {
+            type = LEFT;
+        } else if (eq("LIMIT", sql, tokenStart, length)) {
+            type = provider.getMode().limit ? LIMIT : IDENTIFIER;
+        } else if (eq("LIKE", sql, tokenStart, length)) {
+            type = LIKE;
+        } else if (eq("LOCALTIME", sql, tokenStart, length)) {
+            type = LOCALTIME;
+        } else if (eq("LOCALTIMESTAMP", sql, tokenStart, length)) {
+            type = LOCALTIMESTAMP;
+        } else {
+            type = IDENTIFIER;
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readM(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (eq("MINUS", sql, tokenStart, length)) {
+            type = provider.getMode().minusIsExcept ? MINUS : IDENTIFIER;
+        } else if (eq("MINUTE", sql, tokenStart, length)) {
+            type = MINUTE;
+        } else if (eq("MONTH", sql, tokenStart, length)) {
+            type = MONTH;
+        } else {
+            type = IDENTIFIER;
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readN(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (eq("NOT", sql, tokenStart, length)) {
+            type = NOT;
+        } else if (eq("NATURAL", sql, tokenStart, length)) {
+            type = NATURAL;
+        } else if (eq("NULL", sql, tokenStart, length)) {
+            type = NULL;
+        } else {
+            type = IDENTIFIER;
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readO(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (length == 2) {
+            switch ((sql.charAt(tokenStart + 1) & 0xffdf)) {
+            case 'N':
+                type = ON;
+                break;
+            case 'R':
+                type = OR;
+                break;
+            default:
+                type = IDENTIFIER;
+            }
+        } else {
+            if (eq("OFFSET", sql, tokenStart, length)) {
+                type = OFFSET;
+            } else if (eq("ORDER", sql, tokenStart, length)) {
+                type = ORDER;
+            } else {
+                type = IDENTIFIER;
+            }
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readP(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type = eq("PRIMARY", sql, tokenStart, length) ? PRIMARY : IDENTIFIER;
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readQ(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type = eq("QUALIFY", sql, tokenStart, length) ? QUALIFY : IDENTIFIER;
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readR(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (eq("RIGHT", sql, tokenStart, length)) {
+            type = RIGHT;
+        } else if (eq("ROW", sql, tokenStart, length)) {
+            type = ROW;
+        } else if (eq("ROWNUM", sql, tokenStart, length)) {
+            type = ROWNUM;
+        } else {
+            type = IDENTIFIER;
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readS(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (eq("SECOND", sql, tokenStart, length)) {
+            type = SECOND;
+        } else if (eq("SELECT", sql, tokenStart, length)) {
+            type = SELECT;
+        } else if (eq("SESSION_USER", sql, tokenStart, length)) {
+            type = SESSION_USER;
+        } else if (eq("SET", sql, tokenStart, length)) {
+            type = SET;
+        } else if (eq("SOME", sql, tokenStart, length)) {
+            type = SOME;
+        } else if (eq("SYMMETRIC", sql, tokenStart, length)) {
+            type = SYMMETRIC;
+        } else if (eq("SYSTEM_USER", sql, tokenStart, length)) {
+            type = SYSTEM_USER;
+        } else {
+            type = IDENTIFIER;
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readT(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (length == 2) {
+            type = (sql.charAt(tokenStart + 1) & 0xffdf) == 'O' ? TO : IDENTIFIER;
+        } else {
+            if (eq("TABLE", sql, tokenStart, length)) {
+                type = TABLE;
+            } else if (eq("TRUE", sql, tokenStart, length)) {
+                type = TRUE;
+            } else {
+                type = IDENTIFIER;
+            }
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readU(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (eq("UESCAPE", sql, tokenStart, length)) {
+            type = UESCAPE;
+        } else if (eq("UNION", sql, tokenStart, length)) {
+            type = UNION;
+        } else if (eq("UNIQUE", sql, tokenStart, length)) {
+            type = UNIQUE;
+        } else if (eq("UNKNOWN", sql, tokenStart, length)) {
+            type = UNKNOWN;
+        } else if (eq("USER", sql, tokenStart, length)) {
+            type = USER;
+        } else if (eq("USING", sql, tokenStart, length)) {
+            type = USING;
+        } else {
+            type = IDENTIFIER;
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readV(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (eq("VALUE", sql, tokenStart, length)) {
+            type = VALUE;
+        } else if (eq("VALUES", sql, tokenStart, length)) {
+            type = VALUES;
+        } else {
+            type = IDENTIFIER;
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readW(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type;
+        if (eq("WHEN", sql, tokenStart, length)) {
+            type = WHEN;
+        } else if (eq("WHERE", sql, tokenStart, length)) {
+            type = WHERE;
+        } else if (eq("WINDOW", sql, tokenStart, length)) {
+            type = WINDOW;
+        } else if (eq("WITH", sql, tokenStart, length)) {
+            type = WITH;
+        } else {
+            type = IDENTIFIER;
+        }
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readY(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int length = endIndex - tokenStart;
+        int type = eq("YEAR", sql, tokenStart, length) ? YEAR : IDENTIFIER;
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int read_(String sql, int end, int tokenStart, ArrayList tokens) {
+        int endIndex = findIdentifierEnd(sql, end, tokenStart);
+        int type = endIndex - tokenStart == 7 && "_ROWID_".regionMatches(true, 1, sql, tokenStart + 1, 6) ? _ROWID_
+                : IDENTIFIER;
+        return readIdentifierOrKeyword(sql, tokenStart, tokens, endIndex, type);
+    }
+
+    private int readIdentifierOrKeyword(String sql, int tokenStart, ArrayList tokens, int endIndex, int type) {
+        Token token;
+        if (type == IDENTIFIER) {
+            token = new Token.IdentifierToken(tokenStart, extractIdentifier(sql, tokenStart, endIndex), false, false);
+        } else if (nonKeywords != null && nonKeywords.get(type)) {
+            token = new Token.KeywordOrIdentifierToken(tokenStart, type, extractIdentifier(sql, tokenStart, endIndex));
+        } else {
+            token = new Token.KeywordToken(tokenStart, type);
+        }
+        tokens.add(token);
+        return endIndex;
+    }
+
+    private static boolean eq(String expected, String s, int start, int length) {
+        if (length != expected.length()) {
+            return false;
+        }
+        for (int i = 1; i < length; i++) {
+            if (expected.charAt(i) != (s.charAt(++start) & 0xffdf)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private int findIdentifierEnd(String sql, int end, int i) {
+        i++;
+        for (;;) {
+            int cp;
+            if (i > end || (!Character.isJavaIdentifierPart(cp = sql.codePointAt(i))
+                    && (cp != '#' || !provider.getMode().supportPoundSymbolForColumnNames))) {
+                break;
+            }
+            i += Character.charCount(cp);
+        }
+        return i;
+    }
+
+    private String extractIdentifier(String sql, int beginIndex, int endIndex) {
+        return convertCase(sql.substring(beginIndex, endIndex));
+    }
+
+    private int readQuotedIdentifier(String sql, int end, int tokenStart, int i, char c, boolean unicode,
+            ArrayList tokens) {
+        int identifierEnd = sql.indexOf(c, ++i);
+        if (identifierEnd < 0) {
+            throw DbException.getSyntaxError(sql, tokenStart);
+        }
+        String s = sql.substring(i, identifierEnd);
+        i = identifierEnd + 1;
+        if (i <= end && sql.charAt(i) == c) {
+            StringBuilder builder = new StringBuilder(s);
+            do {
+                identifierEnd = sql.indexOf(c, i + 1);
+                if (identifierEnd < 0) {
+                    throw DbException.getSyntaxError(sql, tokenStart);
+                }
+                builder.append(sql, i, identifierEnd);
+                i = identifierEnd + 1;
+            } while (i <= end && sql.charAt(i) == c);
+            s = builder.toString();
+        }
+        if (c == '`') {
+            s = convertCase(s);
+        }
+        tokens.add(new Token.IdentifierToken(tokenStart, s, true, unicode));
+        return i;
+    }
+
+    private String convertCase(String s) {
+        if (identifiersToUpper) {
+            s = StringUtils.toUpperEnglish(s);
+        } else if (identifiersToLower) {
+            s = StringUtils.toLowerEnglish(s);
+        }
+        return s;
+    }
+
+    private static int readBinaryString(String sql, int tokenStart, int end, int i, ArrayList tokens) {
+        ByteArrayOutputStream result = new ByteArrayOutputStream();
+        int stringEnd;
+        do {
+            stringEnd = sql.indexOf('\'', ++i);
+            if (stringEnd < 0 || stringEnd < end && sql.charAt(stringEnd + 1) == '\'') {
+                throw DbException.getSyntaxError(sql, tokenStart);
+            }
+            StringUtils.convertHexWithSpacesToBytes(result, sql, i, stringEnd);
+            i = skipWhitespace(sql, end, stringEnd + 1);
+        } while (i <= end && sql.charAt(i) == '\'');
+        tokens.add(new Token.BinaryStringToken(tokenStart, result.toByteArray()));
+        return i;
+    }
+
+    private static int readCharacterString(String sql, int tokenStart, int end, int i, boolean unicode,
+            ArrayList tokens) {
+        String s = null;
+        StringBuilder builder = null;
+        int stringEnd;
+        do {
+            stringEnd = sql.indexOf('\'', ++i);
+            if (stringEnd < 0) {
+                throw DbException.getSyntaxError(sql, tokenStart);
+            }
+            if (s == null) {
+                s = sql.substring(i, stringEnd);
+            } else {
+                if (builder == null) {
+                    builder = new StringBuilder(s);
+                }
+                builder.append(sql, i, stringEnd);
+            }
+            i = stringEnd + 1;
+            if (i <= end && sql.charAt(i) == '\'') {
+                if (builder == null) {
+                    builder = new StringBuilder(s);
+                }
+                do {
+                    stringEnd = sql.indexOf('\'', i + 1);
+                    if (stringEnd < 0) {
+                        throw DbException.getSyntaxError(sql, tokenStart);
+                    }
+                    builder.append(sql, i, stringEnd);
+                    i = stringEnd + 1;
+                } while (i <= end && sql.charAt(i) == '\'');
+            }
+            i = skipWhitespace(sql, end, i);
+        } while (i <= end && sql.charAt(i) == '\'');
+        if (builder != null) {
+            s = builder.toString();
+        }
+        tokens.add(new Token.CharacterStringToken(tokenStart, s, unicode));
+        return i;
+    }
+
+    private static int skipWhitespace(String sql, int end, int i) {
+        while (i <= end) {
+            int cp = sql.codePointAt(i);
+            if (!Character.isWhitespace(cp)) {
+                if (cp == '/' && i < end) {
+                    char c2 = sql.charAt(i + 1);
+                    if (c2 == '*') {
+                        i = skipBracketedComment(sql, end, i);
+                        continue;
+                    } else if (c2 == '/') {
+                        i = skipSimpleComment(sql, end, i);
+                        continue;
+                    }
+                }
+                break;
+            }
+            i += Character.charCount(cp);
+        }
+        return i;
+    }
+
+    private static int read0xBinaryString(String sql, int end, int i, ArrayList tokens) {
+        int start = i;
+        for (char c; i <= end && (((c = sql.charAt(i)) >= '0' && c <= '9') || ((c &= 0xffdf) >= 'A' && c <= 'F'));) {
+            i++;
+        }
+        if (i <= end && Character.isJavaIdentifierPart(sql.codePointAt(i))) {
+            throw DbException.get(ErrorCode.HEX_STRING_WRONG_1, sql.substring(start, i + 1));
+        }
+        tokens.add(new Token.BinaryStringToken(start, StringUtils.convertHexToBytes(sql.substring(start, i))));
+        return i;
+    }
+
+    private static int readIntegerNumber(String sql, int tokenStart, int end, int i, ArrayList tokens,
+            String name, int radix) {
+        if (i > end) {
+            throw DbException.getSyntaxError(sql, tokenStart, name);
+        }
+        int maxDigit, maxLetter;
+        if (radix > 10) {
+            maxDigit = '9';
+            maxLetter = ('A' - 11) + radix;
+        } else {
+            maxDigit = ('0' - 1) + radix;
+            maxLetter = -1;
+        }
+        int start = i;
+        long number = 0;
+        char c;
+        int lastUnderscore = Integer.MIN_VALUE;
+        do {
+            c = sql.charAt(i);
+            if (c >= '0' && c <= maxDigit) {
+                number = (number * radix) + c - '0';
+            } else if (c == '_') {
+                if (lastUnderscore == i - 1) {
+                    throw DbException.getSyntaxError(sql, tokenStart, name);
+                }
+                lastUnderscore = i;
+                continue;
+            } else if (maxLetter >= 0 && (c &= 0xffdf) >= 'A' && c <= maxLetter) {
+                number = (number * radix) + c - ('A' - 10);
+            } else if (i == start) {
+                throw DbException.getSyntaxError(sql, tokenStart, name);
+            } else {
+                break;
+            }
+            if (number > Integer.MAX_VALUE) {
+                while (++i <= end) {
+                    if ((c = sql.charAt(i)) >= '0' && c <= maxDigit) {
+                        //
+                    } else if (c == '_') {
+                        if (lastUnderscore == i - 1) {
+                            throw DbException.getSyntaxError(sql, tokenStart, name);
+                        }
+                        lastUnderscore = i;
+                        continue;
+                    } else if (maxLetter >= 0 && (c &= 0xffdf) >= 'A' && c <= 'F') {
+                        //
+                    } else {
+                        break;
+                    }
+                }
+                if (lastUnderscore == i - 1) {
+                    throw DbException.getSyntaxError(sql, tokenStart, name);
+                }
+                return finishBigInteger(sql, tokenStart, end, i, start, i <= end && c == 'L', lastUnderscore >= 0,
+                        radix, tokens);
+            }
+        } while (++i <= end);
+        if (lastUnderscore == i - 1) {
+            throw DbException.getSyntaxError(sql, tokenStart, name);
+        }
+        boolean bigint = i <= end && c == 'L';
+        if (bigint) {
+            i++;
+        }
+        if (i <= end && Character.isJavaIdentifierPart(sql.codePointAt(i))) {
+            throw DbException.getSyntaxError(sql, tokenStart, name);
+        }
+        tokens.add(bigint ? new Token.BigintToken(start, number) : new Token.IntegerToken(start, (int) number));
+        return i;
+    }
+
+    private static int readNumeric(String sql, int tokenStart, int end, int i, char c, ArrayList tokens) {
+        long number = c - '0';
+        int lastUnderscore = Integer.MIN_VALUE;
+        for (; i <= end; i++) {
+            c = sql.charAt(i);
+            if (c < '0' || c > '9') {
+                if (lastUnderscore == i - 1) {
+                    throw DbException.getSyntaxError(sql, tokenStart, "Numeric");
+                }
+                switch (c) {
+                case '.':
+                    return readFloat(sql, tokenStart, end, i, lastUnderscore >= 0, tokens);
+                case 'E':
+                case 'e':
+                    return readApproximateNumeric(sql, tokenStart, end, i, lastUnderscore >= 0, tokens);
+                case 'L':
+                case 'l':
+                    return finishBigInteger(sql, tokenStart, end, i, tokenStart, true, lastUnderscore >= 0, 10, //
+                            tokens);
+                case '_':
+                    lastUnderscore = i;
+                    continue;
+                }
+                break;
+            }
+            number = number * 10 + (c - '0');
+            if (number > Integer.MAX_VALUE) {
+                while (++i <= end) {
+                    c = sql.charAt(i);
+                    if (c < '0' || c > '9') {
+                        if (lastUnderscore == i - 1) {
+                            throw DbException.getSyntaxError(sql, tokenStart, "Numeric");
+                        }
+                        switch (c) {
+                        case '.':
+                            return readFloat(sql, tokenStart, end, i, lastUnderscore >= 0, tokens);
+                        case 'E':
+                        case 'e':
+                            return readApproximateNumeric(sql, tokenStart, end, i, lastUnderscore >= 0, tokens);
+                        case '_':
+                            lastUnderscore = i;
+                            continue;
+                        }
+                        break;
+                    }
+                }
+                if (lastUnderscore == i - 1) {
+                    throw DbException.getSyntaxError(sql, tokenStart, "Numeric");
+                }
+                return finishBigInteger(sql, tokenStart, end, i, tokenStart, c == 'L' || c == 'l', lastUnderscore >= 0,
+                        10, tokens);
+            }
+        }
+        if (lastUnderscore == i - 1) {
+            throw DbException.getSyntaxError(sql, tokenStart, "Numeric");
+        }
+        tokens.add(new Token.IntegerToken(tokenStart, (int) number));
+        return i;
+    }
+
+    private static int readFloat(String sql, int tokenStart, int end, int i, boolean withUnderscore,
+            ArrayList tokens) {
+        int start = i + 1;
+        int lastUnderscore = Integer.MIN_VALUE;
+        while (++i <= end) {
+            char c = sql.charAt(i);
+            if (c < '0' || c > '9') {
+                if (lastUnderscore == i - 1) {
+                    throw DbException.getSyntaxError(sql, tokenStart, "Numeric");
+                }
+                switch (c) {
+                case 'E':
+                case 'e':
+                    return readApproximateNumeric(sql, tokenStart, end, i, withUnderscore, tokens);
+                case '_':
+                    if (i == start) {
+                        throw DbException.getSyntaxError(sql, tokenStart, "Numeric");
+                    }
+                    lastUnderscore = i;
+                    withUnderscore = true;
+                    continue;
+                }
+                break;
+            }
+        }
+        if (lastUnderscore == i - 1) {
+            throw DbException.getSyntaxError(sql, tokenStart, "Numeric");
+        }
+        tokens.add(new Token.ValueToken(tokenStart, //
+                ValueNumeric.get(readBigDecimal(sql, tokenStart, i, withUnderscore))));
+        return i;
+    }
+
+    private static int readApproximateNumeric(String sql, int tokenStart, int end, int i, boolean withUnderscore,
+            ArrayList tokens) {
+        if (i == end) {
+            throw DbException.getSyntaxError(sql, tokenStart, "Approximate numeric");
+        }
+        char c = sql.charAt(++i);
+        if (c == '+' || c == '-') {
+            if (i == end) {
+                throw DbException.getSyntaxError(sql, tokenStart, "Approximate numeric");
+            }
+            c = sql.charAt(++i);
+        }
+        if (c < '0' || c > '9') {
+            throw DbException.getSyntaxError(sql, tokenStart, "Approximate numeric");
+        }
+        int lastUnderscore = Integer.MIN_VALUE;
+        while (++i <= end) {
+            c = sql.charAt(i);
+            if (c < '0' || c > '9') {
+                if (lastUnderscore == i - 1) {
+                    throw DbException.getSyntaxError(sql, tokenStart, "Approximate numeric");
+                }
+                if (c == '_') {
+                    lastUnderscore = i;
+                    withUnderscore = true;
+                    continue;
+                }
+                break;
+            }
+        }
+        if (lastUnderscore == i - 1) {
+            throw DbException.getSyntaxError(sql, tokenStart, "Approximate numeric");
+        }
+        tokens.add(new Token.ValueToken(tokenStart,
+                ValueDecfloat.get(readBigDecimal(sql, tokenStart, i, withUnderscore))));
+        return i;
+    }
+
+    private static BigDecimal readBigDecimal(String sql, int tokenStart, int i, boolean withUnderscore) {
+        String string = readAndRemoveUnderscores(sql, tokenStart, i, withUnderscore);
+        BigDecimal bd;
+        try {
+            bd = new BigDecimal(string);
+        } catch (NumberFormatException e) {
+            throw DbException.getSyntaxError(sql, tokenStart, "Numeric");
+        }
+        return bd;
+    }
+
+    private static int finishBigInteger(String sql, int tokenStart, int end, int i, int start, boolean asBigint,
+            boolean withUnderscore, int radix, ArrayList tokens) {
+        int endIndex = i;
+        if (asBigint) {
+            i++;
+        }
+        if (radix == 16 && i <= end && Character.isJavaIdentifierPart(sql.codePointAt(i))) {
+            throw DbException.getSyntaxError(sql, tokenStart, "Hex number");
+        }
+        BigInteger bigInteger = new BigInteger(readAndRemoveUnderscores(sql, start, endIndex, withUnderscore), radix);
+        Token token;
+        if (bigInteger.compareTo(ValueBigint.MAX_BI) > 0) {
+            if (asBigint) {
+                throw DbException.getSyntaxError(sql, tokenStart, "BIGINT");
+            }
+            token = new Token.ValueToken(tokenStart, ValueNumeric.get(bigInteger));
+        } else {
+            token = new Token.BigintToken(tokenStart, bigInteger.longValue());
+        }
+        tokens.add(token);
+        return i;
+    }
+
+    private static String readAndRemoveUnderscores(String sql, int start, int endIndex, boolean withUnderscore) {
+        if (!withUnderscore) {
+            return sql.substring(start, endIndex);
+        }
+        StringBuilder builder = new StringBuilder(endIndex - start - 1);
+        for (; start < endIndex; start++) {
+            char c = sql.charAt(start);
+            if (c != '_') {
+                builder.append(c);
+            }
+        }
+        return builder.toString();
+    }
+
+    private static int skipBracketedComment(String sql, int end, int i) {
+        int tokenStart = i;
+        i += 2;
+        for (int level = 1; level > 0;) {
+            for (;;) {
+                if (i >= end) {
+                    throw DbException.getSyntaxError(sql, tokenStart);
+                }
+                char c = sql.charAt(i++);
+                if (c == '*') {
+                    if (sql.charAt(i) == '/') {
+                        level--;
+                        i++;
+                        break;
+                    }
+                } else if (c == '/' && sql.charAt(i) == '*') {
+                    level++;
+                    i++;
+                }
+            }
+        }
+        return i;
+    }
+
+    private static int skipSimpleComment(String sql, int end, int i) {
+        i += 2;
+        for (char c; i <= end && (c = sql.charAt(i)) != '\n' && c != '\r'; i++) {
+            //
+        }
+        return i;
+    }
+
+    private static int parseParameterIndex(String sql, int end, int i, ArrayList tokens) {
+        int tokenStart = i;
+        long number = 0;
+        for (char c; ++i <= end && (c = sql.charAt(i)) >= '0' && c <= '9';) {
+            number = number * 10 + (c - '0');
+            if (number > Integer.MAX_VALUE) {
+                throw DbException.getInvalidValueException("parameter index", number);
+            }
+        }
+        if (i > tokenStart + 1 && number == 0) {
+            throw DbException.getInvalidValueException("parameter index", number);
+        }
+        tokens.add(new Token.ParameterToken(tokenStart, (int) number));
+        return i;
+    }
+
+    private static int assignParameterIndex(ArrayList tokens, int lastParameter, BitSet parameters) {
+        Token.ParameterToken parameter = (Token.ParameterToken) tokens.get(tokens.size() - 1);
+        int index = parameter.index;
+        if (index == 0) {
+            if (lastParameter < 0) {
+                throw DbException.get(ErrorCode.CANNOT_MIX_INDEXED_AND_UNINDEXED_PARAMS);
+            }
+            parameter.index = index = ++lastParameter;
+        } else if (lastParameter > 0) {
+            throw DbException.get(ErrorCode.CANNOT_MIX_INDEXED_AND_UNINDEXED_PARAMS);
+        } else {
+            lastParameter = -1;
+        }
+        parameters.set(index - 1);
+        return lastParameter;
+    }
+
+    private static void processUescape(String sql, ArrayList tokens) {
+        ListIterator i = tokens.listIterator();
+        while (i.hasNext()) {
+            Token token = i.next();
+            if (token.needsUnicodeConversion()) {
+                int uescape = '\\';
+                condition: if (i.hasNext()) {
+                    Token t2 = i.next();
+                    if (t2.tokenType() == UESCAPE) {
+                        i.remove();
+                        if (i.hasNext()) {
+                            Token t3 = i.next();
+                            i.remove();
+                            if (t3 instanceof Token.CharacterStringToken) {
+                                String s = ((Token.CharacterStringToken) t3).string;
+                                if (s.codePointCount(0, s.length()) == 1) {
+                                    int escape = s.codePointAt(0);
+                                    if (!Character.isWhitespace(escape) && (escape < '0' || escape > '9')
+                                            && (escape < 'A' || escape > 'F') && (escape < 'a' || escape > 'f')) {
+                                        switch (escape) {
+                                        default:
+                                            uescape = escape;
+                                            break condition;
+                                        case '"':
+                                        case '\'':
+                                        case '+':
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        throw DbException.getSyntaxError(sql, t2.start() + 7, "''");
+                    }
+                }
+                token.convertUnicode(uescape);
+            }
+        }
+    }
+
+}
diff --git a/h2/src/main/org/h2/command/ddl/AlterDomain.java b/h2/src/main/org/h2/command/ddl/AlterDomain.java
index 8fefc8677e..052d9c453f 100644
--- a/h2/src/main/org/h2/command/ddl/AlterDomain.java
+++ b/h2/src/main/org/h2/command/ddl/AlterDomain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/ddl/AlterDomainAddConstraint.java b/h2/src/main/org/h2/command/ddl/AlterDomainAddConstraint.java
index e1646a1bc4..188a0bccc4 100644
--- a/h2/src/main/org/h2/command/ddl/AlterDomainAddConstraint.java
+++ b/h2/src/main/org/h2/command/ddl/AlterDomainAddConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -61,7 +61,7 @@ private int tryUpdate(Schema schema, Domain domain) {
             }
             throw DbException.get(ErrorCode.CONSTRAINT_ALREADY_EXISTS_1, constraintName);
         }
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         db.lockMeta(session);
 
         int id = getObjectId();
diff --git a/h2/src/main/org/h2/command/ddl/AlterDomainDropConstraint.java b/h2/src/main/org/h2/command/ddl/AlterDomainDropConstraint.java
index 78e69e365f..fd9293f9b0 100644
--- a/h2/src/main/org/h2/command/ddl/AlterDomainDropConstraint.java
+++ b/h2/src/main/org/h2/command/ddl/AlterDomainDropConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -41,7 +41,7 @@ long update(Schema schema, Domain domain) {
                 throw DbException.get(ErrorCode.CONSTRAINT_NOT_FOUND_1, constraintName);
             }
         } else {
-            session.getDatabase().removeSchemaObject(session, constraint);
+            getDatabase().removeSchemaObject(session, constraint);
         }
         return 0;
     }
diff --git a/h2/src/main/org/h2/command/ddl/AlterDomainExpressions.java b/h2/src/main/org/h2/command/ddl/AlterDomainExpressions.java
index d62975f877..ffba14a512 100644
--- a/h2/src/main/org/h2/command/ddl/AlterDomainExpressions.java
+++ b/h2/src/main/org/h2/command/ddl/AlterDomainExpressions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -51,7 +51,7 @@ long update(Schema schema, Domain domain) {
         if (expression != null) {
             forAllDependencies(session, domain, this::copyColumn, this::copyDomain, true);
         }
-        session.getDatabase().updateMeta(session, domain);
+        getDatabase().updateMeta(session, domain);
         return 0;
     }
 
diff --git a/h2/src/main/org/h2/command/ddl/AlterDomainRename.java b/h2/src/main/org/h2/command/ddl/AlterDomainRename.java
index 99ca5cd66c..ad1dfffd91 100644
--- a/h2/src/main/org/h2/command/ddl/AlterDomainRename.java
+++ b/h2/src/main/org/h2/command/ddl/AlterDomainRename.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -39,7 +39,7 @@ long update(Schema schema, Domain domain) {
                 return 0;
             }
         }
-        session.getDatabase().renameSchemaObject(session, domain, newDomainName);
+        getDatabase().renameSchemaObject(session, domain, newDomainName);
         forAllDependencies(session, domain, null, null, false);
         return 0;
     }
diff --git a/h2/src/main/org/h2/command/ddl/AlterDomainRenameConstraint.java b/h2/src/main/org/h2/command/ddl/AlterDomainRenameConstraint.java
index 6adbe6aa12..074f65a87c 100644
--- a/h2/src/main/org/h2/command/ddl/AlterDomainRenameConstraint.java
+++ b/h2/src/main/org/h2/command/ddl/AlterDomainRenameConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -47,7 +47,7 @@ long update(Schema schema, Domain domain) {
                 || newConstraintName.equals(constraintName)) {
             throw DbException.get(ErrorCode.CONSTRAINT_ALREADY_EXISTS_1, newConstraintName);
         }
-        session.getDatabase().renameSchemaObject(session, constraint, newConstraintName);
+        getDatabase().renameSchemaObject(session, constraint, newConstraintName);
         return 0;
     }
 
diff --git a/h2/src/main/org/h2/command/ddl/AlterIndexRename.java b/h2/src/main/org/h2/command/ddl/AlterIndexRename.java
index 07fdb101b6..f2ab4947d6 100644
--- a/h2/src/main/org/h2/command/ddl/AlterIndexRename.java
+++ b/h2/src/main/org/h2/command/ddl/AlterIndexRename.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -47,7 +47,7 @@ public void setNewName(String name) {
 
     @Override
     public long update() {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         Index oldIndex = oldSchema.findIndex(session, oldIndexName);
         if (oldIndex == null) {
             if (!ifExists) {
diff --git a/h2/src/main/org/h2/command/ddl/AlterSchemaRename.java b/h2/src/main/org/h2/command/ddl/AlterSchemaRename.java
index bd93ae9a53..0762a7f54b 100644
--- a/h2/src/main/org/h2/command/ddl/AlterSchemaRename.java
+++ b/h2/src/main/org/h2/command/ddl/AlterSchemaRename.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -38,7 +38,7 @@ public void setNewName(String name) {
     @Override
     public long update() {
         session.getUser().checkSchemaAdmin();
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         if (!oldSchema.canDrop()) {
             throw DbException.get(ErrorCode.SCHEMA_CAN_NOT_BE_DROPPED_1, oldSchema.getName());
         }
diff --git a/h2/src/main/org/h2/command/ddl/AlterSequence.java b/h2/src/main/org/h2/command/ddl/AlterSequence.java
index 630b6760e0..2995c673e0 100644
--- a/h2/src/main/org/h2/command/ddl/AlterSequence.java
+++ b/h2/src/main/org/h2/command/ddl/AlterSequence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -93,7 +93,7 @@ long update(Schema schema) {
         sequence.flush(session);
         if (column != null && always != null) {
             column.setSequence(sequence, always);
-            session.getDatabase().updateMeta(session, column.getTable());
+            getDatabase().updateMeta(session, column.getTable());
         }
         return 0;
     }
diff --git a/h2/src/main/org/h2/command/ddl/AlterTable.java b/h2/src/main/org/h2/command/ddl/AlterTable.java
index cd00ae84ba..7ed759bf9d 100644
--- a/h2/src/main/org/h2/command/ddl/AlterTable.java
+++ b/h2/src/main/org/h2/command/ddl/AlterTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/ddl/AlterTableAddConstraint.java b/h2/src/main/org/h2/command/ddl/AlterTableAddConstraint.java
index 760cfd810e..39b9216e40 100644
--- a/h2/src/main/org/h2/command/ddl/AlterTableAddConstraint.java
+++ b/h2/src/main/org/h2/command/ddl/AlterTableAddConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -18,6 +18,7 @@
 import org.h2.engine.Database;
 import org.h2.engine.Right;
 import org.h2.engine.SessionLocal;
+import org.h2.engine.NullsDistinct;
 import org.h2.expression.Expression;
 import org.h2.index.Index;
 import org.h2.index.IndexType;
@@ -38,6 +39,7 @@ public class AlterTableAddConstraint extends AlterTable {
 
     private final int type;
     private String constraintName;
+    private NullsDistinct nullsDistinct;
     private IndexColumn[] indexColumns;
     private ConstraintActionType deleteAction = ConstraintActionType.RESTRICT;
     private ConstraintActionType updateAction = ConstraintActionType.RESTRICT;
@@ -74,11 +76,11 @@ public long update(Table table) {
             try {
                 if (createdUniqueConstraint != null) {
                     Index index = createdUniqueConstraint.getIndex();
-                    session.getDatabase().removeSchemaObject(session, createdUniqueConstraint);
+                    getDatabase().removeSchemaObject(session, createdUniqueConstraint);
                     createdIndexes.remove(index);
                 }
                 for (Index index : createdIndexes) {
-                    session.getDatabase().removeSchemaObject(session, index);
+                    getDatabase().removeSchemaObject(session, index);
                 }
             } catch (Throwable ex) {
                 e.addSuppressed(ex);
@@ -110,9 +112,9 @@ private int tryUpdate(Table table) {
             }
             constraintName = null;
         }
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         db.lockMeta(session);
-        table.lock(session, true, true);
+        table.lock(session, Table.EXCLUSIVE_LOCK);
         Constraint constraint;
         switch (type) {
         case CommandInterface.ALTER_TABLE_ADD_CONSTRAINT_PRIMARY_KEY: {
@@ -142,7 +144,7 @@ private int tryUpdate(Table table) {
                         table.isPersistIndexes(), primaryKeyHash);
                 String indexName = table.getSchema().getUniqueIndexName(
                         session, table, Constants.PREFIX_PRIMARY_KEY);
-                int indexId = session.getDatabase().allocateObjectId();
+                int indexId = getDatabase().allocateObjectId();
                 try {
                     index = table.addIndex(session, indexName, indexId, indexColumns, indexColumns.length, indexType,
                             true, null);
@@ -153,15 +155,32 @@ private int tryUpdate(Table table) {
             index.getIndexType().setBelongsToConstraint(true);
             int id = getObjectId();
             String name = generateConstraintName(table);
-            ConstraintUnique pk = new ConstraintUnique(getSchema(),
-                    id, name, table, true);
+            ConstraintUnique pk = new ConstraintUnique(getSchema(), id, name, table, true, null);
             pk.setColumns(indexColumns);
             pk.setIndex(index, true);
             constraint = pk;
             break;
         }
         case CommandInterface.ALTER_TABLE_ADD_CONSTRAINT_UNIQUE:
-            IndexColumn.mapColumns(indexColumns, table);
+            if (indexColumns == null) {
+                Column[] columns = table.getColumns();
+                int columnCount = columns.length;
+                ArrayList list = new ArrayList<>(columnCount);
+                for (int i = 0; i < columnCount; i++) {
+                    Column c = columns[i];
+                    if (c.getVisible()) {
+                        IndexColumn indexColumn = new IndexColumn(c.getName());
+                        indexColumn.column = c;
+                        list.add(indexColumn);
+                    }
+                }
+                if (list.isEmpty()) {
+                    throw DbException.get(ErrorCode.SYNTAX_ERROR_1, "UNIQUE(VALUE) on table without columns");
+                }
+                indexColumns = list.toArray(new IndexColumn[0]);
+            } else {
+                IndexColumn.mapColumns(indexColumns, table);
+            }
             constraint = createUniqueConstraint(table, index, indexColumns, false);
             break;
         case CommandInterface.ALTER_TABLE_ADD_CONSTRAINT_CHECK: {
@@ -241,13 +260,13 @@ private int tryUpdate(Table table) {
                         new StringBuilder("PRIMARY KEY | UNIQUE ("), refIndexColumns, HasSQL.TRACE_SQL_FLAGS)
                         .append(')').toString());
             }
-            if (index != null && canUseIndex(index, table, indexColumns, false)) {
+            if (index != null && canUseIndex(index, table, indexColumns, null)) {
                 isOwner = true;
                 index.getIndexType().setBelongsToConstraint(true);
             } else {
-                index = getIndex(table, indexColumns, false);
+                index = getIndex(table, indexColumns, null);
                 if (index == null) {
-                    index = createIndex(table, indexColumns, false);
+                    index = createIndex(table, indexColumns, null);
                     isOwner = true;
                 }
             }
@@ -286,13 +305,15 @@ private int tryUpdate(Table table) {
     private ConstraintUnique createUniqueConstraint(Table table, Index index, IndexColumn[] indexColumns,
             boolean forForeignKey) {
         boolean isOwner = false;
-        if (index != null && canUseIndex(index, table, indexColumns, true)) {
+        NullsDistinct needNullsDistinct = nullsDistinct != null ? nullsDistinct : NullsDistinct.DISTINCT;
+        if (index != null && canUseIndex(index, table, indexColumns, needNullsDistinct)) {
             isOwner = true;
             index.getIndexType().setBelongsToConstraint(true);
         } else {
-            index = getIndex(table, indexColumns, true);
+            index = getIndex(table, indexColumns, needNullsDistinct);
             if (index == null) {
-                index = createIndex(table, indexColumns, true);
+                index = createIndex(table, indexColumns,
+                        nullsDistinct != null ? nullsDistinct : session.getMode().nullsDistinct);
                 isOwner = true;
             }
         }
@@ -300,7 +321,7 @@ private ConstraintUnique createUniqueConstraint(Table table, Index index, IndexC
         String name;
         Schema tableSchema = table.getSchema();
         if (forForeignKey) {
-            id = session.getDatabase().allocateObjectId();
+            id = getDatabase().allocateObjectId();
             try {
                 tableSchema.reserveUniqueName(constraintName);
                 name = tableSchema.getUniqueConstraintName(session, table);
@@ -311,7 +332,10 @@ private ConstraintUnique createUniqueConstraint(Table table, Index index, IndexC
             id = getObjectId();
             name = generateConstraintName(table);
         }
-        ConstraintUnique unique = new ConstraintUnique(tableSchema, id, name, table, false);
+        if (indexColumns.length == 1 && needNullsDistinct == NullsDistinct.ALL_DISTINCT) {
+            needNullsDistinct = NullsDistinct.DISTINCT;
+        }
+        ConstraintUnique unique = new ConstraintUnique(tableSchema, id, name, table, false, needNullsDistinct);
         unique.setColumns(indexColumns);
         unique.setIndex(index, isOwner);
         return unique;
@@ -326,12 +350,12 @@ private void addConstraintToTable(Database db, Table table, Constraint constrain
         table.addConstraint(constraint);
     }
 
-    private Index createIndex(Table t, IndexColumn[] cols, boolean unique) {
-        int indexId = session.getDatabase().allocateObjectId();
+    private Index createIndex(Table t, IndexColumn[] cols, NullsDistinct nullsDistinct) {
+        int indexId = getDatabase().allocateObjectId();
         IndexType indexType;
-        if (unique) {
+        if (nullsDistinct != null) {
             // for unique constraints
-            indexType = IndexType.createUnique(t.isPersistIndexes(), false);
+            indexType = IndexType.createUnique(t.isPersistIndexes(), false, cols.length, nullsDistinct);
         } else {
             // constraints
             indexType = IndexType.createNonUnique(t.isPersistIndexes());
@@ -341,8 +365,8 @@ private Index createIndex(Table t, IndexColumn[] cols, boolean unique) {
         String indexName = t.getSchema().getUniqueIndexName(session, t,
                 prefix + "_INDEX_");
         try {
-            Index index = t.addIndex(session, indexName, indexId, cols, unique ? cols.length : 0, indexType, true,
-                    null);
+            Index index = t.addIndex(session, indexName, indexId, cols, nullsDistinct != null ? cols.length : 0,
+                    indexType, true, null);
             createdIndexes.add(index);
             return index;
         } finally {
@@ -365,7 +389,7 @@ private static ConstraintUnique getUniqueConstraint(Table t, IndexColumn[] cols)
                 if (constraint.getTable() == t) {
                     Constraint.Type constraintType = constraint.getConstraintType();
                     if (constraintType == Constraint.Type.PRIMARY_KEY || constraintType == Constraint.Type.UNIQUE) {
-                        if (canUseIndex(constraint.getIndex(), t, cols, true)) {
+                        if (canUseIndex(constraint.getIndex(), t, cols, NullsDistinct.DISTINCT)) {
                             return (ConstraintUnique) constraint;
                         }
                     }
@@ -375,12 +399,12 @@ private static ConstraintUnique getUniqueConstraint(Table t, IndexColumn[] cols)
         return null;
     }
 
-    private static Index getIndex(Table t, IndexColumn[] cols, boolean unique) {
+    private static Index getIndex(Table t, IndexColumn[] cols, NullsDistinct nullsDistinct) {
         ArrayList indexes = t.getIndexes();
         Index index = null;
         if (indexes != null) {
             for (Index idx : indexes) {
-                if (canUseIndex(idx, t, cols, unique)) {
+                if (canUseIndex(idx, t, cols, nullsDistinct)) {
                     if (index == null || idx.getIndexColumns().length < index.getIndexColumns().length) {
                         index = idx;
                     }
@@ -390,16 +414,19 @@ private static Index getIndex(Table t, IndexColumn[] cols, boolean unique) {
         return index;
     }
 
-    private static boolean canUseIndex(Index index, Table table, IndexColumn[] cols, boolean unique) {
+    private static boolean canUseIndex(Index index, Table table, IndexColumn[] cols, NullsDistinct nullsDistinct) {
         if (index.getTable() != table) {
             return false;
         }
         int allowedColumns;
-        if (unique) {
+        if (nullsDistinct != null) {
             allowedColumns = index.getUniqueColumnCount();
             if (allowedColumns != cols.length) {
                 return false;
             }
+            if (index.getIndexType().getEffectiveNullsDistinct().compareTo(nullsDistinct) < 0) {
+                return false;
+            }
         } else {
             if (index.getCreateSQL() == null || (allowedColumns = index.getColumns().length) != cols.length) {
                 return false;
@@ -428,6 +455,10 @@ public int getType() {
         return type;
     }
 
+    public void setNullsDistinct(NullsDistinct nullsDistinct) {
+        this.nullsDistinct = nullsDistinct;
+    }
+
     public void setCheckExpression(Expression expression) {
         this.checkExpression = expression;
     }
diff --git a/h2/src/main/org/h2/command/ddl/AlterTableAlterColumn.java b/h2/src/main/org/h2/command/ddl/AlterTableAlterColumn.java
index ac37d64f27..c75b552e83 100644
--- a/h2/src/main/org/h2/command/ddl/AlterTableAlterColumn.java
+++ b/h2/src/main/org/h2/command/ddl/AlterTableAlterColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -107,7 +107,7 @@ public void setAddAfter(String after) {
 
     @Override
     public long update() {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         Table table = getSchema().resolveTableOrView(session, tableName);
         if (table == null) {
             if (ifTableExists) {
@@ -117,7 +117,7 @@ public long update() {
         }
         session.getUser().checkTableRight(table, Right.SCHEMA_OWNER);
         table.checkSupportAlter();
-        table.lock(session, true, true);
+        table.lock(session, Table.EXCLUSIVE_LOCK);
         if (newColumn != null) {
             checkDefaultReferencesTable(table, newColumn.getDefaultExpression());
             checkClustering(newColumn);
@@ -247,7 +247,7 @@ public long update() {
                 throw DbException.get(ErrorCode.CANNOT_DROP_LAST_COLUMN, columnsToRemove.get(0).getTraceSQL());
             }
             table.dropMultipleColumnsConstraintsAndIndexes(session, columnsToRemove);
-            copyData(table);
+            copyData(table, null, false);
             break;
         }
         case CommandInterface.ALTER_TABLE_ALTER_COLUMN_SELECTIVITY: {
@@ -300,7 +300,7 @@ private static void checkDefaultReferencesTable(Table table, Expression defaultE
 
     private void checkClustering(Column c) {
         if (!Constants.CLUSTERING_DISABLED
-                .equals(session.getDatabase().getCluster())
+                .equals(getDatabase().getCluster())
                 && c.hasIdentityOptions()) {
             throw DbException.getUnsupportedException(
                     "CLUSTERING && identity columns");
@@ -322,20 +322,16 @@ private void removeSequence(Table table, Sequence sequence) {
         if (sequence != null) {
             table.removeSequence(sequence);
             sequence.setBelongsToTable(false);
-            Database db = session.getDatabase();
+            Database db = getDatabase();
             db.removeSchemaObject(session, sequence);
         }
     }
 
-    private void copyData(Table table) {
-        copyData(table, null, false);
-    }
-
     private void copyData(Table table, ArrayList sequences, boolean createConstraints) {
         if (table.isTemporary()) {
             throw DbException.getUnsupportedException("TEMP TABLE");
         }
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         String baseName = table.getName();
         String tempName = db.getTempTableName(baseName, session);
         Column[] columns = table.getColumns();
@@ -458,34 +454,30 @@ private Table cloneTableStructure(Table table, Column[] columns, Database db,
         Table newTable = getSchema().createTable(data);
         newTable.setComment(table.getComment());
         String newTableSQL = newTable.getCreateSQLForMeta();
-        StringBuilder columnList = new StringBuilder();
+        StringBuilder columnNames = new StringBuilder();
+        StringBuilder columnValues = new StringBuilder();
         for (Column nc : newColumns) {
-            if (columnList.length() > 0) {
-                columnList.append(", ");
+            if (nc.isGenerated()) {
+                continue;
             }
             switch (type) {
             case CommandInterface.ALTER_TABLE_ADD_COLUMN:
                 if (columnsToAdd != null && columnsToAdd.contains(nc)) {
                     if (usingExpression != null) {
-                        usingExpression.getUnenclosedSQL(columnList, HasSQL.DEFAULT_SQL_FLAGS);
-                    } else {
-                        Expression def = nc.getDefaultExpression();
-                        if (def == null) {
-                            columnList.append("NULL");
-                        } else {
-                            def.getUnenclosedSQL(columnList, HasSQL.DEFAULT_SQL_FLAGS);
-                        }
+                        usingExpression.getUnenclosedSQL(addColumn(nc, columnNames, columnValues),
+                                HasSQL.DEFAULT_SQL_FLAGS);
                     }
                     continue;
                 }
                 break;
             case CommandInterface.ALTER_TABLE_ALTER_COLUMN_CHANGE_TYPE:
                 if (nc.equals(newColumn) && usingExpression != null) {
-                    usingExpression.getUnenclosedSQL(columnList, HasSQL.DEFAULT_SQL_FLAGS);
+                    usingExpression.getUnenclosedSQL(addColumn(nc, columnNames, columnValues),
+                            HasSQL.DEFAULT_SQL_FLAGS);
                     continue;
                 }
             }
-            nc.getSQL(columnList, HasSQL.DEFAULT_SQL_FLAGS);
+            nc.getSQL(addColumn(nc, columnNames, columnValues), HasSQL.DEFAULT_SQL_FLAGS);
         }
         String newTableName = newTable.getName();
         Schema newTableSchema = newTable.getSchema();
@@ -551,24 +543,22 @@ private Table cloneTableStructure(Table table, Column[] columns, Database db,
                 }
             }
         }
-        StringBuilder buff = new StringBuilder();
-        buff.append("INSERT INTO ");
-        newTable.getSQL(buff, HasSQL.DEFAULT_SQL_FLAGS);
-        buff.append(" SELECT ");
-        if (columnList.length() == 0) {
+        StringBuilder builder = newTable.getSQL(new StringBuilder(128).append("INSERT INTO "), //
+                HasSQL.DEFAULT_SQL_FLAGS)
+            .append('(').append(columnNames).append(") OVERRIDING SYSTEM VALUE SELECT ");
+        if (columnValues.length() == 0) {
             // special case: insert into test select * from
-            buff.append('*');
+            builder.append('*');
         } else {
-            buff.append(columnList);
+            builder.append(columnValues);
         }
-        buff.append(" FROM ");
-        table.getSQL(buff, HasSQL.DEFAULT_SQL_FLAGS);
+        table.getSQL(builder.append(" FROM "), HasSQL.DEFAULT_SQL_FLAGS);
         try {
-            execute(buff.toString());
+            execute(builder.toString());
         } catch (Throwable t) {
             // data was not inserted due to data conversion error or some
             // unexpected reason
-            StringBuilder builder = new StringBuilder("DROP TABLE ");
+            builder = new StringBuilder("DROP TABLE ");
             newTable.getSQL(builder, HasSQL.DEFAULT_SQL_FLAGS);
             execute(builder.toString());
             throw t;
@@ -592,6 +582,17 @@ private Table cloneTableStructure(Table table, Column[] columns, Database db,
         return newTable;
     }
 
+    private static StringBuilder addColumn(Column column, StringBuilder columnNames, StringBuilder columnValues) {
+        if (columnNames.length() > 0) {
+            columnNames.append(", ");
+        }
+        column.getSQL(columnNames, HasSQL.DEFAULT_SQL_FLAGS);
+        if (columnValues.length() > 0) {
+            columnValues.append(", ");
+        }
+        return columnValues;
+    }
+
     /**
      * Check that all views and other dependent objects.
      */
@@ -624,7 +625,7 @@ private void checkViews(SchemaObject sourceTable, SchemaObject newTable) {
     private void checkViewsAreValid(DbObject tableOrView) {
         for (DbObject view : tableOrView.getChildren()) {
             if (view instanceof TableView) {
-                String sql = ((TableView) view).getQuery();
+                String sql = ((TableView) view).getQuerySQL();
                 // check if the query is still valid
                 // do not execute, not even with limit 1, because that could
                 // have side effects or take a very long time
diff --git a/h2/src/main/org/h2/command/ddl/AlterTableDropConstraint.java b/h2/src/main/org/h2/command/ddl/AlterTableDropConstraint.java
index 91def0461e..4c774d645f 100644
--- a/h2/src/main/org/h2/command/ddl/AlterTableDropConstraint.java
+++ b/h2/src/main/org/h2/command/ddl/AlterTableDropConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -29,7 +29,7 @@ public class AlterTableDropConstraint extends AlterTable {
     public AlterTableDropConstraint(SessionLocal session, Schema schema, boolean ifExists) {
         super(session, schema);
         this.ifExists = ifExists;
-        dropAction = session.getDatabase().getSettings().dropRestrict ?
+        dropAction = getDatabase().getSettings().dropRestrict ?
                 ConstraintActionType.RESTRICT : ConstraintActionType.CASCADE;
     }
 
@@ -69,7 +69,7 @@ public long update(Table table) {
                     }
                 }
             }
-            session.getDatabase().removeSchemaObject(session, constraint);
+            getDatabase().removeSchemaObject(session, constraint);
         }
         return 0;
     }
diff --git a/h2/src/main/org/h2/command/ddl/AlterTableRename.java b/h2/src/main/org/h2/command/ddl/AlterTableRename.java
index 9870eda27d..29c54160b5 100644
--- a/h2/src/main/org/h2/command/ddl/AlterTableRename.java
+++ b/h2/src/main/org/h2/command/ddl/AlterTableRename.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -32,7 +32,7 @@ public void setNewTableName(String name) {
 
     @Override
     public long update(Table table) {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         Table t = getSchema().findTableOrView(session, newTableName);
         if (t != null && hidden && newTableName.equals(table.getName())) {
             if (!t.isHidden()) {
diff --git a/h2/src/main/org/h2/command/ddl/AlterTableRenameColumn.java b/h2/src/main/org/h2/command/ddl/AlterTableRenameColumn.java
index 162dbe5c11..84b705851b 100644
--- a/h2/src/main/org/h2/command/ddl/AlterTableRenameColumn.java
+++ b/h2/src/main/org/h2/command/ddl/AlterTableRenameColumn.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -49,7 +49,7 @@ public long update(Table table) {
         table.checkSupportAlter();
         table.renameColumn(column, newName);
         table.setModified();
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         db.updateMeta(session, table);
 
         // if we have foreign key constraints pointing at this table, we need to update them
diff --git a/h2/src/main/org/h2/command/ddl/AlterTableRenameConstraint.java b/h2/src/main/org/h2/command/ddl/AlterTableRenameConstraint.java
index f81c06d172..168048c694 100644
--- a/h2/src/main/org/h2/command/ddl/AlterTableRenameConstraint.java
+++ b/h2/src/main/org/h2/command/ddl/AlterTableRenameConstraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -41,7 +41,7 @@ public void setNewConstraintName(String newName) {
     @Override
     public long update(Table table) {
         Constraint constraint = getSchema().findConstraint(session, constraintName);
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         if (constraint == null || constraint.getConstraintType() == Type.DOMAIN || constraint.getTable() != table) {
             throw DbException.get(ErrorCode.CONSTRAINT_NOT_FOUND_1, constraintName);
         }
diff --git a/h2/src/main/org/h2/command/ddl/AlterUser.java b/h2/src/main/org/h2/command/ddl/AlterUser.java
index cda3d1b388..84fea64958 100644
--- a/h2/src/main/org/h2/command/ddl/AlterUser.java
+++ b/h2/src/main/org/h2/command/ddl/AlterUser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -63,7 +63,7 @@ public void setPassword(Expression password) {
 
     @Override
     public long update() {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         switch (type) {
         case CommandInterface.ALTER_USER_SET_PASSWORD:
             if (user != session.getUser()) {
diff --git a/h2/src/main/org/h2/command/ddl/AlterView.java b/h2/src/main/org/h2/command/ddl/AlterView.java
index f319e044d5..4b6a9bb1c2 100644
--- a/h2/src/main/org/h2/command/ddl/AlterView.java
+++ b/h2/src/main/org/h2/command/ddl/AlterView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/ddl/Analyze.java b/h2/src/main/org/h2/command/ddl/Analyze.java
index 979516a5bd..992f7d17d0 100644
--- a/h2/src/main/org/h2/command/ddl/Analyze.java
+++ b/h2/src/main/org/h2/command/ddl/Analyze.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -137,7 +137,7 @@ private void rehash() {
 
     public Analyze(SessionLocal session) {
         super(session);
-        sampleRows = session.getDatabase().getSettings().analyzeSample;
+        sampleRows = getDatabase().getSettings().analyzeSample;
     }
 
     public void setTable(Table table) {
@@ -147,7 +147,7 @@ public void setTable(Table table) {
     @Override
     public long update() {
         session.getUser().checkAdmin();
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         if (table != null) {
             analyzeTable(session, table, sampleRows, true);
         } else {
@@ -169,7 +169,8 @@ public long update() {
      * @param manual whether the command was called by the user
      */
     public static void analyzeTable(SessionLocal session, Table table, int sample, boolean manual) {
-        if (table.getTableType() != TableType.TABLE //
+        if (!table.isValid()
+                || table.getTableType() != TableType.TABLE //
                 || table.isHidden() //
                 || session == null //
                 || !manual && (session.getDatabase().isSysTableLocked() || table.hasSelectTrigger()) //
@@ -181,7 +182,7 @@ public static void analyzeTable(SessionLocal session, Table table, int sample, b
                 || session.getCancel() != 0) {
             return;
         }
-        table.lock(session, false, false);
+        table.lock(session, Table.READ_LOCK);
         Column[] columns = table.getColumns();
         int columnCount = columns.length;
         if (columnCount == 0) {
diff --git a/h2/src/main/org/h2/command/ddl/CommandWithColumns.java b/h2/src/main/org/h2/command/ddl/CommandWithColumns.java
index 60359de798..4ead12b3fd 100644
--- a/h2/src/main/org/h2/command/ddl/CommandWithColumns.java
+++ b/h2/src/main/org/h2/command/ddl/CommandWithColumns.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -99,9 +99,9 @@ protected ArrayList generateSequences(ArrayList columns, boole
         if (columns != null) {
             for (Column c : columns) {
                 if (c.hasIdentityOptions()) {
-                    int objId = session.getDatabase().allocateObjectId();
+                    int objId = getDatabase().allocateObjectId();
                     c.initializeSequence(session, getSchema(), objId, temporary);
-                    if (!Constants.CLUSTERING_DISABLED.equals(session.getDatabase().getCluster())) {
+                    if (!Constants.CLUSTERING_DISABLED.equals(getDatabase().getCluster())) {
                         throw DbException.getUnsupportedException("CLUSTERING && identity columns");
                     }
                 }
diff --git a/h2/src/main/org/h2/command/ddl/CreateAggregate.java b/h2/src/main/org/h2/command/ddl/CreateAggregate.java
index 9b451ed9a6..10aff44912 100644
--- a/h2/src/main/org/h2/command/ddl/CreateAggregate.java
+++ b/h2/src/main/org/h2/command/ddl/CreateAggregate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -31,7 +31,7 @@ public CreateAggregate(SessionLocal session, Schema schema) {
     @Override
     public long update() {
         session.getUser().checkAdmin();
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         Schema schema = getSchema();
         if (schema.findFunctionOrAggregate(name) != null) {
             if (!ifNotExists) {
diff --git a/h2/src/main/org/h2/command/ddl/CreateConstant.java b/h2/src/main/org/h2/command/ddl/CreateConstant.java
index dff1c1cfdf..1341809bba 100644
--- a/h2/src/main/org/h2/command/ddl/CreateConstant.java
+++ b/h2/src/main/org/h2/command/ddl/CreateConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -35,7 +35,7 @@ public void setIfNotExists(boolean ifNotExists) {
 
     @Override
     long update(Schema schema) {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         if (schema.findConstant(constantName) != null) {
             if (ifNotExists) {
                 return 0;
diff --git a/h2/src/main/org/h2/command/ddl/CreateDomain.java b/h2/src/main/org/h2/command/ddl/CreateDomain.java
index 9c8e8416c0..7e67b4c064 100644
--- a/h2/src/main/org/h2/command/ddl/CreateDomain.java
+++ b/h2/src/main/org/h2/command/ddl/CreateDomain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -82,12 +82,12 @@ long update(Schema schema) {
             throw DbException.get(ErrorCode.DOMAIN_ALREADY_EXISTS_1, typeName);
         }
         if (typeName.indexOf(' ') < 0) {
-            DataType builtIn = DataType.getTypeByName(typeName, session.getDatabase().getMode());
+            DataType builtIn = DataType.getTypeByName(typeName, getDatabase().getMode());
             if (builtIn != null) {
-                if (session.getDatabase().equalsIdentifiers(typeName, Value.getTypeName(builtIn.type))) {
+                if (getDatabase().equalsIdentifiers(typeName, Value.getTypeName(builtIn.type))) {
                     throw DbException.get(ErrorCode.DOMAIN_ALREADY_EXISTS_1, typeName);
                 }
-                Table table = session.getDatabase().getFirstUserTable();
+                Table table = getDatabase().getFirstUserTable();
                 if (table != null) {
                     StringBuilder builder = new StringBuilder(typeName).append(" (");
                     table.getSQL(builder, HasSQL.TRACE_SQL_FLAGS).append(')');
diff --git a/h2/src/main/org/h2/command/ddl/CreateFunctionAlias.java b/h2/src/main/org/h2/command/ddl/CreateFunctionAlias.java
index 49e2fe9a1b..09899625cc 100644
--- a/h2/src/main/org/h2/command/ddl/CreateFunctionAlias.java
+++ b/h2/src/main/org/h2/command/ddl/CreateFunctionAlias.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -34,7 +34,7 @@ public CreateFunctionAlias(SessionLocal session, Schema schema) {
     @Override
     public long update() {
         session.getUser().checkAdmin();
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         Schema schema = getSchema();
         if (schema.findFunctionOrAggregate(aliasName) != null) {
             if (!ifNotExists) {
diff --git a/h2/src/main/org/h2/command/ddl/CreateIndex.java b/h2/src/main/org/h2/command/ddl/CreateIndex.java
index ae9e70c43a..d7802f0743 100644
--- a/h2/src/main/org/h2/command/ddl/CreateIndex.java
+++ b/h2/src/main/org/h2/command/ddl/CreateIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -11,6 +11,7 @@
 import org.h2.engine.Database;
 import org.h2.engine.Right;
 import org.h2.engine.SessionLocal;
+import org.h2.engine.NullsDistinct;
 import org.h2.index.IndexType;
 import org.h2.message.DbException;
 import org.h2.schema.Schema;
@@ -26,6 +27,7 @@ public class CreateIndex extends SchemaCommand {
     private String tableName;
     private String indexName;
     private IndexColumn[] indexColumns;
+    private NullsDistinct nullsDistinct;
     private int uniqueColumnCount;
     private boolean primaryKey, hash, spatial;
     private boolean ifTableExists;
@@ -58,7 +60,7 @@ public void setIndexColumns(IndexColumn[] columns) {
 
     @Override
     public long update() {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         boolean persistent = db.isPersistent();
         Table table = getSchema().findTableOrView(session, tableName);
         if (table == null) {
@@ -74,7 +76,7 @@ public long update() {
             throw DbException.get(ErrorCode.INDEX_ALREADY_EXISTS_1, indexName);
         }
         session.getUser().checkTableRight(table, Right.SCHEMA_OWNER);
-        table.lock(session, true, true);
+        table.lock(session, Table.EXCLUSIVE_LOCK);
         if (!table.isPersistIndexes()) {
             persistent = false;
         }
@@ -95,7 +97,7 @@ public long update() {
             }
             indexType = IndexType.createPrimaryKey(persistent, hash);
         } else if (uniqueColumnCount > 0) {
-            indexType = IndexType.createUnique(persistent, hash);
+            indexType = IndexType.createUnique(persistent, hash, uniqueColumnCount, nullsDistinct);
         } else {
             indexType = IndexType.createNonUnique(persistent, hash, spatial);
         }
@@ -108,7 +110,8 @@ public void setPrimaryKey(boolean b) {
         this.primaryKey = b;
     }
 
-    public void setUniqueColumnCount(int uniqueColumnCount) {
+    public void setUnique(NullsDistinct nullsDistinct, int uniqueColumnCount) {
+        this.nullsDistinct = nullsDistinct;
         this.uniqueColumnCount = uniqueColumnCount;
     }
 
diff --git a/h2/src/main/org/h2/command/ddl/CreateLinkedTable.java b/h2/src/main/org/h2/command/ddl/CreateLinkedTable.java
index e5e226401d..dbfd1e6bd0 100644
--- a/h2/src/main/org/h2/command/ddl/CreateLinkedTable.java
+++ b/h2/src/main/org/h2/command/ddl/CreateLinkedTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -84,7 +84,7 @@ public void setAutoCommit(boolean mode) {
     @Override
     public long update() {
         session.getUser().checkAdmin();
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         if (getSchema().resolveTableOrView(session, tableName) != null) {
             if (ifNotExists) {
                 return 0;
diff --git a/h2/src/main/org/h2/command/ddl/CreateMaterializedView.java b/h2/src/main/org/h2/command/ddl/CreateMaterializedView.java
new file mode 100644
index 0000000000..a49a03d027
--- /dev/null
+++ b/h2/src/main/org/h2/command/ddl/CreateMaterializedView.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (https://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.command.ddl;
+
+import org.h2.api.ErrorCode;
+import org.h2.command.CommandInterface;
+import org.h2.command.query.Query;
+import org.h2.engine.Database;
+import org.h2.engine.SessionLocal;
+import org.h2.message.DbException;
+import org.h2.schema.Schema;
+import org.h2.table.MaterializedView;
+import org.h2.table.Table;
+import org.h2.table.TableType;
+
+/**
+ * This class represents the statement CREATE MATERIALIZED VIEW
+ */
+public class CreateMaterializedView extends SchemaOwnerCommand {
+
+    /** Re-use the CREATE TABLE functionality to avoid duplicating a bunch of logic */
+    private final CreateTable createTable;
+    private boolean orReplace;
+    private boolean ifNotExists;
+    private String viewName;
+    private String comment;
+    private Query select;
+    private String selectSQL;
+
+    public CreateMaterializedView(SessionLocal session, Schema schema) {
+        super(session, schema);
+        createTable = new CreateTable(session, schema);
+    }
+
+    public void setViewName(String name) {
+        this.viewName = name;
+        this.createTable.setTableName(name + "$1");
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public void setSelectSQL(String selectSQL) {
+        this.selectSQL = selectSQL;
+    }
+
+    public void setIfNotExists(boolean ifNotExists) {
+        this.ifNotExists = ifNotExists;
+        this.createTable.setIfNotExists(ifNotExists);
+    }
+
+    public void setSelect(Query query) {
+        this.select = query;
+        this.createTable.setQuery(query);
+    }
+
+    public void setOrReplace(boolean orReplace) {
+        this.orReplace = orReplace;
+    }
+
+    @Override
+    long update(Schema schema) {
+        final Database db = getDatabase();
+        final Table old = schema.findTableOrView(session, viewName);
+        MaterializedView view = null;
+        if (old != null) {
+            if (ifNotExists) {
+                return 0;
+            }
+            if (!orReplace || TableType.MATERIALIZED_VIEW != old.getTableType()) {
+                throw DbException.get(ErrorCode.VIEW_ALREADY_EXISTS_1, viewName);
+            }
+            view = (MaterializedView) old;
+        }
+        final int id = getObjectId();
+        // Re-use the CREATE TABLE functionality to avoid duplicating a bunch of logic.
+        createTable.update();
+        // Look up the freshly created table.
+        final Table underlyingTable = schema.getTableOrView(session, viewName + "$1");
+        if (view == null) {
+            view = new MaterializedView(schema, id, viewName, underlyingTable, select, selectSQL);
+        } else {
+            view.replace(underlyingTable, select, selectSQL);
+            view.setModified();
+        }
+        if (comment != null) {
+            view.setComment(comment);
+        }
+        for (Table table : select.getTables()) {
+            table.addDependentMaterializedView(view);
+        }
+        if (old == null) {
+            db.addSchemaObject(session, view);
+            db.unlockMeta(session);
+        } else {
+            db.updateMeta(session, view);
+        }
+        return 0;
+    }
+
+    @Override
+    public int getType() {
+        return CommandInterface.CREATE_MATERIALIZED_VIEW;
+    }
+
+}
diff --git a/h2/src/main/org/h2/command/ddl/CreateRole.java b/h2/src/main/org/h2/command/ddl/CreateRole.java
index ebeca311d7..86a1a7c803 100644
--- a/h2/src/main/org/h2/command/ddl/CreateRole.java
+++ b/h2/src/main/org/h2/command/ddl/CreateRole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -37,7 +37,7 @@ public void setRoleName(String name) {
     @Override
     public long update() {
         session.getUser().checkAdmin();
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         RightOwner rightOwner = db.findUserOrRole(roleName);
         if (rightOwner != null) {
             if (rightOwner instanceof Role) {
diff --git a/h2/src/main/org/h2/command/ddl/CreateSchema.java b/h2/src/main/org/h2/command/ddl/CreateSchema.java
index e711a6c792..cd05584034 100644
--- a/h2/src/main/org/h2/command/ddl/CreateSchema.java
+++ b/h2/src/main/org/h2/command/ddl/CreateSchema.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -36,7 +36,7 @@ public void setIfNotExists(boolean ifNotExists) {
     @Override
     public long update() {
         session.getUser().checkSchemaAdmin();
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         RightOwner owner = db.findUserOrRole(authorization);
         if (owner == null) {
             throw DbException.get(ErrorCode.USER_OR_ROLE_NOT_FOUND_1, authorization);
diff --git a/h2/src/main/org/h2/command/ddl/CreateSequence.java b/h2/src/main/org/h2/command/ddl/CreateSequence.java
index 3c51c1efb4..96278cd78f 100644
--- a/h2/src/main/org/h2/command/ddl/CreateSequence.java
+++ b/h2/src/main/org/h2/command/ddl/CreateSequence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -45,7 +45,7 @@ public void setOptions(SequenceOptions options) {
 
     @Override
     long update(Schema schema) {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         if (schema.findSequence(sequenceName) != null) {
             if (ifNotExists) {
                 return 0;
diff --git a/h2/src/main/org/h2/command/ddl/CreateSynonym.java b/h2/src/main/org/h2/command/ddl/CreateSynonym.java
index 546729137d..9a54588471 100644
--- a/h2/src/main/org/h2/command/ddl/CreateSynonym.java
+++ b/h2/src/main/org/h2/command/ddl/CreateSynonym.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -48,7 +48,7 @@ public void setIfNotExists(boolean ifNotExists) {
 
     @Override
     long update(Schema schema) {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         data.session = session;
         db.lockMeta(session);
 
diff --git a/h2/src/main/org/h2/command/ddl/CreateSynonymData.java b/h2/src/main/org/h2/command/ddl/CreateSynonymData.java
index 62abcf7769..cb9753b5e2 100644
--- a/h2/src/main/org/h2/command/ddl/CreateSynonymData.java
+++ b/h2/src/main/org/h2/command/ddl/CreateSynonymData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/ddl/CreateTable.java b/h2/src/main/org/h2/command/ddl/CreateTable.java
index 3a7a680bcf..8000820cae 100644
--- a/h2/src/main/org/h2/command/ddl/CreateTable.java
+++ b/h2/src/main/org/h2/command/ddl/CreateTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -71,10 +71,13 @@ public void setIfNotExists(boolean ifNotExists) {
     public long update() {
         Schema schema = getSchema();
         boolean isSessionTemporary = data.temporary && !data.globalTemporary;
-        if (!isSessionTemporary) {
+        Database db = getDatabase();
+        String tableEngine = data.tableEngine;
+        if (tableEngine != null || db.getSettings().defaultTableEngine != null) {
+            session.getUser().checkAdmin();
+        } else if (!isSessionTemporary) {
             session.getUser().checkSchemaOwner(schema);
         }
-        Database db = session.getDatabase();
         if (!db.isPersistent()) {
             data.persistIndexes = false;
         }
@@ -151,38 +154,7 @@ public long update() {
                 }
             }
             if (asQuery != null && !withNoData) {
-                boolean flushSequences = false;
-                if (!isSessionTemporary) {
-                    db.unlockMeta(session);
-                    for (Column c : table.getColumns()) {
-                        Sequence s = c.getSequence();
-                        if (s != null) {
-                            flushSequences = true;
-                            s.setTemporary(true);
-                        }
-                    }
-                }
-                try {
-                    session.startStatementWithinTransaction(null);
-                    Insert insert = new Insert(session);
-                    insert.setQuery(asQuery);
-                    insert.setTable(table);
-                    insert.setInsertFromSelect(true);
-                    insert.prepare();
-                    insert.update();
-                } finally {
-                    session.endStatement();
-                }
-                if (flushSequences) {
-                    db.lockMeta(session);
-                    for (Column c : table.getColumns()) {
-                        Sequence s = c.getSequence();
-                        if (s != null) {
-                            s.setTemporary(false);
-                            s.flush(session);
-                        }
-                    }
-                }
+                insertAsData(isSessionTemporary, db, table);
             }
         } catch (DbException e) {
             try {
@@ -199,6 +171,47 @@ public long update() {
         return 0;
     }
 
+    /** This is called from REFRESH MATERIALIZED VIEW */
+    void insertAsData(Table table) {
+        insertAsData(false, getDatabase(), table);
+    }
+
+    /** Insert data for the CREATE TABLE .. AS */
+    private void insertAsData(boolean isSessionTemporary, Database db, Table table) {
+        boolean flushSequences = false;
+        if (!isSessionTemporary) {
+            db.unlockMeta(session);
+            for (Column c : table.getColumns()) {
+                Sequence s = c.getSequence();
+                if (s != null) {
+                    flushSequences = true;
+                    s.setTemporary(true);
+                }
+            }
+        }
+        try {
+            session.startStatementWithinTransaction(null);
+            Insert insert = new Insert(session);
+            insert.setQuery(asQuery);
+            insert.setTable(table);
+            insert.setInsertFromSelect(true);
+            insert.prepare();
+            insert.update();
+        } finally {
+            session.endStatement();
+        }
+        if (flushSequences) {
+            db.lockMeta(session);
+            for (Column c : table.getColumns()) {
+                Sequence s = c.getSequence();
+                if (s != null) {
+                    s.setTemporary(false);
+                    s.flush(session);
+                }
+            }
+        }
+    }
+
     private void generateColumnsFromQuery() {
         int columnCount = asQuery.getColumnCount();
         ArrayList expressions = asQuery.getExpressions();
diff --git a/h2/src/main/org/h2/command/ddl/CreateTableData.java b/h2/src/main/org/h2/command/ddl/CreateTableData.java
index df0de1a83e..f8039cc45f 100644
--- a/h2/src/main/org/h2/command/ddl/CreateTableData.java
+++ b/h2/src/main/org/h2/command/ddl/CreateTableData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/ddl/CreateTrigger.java b/h2/src/main/org/h2/command/ddl/CreateTrigger.java
index 8b2d82266b..722235f46d 100644
--- a/h2/src/main/org/h2/command/ddl/CreateTrigger.java
+++ b/h2/src/main/org/h2/command/ddl/CreateTrigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -87,7 +87,7 @@ public void setIfNotExists(boolean ifNotExists) {
     @Override
     public long update() {
         session.getUser().checkAdmin();
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         if (getSchema().findTrigger(triggerName) != null) {
             if (ifNotExists) {
                 return 0;
diff --git a/h2/src/main/org/h2/command/ddl/CreateUser.java b/h2/src/main/org/h2/command/ddl/CreateUser.java
index 6c4b86bd3f..2e782d432a 100644
--- a/h2/src/main/org/h2/command/ddl/CreateUser.java
+++ b/h2/src/main/org/h2/command/ddl/CreateUser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -93,7 +93,7 @@ static void setPassword(User user, SessionLocal session, Expression password) {
     @Override
     public long update() {
         session.getUser().checkAdmin();
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         RightOwner rightOwner = db.findUserOrRole(userName);
         if (rightOwner != null) {
             if (rightOwner instanceof User) {
diff --git a/h2/src/main/org/h2/command/ddl/CreateView.java b/h2/src/main/org/h2/command/ddl/CreateView.java
index 56cb20db4b..9167457670 100644
--- a/h2/src/main/org/h2/command/ddl/CreateView.java
+++ b/h2/src/main/org/h2/command/ddl/CreateView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -79,7 +79,7 @@ public void setTableExpression(boolean isTableExpression) {
 
     @Override
     long update(Schema schema) {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         TableView view = null;
         Table old = schema.findTableOrView(session, viewName);
         if (old != null) {
@@ -121,7 +121,7 @@ long update(Schema schema) {
                         false/*isTemporary*/, db);
             } else {
                 view = new TableView(schema, id, viewName, querySQL, null, columnTemplatesAsUnknowns, session,
-                        false/* allow recursive */, false/* literalsChecked */, isTableExpression, false/*temporary*/);
+                        false, false, isTableExpression, false);
             }
         } else {
             // TODO support isTableExpression in replace function...
diff --git a/h2/src/main/org/h2/command/ddl/DeallocateProcedure.java b/h2/src/main/org/h2/command/ddl/DeallocateProcedure.java
index 51d4f7f1a9..aeceb21719 100644
--- a/h2/src/main/org/h2/command/ddl/DeallocateProcedure.java
+++ b/h2/src/main/org/h2/command/ddl/DeallocateProcedure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/ddl/DefineCommand.java b/h2/src/main/org/h2/command/ddl/DefineCommand.java
index a165f3b599..296d3f7545 100644
--- a/h2/src/main/org/h2/command/ddl/DefineCommand.java
+++ b/h2/src/main/org/h2/command/ddl/DefineCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -49,4 +49,9 @@ public boolean isTransactional() {
         return transactional;
     }
 
+    @Override
+    public boolean isRetryable() {
+        return false;
+    }
+
 }
diff --git a/h2/src/main/org/h2/command/ddl/DropAggregate.java b/h2/src/main/org/h2/command/ddl/DropAggregate.java
index 6b2225cb64..0ea9665150 100644
--- a/h2/src/main/org/h2/command/ddl/DropAggregate.java
+++ b/h2/src/main/org/h2/command/ddl/DropAggregate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -28,7 +28,7 @@ public DropAggregate(SessionLocal session, Schema schema) {
 
     @Override
     long update(Schema schema) {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         UserAggregate aggregate = schema.findAggregate(name);
         if (aggregate == null) {
             if (!ifExists) {
diff --git a/h2/src/main/org/h2/command/ddl/DropConstant.java b/h2/src/main/org/h2/command/ddl/DropConstant.java
index a6a12024b0..357b796cf2 100644
--- a/h2/src/main/org/h2/command/ddl/DropConstant.java
+++ b/h2/src/main/org/h2/command/ddl/DropConstant.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -36,7 +36,7 @@ public void setConstantName(String constantName) {
 
     @Override
     long update(Schema schema) {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         Constant constant = schema.findConstant(constantName);
         if (constant == null) {
             if (!ifExists) {
diff --git a/h2/src/main/org/h2/command/ddl/DropDatabase.java b/h2/src/main/org/h2/command/ddl/DropDatabase.java
index 8c2b0ac13a..8321ac6631 100644
--- a/h2/src/main/org/h2/command/ddl/DropDatabase.java
+++ b/h2/src/main/org/h2/command/ddl/DropDatabase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -42,7 +42,7 @@ public long update() {
             dropAllObjects();
         }
         if (deleteFiles) {
-            session.getDatabase().setDeleteFilesOnDisconnect(true);
+            getDatabase().setDeleteFilesOnDisconnect(true);
         }
         return 0;
     }
@@ -50,7 +50,7 @@ public long update() {
     private void dropAllObjects() {
         User user = session.getUser();
         user.checkAdmin();
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         db.lockMeta(session);
 
         // There can be dependencies between tables e.g. using computed columns,
diff --git a/h2/src/main/org/h2/command/ddl/DropDomain.java b/h2/src/main/org/h2/command/ddl/DropDomain.java
index 1e4e9505d0..859315e6ff 100644
--- a/h2/src/main/org/h2/command/ddl/DropDomain.java
+++ b/h2/src/main/org/h2/command/ddl/DropDomain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -29,7 +29,7 @@ public class DropDomain extends AlterDomain {
 
     public DropDomain(SessionLocal session, Schema schema) {
         super(session, schema);
-        dropAction = session.getDatabase().getSettings().dropRestrict ? ConstraintActionType.RESTRICT
+        dropAction = getDatabase().getSettings().dropRestrict ? ConstraintActionType.RESTRICT
                 : ConstraintActionType.CASCADE;
     }
 
@@ -40,7 +40,7 @@ public void setDropAction(ConstraintActionType dropAction) {
     @Override
     long update(Schema schema, Domain domain) {
         forAllDependencies(session, domain, this::copyColumn, this::copyDomain, true);
-        session.getDatabase().removeSchemaObject(session, domain);
+        getDatabase().removeSchemaObject(session, domain);
         return 0;
     }
 
diff --git a/h2/src/main/org/h2/command/ddl/DropFunctionAlias.java b/h2/src/main/org/h2/command/ddl/DropFunctionAlias.java
index d6d56dffc9..8d3b05ff22 100644
--- a/h2/src/main/org/h2/command/ddl/DropFunctionAlias.java
+++ b/h2/src/main/org/h2/command/ddl/DropFunctionAlias.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -28,7 +28,7 @@ public DropFunctionAlias(SessionLocal session, Schema schema) {
 
     @Override
     long update(Schema schema) {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         FunctionAlias functionAlias = schema.findFunction(aliasName);
         if (functionAlias == null) {
             if (!ifExists) {
diff --git a/h2/src/main/org/h2/command/ddl/DropIndex.java b/h2/src/main/org/h2/command/ddl/DropIndex.java
index 8ca9175698..5fbc7088f6 100644
--- a/h2/src/main/org/h2/command/ddl/DropIndex.java
+++ b/h2/src/main/org/h2/command/ddl/DropIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -41,7 +41,7 @@ public void setIndexName(String indexName) {
 
     @Override
     public long update() {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         Index index = getSchema().findIndex(session, indexName);
         if (index == null) {
             if (!ifExists) {
diff --git a/h2/src/main/org/h2/command/ddl/DropMaterializedView.java b/h2/src/main/org/h2/command/ddl/DropMaterializedView.java
new file mode 100644
index 0000000000..759eeadf09
--- /dev/null
+++ b/h2/src/main/org/h2/command/ddl/DropMaterializedView.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (https://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.command.ddl;
+
+import org.h2.api.ErrorCode;
+import org.h2.command.CommandInterface;
+import org.h2.engine.Database;
+import org.h2.engine.SessionLocal;
+import org.h2.message.DbException;
+import org.h2.schema.Schema;
+import org.h2.table.MaterializedView;
+import org.h2.table.Table;
+import org.h2.table.TableType;
+
+/**
+ * This class represents the statement DROP MATERIALIZED VIEW
+ */
+public class DropMaterializedView extends SchemaCommand {
+
+    private String viewName;
+    private boolean ifExists;
+
+    public DropMaterializedView(SessionLocal session, Schema schema) {
+        super(session, schema);
+    }
+
+    public void setIfExists(boolean b) {
+        ifExists = b;
+    }
+
+    public void setViewName(String viewName) {
+        this.viewName = viewName;
+    }
+
+    @Override
+    public long update() {
+        Table view = getSchema().findTableOrView(session, viewName);
+        if (view == null) {
+            if (!ifExists) {
+                throw DbException.get(ErrorCode.VIEW_NOT_FOUND_1, viewName);
+            }
+        } else {
+            if (TableType.MATERIALIZED_VIEW != view.getTableType()) {
+                throw DbException.get(ErrorCode.VIEW_NOT_FOUND_1, viewName);
+            }
+            session.getUser().checkSchemaOwner(view.getSchema());
+
+            final MaterializedView materializedView = (MaterializedView) view;
+
+            for (Table table : materializedView.getSelect().getTables()) {
+                table.removeDependentMaterializedView(materializedView);
+            }
+
+            final Database database = getDatabase();
+            database.lockMeta(session);
+            database.removeSchemaObject(session, view);
+
+            // make sure its all unlocked
+            database.unlockMeta(session);
+        }
+        return 0;
+    }
+
+    @Override
+    public int getType() {
+        return CommandInterface.DROP_MATERIALIZED_VIEW;
+    }
+
+}
diff --git a/h2/src/main/org/h2/command/ddl/DropRole.java b/h2/src/main/org/h2/command/ddl/DropRole.java
index 0dc49b12c8..debcc286c4 100644
--- a/h2/src/main/org/h2/command/ddl/DropRole.java
+++ b/h2/src/main/org/h2/command/ddl/DropRole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -32,7 +32,7 @@ public void setRoleName(String roleName) {
     @Override
     public long update() {
         session.getUser().checkAdmin();
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         Role role = db.findRole(roleName);
         if (role == null) {
             if (!ifExists) {
diff --git a/h2/src/main/org/h2/command/ddl/DropSchema.java b/h2/src/main/org/h2/command/ddl/DropSchema.java
index eda135b4b5..0f456bde29 100644
--- a/h2/src/main/org/h2/command/ddl/DropSchema.java
+++ b/h2/src/main/org/h2/command/ddl/DropSchema.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -27,7 +27,7 @@ public class DropSchema extends DefineCommand {
 
     public DropSchema(SessionLocal session) {
         super(session);
-        dropAction = session.getDatabase().getSettings().dropRestrict ?
+        dropAction = getDatabase().getSettings().dropRestrict ?
                 ConstraintActionType.RESTRICT : ConstraintActionType.CASCADE;
     }
 
@@ -37,7 +37,7 @@ public void setSchemaName(String name) {
 
     @Override
     public long update() {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         Schema schema = db.findSchema(schemaName);
         if (schema == null) {
             if (!ifExists) {
diff --git a/h2/src/main/org/h2/command/ddl/DropSequence.java b/h2/src/main/org/h2/command/ddl/DropSequence.java
index 60a1b03da2..73b825c0bb 100644
--- a/h2/src/main/org/h2/command/ddl/DropSequence.java
+++ b/h2/src/main/org/h2/command/ddl/DropSequence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -44,7 +44,7 @@ long update(Schema schema) {
             if (sequence.getBelongsToTable()) {
                 throw DbException.get(ErrorCode.SEQUENCE_BELONGS_TO_A_TABLE_1, sequenceName);
             }
-            session.getDatabase().removeSchemaObject(session, sequence);
+            getDatabase().removeSchemaObject(session, sequence);
         }
         return 0;
     }
diff --git a/h2/src/main/org/h2/command/ddl/DropSynonym.java b/h2/src/main/org/h2/command/ddl/DropSynonym.java
index d24c5d5982..06195b1467 100644
--- a/h2/src/main/org/h2/command/ddl/DropSynonym.java
+++ b/h2/src/main/org/h2/command/ddl/DropSynonym.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -37,7 +37,7 @@ long update(Schema schema) {
                 throw DbException.get(ErrorCode.TABLE_OR_VIEW_NOT_FOUND_1, synonymName);
             }
         } else {
-            session.getDatabase().removeSchemaObject(session, synonym);
+            getDatabase().removeSchemaObject(session, synonym);
         }
         return 0;
     }
diff --git a/h2/src/main/org/h2/command/ddl/DropTable.java b/h2/src/main/org/h2/command/ddl/DropTable.java
index 884fbaf185..2baf172548 100644
--- a/h2/src/main/org/h2/command/ddl/DropTable.java
+++ b/h2/src/main/org/h2/command/ddl/DropTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -9,6 +9,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
+
 import org.h2.api.ErrorCode;
 import org.h2.command.CommandInterface;
 import org.h2.constraint.Constraint;
@@ -18,9 +19,9 @@
 import org.h2.engine.SessionLocal;
 import org.h2.message.DbException;
 import org.h2.schema.Schema;
+import org.h2.table.MaterializedView;
 import org.h2.table.Table;
 import org.h2.table.TableView;
-import org.h2.util.StringUtils;
 import org.h2.util.Utils;
 
 /**
@@ -36,7 +37,7 @@ public class DropTable extends DefineCommand {
 
     public DropTable(SessionLocal session) {
         super(session);
-        dropAction = session.getDatabase().getSettings().dropRestrict ?
+        dropAction = getDatabase().getSettings().dropRestrict ?
                 ConstraintActionType.RESTRICT :
                     ConstraintActionType.CASCADE;
     }
@@ -86,6 +87,15 @@ private boolean prepareDrop() {
                         }
                     }
                 }
+                CopyOnWriteArrayList dependentMaterializedViews = table
+                        .getDependentMaterializedViews();
+                if (dependentMaterializedViews != null && !dependentMaterializedViews.isEmpty()) {
+                    for (MaterializedView v : dependentMaterializedViews) {
+                        if (!tablesToDrop.contains(v)) {
+                            dependencies.add(v.getName());
+                        }
+                    }
+                }
                 final List constraints = table.getConstraints();
                 if (constraints != null && !constraints.isEmpty()) {
                     for (Constraint c : constraints) {
@@ -96,10 +106,10 @@ private boolean prepareDrop() {
                 }
                 if (!dependencies.isEmpty()) {
                     throw DbException.get(ErrorCode.CANNOT_DROP_2, table.getName(),
-                            StringUtils.join(new StringBuilder(), dependencies, ", ").toString());
+                            String.join(", ", new HashSet<>(dependencies)));
                 }
             }
-            table.lock(session, true, true);
+            table.lock(session, Table.EXCLUSIVE_LOCK);
         }
         return true;
     }
@@ -111,7 +121,7 @@ private void executeDrop() {
             Table table = schemaAndTable.schema.findTableOrView(session, schemaAndTable.tableName);
             if (table != null) {
                 table.setModified();
-                Database db = session.getDatabase();
+                Database db = getDatabase();
                 db.lockMeta(session);
                 db.removeSchemaObject(session, table);
             }
diff --git a/h2/src/main/org/h2/command/ddl/DropTrigger.java b/h2/src/main/org/h2/command/ddl/DropTrigger.java
index e6503c67ff..e611834f4c 100644
--- a/h2/src/main/org/h2/command/ddl/DropTrigger.java
+++ b/h2/src/main/org/h2/command/ddl/DropTrigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -38,7 +38,7 @@ public void setTriggerName(String triggerName) {
 
     @Override
     public long update() {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         TriggerObject trigger = getSchema().findTrigger(triggerName);
         if (trigger == null) {
             if (!ifExists) {
diff --git a/h2/src/main/org/h2/command/ddl/DropUser.java b/h2/src/main/org/h2/command/ddl/DropUser.java
index 1c3659690d..950283e856 100644
--- a/h2/src/main/org/h2/command/ddl/DropUser.java
+++ b/h2/src/main/org/h2/command/ddl/DropUser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -37,7 +37,7 @@ public void setUserName(String userName) {
     @Override
     public long update() {
         session.getUser().checkAdmin();
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         User user = db.findUser(userName);
         if (user == null) {
             if (!ifExists) {
diff --git a/h2/src/main/org/h2/command/ddl/DropView.java b/h2/src/main/org/h2/command/ddl/DropView.java
index 9713649770..65c40afd08 100644
--- a/h2/src/main/org/h2/command/ddl/DropView.java
+++ b/h2/src/main/org/h2/command/ddl/DropView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -9,6 +9,7 @@
 import org.h2.api.ErrorCode;
 import org.h2.command.CommandInterface;
 import org.h2.constraint.ConstraintActionType;
+import org.h2.engine.Database;
 import org.h2.engine.DbObject;
 import org.h2.engine.SessionLocal;
 import org.h2.message.DbException;
@@ -29,7 +30,7 @@ public class DropView extends SchemaCommand {
 
     public DropView(SessionLocal session, Schema schema) {
         super(session, schema);
-        dropAction = session.getDatabase().getSettings().dropRestrict ?
+        dropAction = getDatabase().getSettings().dropRestrict ?
                 ConstraintActionType.RESTRICT :
                 ConstraintActionType.CASCADE;
     }
@@ -73,20 +74,21 @@ public long update() {
             TableView tableView = (TableView) view;
             ArrayList copyOfDependencies = new ArrayList<>(tableView.getTables());
 
-            view.lock(session, true, true);
-            session.getDatabase().removeSchemaObject(session, view);
+            view.lock(session, Table.EXCLUSIVE_LOCK);
+            Database database = getDatabase();
+            database.removeSchemaObject(session, view);
 
             // remove dependent table expressions
             for (Table childTable: copyOfDependencies) {
                 if (TableType.VIEW == childTable.getTableType()) {
                     TableView childTableView = (TableView) childTable;
                     if (childTableView.isTableExpression() && childTableView.getName() != null) {
-                        session.getDatabase().removeSchemaObject(session, childTableView);
+                        database.removeSchemaObject(session, childTableView);
                     }
                 }
             }
             // make sure its all unlocked
-            session.getDatabase().unlockMeta(session);
+            database.unlockMeta(session);
         }
         return 0;
     }
diff --git a/h2/src/main/org/h2/command/ddl/GrantRevoke.java b/h2/src/main/org/h2/command/ddl/GrantRevoke.java
index 936eceff1d..550e47b622 100644
--- a/h2/src/main/org/h2/command/ddl/GrantRevoke.java
+++ b/h2/src/main/org/h2/command/ddl/GrantRevoke.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -67,7 +67,7 @@ public void addRoleName(String roleName) {
     }
 
     public void setGranteeName(String granteeName) {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         grantee = db.findUserOrRole(granteeName);
         if (grantee == null) {
             throw DbException.get(ErrorCode.USER_OR_ROLE_NOT_FOUND_1, granteeName);
@@ -76,7 +76,7 @@ public void setGranteeName(String granteeName) {
 
     @Override
     public long update() {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         User user = session.getUser();
         if (roleNames != null) {
             user.checkAdmin();
@@ -125,12 +125,12 @@ private void grantRight() {
     }
 
     private void grantRight(DbObject object) {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         Right right = grantee.getRightForObject(object);
         if (right == null) {
             int id = getPersistedObjectId();
             if (id == 0) {
-                id = session.getDatabase().allocateObjectId();
+                id = getDatabase().allocateObjectId();
             }
             right = new Right(db, id, grantee, rightMask, object);
             grantee.grantRight(object, right);
@@ -152,7 +152,7 @@ private void grantRole(Role grantedRole) {
                 throw DbException.get(ErrorCode.ROLE_ALREADY_GRANTED_1, grantedRole.getTraceSQL());
             }
         }
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         int id = getObjectId();
         Right right = new Right(db, id, grantee, grantedRole);
         db.addDatabaseObject(session, right);
@@ -175,7 +175,7 @@ private void revokeRight(DbObject object) {
         }
         int mask = right.getRightMask();
         int newRight = mask & ~rightMask;
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         if (newRight == 0) {
             db.removeDatabaseObject(session, right);
         } else {
@@ -190,7 +190,7 @@ private void revokeRole(Role grantedRole) {
         if (right == null) {
             return;
         }
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         db.removeDatabaseObject(session, right);
     }
 
diff --git a/h2/src/main/org/h2/command/ddl/PrepareProcedure.java b/h2/src/main/org/h2/command/ddl/PrepareProcedure.java
index fe51ee7fa4..a1116f3bf8 100644
--- a/h2/src/main/org/h2/command/ddl/PrepareProcedure.java
+++ b/h2/src/main/org/h2/command/ddl/PrepareProcedure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/ddl/RefreshMaterializedView.java b/h2/src/main/org/h2/command/ddl/RefreshMaterializedView.java
new file mode 100644
index 0000000000..e3ef399142
--- /dev/null
+++ b/h2/src/main/org/h2/command/ddl/RefreshMaterializedView.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (https://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.command.ddl;
+
+import org.h2.command.CommandInterface;
+import org.h2.engine.SessionLocal;
+import org.h2.schema.Schema;
+import org.h2.table.MaterializedView;
+
+/**
+ * This class represents the statement REFRESH MATERIALIZED VIEW
+ */
+public class RefreshMaterializedView extends SchemaOwnerCommand {
+
+    private MaterializedView view;
+
+    public RefreshMaterializedView(SessionLocal session, Schema schema) {
+        super(session, schema);
+    }
+
+    public void setView(MaterializedView view) {
+        this.view = view;
+    }
+
+    @Override
+    long update(Schema schema) {
+        // Re-use logic from the existing code for TRUNCATE and CREATE TABLE
+
+        TruncateTable truncate = new TruncateTable(session);
+        truncate.setTable(view.getUnderlyingTable());
+        truncate.update();
+
+        CreateTable createTable = new CreateTable(session, schema);
+        createTable.setQuery(view.getSelect());
+        createTable.insertAsData(view.getUnderlyingTable());
+        view.setModified();
+        return 0;
+    }
+
+    @Override
+    public int getType() {
+        return CommandInterface.REFRESH_MATERIALIZED_VIEW;
+    }
+
+}
diff --git a/h2/src/main/org/h2/command/ddl/SchemaCommand.java b/h2/src/main/org/h2/command/ddl/SchemaCommand.java
index abbbb4a711..fbd837cbee 100644
--- a/h2/src/main/org/h2/command/ddl/SchemaCommand.java
+++ b/h2/src/main/org/h2/command/ddl/SchemaCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/ddl/SchemaOwnerCommand.java b/h2/src/main/org/h2/command/ddl/SchemaOwnerCommand.java
index 2e11c25178..8076aaeb34 100644
--- a/h2/src/main/org/h2/command/ddl/SchemaOwnerCommand.java
+++ b/h2/src/main/org/h2/command/ddl/SchemaOwnerCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/ddl/SequenceOptions.java b/h2/src/main/org/h2/command/ddl/SequenceOptions.java
index 22abc7d343..51051ac667 100644
--- a/h2/src/main/org/h2/command/ddl/SequenceOptions.java
+++ b/h2/src/main/org/h2/command/ddl/SequenceOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -280,6 +280,9 @@ public static long[] getBounds(TypeInfo dataType) {
             max = 0x20_0000_0000_0000L;
             break;
         case Value.NUMERIC: {
+            if (dataType.getScale() != 0) {
+                throw DbException.getUnsupportedException(dataType.getTraceSQL());
+            }
             long p = (dataType.getPrecision() - dataType.getScale());
             if (p <= 0) {
                 throw DbException.getUnsupportedException(dataType.getTraceSQL());
diff --git a/h2/src/main/org/h2/command/ddl/SetComment.java b/h2/src/main/org/h2/command/ddl/SetComment.java
index fbb881b37c..5aea93f957 100644
--- a/h2/src/main/org/h2/command/ddl/SetComment.java
+++ b/h2/src/main/org/h2/command/ddl/SetComment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -35,7 +35,7 @@ public SetComment(SessionLocal session) {
 
     @Override
     public long update() {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         DbObject object = null;
         int errorCode = ErrorCode.GENERAL_ERROR_1;
         if (schemaName == null) {
diff --git a/h2/src/main/org/h2/command/ddl/TruncateTable.java b/h2/src/main/org/h2/command/ddl/TruncateTable.java
index 3e365066c6..fb5837fcbf 100644
--- a/h2/src/main/org/h2/command/ddl/TruncateTable.java
+++ b/h2/src/main/org/h2/command/ddl/TruncateTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -42,14 +42,14 @@ public long update() {
             throw DbException.get(ErrorCode.CANNOT_TRUNCATE_1, table.getTraceSQL());
         }
         session.getUser().checkTableRight(table, Right.DELETE);
-        table.lock(session, true, true);
+        table.lock(session, Table.EXCLUSIVE_LOCK);
         long result = table.truncate(session);
         if (restart) {
             for (Column column : table.getColumns()) {
                 Sequence sequence = column.getSequence();
                 if (sequence != null) {
                     sequence.modify(sequence.getStartValue(), null, null, null, null, null, null);
-                    session.getDatabase().updateMeta(session, sequence);
+                    getDatabase().updateMeta(session, sequence);
                 }
             }
         }
diff --git a/h2/src/main/org/h2/command/ddl/package.html b/h2/src/main/org/h2/command/ddl/package.html
index d503173c8f..7d1c820806 100644
--- a/h2/src/main/org/h2/command/ddl/package.html
+++ b/h2/src/main/org/h2/command/ddl/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/main/org/h2/command/dml/AlterTableSet.java b/h2/src/main/org/h2/command/dml/AlterTableSet.java
index 8b80db0c32..525a3fa18b 100644
--- a/h2/src/main/org/h2/command/dml/AlterTableSet.java
+++ b/h2/src/main/org/h2/command/dml/AlterTableSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -60,7 +60,7 @@ public long update() {
             throw DbException.get(ErrorCode.TABLE_OR_VIEW_NOT_FOUND_1, tableName);
         }
         session.getUser().checkTableRight(table, Right.SCHEMA_OWNER);
-        table.lock(session, true, true);
+        table.lock(session, Table.EXCLUSIVE_LOCK);
         switch (type) {
         case CommandInterface.ALTER_TABLE_SET_REFERENTIAL_INTEGRITY:
             table.setCheckForeignKeyConstraints(session, value, value ?
diff --git a/h2/src/main/org/h2/command/dml/BackupCommand.java b/h2/src/main/org/h2/command/dml/BackupCommand.java
index a608121b4e..1bc7a3528d 100644
--- a/h2/src/main/org/h2/command/dml/BackupCommand.java
+++ b/h2/src/main/org/h2/command/dml/BackupCommand.java
@@ -1,15 +1,13 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
 package org.h2.command.dml;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
-import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 import org.h2.api.ErrorCode;
 import org.h2.command.CommandInterface;
@@ -19,12 +17,10 @@
 import org.h2.engine.SessionLocal;
 import org.h2.expression.Expression;
 import org.h2.message.DbException;
-import org.h2.mvstore.MVStore;
 import org.h2.mvstore.db.Store;
 import org.h2.result.ResultInterface;
 import org.h2.store.FileLister;
 import org.h2.store.fs.FileUtils;
-import org.h2.util.IOUtils;
 
 /**
  * This class represents the statement
@@ -51,7 +47,7 @@ public long update() {
     }
 
     private void backupTo(String fileName) {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         if (!db.isPersistent()) {
             throw DbException.get(ErrorCode.DATABASE_IS_NOT_PERSISTENT);
         }
@@ -65,7 +61,6 @@ private void backupTo(String fileName) {
                 db.flush();
                 // synchronize on the database, to avoid concurrent temp file
                 // creation / deletion / backup
-                String base = FileUtils.getParent(db.getName());
                 synchronized (db.getLobSyncObject()) {
                     String prefix = db.getDatabasePath();
                     String dir = FileUtils.getParent(prefix);
@@ -73,15 +68,7 @@ private void backupTo(String fileName) {
                     ArrayList fileList = FileLister.getDatabaseFiles(dir, name, true);
                     for (String n : fileList) {
                         if (n.endsWith(Constants.SUFFIX_MV_FILE)) {
-                            MVStore s = store.getMvStore();
-                            boolean before = s.getReuseSpace();
-                            s.setReuseSpace(false);
-                            try {
-                                InputStream in = store.getInputStream();
-                                backupFile(out, base, n, in);
-                            } finally {
-                                s.setReuseSpace(before);
-                            }
+                            store.getMvStore().getFileStore().backup(out);
                         }
                     }
                 }
@@ -92,20 +79,6 @@ private void backupTo(String fileName) {
         }
     }
 
-    private static void backupFile(ZipOutputStream out, String base, String fn,
-            InputStream in) throws IOException {
-        String f = FileUtils.toRealPath(fn);
-        base = FileUtils.toRealPath(base);
-        if (!f.startsWith(base)) {
-            throw DbException.getInternalError(f + " does not start with " + base);
-        }
-        f = f.substring(base.length());
-        f = correctFileName(f);
-        out.putNextEntry(new ZipEntry(f));
-        IOUtils.copyAndCloseInput(in, out);
-        out.closeEntry();
-    }
-
     @Override
     public boolean isTransactional() {
         return true;
diff --git a/h2/src/main/org/h2/command/dml/Call.java b/h2/src/main/org/h2/command/dml/Call.java
index 18eef35fdc..7f07cad61b 100644
--- a/h2/src/main/org/h2/command/dml/Call.java
+++ b/h2/src/main/org/h2/command/dml/Call.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -83,7 +83,7 @@ public void prepare() {
             for (int i = 0; i < columnCount; i++) {
                 String name = result.getColumnName(i);
                 String alias = result.getAlias(i);
-                Expression e = new ExpressionColumn(session.getDatabase(), new Column(name, result.getColumnType(i)));
+                Expression e = new ExpressionColumn(getDatabase(), new Column(name, result.getColumnType(i)));
                 if (!alias.equals(name)) {
                     e = new Alias(e, alias, false);
                 }
diff --git a/h2/src/main/org/h2/command/dml/CommandWithValues.java b/h2/src/main/org/h2/command/dml/CommandWithValues.java
index 7985eaab97..f034e4cbbf 100644
--- a/h2/src/main/org/h2/command/dml/CommandWithValues.java
+++ b/h2/src/main/org/h2/command/dml/CommandWithValues.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/dml/DataChangeStatement.java b/h2/src/main/org/h2/command/dml/DataChangeStatement.java
index a51e96ccd0..c03d37e802 100644
--- a/h2/src/main/org/h2/command/dml/DataChangeStatement.java
+++ b/h2/src/main/org/h2/command/dml/DataChangeStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -17,6 +17,8 @@
  */
 public abstract class DataChangeStatement extends Prepared {
 
+    private boolean isPrepared;
+
     /**
      * Creates new instance of DataChangeStatement.
      *
@@ -27,6 +29,17 @@ protected DataChangeStatement(SessionLocal session) {
         super(session);
     }
 
+    @Override
+    public final void prepare() {
+        if (isPrepared) {
+            return;
+        }
+        doPrepare();
+        isPrepared = true;
+    }
+
+    abstract void doPrepare();
+
     /**
      * Return the name of this statement.
      *
diff --git a/h2/src/main/org/h2/command/dml/Delete.java b/h2/src/main/org/h2/command/dml/Delete.java
index fb40248f92..6e6e685a12 100644
--- a/h2/src/main/org/h2/command/dml/Delete.java
+++ b/h2/src/main/org/h2/command/dml/Delete.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -44,7 +44,7 @@ public long update(ResultTarget deltaChangeCollector, ResultOption deltaChangeCo
         Table table = targetTableFilter.getTable();
         session.getUser().checkTableRight(table, Right.DELETE);
         table.fire(session, Trigger.DELETE, true);
-        table.lock(session, true, false);
+        table.lock(session, Table.WRITE_LOCK);
         long limitRows = -1;
         if (fetchExpr != null) {
             Value v = fetchExpr.getValue(session);
@@ -58,7 +58,7 @@ public long update(ResultTarget deltaChangeCollector, ResultOption deltaChangeCo
             while (nextRow(limitRows, count)) {
                 Row row = targetTableFilter.get();
                 if (table.isRowLockable()) {
-                    Row lockedRow = table.lockRow(session, row);
+                    Row lockedRow = table.lockRow(session, row, -1);
                     if (lockedRow == null) {
                         continue;
                     }
@@ -106,7 +106,7 @@ public String getPlanSQL(int sqlFlags) {
     }
 
     @Override
-    public void prepare() {
+    void doPrepare() {
         if (condition != null) {
             condition.mapColumns(targetTableFilter, 0, Expression.MAP_INITIAL);
             condition = condition.optimizeCondition(session);
@@ -137,4 +137,5 @@ public void collectDependencies(HashSet dependencies) {
             condition.isEverything(visitor);
         }
     }
+
 }
diff --git a/h2/src/main/org/h2/command/dml/ExecuteImmediate.java b/h2/src/main/org/h2/command/dml/ExecuteImmediate.java
index c56d39cd99..8ebc739f6b 100644
--- a/h2/src/main/org/h2/command/dml/ExecuteImmediate.java
+++ b/h2/src/main/org/h2/command/dml/ExecuteImmediate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/dml/ExecuteProcedure.java b/h2/src/main/org/h2/command/dml/ExecuteProcedure.java
index 03694e2083..059fbc0fc9 100644
--- a/h2/src/main/org/h2/command/dml/ExecuteProcedure.java
+++ b/h2/src/main/org/h2/command/dml/ExecuteProcedure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/dml/Explain.java b/h2/src/main/org/h2/command/dml/Explain.java
index 0a4a539f8a..c2ca7e4daf 100644
--- a/h2/src/main/org/h2/command/dml/Explain.java
+++ b/h2/src/main/org/h2/command/dml/Explain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -70,7 +70,7 @@ protected void checkParameters() {
 
     @Override
     public ResultInterface query(long maxrows) {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         Expression[] expressions = { new ExpressionColumn(db, new Column("PLAN", TypeInfo.TYPE_VARCHAR)) };
         result = new LocalResult(session, expressions, 1, 1);
         int sqlFlags = HasSQL.ADD_PLAN_INFORMATION;
@@ -94,8 +94,8 @@ public ResultInterface query(long maxrows) {
                 }
                 if (statistics != null) {
                     int total = 0;
-                    for (Entry e : statistics.entrySet()) {
-                        total += e.getValue();
+                    for (Integer value : statistics.values()) {
+                        total += value;
                     }
                     if (total > 0) {
                         statistics = new TreeMap<>(statistics);
@@ -112,7 +112,7 @@ public ResultInterface query(long maxrows) {
                             }
                             buff.append('\n');
                         }
-                        plan += "\n/*\n" + buff.toString() + "*/";
+                        plan += "\n/*\n" + buff + "*/";
                     }
                 }
             } else {
diff --git a/h2/src/main/org/h2/command/dml/FilteredDataChangeStatement.java b/h2/src/main/org/h2/command/dml/FilteredDataChangeStatement.java
index 09ca2e20c5..83280ca1c1 100644
--- a/h2/src/main/org/h2/command/dml/FilteredDataChangeStatement.java
+++ b/h2/src/main/org/h2/command/dml/FilteredDataChangeStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/dml/Help.java b/h2/src/main/org/h2/command/dml/Help.java
index acfc14c4eb..425ec31638 100644
--- a/h2/src/main/org/h2/command/dml/Help.java
+++ b/h2/src/main/org/h2/command/dml/Help.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -9,6 +9,7 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.nio.charset.StandardCharsets;
 import java.sql.ResultSet;
 
 import org.h2.command.CommandInterface;
@@ -38,7 +39,7 @@ public class Help extends Prepared {
     public Help(SessionLocal session, String[] conditions) {
         super(session);
         this.conditions = conditions;
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         expressions = new Expression[] { //
                 new ExpressionColumn(db, new Column("SECTION", TypeInfo.TYPE_VARCHAR)), //
                 new ExpressionColumn(db, new Column("TOPIC", TypeInfo.TYPE_VARCHAR)), //
@@ -127,7 +128,8 @@ public static String processHelpText(String s) {
      *             on I/O exception
      */
     public static ResultSet getTable() throws IOException {
-        Reader reader = new InputStreamReader(new ByteArrayInputStream(Utils.getResource("/org/h2/res/help.csv")));
+        Reader reader = new InputStreamReader(new ByteArrayInputStream(Utils.getResource("/org/h2/res/help.csv")),
+                StandardCharsets.UTF_8);
         Csv csv = new Csv();
         csv.setLineCommentCharacter('#');
         return csv.read(reader, null);
diff --git a/h2/src/main/org/h2/command/dml/Insert.java b/h2/src/main/org/h2/command/dml/Insert.java
index 6ddced53e0..626e658a5d 100644
--- a/h2/src/main/org/h2/command/dml/Insert.java
+++ b/h2/src/main/org/h2/command/dml/Insert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -169,7 +169,7 @@ private long insertRows() {
                     deltaChangeCollector.addRow(newRow.getValueList().clone());
                 }
                 if (!table.fireBeforeRow(session, null, newRow)) {
-                    table.lock(session, true, false);
+                    table.lock(session, Table.WRITE_LOCK);
                     try {
                         table.addRow(session, newRow);
                     } catch (DbException de) {
@@ -192,7 +192,7 @@ private long insertRows() {
                 }
             }
         } else {
-            table.lock(session, true, false);
+            table.lock(session, Table.WRITE_LOCK);
             if (insertFromSelect) {
                 query.query(0, this);
             } else {
@@ -280,7 +280,7 @@ public String getPlanSQL(int sqlFlags) {
     }
 
     @Override
-    public void prepare() {
+    void doPrepare() {
         if (columns == null) {
             if (!valuesExpressionList.isEmpty() && valuesExpressionList.get(0).length == 0) {
                 // special case where table is used as a sequence
@@ -412,7 +412,7 @@ private Expression prepareUpdateCondition(Index foundIndex, Expression[] row) {
 
         Expression condition = null;
         for (Column column : indexedColumns) {
-            ExpressionColumn expr = new ExpressionColumn(session.getDatabase(),
+            ExpressionColumn expr = new ExpressionColumn(getDatabase(),
                     table.getSchema().getName(), table.getName(), column.getName());
             for (int i = 0; i < columns.length; i++) {
                 if (expr.getColumnName(session, i).equals(columns[i].getName())) {
@@ -452,4 +452,5 @@ public void collectDependencies(HashSet dependencies) {
             query.isEverything(visitor);
         }
     }
+
 }
diff --git a/h2/src/main/org/h2/command/dml/Merge.java b/h2/src/main/org/h2/command/dml/Merge.java
index b76b211b67..56eb3bcfba 100644
--- a/h2/src/main/org/h2/command/dml/Merge.java
+++ b/h2/src/main/org/h2/command/dml/Merge.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -113,7 +113,7 @@ public long update(ResultTarget deltaChangeCollector, ResultOption deltaChangeCo
             query.setNeverLazy(true);
             ResultInterface rows = query.query(0);
             table.fire(session, Trigger.UPDATE | Trigger.INSERT, true);
-            table.lock(session, true, false);
+            table.lock(session, Table.WRITE_LOCK);
             while (rows.next()) {
                 Value[] r = rows.currentRow();
                 Row newRow = table.getTemplateRow();
@@ -182,7 +182,7 @@ private int merge(Row row, Expression[] expressions, ResultTarget deltaChangeCol
                     deltaChangeCollector.addRow(row.getValueList().clone());
                 }
                 if (!table.fireBeforeRow(session, null, row)) {
-                    table.lock(session, true, false);
+                    table.lock(session, Table.WRITE_LOCK);
                     table.addRow(session, row);
                     DataChangeDeltaTable.collectInsertedFinalRow(session, table, deltaChangeCollector,
                             deltaChangeCollectionMode, row);
@@ -259,7 +259,7 @@ public String getPlanSQL(int sqlFlags) {
     }
 
     @Override
-    public void prepare() {
+    void doPrepare() {
         if (columns == null) {
             if (!valuesExpressionList.isEmpty() && valuesExpressionList.get(0).length == 0) {
                 // special case where table is used as a sequence
@@ -345,4 +345,5 @@ public void collectDependencies(HashSet dependencies) {
             query.collectDependencies(dependencies);
         }
     }
+
 }
diff --git a/h2/src/main/org/h2/command/dml/MergeUsing.java b/h2/src/main/org/h2/command/dml/MergeUsing.java
index d3b3e8a030..49b93ee8be 100644
--- a/h2/src/main/org/h2/command/dml/MergeUsing.java
+++ b/h2/src/main/org/h2/command/dml/MergeUsing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -79,7 +79,7 @@ public long update(ResultTarget deltaChangeCollector, ResultOption deltaChangeCo
         sourceTableFilter.reset();
         Table table = targetTableFilter.getTable();
         table.fire(session, evaluateTriggerMasks(), true);
-        table.lock(session, true, false);
+        table.lock(session, Table.WRITE_LOCK);
         setCurrentRowNumber(0);
         long count = 0;
         Row previousSource = null, missedSource = null;
@@ -103,7 +103,7 @@ public long update(ResultTarget deltaChangeCollector, ResultOption deltaChangeCo
             if (!nullRow) {
                 Row targetRow = targetTableFilter.get();
                 if (table.isRowLockable()) {
-                    Row lockedRow = table.lockRow(session, targetRow);
+                    Row lockedRow = table.lockRow(session, targetRow, -1);
                     if (lockedRow == null) {
                         if (previousSource != source) {
                             missedSource = source;
@@ -179,8 +179,8 @@ private void checkRights() {
     public String getPlanSQL(int sqlFlags) {
         StringBuilder builder = new StringBuilder("MERGE INTO ");
         targetTableFilter.getPlanSQL(builder, false, sqlFlags);
-        builder.append('\n').append("USING ");
-        sourceTableFilter.getPlanSQL(builder, false, sqlFlags);
+        sourceTableFilter.getPlanSQL(builder.append('\n').append("USING "), false, sqlFlags);
+        onCondition.getSQL(builder.append('\n').append("ON "), sqlFlags);
         for (When w : when) {
             w.getSQL(builder.append('\n'), sqlFlags);
         }
@@ -188,7 +188,7 @@ public String getPlanSQL(int sqlFlags) {
     }
 
     @Override
-    public void prepare() {
+    void doPrepare() {
         onCondition.addFilterConditions(sourceTableFilter);
         onCondition.addFilterConditions(targetTableFilter);
 
diff --git a/h2/src/main/org/h2/command/dml/NoOperation.java b/h2/src/main/org/h2/command/dml/NoOperation.java
index 142bc0b30c..2d05769bb6 100644
--- a/h2/src/main/org/h2/command/dml/NoOperation.java
+++ b/h2/src/main/org/h2/command/dml/NoOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/dml/RunScriptCommand.java b/h2/src/main/org/h2/command/dml/RunScriptCommand.java
index c4c0635ac9..643f44ce91 100644
--- a/h2/src/main/org/h2/command/dml/RunScriptCommand.java
+++ b/h2/src/main/org/h2/command/dml/RunScriptCommand.java
@@ -1,13 +1,11 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
 package org.h2.command.dml;
 
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
@@ -18,6 +16,7 @@
 import org.h2.message.DbException;
 import org.h2.result.ResultInterface;
 import org.h2.util.ScriptReader;
+import org.h2.util.StringUtils;
 
 /**
  * This class represents the statement
@@ -51,8 +50,7 @@ public long update() {
         boolean oldQuirksMode = session.isQuirksMode();
         boolean oldVariableBinary = session.isVariableBinary();
         try {
-            openInput();
-            BufferedReader reader = new BufferedReader(new InputStreamReader(in, charset));
+            openInput(charset);
             // if necessary, strip the BOM from the front of the file
             reader.mark(1);
             if (reader.read() != UTF8_BOM) {
@@ -94,6 +92,17 @@ public long update() {
     private void execute(String sql) {
         if (from1X) {
             sql = sql.trim();
+            if (sql.startsWith("--")) {
+                int i = 2, l = sql.length();
+                char c;
+                do {
+                    if (i >= l) {
+                        return;
+                    }
+                    c = sql.charAt(i++);
+                } while (c != '\n' && c != '\r');
+                sql = StringUtils.trimSubstring(sql, i);
+            }
             if (sql.startsWith("INSERT INTO SYSTEM_LOB_STREAM VALUES(")) {
                 int idx = sql.indexOf(", NULL, '");
                 if (idx >= 0) {
diff --git a/h2/src/main/org/h2/command/dml/ScriptBase.java b/h2/src/main/org/h2/command/dml/ScriptBase.java
index 9af5c86be6..1d9c95fd76 100644
--- a/h2/src/main/org/h2/command/dml/ScriptBase.java
+++ b/h2/src/main/org/h2/command/dml/ScriptBase.java
@@ -1,15 +1,17 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
 package org.h2.command.dml;
 
-import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.nio.charset.Charset;
 import org.h2.api.ErrorCode;
 import org.h2.command.Prepared;
 import org.h2.engine.Constants;
@@ -43,9 +45,9 @@ abstract class ScriptBase extends Prepared {
     protected OutputStream out;
 
     /**
-     * The input stream.
+     * The input reader.
      */
-    protected InputStream in;
+    protected BufferedReader reader;
 
     /**
      * The file name (if set).
@@ -102,12 +104,14 @@ public boolean isTransactional() {
     void deleteStore() {
         String file = getFileName();
         if (file != null) {
-            FileUtils.delete(file);
+            if (FileUtils.isRegularFile(file)) {
+                FileUtils.delete(file);
+            }
         }
     }
 
     private void initStore() {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         byte[] key = null;
         if (cipher != null && password != null) {
             char[] pass = password.optimize(session).
@@ -147,28 +151,30 @@ void openOutput() {
 
     /**
      * Open the input stream.
+     *
+     * @param charset the charset to use
      */
-    void openInput() {
+    void openInput(Charset charset) {
         String file = getFileName();
         if (file == null) {
             return;
         }
+        InputStream in;
         if (isEncrypted()) {
             initStore();
             in = new FileStoreInputStream(store, compressionAlgorithm != null, false);
         } else {
-            InputStream inStream;
             try {
-                inStream = FileUtils.newInputStream(file);
+                in = FileUtils.newInputStream(file);
             } catch (IOException e) {
                 throw DbException.convertIOException(e, file);
             }
-            in = new BufferedInputStream(inStream, Constants.IO_BUFFER_SIZE);
             in = CompressTool.wrapInputStream(in, compressionAlgorithm, SCRIPT_SQL);
             if (in == null) {
                 throw DbException.get(ErrorCode.FILE_NOT_FOUND_1, SCRIPT_SQL + " in " + file);
             }
         }
+        reader = new BufferedReader(new InputStreamReader(in, charset), Constants.IO_BUFFER_SIZE);
     }
 
     /**
@@ -177,8 +183,8 @@ void openInput() {
     void closeIO() {
         IOUtils.closeSilently(out);
         out = null;
-        IOUtils.closeSilently(in);
-        in = null;
+        IOUtils.closeSilently(reader);
+        reader = null;
         if (store != null) {
             store.closeSilently();
             store = null;
diff --git a/h2/src/main/org/h2/command/dml/ScriptCommand.java b/h2/src/main/org/h2/command/dml/ScriptCommand.java
index 13e480dbd6..a4ab0303b6 100644
--- a/h2/src/main/org/h2/command/dml/ScriptCommand.java
+++ b/h2/src/main/org/h2/command/dml/ScriptCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -153,14 +153,14 @@ public ResultInterface queryMeta() {
 
     private LocalResult createResult() {
         return new LocalResult(session, new Expression[] {
-                new ExpressionColumn(session.getDatabase(), new Column("SCRIPT", TypeInfo.TYPE_VARCHAR)) }, 1, 1);
+                new ExpressionColumn(getDatabase(), new Column("SCRIPT", TypeInfo.TYPE_VARCHAR)) }, 1, 1);
     }
 
     @Override
     public ResultInterface query(long maxrows) {
         session.getUser().checkAdmin();
         reset();
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         if (schemaNames != null) {
             for (String schemaName : schemaNames) {
                 Schema schema = db.findSchema(schemaName);
@@ -247,7 +247,7 @@ public ResultInterface query(long maxrows) {
                 if (table.isHidden()) {
                     continue;
                 }
-                table.lock(session, false, false);
+                table.lock(session, Table.READ_LOCK);
                 String sql = table.getCreateSQL();
                 if (sql == null) {
                     // null for metadata tables
@@ -290,7 +290,7 @@ public ResultInterface query(long maxrows) {
                 if (table.isHidden()) {
                     continue;
                 }
-                table.lock(session, false, false);
+                table.lock(session, Table.READ_LOCK);
                 String createTableSql = table.getCreateSQL();
                 if (createTableSql == null) {
                     // null for metadata tables
@@ -573,7 +573,7 @@ private int generateInsertValues(int count, Table table) throws IOException {
 
     private int writeLobStream(Value v) throws IOException {
         if (!tempLobTableCreated) {
-            add("CREATE TABLE IF NOT EXISTS SYSTEM_LOB_STREAM" +
+            add("CREATE CACHED LOCAL TEMPORARY TABLE IF NOT EXISTS SYSTEM_LOB_STREAM" +
                     "(ID INT NOT NULL, PART INT NOT NULL, " +
                     "CDATA VARCHAR, BDATA VARBINARY)",
                     true);
diff --git a/h2/src/main/org/h2/command/dml/Set.java b/h2/src/main/org/h2/command/dml/Set.java
index e7c9df3894..71e05b1780 100644
--- a/h2/src/main/org/h2/command/dml/Set.java
+++ b/h2/src/main/org/h2/command/dml/Set.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -83,7 +83,7 @@ public boolean isTransactional() {
 
     @Override
     public long update() {
-        Database database = session.getDatabase();
+        Database database = getDatabase();
         String name = SetTypes.getTypeName(type);
         switch (type) {
         case SetTypes.ALLOW_LITERALS: {
@@ -479,15 +479,6 @@ public long update() {
             }
             break;
         }
-        case SetTypes.FORCE_JOIN_ORDER: {
-            int value = getIntValue();
-            if (value != 0 && value != 1) {
-                throw DbException.getInvalidValueException("FORCE_JOIN_ORDER",
-                        value);
-            }
-            session.setForceJoinOrder(value == 1);
-            break;
-        }
         case SetTypes.LAZY_QUERY_EXECUTION: {
             int value = getIntValue();
             if (value != 0 && value != 1) {
@@ -581,7 +572,7 @@ private static TimeZoneProvider parseTimeZone(Value v) {
             TimeZoneProvider timeZone;
             try {
                 timeZone = TimeZoneProvider.ofId(v.getString());
-            } catch (IllegalArgumentException ex) {
+            } catch (RuntimeException ex) {
                 throw DbException.getInvalidValueException("TIME ZONE", v.getTraceSQL());
             }
             return timeZone;
diff --git a/h2/src/main/org/h2/command/dml/SetClauseList.java b/h2/src/main/org/h2/command/dml/SetClauseList.java
index c941f5ca83..31c33bd8a4 100644
--- a/h2/src/main/org/h2/command/dml/SetClauseList.java
+++ b/h2/src/main/org/h2/command/dml/SetClauseList.java
@@ -1,13 +1,15 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
 package org.h2.command.dml;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import org.h2.api.ErrorCode;
+import org.h2.engine.Constants;
 import org.h2.engine.SessionLocal;
 import org.h2.expression.Expression;
 import org.h2.expression.ExpressionList;
@@ -24,6 +26,7 @@
 import org.h2.table.Table;
 import org.h2.util.HasSQL;
 import org.h2.value.Value;
+import org.h2.value.ValueArray;
 import org.h2.value.ValueNull;
 
 /**
@@ -46,15 +49,18 @@ public SetClauseList(Table table) {
      * Add a single column.
      *
      * @param column the column
+     * @param arrayIndexes
+     *            non-empty array of indexes for array element assignment, or
+     *            {@code null} for simple assignment
      * @param expression the expression
      */
-    public void addSingle(Column column, Expression expression) {
+    public void addSingle(Column column, Expression[] arrayIndexes, Expression expression) {
         int id = column.getColumnId();
         if (actions[id] != null) {
             throw DbException.get(ErrorCode.DUPLICATE_COLUMN_NAME_1, column.getName());
         }
         if (expression != ValueExpression.DEFAULT) {
-            actions[id] = new SetSimple(expression);
+            actions[id] = new SetSimple(arrayIndexes, expression);
             if (expression instanceof Parameter) {
                 ((Parameter) expression).setColumn(column);
             }
@@ -67,9 +73,12 @@ public void addSingle(Column column, Expression expression) {
      * Add multiple columns.
      *
      * @param columns the columns
+     * @param allIndexes
+     *            list of non-empty arrays of indexes for array element
+     *            assignments, or {@code null} values for simple assignments
      * @param expression the expression (e.g. an expression list)
      */
-    public void addMultiple(ArrayList columns, Expression expression) {
+    public void addMultiple(ArrayList columns, ArrayList allIndexes, Expression expression) {
         int columnCount = columns.size();
         if (expression instanceof ExpressionList) {
             ExpressionList expressions = (ExpressionList) expression;
@@ -78,14 +87,14 @@ public void addMultiple(ArrayList columns, Expression expression) {
                     throw DbException.get(ErrorCode.COLUMN_COUNT_DOES_NOT_MATCH);
                 }
                 for (int i = 0; i < columnCount; i++) {
-                    addSingle(columns.get(i), expressions.getSubexpression(i));
+                    addSingle(columns.get(i), allIndexes.get(i), expressions.getSubexpression(i));
                 }
                 return;
             }
         }
         if (columnCount == 1) {
             // Row value special case
-            addSingle(columns.get(0), expression);
+            addSingle(columns.get(0), allIndexes.get(0), expression);
         } else {
             int[] cols = new int[columnCount];
             RowExpression row = new RowExpression(expression, cols);
@@ -106,7 +115,7 @@ public void addMultiple(ArrayList columns, Expression expression) {
                 if (actions[id] != null) {
                     throw DbException.get(ErrorCode.DUPLICATE_COLUMN_NAME_1, column.getName());
                 }
-                actions[id] = new SetMultiple(row, i, id == minId, id == maxId);
+                actions[id] = new SetMultiple(allIndexes.get(i), row, i, id == minId, id == maxId);
             }
         }
     }
@@ -120,15 +129,15 @@ boolean prepareUpdate(Table table, SessionLocal session, ResultTarget deltaChang
         for (int i = 0; i < columnCount; i++) {
             UpdateAction action = actions[i];
             Column column = columns[i];
-            Value newValue;
+            Value oldValue = oldRow.getValue(i), newValue;
             if (action == null || action == UpdateAction.ON_UPDATE) {
-                newValue = column.isGenerated() ? null : oldRow.getValue(i);
+                newValue = column.isGenerated() ? null : oldValue;
             } else if (action == UpdateAction.SET_DEFAULT) {
-                newValue = !column.isIdentity() ? null : oldRow.getValue(i);
+                newValue = !column.isIdentity() ? null : oldValue;
             } else {
-                newValue = action.update(session);
+                newValue = action.update(session, oldValue);
                 if (newValue == ValueNull.INSTANCE && column.isDefaultOnNull()) {
-                    newValue = !column.isIdentity() ? null : oldRow.getValue(i);
+                    newValue = !column.isIdentity() ? null : oldValue;
                 } else if (column.isGeneratedAlways()) {
                     throw DbException.get(ErrorCode.GENERATED_COLUMN_CANNOT_BE_ASSIGNED_1,
                             column.getSQLWithTable(new StringBuilder(), TRACE_SQL_FLAGS).toString());
@@ -271,7 +280,7 @@ private static class UpdateAction {
         UpdateAction() {
         }
 
-        Value update(SessionLocal session) {
+        Value update(SessionLocal session, Value oldValue) {
             throw DbException.getInternalError();
         }
 
@@ -289,11 +298,94 @@ void getSQL(StringBuilder builder, int sqlFlags, Column column) {
 
     }
 
-    private static final class SetSimple extends UpdateAction {
+    private static abstract class SetAction extends UpdateAction {
+
+        private final Expression[] arrayIndexes;
+
+        SetAction(Expression[] arrayIndexes) {
+            this.arrayIndexes = arrayIndexes;
+        }
+
+        @Override
+        boolean isEverything(ExpressionVisitor visitor) {
+            if (arrayIndexes != null) {
+                for (Expression e : arrayIndexes) {
+                    if (!e.isEverything(visitor)) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+
+        @Override
+        void mapAndOptimize(SessionLocal session, ColumnResolver resolver1, ColumnResolver resolver2) {
+            if (arrayIndexes != null) {
+                for (int i = 0, l = arrayIndexes.length; i < l; i++) {
+                    Expression e = arrayIndexes[i];
+                    e.mapColumns(resolver1, 0, Expression.MAP_INITIAL);
+                    if (resolver2 != null) {
+                        e.mapColumns(resolver2, 0, Expression.MAP_INITIAL);
+                    }
+                    arrayIndexes[i] = e.optimize(session);
+                }
+            }
+        }
+
+        @Override
+        final Value update(SessionLocal session, Value oldValue) {
+            Value newValue = update(session);
+            if (arrayIndexes != null) {
+                newValue = updateArray(session, oldValue, newValue, 0);
+            }
+            return newValue;
+        }
+
+        private Value updateArray(SessionLocal session, Value oldValue, Value newValue, int indexNumber) {
+            int index = arrayIndexes[indexNumber++].getValue(session).getInt();
+            int cardinality = Constants.MAX_ARRAY_CARDINALITY;
+            if (index < 0 || index > cardinality) {
+                throw DbException.get(ErrorCode.ARRAY_ELEMENT_ERROR_2, Integer.toString(index),
+                        "1.." + cardinality);
+            }
+            Value[] values;
+            if (oldValue == null) {
+                values = new Value[index];
+                for (int i = 0; i < index - 1; i++) {
+                    values[i] = ValueNull.INSTANCE;
+                }
+            } else if (oldValue == ValueNull.INSTANCE) {
+                throw DbException.get(ErrorCode.NULL_VALUE_IN_ARRAY_TARGET);
+            } else if (oldValue.getValueType() != Value.ARRAY) {
+                throw DbException.get(ErrorCode.ARRAY_ELEMENT_ERROR_2, oldValue.getType().getTraceSQL(),
+                        "ARRAY");
+            } else {
+                values = ((ValueArray) oldValue).getList();
+                int length = values.length;
+                if (index <= length) {
+                    values = values.clone();
+                } else {
+                    values = Arrays.copyOf(values, index);
+                    for (int i = length; i < index - 1; i++) {
+                        values[i] = ValueNull.INSTANCE;
+                    }
+                }
+            }
+            values[index - 1] = indexNumber == arrayIndexes.length ? newValue
+                    : updateArray(session, values[index - 1], newValue, indexNumber);
+            return ValueArray.get(values, session);
+        }
+
+        abstract Value update(SessionLocal session);
+
+    }
+
+    private static final class SetSimple extends SetAction {
 
         private Expression expression;
 
-        SetSimple(Expression expression) {
+        SetSimple(Expression[] arrayIndexes, Expression expression) {
+            super(arrayIndexes);
             this.expression = expression;
         }
 
@@ -304,11 +396,12 @@ Value update(SessionLocal session) {
 
         @Override
         boolean isEverything(ExpressionVisitor visitor) {
-            return expression.isEverything(visitor);
+            return super.isEverything(visitor) && expression.isEverything(visitor);
         }
 
         @Override
         void mapAndOptimize(SessionLocal session, ColumnResolver resolver1, ColumnResolver resolver2) {
+            super.mapAndOptimize(session, resolver1, resolver2);
             expression.mapColumns(resolver1, 0, Expression.MAP_INITIAL);
             if (resolver2 != null) {
                 expression.mapColumns(resolver2, 0, Expression.MAP_INITIAL);
@@ -349,7 +442,7 @@ void mapAndOptimize(SessionLocal session, ColumnResolver resolver1, ColumnResolv
         }
     }
 
-    private static final class SetMultiple extends UpdateAction {
+    private static final class SetMultiple extends SetAction {
 
         final RowExpression row;
 
@@ -359,7 +452,8 @@ private static final class SetMultiple extends UpdateAction {
 
         private boolean last;
 
-        SetMultiple(RowExpression row, int position, boolean first, boolean last) {
+        SetMultiple(Expression[] arrayIndexes, RowExpression row, int position, boolean first, boolean last) {
+            super(arrayIndexes);
             this.row = row;
             this.position = position;
             this.first = first;
@@ -389,11 +483,12 @@ Value update(SessionLocal session) {
 
         @Override
         boolean isEverything(ExpressionVisitor visitor) {
-            return !first || row.isEverything(visitor);
+            return super.isEverything(visitor) && (!first || row.isEverything(visitor));
         }
 
         @Override
         void mapAndOptimize(SessionLocal session, ColumnResolver resolver1, ColumnResolver resolver2) {
+            super.mapAndOptimize(session, resolver1, resolver2);
             if (first) {
                 row.mapAndOptimize(session, resolver1, resolver2);
             }
diff --git a/h2/src/main/org/h2/command/dml/SetSessionCharacteristics.java b/h2/src/main/org/h2/command/dml/SetSessionCharacteristics.java
index 5d04b2fab7..b818642850 100644
--- a/h2/src/main/org/h2/command/dml/SetSessionCharacteristics.java
+++ b/h2/src/main/org/h2/command/dml/SetSessionCharacteristics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/dml/SetTypes.java b/h2/src/main/org/h2/command/dml/SetTypes.java
index cc5df4dc44..14b2b3463c 100644
--- a/h2/src/main/org/h2/command/dml/SetTypes.java
+++ b/h2/src/main/org/h2/command/dml/SetTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -192,15 +192,10 @@ public class SetTypes {
      */
     public static final int QUERY_STATISTICS_MAX_ENTRIES = QUERY_STATISTICS + 1;
 
-    /**
-     * The type of SET FORCE_JOIN_ORDER statement.
-     */
-    public static final int FORCE_JOIN_ORDER = QUERY_STATISTICS_MAX_ENTRIES + 1;
-
     /**
      * The type of SET LAZY_QUERY_EXECUTION statement.
      */
-    public static final int LAZY_QUERY_EXECUTION = FORCE_JOIN_ORDER + 1;
+    public static final int LAZY_QUERY_EXECUTION = QUERY_STATISTICS_MAX_ENTRIES + 1;
 
     /**
      * The type of SET BUILTIN_ALIAS_OVERRIDE statement.
@@ -293,7 +288,6 @@ private SetTypes() {
         list.add("RETENTION_TIME");
         list.add("QUERY_STATISTICS");
         list.add("QUERY_STATISTICS_MAX_ENTRIES");
-        list.add("FORCE_JOIN_ORDER");
         list.add("LAZY_QUERY_EXECUTION");
         list.add("BUILTIN_ALIAS_OVERRIDE");
         list.add("AUTHENTICATOR");
diff --git a/h2/src/main/org/h2/command/dml/TransactionCommand.java b/h2/src/main/org/h2/command/dml/TransactionCommand.java
index 8bbbe8b260..be3ed90b8e 100644
--- a/h2/src/main/org/h2/command/dml/TransactionCommand.java
+++ b/h2/src/main/org/h2/command/dml/TransactionCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -50,7 +50,7 @@ public long update() {
             break;
         case CommandInterface.CHECKPOINT:
             session.getUser().checkAdmin();
-            session.getDatabase().checkpoint();
+            getDatabase().checkpoint();
             break;
         case CommandInterface.SAVEPOINT:
             session.addSavepoint(savepointName);
@@ -60,7 +60,7 @@ public long update() {
             break;
         case CommandInterface.CHECKPOINT_SYNC:
             session.getUser().checkAdmin();
-            session.getDatabase().sync();
+            getDatabase().sync();
             break;
         case CommandInterface.PREPARE_COMMIT:
             session.prepareCommit(transactionName);
@@ -83,7 +83,7 @@ public long update() {
             // throttle, to allow testing concurrent
             // execution of shutdown and query
             session.throttle();
-            Database db = session.getDatabase();
+            Database db = getDatabase();
             if (db.setExclusiveSession(session, true)) {
                 db.setCompactMode(type);
                 // close the database, but don't update the persistent setting
diff --git a/h2/src/main/org/h2/command/dml/Update.java b/h2/src/main/org/h2/command/dml/Update.java
index 7f4ca82caf..b7cf89086a 100644
--- a/h2/src/main/org/h2/command/dml/Update.java
+++ b/h2/src/main/org/h2/command/dml/Update.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -37,8 +37,6 @@ public final class Update extends FilteredDataChangeStatement {
 
     private Insert onDuplicateKeyInsert;
 
-    private TableFilter fromTableFilter;
-
     public Update(SessionLocal session) {
         super(session);
     }
@@ -47,10 +45,6 @@ public void setSetClauseList(SetClauseList setClauseList) {
         this.setClauseList = setClauseList;
     }
 
-    public void setFromTableFilter(TableFilter tableFilter) {
-        this.fromTableFilter = tableFilter;
-    }
-
     @Override
     public long update(ResultTarget deltaChangeCollector, ResultOption deltaChangeCollectionMode) {
         targetTableFilter.startQuery(session);
@@ -59,7 +53,7 @@ public long update(ResultTarget deltaChangeCollector, ResultOption deltaChangeCo
         try (LocalResult rows = LocalResult.forTable(session, table)) {
             session.getUser().checkTableRight(table, Right.UPDATE);
             table.fire(session, Trigger.UPDATE, true);
-            table.lock(session, true, false);
+            table.lock(session, Table.WRITE_LOCK);
             // get the old rows, compute the new rows
             setCurrentRowNumber(0);
             long count = 0;
@@ -73,7 +67,7 @@ public long update(ResultTarget deltaChangeCollector, ResultOption deltaChangeCo
             while (nextRow(limitRows, count)) {
                 Row oldRow = targetTableFilter.get();
                 if (table.isRowLockable()) {
-                    Row lockedRow = table.lockRow(session, oldRow);
+                    Row lockedRow = table.lockRow(session, oldRow, -1);
                     if (lockedRow == null) {
                         continue;
                     }
@@ -121,37 +115,22 @@ static void doUpdate(Prepared prepared, SessionLocal session, Table table, Local
     public String getPlanSQL(int sqlFlags) {
         StringBuilder builder = new StringBuilder("UPDATE ");
         targetTableFilter.getPlanSQL(builder, false, sqlFlags);
-        if (fromTableFilter != null) {
-            builder.append("\nFROM ");
-            fromTableFilter.getPlanSQL(builder, false, sqlFlags);
-        }
         setClauseList.getSQL(builder, sqlFlags);
         appendFilterCondition(builder, sqlFlags);
         return builder.toString();
     }
 
     @Override
-    public void prepare() {
-        if (fromTableFilter != null) {
-            targetTableFilter.addJoin(fromTableFilter, false, null);
-        }
+    void doPrepare() {
         if (condition != null) {
             condition.mapColumns(targetTableFilter, 0, Expression.MAP_INITIAL);
-            if (fromTableFilter != null) {
-                condition.mapColumns(fromTableFilter, 0, Expression.MAP_INITIAL);
-            }
             condition = condition.optimizeCondition(session);
             if (condition != null) {
                 condition.createIndexConditions(session, targetTableFilter);
             }
         }
-        setClauseList.mapAndOptimize(session, targetTableFilter, fromTableFilter);
-        TableFilter[] filters = null;
-        if (fromTableFilter == null) {
-            filters = new TableFilter[] { targetTableFilter };
-        } else {
-            filters = new TableFilter[] { targetTableFilter, fromTableFilter };
-        }
+        setClauseList.mapAndOptimize(session, targetTableFilter, null);
+        TableFilter[] filters = new TableFilter[] { targetTableFilter };
         PlanItem item = targetTableFilter.getBestPlanItem(session, filters, 0, new AllColumnsForPlan(filters));
         targetTableFilter.setPlanItem(item);
         targetTableFilter.prepare();
diff --git a/h2/src/main/org/h2/command/dml/package.html b/h2/src/main/org/h2/command/dml/package.html
index 492fcc7745..1f49b8c5d6 100644
--- a/h2/src/main/org/h2/command/dml/package.html
+++ b/h2/src/main/org/h2/command/dml/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/main/org/h2/command/package.html b/h2/src/main/org/h2/command/package.html
index e9d4000314..d2146901b6 100644
--- a/h2/src/main/org/h2/command/package.html
+++ b/h2/src/main/org/h2/command/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/main/org/h2/command/query/AllColumnsForPlan.java b/h2/src/main/org/h2/command/query/AllColumnsForPlan.java
index 8af08eb382..a0390db20a 100644
--- a/h2/src/main/org/h2/command/query/AllColumnsForPlan.java
+++ b/h2/src/main/org/h2/command/query/AllColumnsForPlan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/query/ForUpdate.java b/h2/src/main/org/h2/command/query/ForUpdate.java
new file mode 100644
index 0000000000..bcd558a837
--- /dev/null
+++ b/h2/src/main/org/h2/command/query/ForUpdate.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (https://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.command.query;
+
+import org.h2.message.DbException;
+import org.h2.util.HasSQL;
+import org.h2.util.StringUtils;
+
+/**
+ * FOR UPDATE clause.
+ */
+public final class ForUpdate implements HasSQL {
+
+    /**
+     * Type of FOR UPDATE clause.
+     */
+    public enum Type {
+
+        /**
+         * Use default lock timeout.
+         */
+        DEFAULT,
+
+        /**
+         * Use specified lock timeout.
+         */
+        WAIT,
+
+        /**
+         * Use zero timeout.
+         */
+        NOWAIT,
+
+        /**
+         * Skip locked rows.
+         */
+        SKIP_LOCKED;
+
+    }
+
+    /**
+     * FOR UPDATE clause without additional parameters.
+     */
+    public static final ForUpdate DEFAULT = new ForUpdate(Type.DEFAULT, -1);
+
+    /**
+     * FOR UPDATE NOWAIT clause.
+     */
+    public static final ForUpdate NOWAIT = new ForUpdate(Type.NOWAIT, 0);
+
+    /**
+     * FOR UPDATE SKIP LOCKED clause.
+     */
+    public static final ForUpdate SKIP_LOCKED = new ForUpdate(Type.SKIP_LOCKED, -2);
+
+    /**
+     * Returns FOR UPDATE WAIT N clause.
+     *
+     * @param timeoutMillis
+     *            timeout in milliseconds
+     * @return FOR UPDATE WAIT N clause
+     */
+    public static final ForUpdate wait(int timeoutMillis) {
+        if (timeoutMillis < 0) {
+            throw DbException.getInvalidValueException("timeout", timeoutMillis);
+        }
+        if (timeoutMillis == 0) {
+            return NOWAIT;
+        }
+        return new ForUpdate(Type.WAIT, timeoutMillis);
+    }
+
+    private final Type type;
+
+    private final int timeoutMillis;
+
+    private ForUpdate(Type type, int timeoutMillis) {
+        this.type = type;
+        this.timeoutMillis = timeoutMillis;
+    }
+
+    /**
+     * Returns type of FOR UPDATE clause.
+     *
+     * @return type of FOR UPDATE clause
+     */
+    public Type getType() {
+        return type;
+    }
+
+    /**
+     * Returns timeout in milliseconds.
+     *
+     * @return timeout in milliseconds for {@link Type#WAIT}, {@code 0} for
+     *         {@link Type#NOWAIT}, {@code -2} for {@link Type#SKIP_LOCKED},
+     *         {@code -1} for default timeout
+     */
+    public int getTimeoutMillis() {
+        return timeoutMillis;
+    }
+
+    @Override
+    public StringBuilder getSQL(StringBuilder builder, int sqlFlags) {
+        builder.append(" FOR UPDATE");
+        switch (type) {
+        case WAIT: {
+            builder.append(" WAIT ").append(timeoutMillis / 1_000);
+            int millis = timeoutMillis % 1_000;
+            if (millis > 0) {
+                StringUtils.appendZeroPadded(builder.append('.'), 3, millis);
+            }
+            break;
+        }
+        case NOWAIT:
+            builder.append(" NOWAIT");
+            break;
+        case SKIP_LOCKED:
+            builder.append(" SKIP LOCKED");
+            break;
+        default:
+        }
+        return builder;
+    }
+
+}
diff --git a/h2/src/main/org/h2/command/query/Optimizer.java b/h2/src/main/org/h2/command/query/Optimizer.java
index d8e6f219f1..c204c62309 100644
--- a/h2/src/main/org/h2/command/query/Optimizer.java
+++ b/h2/src/main/org/h2/command/query/Optimizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -77,7 +77,7 @@ private static int getMaxBruteForceFilters(int filterCount) {
 
     private void calculateBestPlan() {
         cost = -1;
-        if (filters.length == 1 || session.isForceJoinOrder()) {
+        if (filters.length == 1) {
             testPlan(filters);
         } else {
             startNs = System.nanoTime();
diff --git a/h2/src/main/org/h2/command/query/Query.java b/h2/src/main/org/h2/command/query/Query.java
index 154a968d58..b1980913fa 100644
--- a/h2/src/main/org/h2/command/query/Query.java
+++ b/h2/src/main/org/h2/command/query/Query.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -31,9 +31,9 @@
 import org.h2.result.SortOrder;
 import org.h2.table.Column;
 import org.h2.table.ColumnResolver;
+import org.h2.table.DerivedTable;
 import org.h2.table.Table;
 import org.h2.table.TableFilter;
-import org.h2.table.TableView;
 import org.h2.util.Utils;
 import org.h2.value.ExtTypeInfoRow;
 import org.h2.value.TypeInfo;
@@ -207,6 +207,22 @@ private ResultInterface queryWithoutCacheLazyCheck(long limit, ResultTarget targ
      */
     public abstract void init();
 
+    @Override
+    public final void prepare() {
+        if (!checkInit) {
+            throw DbException.getInternalError("not initialized");
+        }
+        if (isPrepared) {
+            return;
+        }
+        prepareExpressions();
+        preparePlan();
+    }
+
+    public abstract void prepareExpressions();
+
+    public abstract void preparePlan();
+
     /**
      * The the list of select expressions.
      * This may include invisible expressions such as order by expressions.
@@ -263,11 +279,19 @@ public boolean hasOrder() {
     }
 
     /**
-     * Set the 'for update' flag.
+     * Returns FOR UPDATE clause, if any.
+     * @return FOR UPDATE clause or {@code null}
+     */
+    public ForUpdate getForUpdate() {
+        return null;
+    }
+
+    /**
+     * Set the FOR UPDATE clause.
      *
-     * @param forUpdate the new setting
+     * @param forUpdate the new FOR UPDATE clause
      */
-    public abstract void setForUpdate(boolean forUpdate);
+    public abstract void setForUpdate(ForUpdate forUpdate);
 
     /**
      * Get the column count of this query.
@@ -431,7 +455,8 @@ private boolean sameResultAsLast(Value[] params, Value[] lastParams, long lastEv
         }
         for (int i = 0; i < params.length; i++) {
             Value a = lastParams[i], b = params[i];
-            if (a.getValueType() != b.getValueType() || !session.areEqual(a, b)) {
+            // Derived tables can have gaps in parameters
+            if (a != null && !a.equals(b)) {
                 return false;
             }
         }
@@ -446,8 +471,9 @@ private  Value[] getParameterValues() {
         int size = list.size();
         Value[] params = new Value[size];
         for (int i = 0; i < size; i++) {
-            Value v = list.get(i).getParamValue();
-            params[i] = v;
+            Parameter parameter = list.get(i);
+            // Derived tables can have gaps in parameters
+            params[i] = parameter != null ? parameter.getParamValue() : null;
         }
         return params;
     }
@@ -471,12 +497,12 @@ public final ResultInterface query(long limit, ResultTarget target) {
             return queryWithoutCacheLazyCheck(limit, target);
         }
         fireBeforeSelectTriggers();
-        if (noCache || !session.getDatabase().getOptimizeReuseResults() ||
+        if (noCache || !getDatabase().getOptimizeReuseResults() ||
                 (session.isLazyQueryExecution() && !neverLazy)) {
             return queryWithoutCacheLazyCheck(limit, target);
         }
         Value[] params = getParameterValues();
-        long now = session.getDatabase().getModificationDataId();
+        long now = getDatabase().getModificationDataId();
         if (isEverything(ExpressionVisitor.DETERMINISTIC_VISITOR)) {
             if (lastResult != null && !lastResult.isClosed() &&
                     limit == lastLimit) {
@@ -517,11 +543,11 @@ public final boolean exists() {
             return executeExists();
         }
         fireBeforeSelectTriggers();
-        if (noCache || !session.getDatabase().getOptimizeReuseResults()) {
+        if (noCache || !getDatabase().getOptimizeReuseResults()) {
             return executeExists();
         }
         Value[] params = getParameterValues();
-        long now = session.getDatabase().getModificationDataId();
+        long now = getDatabase().getModificationDataId();
         if (isEverything(ExpressionVisitor.DETERMINISTIC_VISITOR)) {
             if (lastExists != null) {
                 if (sameResultAsLast(params, lastParameters, lastEvaluated)) {
@@ -586,7 +612,7 @@ boolean initOrder(ArrayList expressionSQL, boolean mustBeInResult, Array
      */
     int initExpression(ArrayList expressionSQL, Expression e, boolean mustBeInResult,
             ArrayList filters) {
-        Database db = session.getDatabase();
+        Database db = getDatabase();
         // special case: SELECT 1 AS A FROM DUAL ORDER BY A
         // (oracle supports it, but only in order by, not in group by and
         // not in having):
@@ -983,8 +1009,8 @@ public Table toTable(String alias, Column[] columnTemplates, ArrayList list = topTableFilter.getTable().getIndexes();
         if (list != null) {
             int[] sortTypes = sort.getSortTypesWithNullOrdering();
-            DefaultNullOrdering defaultNullOrdering = session.getDatabase().getDefaultNullOrdering();
+            DefaultNullOrdering defaultNullOrdering = getDatabase().getDefaultNullOrdering();
             loop: for (Index index : list) {
                 if (index.getCreateSQL() == null) {
                     // can't use the scan index
@@ -716,7 +716,7 @@ private LazyResult queryFlat(int columnCount, ResultTarget result, long offset,
                 limitRows = Long.MAX_VALUE;
             }
         }
-        LazyResultQueryFlat lazyResult = new LazyResultQueryFlat(expressionArray, columnCount, isForUpdate);
+        LazyResultQueryFlat lazyResult = new LazyResultQueryFlat(expressionArray, columnCount, forUpdate != null);
         skipOffset(lazyResult, offset, quickOffset);
         if (result == null) {
             return lazyResult;
@@ -770,12 +770,12 @@ protected ResultInterface queryWithoutCache(long maxRows, ResultTarget target) {
         long fetch = offsetFetch.fetch;
         boolean fetchPercent = offsetFetch.fetchPercent;
         boolean lazy = session.isLazyQueryExecution() &&
-                target == null && !isForUpdate && !isQuickAggregateQuery &&
+                target == null && forUpdate == null && !isQuickAggregateQuery &&
                 fetch != 0 && !fetchPercent && !withTies && offset == 0 && isReadOnly();
         int columnCount = expressions.size();
         LocalResult result = null;
         if (!lazy && (target == null ||
-                !session.getDatabase().getSettings().optimizeInsertFromSelect)) {
+                !getDatabase().getSettings().optimizeInsertFromSelect)) {
             result = createLocalResult(result);
         }
         // Do not add rows before OFFSET to result if possible
@@ -788,9 +788,9 @@ protected ResultInterface queryWithoutCache(long maxRows, ResultTarget target) {
             }
         }
         if (distinct) {
+            result = createLocalResult(result);
             if (!isDistinctQuery) {
                 quickOffset = false;
-                result = createLocalResult(result);
                 result.setDistinct();
             }
         } else if (distinctExpressions != null) {
@@ -857,7 +857,7 @@ private void disableLazyForJoinSubqueries(final TableFilter top) {
         if (session.isLazyQueryExecution()) {
             top.visit(f -> {
                 if (f != top && f.getTable().getTableType() == TableType.VIEW) {
-                    ViewIndex idx = (ViewIndex) f.getIndex();
+                    QueryExpressionIndex idx = (QueryExpressionIndex) f.getIndex();
                     if (idx != null && idx.getQuery() != null) {
                         idx.getQuery().setNeverLazy(true);
                     }
@@ -894,7 +894,7 @@ private void expandColumnList() {
                     i = expandColumnList(filter, i, false, exceptTableColumns);
                 }
             } else {
-                Database db = session.getDatabase();
+                Database db = getDatabase();
                 String schemaName = w.getSchemaName();
                 TableFilter filter = null;
                 for (TableFilter f : filters) {
@@ -935,7 +935,7 @@ private int expandColumnList(TableFilter filter, int index, boolean forAlias,
                     Column left = entry.getKey(), right = entry.getValue();
                     if (!filter.isCommonJoinColumnToExclude(right)
                             && (except == null || except.remove(left) == null && except.remove(right) == null)) {
-                        Database database = session.getDatabase();
+                        Database database = getDatabase();
                         Expression e;
                         if (left == right
                                 || DataType.hasTotalOrdering(left.getType().getValueType())
@@ -967,7 +967,7 @@ private int expandColumnList(TableFilter filter, int index, boolean forAlias,
     private int addExpandedColumn(TableFilter filter, int index, HashMap except,
             String schema, String alias, Column c) {
         if ((except == null || except.remove(c) == null) && c.getVisible()) {
-            ExpressionColumn ec = new ExpressionColumn(session.getDatabase(), schema, alias, filter.getColumnName(c));
+            ExpressionColumn ec = new ExpressionColumn(getDatabase(), schema, alias, filter.getColumnName(c));
             expressions.add(index++, ec);
         }
         return index;
@@ -1030,7 +1030,7 @@ public void init() {
             throw DbException.get(ErrorCode.WITH_TIES_WITHOUT_ORDER_BY);
         }
 
-        Database db = session.getDatabase();
+        Database db = getDatabase();
 
         // first the select list (visible columns),
         // then 'ORDER BY' expressions,
@@ -1158,14 +1158,7 @@ private int mergeGroupByExpressions(Database db, int index, ArrayList ex
     }
 
     @Override
-    public void prepare() {
-        if (isPrepared) {
-            // sometimes a subquery is prepared twice (CREATE TABLE AS SELECT)
-            return;
-        }
-        if (!checkInit) {
-            throw DbException.getInternalError("not initialized");
-        }
+    public void prepareExpressions() {
         if (orderList != null) {
             prepareOrder(orderList, expressions.size());
         }
@@ -1182,27 +1175,32 @@ public void prepare() {
         }
         if (condition != null) {
             condition = condition.optimizeCondition(session);
-            if (condition != null) {
-                for (TableFilter f : filters) {
-                    // outer joins: must not add index conditions such as
-                    // "c is null" - example:
-                    // create table parent(p int primary key) as select 1;
-                    // create table child(c int primary key, pc int);
-                    // insert into child values(2, 1);
-                    // select p, c from parent
-                    // left outer join child on p = pc where c is null;
-                    if (!f.isJoinOuter() && !f.isJoinOuterIndirect()) {
-                        condition.createIndexConditions(session, f);
-                    }
-                }
-            }
         }
         if (isGroupQuery && groupIndex == null && havingIndex < 0 && qualifyIndex < 0 && condition == null
                 && filters.size() == 1) {
             isQuickAggregateQuery = isEverything(ExpressionVisitor.getOptimizableVisitor(filters.get(0).getTable()));
         }
+        expressionArray = expressions.toArray(new Expression[0]);
+    }
+
+    @Override
+    public void preparePlan() {
+        if (condition != null) {
+            for (TableFilter f : filters) {
+                // outer joins: must not add index conditions such as
+                // "c is null" - example:
+                // create table parent(p int primary key) as select 1;
+                // create table child(c int primary key, pc int);
+                // insert into child values(2, 1);
+                // select p, c from parent
+                // left outer join child on p = pc where c is null;
+                if (!f.isJoinOuter() && !f.isJoinOuterIndirect()) {
+                    condition.createIndexConditions(session, f);
+                }
+            }
+        }
         cost = preparePlan(session.isParsingCreateView());
-        if (distinct && session.getDatabase().getSettings().optimizeDistinct &&
+        if (distinct && getDatabase().getSettings().optimizeDistinct &&
                 !isGroupQuery && filters.size() == 1 &&
                 expressions.size() == 1 && condition == null) {
             Expression expr = expressions.get(0);
@@ -1256,7 +1254,7 @@ public void prepare() {
                     }
                 }
             }
-            if (sortUsingIndex && isForUpdate && !topTableFilter.getIndex().isRowIdIndex()) {
+            if (sortUsingIndex && forUpdate != null && !topTableFilter.getIndex().isRowIdIndex()) {
                 sortUsingIndex = false;
             }
         }
@@ -1270,19 +1268,28 @@ public void prepare() {
                 }
             }
         }
-        expressionArray = expressions.toArray(new Expression[0]);
         isPrepared = true;
     }
 
     private void optimizeExpressionsAndPreserveAliases() {
         for (int i = 0; i < expressions.size(); i++) {
-            Expression e = expressions.get(i);
-            String alias = e.getAlias(session, i);
-            e = e.optimize(session);
-            if (!e.getAlias(session, i).equals(alias)) {
-                e = new Alias(e, alias, true);
+            Expression original = expressions.get(i);
+            /*
+             * TODO cannot evaluate optimized now, because some optimize()
+             * methods violate their contract and modify the original
+             * expression.
+             */
+            Expression optimized;
+            if (i < visibleColumnCount) {
+                String alias = original.getAlias(session, i);
+                optimized = original.optimize(session);
+                if (!optimized.getAlias(session, i).equals(alias)) {
+                    optimized = new Alias(optimized, alias, true);
+                }
+            } else {
+                optimized = original.optimize(session);
             }
-            expressions.set(i, e);
+            expressions.set(i, optimized);
         }
     }
 
@@ -1451,8 +1458,8 @@ public String getPlanSQL(int sqlFlags) {
             getFilterSQL(builder, "\nQUALIFY ", exprList, qualify, qualifyIndex, sqlFlags);
         }
         appendEndOfQueryToSQL(builder, sqlFlags, exprList);
-        if (isForUpdate) {
-            builder.append("\nFOR UPDATE");
+        if (forUpdate != null) {
+            forUpdate.getSQL(builder, sqlFlags);
         }
         if ((sqlFlags & ADD_PLAN_INFORMATION) != 0) {
             if (isQuickAggregateQuery) {
@@ -1495,7 +1502,7 @@ private static void getFilterSQL(StringBuilder builder, String sql, Expression[]
     }
 
     private static void getFilterSQL(StringBuilder builder, String sql, Expression condition, int sqlFlags) {
-        condition.getUnenclosedSQL(builder.append(sql), sqlFlags);
+        condition.getNonAliasExpression().getUnenclosedSQL(builder.append(sql), sqlFlags);
     }
 
     private static boolean containsAggregate(Expression expression) {
@@ -1533,11 +1540,16 @@ public TableFilter getTopTableFilter() {
     }
 
     @Override
-    public void setForUpdate(boolean b) {
-        if (b && (isAnyDistinct() || isGroupQuery)) {
+    public ForUpdate getForUpdate() {
+        return forUpdate;
+    }
+
+    @Override
+    public void setForUpdate(ForUpdate b) {
+        if (b != null && (isAnyDistinct() || isGroupQuery)) {
             throw DbException.get(ErrorCode.FOR_UPDATE_IS_NOT_ALLOWED_IN_DISTINCT_OR_GROUPED_SELECT);
         }
-        this.isForUpdate = b;
+        this.forUpdate = b;
     }
 
     @Override
@@ -1666,7 +1678,7 @@ public void updateAggregate(SessionLocal s, int stage) {
     public boolean isEverything(ExpressionVisitor visitor) {
         switch (visitor.getType()) {
         case ExpressionVisitor.DETERMINISTIC: {
-            if (isForUpdate) {
+            if (forUpdate != null) {
                 return false;
             }
             for (TableFilter f : filters) {
@@ -1684,7 +1696,7 @@ public boolean isEverything(ExpressionVisitor visitor) {
             break;
         }
         case ExpressionVisitor.EVALUATABLE: {
-            if (!session.getDatabase().getSettings().optimizeEvaluatableSubqueries) {
+            if (!getDatabase().getSettings().optimizeEvaluatableSubqueries) {
                 return false;
             }
             break;
@@ -1705,6 +1717,12 @@ public boolean isEverything(ExpressionVisitor visitor) {
                 return false;
             }
         }
+        for (TableFilter f : filters) {
+            Expression c = f.getJoinCondition();
+            if (c != null && !c.isEverything(v2)) {
+                return false;
+            }
+        }
         if (condition != null && !condition.isEverything(v2)) {
             return false;
         }
@@ -1720,7 +1738,7 @@ public boolean isEverything(ExpressionVisitor visitor) {
 
     @Override
     public boolean isCacheable() {
-        return !isForUpdate;
+        return forUpdate == null;
     }
 
     @Override
@@ -1884,9 +1902,10 @@ protected Value[] fetchNextRow() {
                 setCurrentRowNumber(rowNumber + 1);
                 if (isConditionMet()) {
                     rowNumber++;
-                    Value[] keyValues = new Value[groupIndex.length];
+                    int groupSize = groupIndex.length;
+                    Value[] keyValues = new Value[groupSize];
                     // update group
-                    for (int i = 0; i < groupIndex.length; i++) {
+                    for (int i = 0; i < groupSize; i++) {
                         int idx = groupIndex[i];
                         Expression expr = expressions.get(idx);
                         keyValues[i] = expr.getValue(getSession());
@@ -1896,10 +1915,16 @@ protected Value[] fetchNextRow() {
                     if (previousKeyValues == null) {
                         previousKeyValues = keyValues;
                         groupData.nextLazyGroup();
-                    } else if (!Arrays.equals(previousKeyValues, keyValues)) {
-                        row = createGroupSortedRow(previousKeyValues, columnCount);
-                        previousKeyValues = keyValues;
-                        groupData.nextLazyGroup();
+                    } else {
+                        SessionLocal session = getSession();
+                        for (int i = 0; i < groupSize; i++) {
+                            if (session.compare(previousKeyValues[i], keyValues[i]) != 0) {
+                                row = createGroupSortedRow(previousKeyValues, columnCount);
+                                previousKeyValues = keyValues;
+                                groupData.nextLazyGroup();
+                                break;
+                            }
+                        }
                     }
                     groupData.nextLazyRow();
                     updateAgg(columnCount, DataAnalysisOperation.STAGE_GROUP);
diff --git a/h2/src/main/org/h2/command/query/SelectGroups.java b/h2/src/main/org/h2/command/query/SelectGroups.java
index 56fb801e2a..616753b872 100644
--- a/h2/src/main/org/h2/command/query/SelectGroups.java
+++ b/h2/src/main/org/h2/command/query/SelectGroups.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/query/SelectListColumnResolver.java b/h2/src/main/org/h2/command/query/SelectListColumnResolver.java
index c8263ec239..466e1712c7 100644
--- a/h2/src/main/org/h2/command/query/SelectListColumnResolver.java
+++ b/h2/src/main/org/h2/command/query/SelectListColumnResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/command/query/SelectUnion.java b/h2/src/main/org/h2/command/query/SelectUnion.java
index 27ab6f8502..75734a3db1 100644
--- a/h2/src/main/org/h2/command/query/SelectUnion.java
+++ b/h2/src/main/org/h2/command/query/SelectUnion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -66,7 +66,7 @@ public enum UnionType {
      */
     final Query right;
 
-    private boolean isForUpdate;
+    private ForUpdate forUpdate;
 
     public SelectUnion(SessionLocal session, UnionType unionType, Query query, Query right) {
         super(session);
@@ -132,7 +132,7 @@ protected ResultInterface queryWithoutCache(long maxRows, ResultTarget target) {
         }
         int columnCount = left.getColumnCount();
         if (session.isLazyQueryExecution() && unionType == UnionType.UNION_ALL && !distinct &&
-                sort == null && !randomAccessResult && !isForUpdate &&
+                sort == null && !randomAccessResult && forUpdate == null &&
                 offset == 0 && !fetchPercent && !withTies && isReadOnly()) {
             // limit 0 means no rows
             if (fetch != 0) {
@@ -246,17 +246,9 @@ public void init() {
     }
 
     @Override
-    public void prepare() {
-        if (isPrepared) {
-            // sometimes a subquery is prepared twice (CREATE TABLE AS SELECT)
-            return;
-        }
-        if (!checkInit) {
-            throw DbException.getInternalError("not initialized");
-        }
-        isPrepared = true;
-        left.prepare();
-        right.prepare();
+    public void prepareExpressions() {
+        left.prepareExpressions();
+        right.prepareExpressions();
         int len = left.getColumnCount();
         // set the correct expressions now
         expressions = new ArrayList<>(len);
@@ -279,6 +271,13 @@ public void prepare() {
         expressionArray = expressions.toArray(new Expression[0]);
     }
 
+    @Override
+    public void preparePlan() {
+        left.preparePlan();
+        right.preparePlan();
+        isPrepared = true;
+    }
+
     @Override
     public double getCost() {
         return left.getCost() + right.getCost();
@@ -292,10 +291,15 @@ public HashSet getTables() {
     }
 
     @Override
-    public void setForUpdate(boolean forUpdate) {
+    public ForUpdate getForUpdate() {
+        return forUpdate;
+    }
+
+    @Override
+    public void setForUpdate(ForUpdate forUpdate) {
         left.setForUpdate(forUpdate);
         right.setForUpdate(forUpdate);
-        isForUpdate = forUpdate;
+        this.forUpdate = forUpdate;
     }
 
     @Override
@@ -333,30 +337,29 @@ public void addGlobalCondition(Parameter param, int columnId,
 
     @Override
     public String getPlanSQL(int sqlFlags) {
-        StringBuilder buff = new StringBuilder();
-        buff.append('(').append(left.getPlanSQL(sqlFlags)).append(')');
+        StringBuilder builder = new StringBuilder().append('(').append(left.getPlanSQL(sqlFlags)).append(')');
         switch (unionType) {
         case UNION_ALL:
-            buff.append("\nUNION ALL\n");
+            builder.append("\nUNION ALL\n");
             break;
         case UNION:
-            buff.append("\nUNION\n");
+            builder.append("\nUNION\n");
             break;
         case INTERSECT:
-            buff.append("\nINTERSECT\n");
+            builder.append("\nINTERSECT\n");
             break;
         case EXCEPT:
-            buff.append("\nEXCEPT\n");
+            builder.append("\nEXCEPT\n");
             break;
         default:
             throw DbException.getInternalError("type=" + unionType);
         }
-        buff.append('(').append(right.getPlanSQL(sqlFlags)).append(')');
-        appendEndOfQueryToSQL(buff, sqlFlags, expressions.toArray(new Expression[0]));
-        if (isForUpdate) {
-            buff.append("\nFOR UPDATE");
+        builder.append('(').append(right.getPlanSQL(sqlFlags)).append(')');
+        appendEndOfQueryToSQL(builder, sqlFlags, expressions.toArray(new Expression[0]));
+        if (forUpdate != null) {
+            forUpdate.getSQL(builder, sqlFlags);
         }
-        return buff.toString();
+        return builder.toString();
     }
 
     @Override
diff --git a/h2/src/main/org/h2/command/query/TableValueConstructor.java b/h2/src/main/org/h2/command/query/TableValueConstructor.java
index 4b3bbb5c38..3ce626b5c3 100644
--- a/h2/src/main/org/h2/command/query/TableValueConstructor.java
+++ b/h2/src/main/org/h2/command/query/TableValueConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -168,15 +168,7 @@ public void init() {
     }
 
     @Override
-    public void prepare() {
-        if (isPrepared) {
-            // sometimes a subquery is prepared twice (CREATE TABLE AS SELECT)
-            return;
-        }
-        if (!checkInit) {
-            throw DbException.getInternalError("not initialized");
-        }
-        isPrepared = true;
+    public void prepareExpressions() {
         if (columnResolver == null) {
             createTable();
         }
@@ -200,6 +192,10 @@ public void prepare() {
             cleanupOrder();
         }
         expressionArray = expressions.toArray(new Expression[0]);
+    }
+
+    @Override
+    public void preparePlan() {
         double cost = 0;
         int columnCount = visibleColumnCount;
         for (ArrayList r : rows) {
@@ -208,6 +204,7 @@ public void prepare() {
             }
         }
         this.cost = cost + rows.size();
+        isPrepared = true;
     }
 
     private void createTable() {
@@ -243,7 +240,7 @@ private void createTable() {
             expressions.add(new ExpressionColumn(database, null, null, columns[i].getName()));
         }
         this.expressions = expressions;
-        table = new TableValueConstructorTable(session.getDatabase().getMainSchema(), session, columns, rows);
+        table = new TableValueConstructorTable(database.getMainSchema(), session, columns, rows);
         columnResolver = new TableValueColumnResolver();
     }
 
@@ -260,7 +257,7 @@ public HashSet getTables() {
     }
 
     @Override
-    public void setForUpdate(boolean forUpdate) {
+    public void setForUpdate(ForUpdate forUpdate) {
         throw DbException.get(ErrorCode.RESULT_SET_READONLY);
     }
 
diff --git a/h2/src/main/org/h2/command/query/package.html b/h2/src/main/org/h2/command/query/package.html
index de6f569b61..f5a45fbde8 100644
--- a/h2/src/main/org/h2/command/query/package.html
+++ b/h2/src/main/org/h2/command/query/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/main/org/h2/compress/CompressDeflate.java b/h2/src/main/org/h2/compress/CompressDeflate.java
index 8dcdda363a..ef0ea1a68b 100644
--- a/h2/src/main/org/h2/compress/CompressDeflate.java
+++ b/h2/src/main/org/h2/compress/CompressDeflate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/compress/CompressLZF.java b/h2/src/main/org/h2/compress/CompressLZF.java
index ad2555e994..477dcdc184 100644
--- a/h2/src/main/org/h2/compress/CompressLZF.java
+++ b/h2/src/main/org/h2/compress/CompressLZF.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  *
  * This code is based on the LZF algorithm from Marc Lehmann. It is a
diff --git a/h2/src/main/org/h2/compress/CompressNo.java b/h2/src/main/org/h2/compress/CompressNo.java
index f9831bb600..86a19fde31 100644
--- a/h2/src/main/org/h2/compress/CompressNo.java
+++ b/h2/src/main/org/h2/compress/CompressNo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/compress/Compressor.java b/h2/src/main/org/h2/compress/Compressor.java
index 35a3bfb32e..7b3c512e70 100644
--- a/h2/src/main/org/h2/compress/Compressor.java
+++ b/h2/src/main/org/h2/compress/Compressor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/compress/LZFInputStream.java b/h2/src/main/org/h2/compress/LZFInputStream.java
index 5be2a1d4b1..3282af5375 100644
--- a/h2/src/main/org/h2/compress/LZFInputStream.java
+++ b/h2/src/main/org/h2/compress/LZFInputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/compress/LZFOutputStream.java b/h2/src/main/org/h2/compress/LZFOutputStream.java
index cd32b77602..f8c97df558 100644
--- a/h2/src/main/org/h2/compress/LZFOutputStream.java
+++ b/h2/src/main/org/h2/compress/LZFOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/compress/package.html b/h2/src/main/org/h2/compress/package.html
index 22b39981fc..78195fcb3d 100644
--- a/h2/src/main/org/h2/compress/package.html
+++ b/h2/src/main/org/h2/compress/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/main/org/h2/constraint/Constraint.java b/h2/src/main/org/h2/constraint/Constraint.java
index 153d759feb..b751da1bae 100644
--- a/h2/src/main/org/h2/constraint/Constraint.java
+++ b/h2/src/main/org/h2/constraint/Constraint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/constraint/ConstraintActionType.java b/h2/src/main/org/h2/constraint/ConstraintActionType.java
index bc5e432a68..7369115a84 100644
--- a/h2/src/main/org/h2/constraint/ConstraintActionType.java
+++ b/h2/src/main/org/h2/constraint/ConstraintActionType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/constraint/ConstraintCheck.java b/h2/src/main/org/h2/constraint/ConstraintCheck.java
index dc1675bc96..edac942e15 100644
--- a/h2/src/main/org/h2/constraint/ConstraintCheck.java
+++ b/h2/src/main/org/h2/constraint/ConstraintCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/constraint/ConstraintDomain.java b/h2/src/main/org/h2/constraint/ConstraintDomain.java
index c619fe1421..a6eedc1be9 100644
--- a/h2/src/main/org/h2/constraint/ConstraintDomain.java
+++ b/h2/src/main/org/h2/constraint/ConstraintDomain.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -75,11 +75,6 @@ public void setExpression(SessionLocal session, Expression expr) {
         this.expr = expr;
     }
 
-    @Override
-    public String getCreateSQLForCopy(Table forTable, String quotedName) {
-        throw DbException.getInternalError(toString());
-    }
-
     @Override
     public String getCreateSQLWithoutIndexes() {
         return getCreateSQL();
diff --git a/h2/src/main/org/h2/constraint/ConstraintReferential.java b/h2/src/main/org/h2/constraint/ConstraintReferential.java
index 7fa9a37c77..4bcba9c9f7 100644
--- a/h2/src/main/org/h2/constraint/ConstraintReferential.java
+++ b/h2/src/main/org/h2/constraint/ConstraintReferential.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -316,7 +316,7 @@ private void checkRowOwnTable(SessionLocal session, Row oldRow, Row newRow) {
     private boolean existsRow(SessionLocal session, Index searchIndex,
             SearchRow check, Row excluding) {
         Table searchTable = searchIndex.getTable();
-        searchTable.lock(session, false, false);
+        searchTable.lock(session, Table.READ_LOCK);
         Cursor cursor = searchIndex.find(session, check, check);
         while (cursor.next()) {
             SearchRow found;
diff --git a/h2/src/main/org/h2/constraint/ConstraintUnique.java b/h2/src/main/org/h2/constraint/ConstraintUnique.java
index 2638c92c2b..fbb51998b5 100644
--- a/h2/src/main/org/h2/constraint/ConstraintUnique.java
+++ b/h2/src/main/org/h2/constraint/ConstraintUnique.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -8,6 +8,7 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import org.h2.engine.SessionLocal;
+import org.h2.engine.NullsDistinct;
 import org.h2.index.Index;
 import org.h2.result.Row;
 import org.h2.schema.Schema;
@@ -25,11 +26,13 @@ public class ConstraintUnique extends Constraint {
     private boolean indexOwner;
     private IndexColumn[] columns;
     private final boolean primaryKey;
+    private NullsDistinct nullsDistinct;
 
-    public ConstraintUnique(Schema schema, int id, String name, Table table,
-            boolean primaryKey) {
+    public ConstraintUnique(Schema schema, int id, String name, Table table, boolean primaryKey,
+            NullsDistinct nullsDistinct) {
         super(schema, id, name, table);
         this.primaryKey = primaryKey;
+        this.nullsDistinct = nullsDistinct;
     }
 
     @Override
@@ -159,4 +162,11 @@ public void rebuild() {
         // nothing to do
     }
 
+    /**
+     * @return are nulls distinct
+     */
+    public NullsDistinct getNullsDistinct() {
+        return nullsDistinct;
+    }
+
 }
diff --git a/h2/src/main/org/h2/constraint/DomainColumnResolver.java b/h2/src/main/org/h2/constraint/DomainColumnResolver.java
index 0cd98e7eb7..d3a87459b1 100644
--- a/h2/src/main/org/h2/constraint/DomainColumnResolver.java
+++ b/h2/src/main/org/h2/constraint/DomainColumnResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/constraint/package.html b/h2/src/main/org/h2/constraint/package.html
index f05d1c34ad..5f7104b988 100644
--- a/h2/src/main/org/h2/constraint/package.html
+++ b/h2/src/main/org/h2/constraint/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/main/org/h2/engine/CastDataProvider.java b/h2/src/main/org/h2/engine/CastDataProvider.java
index c7e709d17e..d6683a0071 100644
--- a/h2/src/main/org/h2/engine/CastDataProvider.java
+++ b/h2/src/main/org/h2/engine/CastDataProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/engine/Comment.java b/h2/src/main/org/h2/engine/Comment.java
index bdd5aa87db..0d066fd06c 100644
--- a/h2/src/main/org/h2/engine/Comment.java
+++ b/h2/src/main/org/h2/engine/Comment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -7,7 +7,6 @@
 
 import org.h2.message.DbException;
 import org.h2.message.Trace;
-import org.h2.table.Table;
 import org.h2.util.StringUtils;
 
 /**
@@ -25,11 +24,6 @@ public Comment(Database database, int id, DbObject obj) {
         this.quotedObjectName = obj.getSQL(DEFAULT_SQL_FLAGS);
     }
 
-    @Override
-    public String getCreateSQLForCopy(Table table, String quotedName) {
-        throw DbException.getInternalError(toString());
-    }
-
     private static String getTypeName(int type) {
         switch (type) {
         case DbObject.CONSTANT:
diff --git a/h2/src/main/org/h2/engine/ConnectionInfo.java b/h2/src/main/org/h2/engine/ConnectionInfo.java
index 610e3899d6..5f8c3e05fb 100644
--- a/h2/src/main/org/h2/engine/ConnectionInfo.java
+++ b/h2/src/main/org/h2/engine/ConnectionInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/engine/Constants.java b/h2/src/main/org/h2/engine/Constants.java
index 23d1e8bde1..f291e05a4d 100644
--- a/h2/src/main/org/h2/engine/Constants.java
+++ b/h2/src/main/org/h2/engine/Constants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -15,23 +15,13 @@ public class Constants {
     /**
      * The build date is updated for each public release.
      */
-    public static final String BUILD_DATE = "2021-12-21";
-
-    /**
-     * The build date of the last stable release.
-     */
-    public static final String BUILD_DATE_STABLE = "2021-11-25";
+    public static final String BUILD_DATE = "2023-07-04";
 
     /**
      * Sequential version number. Even numbers are used for official releases,
      * odd numbers are used for development builds.
      */
-    public static final int BUILD_ID = 204;
-
-    /**
-     * The build id of the last stable release.
-     */
-    public static final int BUILD_ID_STABLE = 202;
+    public static final int BUILD_ID = 220;
 
     /**
      * Whether this is a snapshot version.
@@ -88,7 +78,7 @@ public class Constants {
     /**
      * The minor version of this database.
      */
-    public static final int VERSION_MINOR = 0;
+    public static final int VERSION_MINOR = 2;
 
     /**
      * The lock mode that means no locking is used at all.
@@ -277,8 +267,11 @@ public class Constants {
     /**
      * The maximum allowed length for character string, binary string, and other
      * data types based on them; excluding LOB data types.
+     * 
+     * This needs to be less than (2^31-8)/2 to avoid running into the limit on
+     * encoding data fields when storing rows.
      */
-    public static final int MAX_STRING_LENGTH = 1024 * 1024;
+    public static final int MAX_STRING_LENGTH = 1000_000_000;
 
     /**
      * The maximum allowed precision of numeric data types.
@@ -479,6 +472,11 @@ public class Constants {
      */
     public static final int QUERY_STATISTICS_MAX_ENTRIES = 100;
 
+    /**
+     * The minimum number of characters in web admin password.
+     */
+    public static final int MIN_WEB_ADMIN_PASSWORD_LENGTH = 12;
+
     /**
      * Announced version for PgServer.
      */
@@ -490,11 +488,6 @@ public class Constants {
      */
     public static final String VERSION;
 
-    /**
-     * The last stable version name.
-     */
-    public static final String VERSION_STABLE = "1.4." + BUILD_ID_STABLE;
-
     /**
      * The complete version number of this database, consisting of
      * the major version, the minor version, the build id, and the build date.
diff --git a/h2/src/main/org/h2/engine/Database.java b/h2/src/main/org/h2/engine/Database.java
index c2fbfc89aa..4a25c77927 100644
--- a/h2/src/main/org/h2/engine/Database.java
+++ b/h2/src/main/org/h2/engine/Database.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -54,7 +54,6 @@
 import org.h2.store.FileLockMethod;
 import org.h2.store.FileStore;
 import org.h2.store.InDoubtTransaction;
-import org.h2.store.LobStorageFrontend;
 import org.h2.store.LobStorageInterface;
 import org.h2.store.fs.FileUtils;
 import org.h2.store.fs.encrypt.FileEncrypt;
@@ -131,7 +130,6 @@ public final class Database implements DataHandler, CastDataProvider {
     private final String databaseURL;
     private final String cipher;
     private final byte[] filePasswordHash;
-    private final byte[] fileEncryptionKey;
 
     private final ConcurrentHashMap usersAndRoles = new ConcurrentHashMap<>();
     private final ConcurrentHashMap settings = new ConcurrentHashMap<>();
@@ -208,7 +206,7 @@ public final class Database implements DataHandler, CastDataProvider {
     private JavaObjectSerializer javaObjectSerializer;
     private String javaObjectSerializerName;
     private volatile boolean javaObjectSerializerInitialized;
-    private boolean queryStatistics;
+    private volatile boolean queryStatistics;
     private int queryStatisticsMaxEntries = Constants.QUERY_STATISTICS_MAX_ENTRIES;
     private QueryStatisticsData queryStatisticsData;
     private RowFactory rowFactory = RowFactory.getRowFactory();
@@ -227,10 +225,9 @@ public Database(ConnectionInfo ci, String cipher) {
         this.compareMode = CompareMode.getInstance(null, 0);
         this.persistent = ci.isPersistent();
         this.filePasswordHash = ci.getFilePasswordHash();
-        this.fileEncryptionKey = ci.getFileEncryptionKey();
         this.databaseName = databaseName;
         this.databaseShortName = parseDatabaseShortName();
-        this.maxLengthInplaceLob = Constants.DEFAULT_MAX_LENGTH_INPLACE_LOB;
+        this.maxLengthInplaceLob = persistent ? Constants.DEFAULT_MAX_LENGTH_INPLACE_LOB : Integer.MAX_VALUE - 8;
         this.cipher = cipher;
         this.autoServerMode = ci.getProperty("AUTO_SERVER", false);
         this.autoServerPort = ci.getProperty("AUTO_SERVER_PORT", 0);
@@ -248,7 +245,7 @@ public Database(ConnectionInfo ci, String cipher) {
         this.databaseURL = ci.getURL();
         String s = ci.removeProperty("DATABASE_EVENT_LISTENER", null);
         if (s != null) {
-            setEventListenerClass(StringUtils.trim(s, true, true, "'"));
+            setEventListenerClass(StringUtils.trim(s, true, true, '\''));
         }
         s = ci.removeProperty("MODE", null);
         if (s != null) {
@@ -267,11 +264,14 @@ public Database(ConnectionInfo ci, String cipher) {
         }
         s = ci.getProperty("JAVA_OBJECT_SERIALIZER", null);
         if (s != null) {
-            s = StringUtils.trim(s, true, true, "'");
+            s = StringUtils.trim(s, true, true, '\'');
             javaObjectSerializerName = s;
         }
         this.allowBuiltinAliasOverride = ci.getProperty("BUILTIN_ALIAS_OVERRIDE", false);
         boolean closeAtVmShutdown = dbSettings.dbCloseOnExit;
+        if (autoServerMode && !closeAtVmShutdown) {
+            throw DbException.getUnsupportedException("AUTO_SERVER=TRUE && DB_CLOSE_ON_EXIT=FALSE");
+        }
         int traceLevelFile = ci.getIntProperty(SetTypes.TRACE_LEVEL_FILE, TraceSystem.DEFAULT_TRACE_LEVEL_FILE);
         int traceLevelSystemOut = ci.getIntProperty(SetTypes.TRACE_LEVEL_SYSTEM_OUT,
                 TraceSystem.DEFAULT_TRACE_LEVEL_SYSTEM_OUT);
@@ -321,7 +321,7 @@ public Database(ConnectionInfo ci, String cipher) {
             }
             starting = true;
             if (dbSettings.mvStore) {
-                store = new Store(this);
+                store = new Store(this, ci.getFileEncryptionKey());
             } else {
                 throw new UnsupportedOperationException();
             }
@@ -769,7 +769,7 @@ public boolean lockMeta(SessionLocal session) {
         if (ASSERT) {
             lockMetaAssertion(session);
         }
-        return meta.lock(session, true, true);
+        return meta.lock(session, Table.EXCLUSIVE_LOCK);
     }
 
     private void lockMetaAssertion(SessionLocal session) {
@@ -1181,9 +1181,6 @@ private void closeImpl(boolean fromShutdownHook) {
                     closeAllSessionsExcept(null);
                 }
             }
-            if (!this.isReadOnly()) {
-                removeOrphanedLobs();
-            }
         }
         try {
             try {
@@ -1192,7 +1189,7 @@ private void closeImpl(boolean fromShutdownHook) {
                         for (Schema schema : schemas.values()) {
                             for (Table table : schema.getAllTablesAndViews(null)) {
                                 if (table.isGlobalTemporary()) {
-                                    table.removeChildrenAndResources(systemSession);
+                                    removeSchemaObject(systemSession, table);
                                 } else {
                                     table.close(systemSession);
                                 }
@@ -1217,22 +1214,16 @@ private void closeImpl(boolean fromShutdownHook) {
                         meta.close(systemSession);
                         systemSession.commit(true);
                     }
-                }
-            } catch (DbException e) {
-                trace.error(e, "close");
-            }
-            tempFileDeleter.deleteAll();
-            try {
-                if (lobSession != null) {
-                    lobSession.close();
-                    lobSession = null;
-                }
-                if (systemSession != null) {
+                    if (lobSession != null) {
+                        lobSession.close();
+                        lobSession = null;
+                    }
                     systemSession.close();
                     systemSession = null;
                 }
+                tempFileDeleter.deleteAll();
                 closeOpenFilesAndUnlock();
-            } catch (DbException e) {
+            } catch (DbException | MVStoreException e) {
                 trace.error(e, "close");
             }
             trace.info("closed");
@@ -1253,24 +1244,15 @@ private void closeImpl(boolean fromShutdownHook) {
         }
     }
 
-    private void removeOrphanedLobs() {
-        // remove all session variables and temporary lobs
-        if (!persistent) {
-            return;
-        }
-        try {
-            lobStorage.removeAllForTable(LobStorageFrontend.TABLE_ID_SESSION_VARIABLE);
-        } catch (DbException e) {
-            trace.error(e, "close");
-        }
-    }
-
     /**
      * Close all open files and unlock the database.
      */
     private synchronized void closeOpenFilesAndUnlock() {
         try {
-            if (!store.getMvStore().isClosed()) {
+            if (lobStorage != null) {
+                lobStorage.close();
+            }
+            if (store != null && !store.getMvStore().isClosed()) {
                 if (compactMode == CommandInterface.SHUTDOWN_IMMEDIATELY) {
                     store.closeImmediately();
                 } else {
@@ -1280,13 +1262,13 @@ private synchronized void closeOpenFilesAndUnlock() {
                             dbSettings.defragAlways ? -1 : dbSettings.maxCompactTime;
                     store.close(allowedCompactionTime);
                 }
-            }
-            if (persistent) {
-                // Don't delete temp files if everything is already closed
-                // (maybe in checkPowerOff), the database could be open now
-                // (even from within another process).
-                if (lock != null || fileLockMethod == FileLockMethod.NO || fileLockMethod == FileLockMethod.FS) {
-                    deleteOldTempFiles();
+                if (persistent) {
+                    // Don't delete temp files if everything is already closed
+                    // (maybe in checkPowerOff), the database could be open now
+                    // (even from within another process).
+                    if (lock != null || fileLockMethod == FileLockMethod.NO || fileLockMethod == FileLockMethod.FS) {
+                        deleteOldTempFiles();
+                    }
                 }
             }
         } finally {
@@ -1719,10 +1701,13 @@ public Role getPublicRole() {
      * @return a unique name
      */
     public synchronized String getTempTableName(String baseName, SessionLocal session) {
+        int maxBaseLength = Constants.MAX_IDENTIFIER_LENGTH - (7 + ValueInteger.DISPLAY_SIZE * 2);
+        if (baseName.length() > maxBaseLength) {
+            baseName = baseName.substring(0, maxBaseLength);
+        }
         String tempName;
         do {
-            tempName = baseName + "_COPY_" + session.getId() +
-                    "_" + nextTempTableId++;
+            tempName = baseName + "_COPY_" + session.getId() + '_' + nextTempTableId++;
         } while (mainSchema.findTableOrView(session, tempName) != null);
         return tempName;
     }
@@ -1792,12 +1777,10 @@ synchronized void prepareCommit(SessionLocal session, String transaction) {
      * that thread, throw it now.
      */
     void throwLastBackgroundException() {
-        if (!store.getMvStore().isBackgroundThread()) {
-            DbException b = backgroundException.getAndSet(null);
-            if (b != null) {
-                // wrap the exception, so we see it was thrown here
-                throw DbException.get(b.getErrorCode(), b, b.getMessage());
-            }
+        DbException b = backgroundException.getAndSet(null);
+        if (b != null) {
+            // wrap the exception, so we see it was thrown here
+            throw DbException.get(b.getErrorCode(), b, b.getMessage());
         }
     }
 
@@ -2340,9 +2323,20 @@ private static boolean isUpperSysIdentifier(String upperName) {
         if (l == 0) {
             return false;
         }
-        for (int i = 0; i < l; i++) {
-            int ch = upperName.charAt(i);
-            if (ch < 'A' || ch > 'Z' && ch != '_') {
+        char c = upperName.charAt(0);
+        if (c < 'A' || c > 'Z') {
+            return false;
+        }
+        l--;
+        for (int i = 1; i < l; i++) {
+            c = upperName.charAt(i);
+            if ((c < 'A' || c > 'Z') && c != '_') {
+                return false;
+            }
+        }
+        if (l > 0) {
+            c = upperName.charAt(l);
+            if (c < 'A' || c > 'Z') {
                 return false;
             }
         }
@@ -2354,10 +2348,6 @@ public int readLob(long lobId, byte[] hmac, long offset, byte[] buff, int off, i
         throw DbException.getInternalError();
     }
 
-    public byte[] getFileEncryptionKey() {
-        return fileEncryptionKey;
-    }
-
     public int getPageSize() {
         return pageSize;
     }
diff --git a/h2/src/main/org/h2/engine/DbObject.java b/h2/src/main/org/h2/engine/DbObject.java
index 734309605b..c26f877113 100644
--- a/h2/src/main/org/h2/engine/DbObject.java
+++ b/h2/src/main/org/h2/engine/DbObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -228,7 +228,9 @@ public final boolean isValid() {
      * @param quotedName the quoted name
      * @return the SQL statement
      */
-    public abstract String getCreateSQLForCopy(Table table, String quotedName);
+    public String getCreateSQLForCopy(Table table, String quotedName) {
+        throw DbException.getInternalError(toString());
+    }
 
     /**
      * Construct the CREATE ... SQL statement for this object for meta table.
diff --git a/h2/src/main/org/h2/engine/DbSettings.java b/h2/src/main/org/h2/engine/DbSettings.java
index a854df6b30..820ef97a39 100644
--- a/h2/src/main/org/h2/engine/DbSettings.java
+++ b/h2/src/main/org/h2/engine/DbSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/engine/DelayedDatabaseCloser.java b/h2/src/main/org/h2/engine/DelayedDatabaseCloser.java
index e7c3c9986f..b8c70255df 100644
--- a/h2/src/main/org/h2/engine/DelayedDatabaseCloser.java
+++ b/h2/src/main/org/h2/engine/DelayedDatabaseCloser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/engine/Engine.java b/h2/src/main/org/h2/engine/Engine.java
index 8ab43c3fcd..760bbf88ff 100644
--- a/h2/src/main/org/h2/engine/Engine.java
+++ b/h2/src/main/org/h2/engine/Engine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/engine/GeneratedKeysMode.java b/h2/src/main/org/h2/engine/GeneratedKeysMode.java
index b2ead4577a..a7ad3a6d16 100644
--- a/h2/src/main/org/h2/engine/GeneratedKeysMode.java
+++ b/h2/src/main/org/h2/engine/GeneratedKeysMode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/engine/IsolationLevel.java b/h2/src/main/org/h2/engine/IsolationLevel.java
index 7d39ce5daa..86a4c1149f 100644
--- a/h2/src/main/org/h2/engine/IsolationLevel.java
+++ b/h2/src/main/org/h2/engine/IsolationLevel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/engine/MetaRecord.java b/h2/src/main/org/h2/engine/MetaRecord.java
index 1263a93f96..71b0b3e21b 100644
--- a/h2/src/main/org/h2/engine/MetaRecord.java
+++ b/h2/src/main/org/h2/engine/MetaRecord.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/engine/Mode.java b/h2/src/main/org/h2/engine/Mode.java
index 32da09db59..8ffdc899c5 100644
--- a/h2/src/main/org/h2/engine/Mode.java
+++ b/h2/src/main/org/h2/engine/Mode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -25,30 +25,6 @@ public enum ModeEnum {
         REGULAR, STRICT, LEGACY, DB2, Derby, MariaDB, MSSQLServer, HSQLDB, MySQL, Oracle, PostgreSQL
     }
 
-    /**
-     * Determines how rows with {@code NULL} values in indexed columns are handled
-     * in unique indexes.
-     */
-    public enum UniqueIndexNullsHandling {
-        /**
-         * Multiple rows with identical values in indexed columns with at least one
-         * indexed {@code NULL} value are allowed in unique index.
-         */
-        ALLOW_DUPLICATES_WITH_ANY_NULL,
-
-        /**
-         * Multiple rows with identical values in indexed columns with all indexed
-         * {@code NULL} values are allowed in unique index.
-         */
-        ALLOW_DUPLICATES_WITH_ALL_NULLS,
-
-        /**
-         * Multiple rows with identical values in indexed columns are not allowed in
-         * unique index.
-         */
-        FORBID_ANY_DUPLICATES
-    }
-
     /**
      * Generation of column names for expressions.
      */
@@ -166,9 +142,9 @@ public enum CharPadding {
 
     /**
      * Determines how rows with {@code NULL} values in indexed columns are handled
-     * in unique indexes.
+     * in unique indexes and constraints by default.
      */
-    public UniqueIndexNullsHandling uniqueIndexNullsHandling = UniqueIndexNullsHandling.ALLOW_DUPLICATES_WITH_ANY_NULL;
+    public NullsDistinct nullsDistinct = NullsDistinct.DISTINCT;
 
     /**
      * Empty strings are treated like NULL values. Useful for Oracle emulation.
@@ -285,6 +261,21 @@ public enum CharPadding {
      */
     public boolean alterTableModifyColumn;
 
+    /**
+     * If {@code true} non-standard ALTER TABLE MODIFY COLUMN preserves nullability when changing data type.
+     */
+    public boolean alterTableModifyColumnPreserveNullability;
+
+    /**
+     * If {@code true} MySQL table and column options are allowed
+     */
+    public boolean mySqlTableOptions;
+
+    /**
+     * If {@code true} DELETE identifier FROM is allowed
+     */
+    public boolean deleteIdentifierFrom;
+
     /**
      * If {@code true} TRUNCATE TABLE uses RESTART IDENTITY by default.
      */
@@ -398,6 +389,11 @@ public enum CharPadding {
      */
     public boolean limit;
 
+    /**
+     * Whether MINUS can be used as EXCEPT.
+     */
+    public boolean minusIsExcept;
+
     /**
      * Whether IDENTITY pseudo data type is supported.
      */
@@ -418,6 +414,16 @@ public enum CharPadding {
      */
     public boolean autoIncrementClause;
 
+    /**
+     * Whether DATE data type is parsed as TIMESTAMP(0).
+     */
+    public boolean dateIsTimestamp0;
+
+    /**
+     * Whether NUMERIC and DECIMAL/DEC without parameters are parsed as DECFLOAT.
+     */
+    public boolean numericIsDecfloat;
+
     /**
      * An optional Set of hidden/disallowed column types.
      * Certain DBMSs don't support all column types provided by H2, such as
@@ -440,6 +446,11 @@ public enum CharPadding {
      */
     public boolean numericWithBooleanComparison;
 
+    /**
+     * Accepts comma ',' as key/value separator in JSON_OBJECT and JSON_OBJECTAGG functions.
+     */
+    public boolean acceptsCommaAsJsonKeyValueSeparator;
+
     private final String name;
 
     private final ModeEnum modeEnum;
@@ -450,6 +461,7 @@ public enum CharPadding {
         mode.dateTimeValueWithinTransaction = true;
         mode.topInSelect = true;
         mode.limit = true;
+        mode.minusIsExcept = true;
         mode.identityDataType = true;
         mode.serialDataTypes = true;
         mode.autoIncrementClause = true;
@@ -465,12 +477,14 @@ public enum CharPadding {
         mode.dateTimeValueWithinTransaction = true;
         mode.topInSelect = true;
         mode.limit = true;
+        mode.minusIsExcept = true;
         mode.identityDataType = true;
         mode.serialDataTypes = true;
         mode.autoIncrementClause = true;
         // Legacy identity and sequence features
         mode.identityClause = true;
         mode.updateSequenceOnManualIdentityInsertion = true;
+        mode.takeInsertedIdentity = true;
         mode.identityColumnsHaveDefaultOnNull = true;
         mode.nextvalAndCurrvalPseudoColumns = true;
         // Legacy DML features
@@ -495,15 +509,17 @@ public enum CharPadding {
         mode.allowDB2TimestampFormat = true;
         mode.forBitData = true;
         mode.takeInsertedIdentity = true;
+        mode.nextvalAndCurrvalPseudoColumns = true;
         mode.expressionNames = ExpressionNames.NUMBER;
         mode.viewExpressionNames = ViewExpressionNames.EXCEPTION;
         mode.limit = true;
+        mode.minusIsExcept = true;
         mode.numericWithBooleanComparison = true;
         add(mode);
 
         mode = new Mode(ModeEnum.Derby);
         mode.aliasColumnName = true;
-        mode.uniqueIndexNullsHandling = UniqueIndexNullsHandling.FORBID_ANY_DUPLICATES;
+        mode.nullsDistinct = NullsDistinct.NOT_DISTINCT;
         mode.sysDummy1 = true;
         mode.isolationLevelInSelectOrInsertStatement = true;
         // Derby does not support client info properties as of version 10.12.1.1
@@ -523,13 +539,14 @@ public enum CharPadding {
         mode.expressionNames = ExpressionNames.C_NUMBER;
         mode.topInSelect = true;
         mode.limit = true;
+        mode.minusIsExcept = true;
         mode.numericWithBooleanComparison = true;
         add(mode);
 
         mode = new Mode(ModeEnum.MSSQLServer);
         mode.aliasColumnName = true;
         mode.squareBracketQuotedNames = true;
-        mode.uniqueIndexNullsHandling = UniqueIndexNullsHandling.FORBID_ANY_DUPLICATES;
+        mode.nullsDistinct = NullsDistinct.NOT_DISTINCT;
         mode.allowPlusForStringConcat = true;
         mode.swapLogFunctionParameters = true;
         mode.swapConvertFunctionParameters = true;
@@ -572,6 +589,8 @@ public enum CharPadding {
         mode.allowUnrelatedOrderByExpressionsInDistinctQueries = true;
         mode.alterTableExtensionsMySQL = true;
         mode.alterTableModifyColumn = true;
+        mode.mySqlTableOptions = true;
+        mode.deleteIdentifierFrom = true;
         mode.truncateTableRestartIdentity = true;
         mode.allNumericTypesHavePrecision = true;
         mode.nextValueReturnsDifferentValues = true;
@@ -585,6 +604,7 @@ public enum CharPadding {
         mode.typeByNameMap.put("YEAR", DataType.getDataType(Value.SMALLINT));
         mode.groupByColumnIndex = true;
         mode.numericWithBooleanComparison = true;
+        mode.acceptsCommaAsJsonKeyValueSeparator = true;
         add(mode);
 
         mode = new Mode(ModeEnum.MySQL);
@@ -601,6 +621,8 @@ public enum CharPadding {
         mode.allowUnrelatedOrderByExpressionsInDistinctQueries = true;
         mode.alterTableExtensionsMySQL = true;
         mode.alterTableModifyColumn = true;
+        mode.mySqlTableOptions = true;
+        mode.deleteIdentifierFrom = true;
         mode.truncateTableRestartIdentity = true;
         mode.allNumericTypesHavePrecision = true;
         mode.updateSequenceOnManualIdentityInsertion = true;
@@ -614,12 +636,13 @@ public enum CharPadding {
         mode.typeByNameMap.put("YEAR", DataType.getDataType(Value.SMALLINT));
         mode.groupByColumnIndex = true;
         mode.numericWithBooleanComparison = true;
+        mode.acceptsCommaAsJsonKeyValueSeparator = true;
         add(mode);
 
         mode = new Mode(ModeEnum.Oracle);
         mode.aliasColumnName = true;
         mode.convertOnlyToSmallerScale = true;
-        mode.uniqueIndexNullsHandling = UniqueIndexNullsHandling.ALLOW_DUPLICATES_WITH_ALL_NULLS;
+        mode.nullsDistinct = NullsDistinct.ALL_DISTINCT;
         mode.treatEmptyStringsAsNull = true;
         mode.regexpReplaceBackslashReferences = true;
         mode.supportPoundSymbolForColumnNames = true;
@@ -628,19 +651,17 @@ public enum CharPadding {
         mode.supportedClientInfoPropertiesRegEx =
                 Pattern.compile(".*\\..*");
         mode.alterTableModifyColumn = true;
+        mode.alterTableModifyColumnPreserveNullability = true;
         mode.decimalSequences = true;
         mode.charAndByteLengthUnits = true;
         mode.nextvalAndCurrvalPseudoColumns = true;
         mode.mergeWhere = true;
+        mode.minusIsExcept = true;
         mode.expressionNames = ExpressionNames.ORIGINAL_SQL;
         mode.viewExpressionNames = ViewExpressionNames.EXCEPTION;
+        mode.dateIsTimestamp0 = true;
         mode.typeByNameMap.put("BINARY_FLOAT", DataType.getDataType(Value.REAL));
         mode.typeByNameMap.put("BINARY_DOUBLE", DataType.getDataType(Value.DOUBLE));
-        dt = DataType.createDate(/* 2001-01-01 23:59:59 */ 19, 19, "DATE", false, 0, 0);
-        dt.type = Value.TIMESTAMP;
-        dt.sqlType = Types.TIMESTAMP;
-        dt.specialPrecisionScale = true;
-        mode.typeByNameMap.put("DATE", dt);
         add(mode);
 
         mode = new Mode(ModeEnum.PostgreSQL);
@@ -661,6 +682,7 @@ public enum CharPadding {
         mode.allowUsingFromClauseInUpdateStatement = true;
         mode.limit = true;
         mode.serialDataTypes = true;
+        mode.numericIsDecfloat = true;
         // Enumerate all H2 types NOT supported by PostgreSQL:
         Set disallowedTypes = new java.util.HashSet<>();
         disallowedTypes.add("NUMBER");
diff --git a/h2/src/main/org/h2/engine/NullsDistinct.java b/h2/src/main/org/h2/engine/NullsDistinct.java
new file mode 100644
index 0000000000..634f39d458
--- /dev/null
+++ b/h2/src/main/org/h2/engine/NullsDistinct.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (https://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.engine;
+
+import org.h2.util.HasSQL;
+
+/**
+ * Determines how rows with {@code NULL} values in indexed columns are handled
+ * in unique indexes, unique constraints, or by unique predicate.
+ */
+public enum NullsDistinct implements HasSQL {
+
+    /**
+     * {@code NULL} values of columns are distinct.
+     */
+    DISTINCT,
+
+    /**
+     * {@code NULL} values of columns are distinct only if all columns have null values.
+     */
+    ALL_DISTINCT,
+
+    /**
+     * {@code NULL} values of columns are never distinct.
+     */
+    NOT_DISTINCT;
+
+    @Override
+    public StringBuilder getSQL(StringBuilder builder, int sqlFlags) {
+        builder.append("NULLS ");
+        switch (this) {
+        case DISTINCT:
+            builder.append("DISTINCT");
+            break;
+        case ALL_DISTINCT:
+            builder.append("ALL DISTINCT");
+            break;
+        case NOT_DISTINCT:
+            builder.append("NOT DISTINCT");
+        }
+        return builder;
+    }
+
+}
diff --git a/h2/src/main/org/h2/engine/OnExitDatabaseCloser.java b/h2/src/main/org/h2/engine/OnExitDatabaseCloser.java
index d447a2a51b..4ca9a6d3b0 100644
--- a/h2/src/main/org/h2/engine/OnExitDatabaseCloser.java
+++ b/h2/src/main/org/h2/engine/OnExitDatabaseCloser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/engine/Procedure.java b/h2/src/main/org/h2/engine/Procedure.java
index 66b3e09bc0..4a655c29fa 100644
--- a/h2/src/main/org/h2/engine/Procedure.java
+++ b/h2/src/main/org/h2/engine/Procedure.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/engine/QueryStatisticsData.java b/h2/src/main/org/h2/engine/QueryStatisticsData.java
index a33e38e666..dd651f6149 100644
--- a/h2/src/main/org/h2/engine/QueryStatisticsData.java
+++ b/h2/src/main/org/h2/engine/QueryStatisticsData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/engine/Right.java b/h2/src/main/org/h2/engine/Right.java
index da8046a835..84c66c86b1 100644
--- a/h2/src/main/org/h2/engine/Right.java
+++ b/h2/src/main/org/h2/engine/Right.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/engine/RightOwner.java b/h2/src/main/org/h2/engine/RightOwner.java
index 63360fdb6b..307a2fac05 100644
--- a/h2/src/main/org/h2/engine/RightOwner.java
+++ b/h2/src/main/org/h2/engine/RightOwner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/engine/Role.java b/h2/src/main/org/h2/engine/Role.java
index c4a75bd632..88efc306f4 100644
--- a/h2/src/main/org/h2/engine/Role.java
+++ b/h2/src/main/org/h2/engine/Role.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -7,10 +7,8 @@
 
 import java.util.ArrayList;
 
-import org.h2.message.DbException;
 import org.h2.message.Trace;
 import org.h2.schema.Schema;
-import org.h2.table.Table;
 
 /**
  * Represents a role. Roles can be granted to users, and to other roles.
@@ -24,11 +22,6 @@ public Role(Database database, int id, String roleName, boolean system) {
         this.system = system;
     }
 
-    @Override
-    public String getCreateSQLForCopy(Table table, String quotedName) {
-        throw DbException.getInternalError(toString());
-    }
-
     /**
      * Get the CREATE SQL statement for this object.
      *
diff --git a/h2/src/main/org/h2/engine/Session.java b/h2/src/main/org/h2/engine/Session.java
index 2c62e8b086..fd53f9864d 100644
--- a/h2/src/main/org/h2/engine/Session.java
+++ b/h2/src/main/org/h2/engine/Session.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/engine/SessionLocal.java b/h2/src/main/org/h2/engine/SessionLocal.java
index e449b4b527..f02fe8f342 100644
--- a/h2/src/main/org/h2/engine/SessionLocal.java
+++ b/h2/src/main/org/h2/engine/SessionLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -26,9 +26,10 @@
 import org.h2.command.Parser;
 import org.h2.command.Prepared;
 import org.h2.command.ddl.Analyze;
+import org.h2.command.query.Query;
 import org.h2.constraint.Constraint;
 import org.h2.index.Index;
-import org.h2.index.ViewIndex;
+import org.h2.index.QueryExpressionIndex;
 import org.h2.jdbc.JdbcConnection;
 import org.h2.jdbc.meta.DatabaseMeta;
 import org.h2.jdbc.meta.DatabaseMetaLocal;
@@ -54,6 +55,7 @@
 import org.h2.util.SmallLRUCache;
 import org.h2.util.TimeZoneProvider;
 import org.h2.util.Utils;
+import org.h2.value.CompareMode;
 import org.h2.value.Value;
 import org.h2.value.ValueLob;
 import org.h2.value.ValueNull;
@@ -137,8 +139,8 @@ static Session getThreadLocalSession() {
     }
 
     private final int serialId = nextSerialId++;
-    private final Database database;
-    private final User user;
+    private Database database;
+    private User user;
     private final int id;
 
     private NetworkConnectionInfo networkConnectionInfo;
@@ -183,9 +185,8 @@ static Session getThreadLocalSession() {
     private SmallLRUCache queryCache;
     private long modificationMetaID = -1;
     private int createViewLevel;
-    private volatile SmallLRUCache viewIndexCache;
-    private HashMap subQueryIndexCache;
-    private boolean forceJoinOrder;
+    private volatile SmallLRUCache viewIndexCache;
+    private HashMap derivedTableIndexCache;
     private boolean lazyQueryExecution;
 
     private BitSet nonKeywords;
@@ -278,14 +279,6 @@ public boolean isLazyQueryExecution() {
         return lazyQueryExecution;
     }
 
-    public void setForceJoinOrder(boolean forceJoinOrder) {
-        this.forceJoinOrder = forceJoinOrder;
-    }
-
-    public boolean isForceJoinOrder() {
-        return forceJoinOrder;
-    }
-
     /**
      * This method is called before and after parsing of view definition and may
      * be called recursively.
@@ -315,7 +308,7 @@ public boolean setCommitOrRollbackDisabled(boolean x) {
 
     private void initVariables() {
         if (variables == null) {
-            variables = database.newStringMap();
+            variables = newStringsMap();
         }
     }
 
@@ -334,7 +327,7 @@ public void setVariable(String name, Value value) {
         } else {
             if (value instanceof ValueLob) {
                 // link LOB values, to make sure we have our own object
-                value = ((ValueLob) value).copy(database, LobStorageFrontend.TABLE_ID_SESSION_VARIABLE);
+                value = ((ValueLob) value).copy(getDatabase(), LobStorageFrontend.TABLE_ID_SESSION_VARIABLE);
             }
             old = variables.put(name, value);
         }
@@ -398,7 +391,7 @@ public List
 getLocalTempTables() {
      */
     public void addLocalTempTable(Table table) {
         if (localTempTables == null) {
-            localTempTables = database.newStringMap();
+            localTempTables = newStringsMap();
         }
         if (localTempTables.putIfAbsent(table.getName(), table) != null) {
             StringBuilder builder = new StringBuilder();
@@ -415,12 +408,14 @@ public void addLocalTempTable(Table table) {
      * @param table the table
      */
     public void removeLocalTempTable(Table table) {
-        modificationId++;
-        if (localTempTables != null) {
-            localTempTables.remove(table.getName());
-        }
-        synchronized (database) {
-            table.removeChildrenAndResources(this);
+        if (localTempTables != null && localTempTables.remove(table.getName()) != null) {
+            modificationId++;
+            Database db = database;
+            if (db != null) {
+                synchronized (db) {
+                    table.removeChildrenAndResources(this);
+                }
+            }
         }
     }
 
@@ -453,7 +448,7 @@ public HashMap getLocalTempTableIndexes() {
      */
     public void addLocalTempTableIndex(Index index) {
         if (localTempTableIndexes == null) {
-            localTempTableIndexes = database.newStringMap();
+            localTempTableIndexes = newStringsMap();
         }
         if (localTempTableIndexes.putIfAbsent(index.getName(), index) != null) {
             throw DbException.get(ErrorCode.INDEX_ALREADY_EXISTS_1, index.getTraceSQL());
@@ -509,7 +504,7 @@ public HashMap getLocalTempTableConstraints() {
      */
     public void addLocalTempTableConstraint(Constraint constraint) {
         if (localTempTableConstraints == null) {
-            localTempTableConstraints = database.newStringMap();
+            localTempTableConstraints = newStringsMap();
         }
         String name = constraint.getName();
         if (localTempTableConstraints.putIfAbsent(name, constraint) != null) {
@@ -589,6 +584,21 @@ public Prepared prepare(String sql, boolean rightsChecked, boolean literalsCheck
         return parser.prepare(sql);
     }
 
+    /**
+     * Parse a query and prepare its expressions. Rights and literals must be
+     * already checked.
+     *
+     * @param sql the SQL statement
+     * @return the prepared statement
+     */
+    public Query prepareQueryExpression(String sql) {
+        Parser parser = new Parser(this);
+        parser.setRightsChecked(true);
+        parser.setLiteralsChecked(true);
+        return parser.prepareQueryExpression(sql);
+    }
+
+
     /**
      * Parse and prepare the given SQL statement.
      * This method also checks if the connection has been closed.
@@ -605,9 +615,9 @@ public Command prepareLocal(String sql) {
         if (queryCacheSize > 0) {
             if (queryCache == null) {
                 queryCache = SmallLRUCache.newInstance(queryCacheSize);
-                modificationMetaID = database.getModificationMetaId();
+                modificationMetaID = getDatabase().getModificationMetaId();
             } else {
-                long newModificationMetaID = database.getModificationMetaId();
+                long newModificationMetaID = getDatabase().getModificationMetaId();
                 if (newModificationMetaID != modificationMetaID) {
                     queryCache.clear();
                     modificationMetaID = newModificationMetaID;
@@ -623,8 +633,8 @@ public Command prepareLocal(String sql) {
         try {
             command = parser.prepareCommand(sql);
         } finally {
-            // we can't reuse sub-query indexes, so just drop the whole cache
-            subQueryIndexCache = null;
+            // we can't reuse indexes of derived tables, so just drop the whole cache
+            derivedTableIndexCache = null;
         }
         if (queryCache != null) {
             if (command.isCacheable()) {
@@ -639,7 +649,7 @@ public Command prepareLocal(String sql) {
      * at the end of the current transaction.
      * @param id to be scheduled
      */
-    protected void scheduleDatabaseObjectIdForRelease(int id) {
+    void scheduleDatabaseObjectIdForRelease(int id) {
         if (idsToRelease == null) {
             idsToRelease = new BitSet();
         }
@@ -647,6 +657,9 @@ protected void scheduleDatabaseObjectIdForRelease(int id) {
     }
 
     public Database getDatabase() {
+        if (database == null) {
+            throw DbException.get(ErrorCode.DATABASE_IS_CLOSED);
+        }
         return database;
     }
 
@@ -707,7 +720,7 @@ private void analyzeTables() {
                 Analyze.analyzeTable(this, table, rowCount, false);
             }
             // analyze can lock the meta
-            database.unlockMeta(this);
+            getDatabase().unlockMeta(this);
             // table analysis opens a new transaction(s),
             // so we need to commit afterwards whatever leftovers might be
             commit(true);
@@ -724,7 +737,7 @@ private void removeTemporaryLobs(boolean onTimeout) {
             temporaryLobs.clear();
         }
         if (temporaryResultLobs != null && !temporaryResultLobs.isEmpty()) {
-            long keepYoungerThan = System.nanoTime() - database.getSettings().lobTimeout * 1_000_000L;
+            long keepYoungerThan = System.nanoTime() - getDatabase().getSettings().lobTimeout * 1_000_000L;
             while (!temporaryResultLobs.isEmpty()) {
                 TimeoutValue tv = temporaryResultLobs.getFirst();
                 if (onTimeout && tv.created - keepYoungerThan >= 0) {
@@ -744,7 +757,7 @@ private void beforeCommitOrRollback() {
         }
         currentTransactionName = null;
         currentTimestamp = null;
-        database.throwLastBackgroundException();
+        getDatabase().throwLastBackgroundException();
     }
 
     private void endTransaction() {
@@ -756,11 +769,11 @@ private void endTransaction() {
         }
         unlockAll();
         if (idsToRelease != null) {
-            database.releaseDatabaseObjectIds(idsToRelease);
+            getDatabase().releaseDatabaseObjectIds(idsToRelease);
             idsToRelease = null;
         }
         if (hasTransaction() && !transaction.allowNonRepeatableRead()) {
-            snapshotDataModificationId = database.getNextModificationDataId();
+            snapshotDataModificationId = getDatabase().getNextModificationDataId();
         }
     }
 
@@ -867,15 +880,16 @@ public void close() {
         // so, we should prevent double-closure
         if (state.getAndSet(State.CLOSED) != State.CLOSED) {
             try {
+                if (queryCache != null) {
+                    queryCache.clear();
+                }
                 database.throwLastBackgroundException();
 
                 database.checkPowerOff();
 
                 // release any open table locks
                 if (hasPreparedTransaction()) {
-                    if (currentTransactionName != null) {
-                        removeLobMap = null;
-                    }
+                    removeLobMap = null;
                     endTransaction();
                 } else {
                     rollback();
@@ -890,6 +904,8 @@ public void close() {
                 database.unlockMeta(this);
             } finally {
                 database.removeSession(this);
+                database = null;
+                user = null;
             }
         }
     }
@@ -987,10 +1003,11 @@ public Trace getTrace() {
             return trace;
         }
         String traceModuleName = "jdbc[" + id + "]";
-        if (isClosed()) {
+        Database db = database;
+        if (isClosed() || db == null) {
             return new TraceSystem(null).getTrace(traceModuleName);
         }
-        trace = database.getTraceSystem().getTrace(traceModuleName);
+        trace = db.getTraceSystem().getTrace(traceModuleName);
         return trace;
     }
 
@@ -1005,7 +1022,7 @@ public Trace getTrace() {
      */
     public Value getNextValueFor(Sequence sequence, Prepared prepared) {
         Value value;
-        Mode mode = database.getMode();
+        Mode mode = getMode();
         if (mode.nextValueReturnsDifferentValues || prepared == null) {
             value = sequence.getNext(this);
         } else {
@@ -1082,7 +1099,7 @@ public boolean containsUncommitted() {
      */
     public void addSavepoint(String name) {
         if (savepoints == null) {
-            savepoints = database.newStringMap();
+            savepoints = newStringsMap();
         }
         savepoints.put(name, setSavepoint());
     }
@@ -1110,7 +1127,7 @@ public void prepareCommit(String transactionName) {
         if (hasPendingTransaction()) {
             // need to commit even if rollback is not possible (create/drop
             // table and so on)
-            database.prepareCommit(this, transactionName);
+            getDatabase().prepareCommit(this, transactionName);
         }
         currentTransactionName = transactionName;
     }
@@ -1139,7 +1156,7 @@ public void setPreparedTransaction(String transactionName, boolean commit) {
                 rollback();
             }
         } else {
-            ArrayList list = database.getInDoubtTransactions();
+            ArrayList list = getDatabase().getInDoubtTransactions();
             int state = commit ? InDoubtTransaction.COMMIT : InDoubtTransaction.ROLLBACK;
             boolean found = false;
             for (InDoubtTransaction p: list) {
@@ -1209,7 +1226,7 @@ private void setCurrentCommand(Command command) {
                     cancelAtNs = Utils.currentNanoTimePlusMillis(queryTimeout);
                 }
             } else {
-                if (currentTimestamp != null && !database.getMode().dateTimeValueWithinTransaction) {
+                if (currentTimestamp != null && !getMode().dateTimeValueWithinTransaction) {
                     currentTimestamp = null;
                 }
                 if (nextValueFor != null) {
@@ -1293,7 +1310,7 @@ public String getCurrentSchemaName() {
 
     @Override
     public void setCurrentSchemaName(String schemaName) {
-        Schema schema = database.getSchema(schemaName);
+        Schema schema = getDatabase().getSchema(schemaName);
         setCurrentSchema(schema);
     }
 
@@ -1316,7 +1333,7 @@ public JdbcConnection createConnection(boolean columnList) {
 
     @Override
     public DataHandler getDataHandler() {
-        return database;
+        return getDatabase();
     }
 
     /**
@@ -1366,7 +1383,7 @@ public String getNextSystemIdentifier(String sql) {
      */
     public void addProcedure(Procedure procedure) {
         if (procedures == null) {
-            procedures = database.newStringMap();
+            procedures = newStringsMap();
         }
         procedures.put(procedure.getName(), procedure);
     }
@@ -1431,7 +1448,7 @@ public Set getLocks() {
         /*
          * This implementation needs to be lock-free.
          */
-        if (database.getLockMode() == Constants.LOCK_MODE_OFF || locks.isEmpty()) {
+        if (getDatabase().getLockMode() == Constants.LOCK_MODE_OFF || locks.isEmpty()) {
             return Collections.emptySet();
         }
         /*
@@ -1473,11 +1490,11 @@ public void waitIfExclusiveModeEnabled() {
         transitionToState(State.RUNNING, true);
         // Even in exclusive mode, we have to let the LOB session proceed, or we
         // will get deadlocks.
-        if (database.getLobSession() == this) {
+        if (getDatabase().getLobSession() == this) {
             return;
         }
         while (isOpen()) {
-            SessionLocal exclusive = database.getExclusiveSession();
+            SessionLocal exclusive = getDatabase().getExclusiveSession();
             if (exclusive == null || exclusive == this) {
                 break;
             }
@@ -1494,24 +1511,25 @@ public void waitIfExclusiveModeEnabled() {
     }
 
     /**
-     * Get the view cache for this session. There are two caches: the subquery
-     * cache (which is only use for a single query, has no bounds, and is
+     * Get the view cache for this session. There are two caches: the derived
+     * table cache (which is only use for a single query, has no bounds, and is
      * cleared after use), and the cache for regular views.
      *
-     * @param subQuery true to get the subquery cache
-     * @return the view cache
-     */
-    public Map getViewIndexCache(boolean subQuery) {
-        if (subQuery) {
-            // for sub-queries we don't need to use LRU because the cache should
-            // not grow too large for a single query (we drop the whole cache in
-            // the end of prepareLocal)
-            if (subQueryIndexCache == null) {
-                subQueryIndexCache = new HashMap<>();
+     * @param derivedTable
+     *            true to get the cache of derived tables
+     * @return the view cache or derived table cache
+     */
+    public Map getViewIndexCache(boolean derivedTable) {
+        if (derivedTable) {
+            // for derived tables we don't need to use LRU because the cache
+            // should not grow too large for a single query (we drop the whole
+            // cache in this cache is dropped at the end of prepareLocal)
+            if (derivedTableIndexCache == null) {
+                derivedTableIndexCache = new HashMap<>();
             }
-            return subQueryIndexCache;
+            return derivedTableIndexCache;
         }
-        SmallLRUCache cache = viewIndexCache;
+        SmallLRUCache cache = viewIndexCache;
         if (cache == null) {
             viewIndexCache = cache = SmallLRUCache.newInstance(Constants.VIEW_INDEX_CACHE_SIZE);
         }
@@ -1519,7 +1537,7 @@ public Map getViewIndexCache(boolean subQuery) {
     }
 
     public void setQueryTimeout(int queryTimeout) {
-        int max = database.getSettings().maxQueryTimeout;
+        int max = getDatabase().getSettings().maxQueryTimeout;
         if (max != 0 && (max < queryTimeout || queryTimeout == 0)) {
             // the value must be at most max
             queryTimeout = max;
@@ -1581,10 +1599,10 @@ public int nextObjectId() {
      */
     public Transaction getTransaction() {
         if (transaction == null) {
-            Store store = database.getStore();
+            Store store = getDatabase().getStore();
             if (store.getMvStore().isClosed()) {
-                Throwable backgroundException = database.getBackgroundException();
-                database.shutdownImmediately();
+                Throwable backgroundException = getDatabase().getBackgroundException();
+                getDatabase().shutdownImmediately();
                 throw DbException.get(ErrorCode.DATABASE_IS_CLOSED, backgroundException);
             }
             transaction = store.getTransactionStore().begin(this, this.lockTimeout, id, isolationLevel);
@@ -1615,7 +1633,7 @@ public void startStatementWithinTransaction(Command command) {
                 case SNAPSHOT:
                 case SERIALIZABLE:
                     if (!transaction.hasStatementDependencies()) {
-                        for (Schema schema : database.getAllSchemasNoMeta()) {
+                        for (Schema schema : getDatabase().getAllSchemasNoMeta()) {
                             for (Table table : schema.getAllTablesAndViews(null)) {
                                 if (table instanceof MVTable) {
                                     addTableToDependencies((MVTable)table, maps);
@@ -1748,7 +1766,7 @@ public void onRollback(MVMap> map, Object key,
                             VersionedValue
+     * 
+     * 
      * 
      * 
      * 
@@ -110,32 +110,32 @@ public static void dump(String fileName, Writer writer, boolean details) {
         }
         long size = FileUtils.size(fileName);
         pw.printf("File %s, %d bytes, %d MB\n", fileName, size, size / 1024 / 1024);
-        int blockSize = MVStore.BLOCK_SIZE;
+        int blockSize = FileStore.BLOCK_SIZE;
         TreeMap mapSizesTotal =
                 new TreeMap<>();
         long pageSizeTotal = 0;
         try (FileChannel file = FilePath.get(fileName).open("r")) {
             long fileSize = file.size();
             int len = Long.toHexString(fileSize).length();
-            ByteBuffer block = ByteBuffer.allocate(4096);
+            ByteBuffer buffer = ByteBuffer.allocate(4096);
             long pageCount = 0;
             for (long pos = 0; pos < fileSize; ) {
-                block.rewind();
+                buffer.rewind();
                 // Bugfix - An MVStoreException that wraps EOFException is
                 // thrown when partial writes happens in the case of power off
                 // or file system issues.
                 // So we should skip the broken block at end of the DB file.
                 try {
-                    DataUtils.readFully(file, pos, block);
+                    DataUtils.readFully(file, pos, buffer);
                 } catch (MVStoreException e) {
                     pos += blockSize;
                     pw.printf("ERROR illegal position %d%n", pos);
                     continue;
                 }
-                block.rewind();
-                int headerType = block.get();
+                buffer.rewind();
+                int headerType = buffer.get();
                 if (headerType == 'H') {
-                    String header = new String(block.array(), StandardCharsets.ISO_8859_1).trim();
+                    String header = new String(buffer.array(), StandardCharsets.ISO_8859_1).trim();
                     pw.printf("%0" + len + "x fileHeader %s%n",
                             pos, header);
                     pos += blockSize;
@@ -145,10 +145,10 @@ public static void dump(String fileName, Writer writer, boolean details) {
                     pos += blockSize;
                     continue;
                 }
-                block.position(0);
+                buffer.position(0);
                 Chunk c;
                 try {
-                    c = Chunk.readChunkHeader(block, pos);
+                    c = new SFChunk(Chunk.readChunkHeader(buffer));
                 } catch (MVStoreException e) {
                     pos += blockSize;
                     continue;
@@ -158,12 +158,11 @@ public static void dump(String fileName, Writer writer, boolean details) {
                     pos += blockSize;
                     continue;
                 }
-                int length = c.len * MVStore.BLOCK_SIZE;
-                pw.printf("%n%0" + len + "x chunkHeader %s%n",
-                        pos, c.toString());
+                int length = c.len * FileStore.BLOCK_SIZE;
+                pw.printf("%n%0" + len + "x chunkHeader %s%n", pos, c);
                 ByteBuffer chunk = ByteBuffer.allocate(length);
                 DataUtils.readFully(file, pos, chunk);
-                int p = block.position();
+                int p = buffer.position();
                 pos += length;
                 int remaining = c.pageCount;
                 pageCount += c.pageCount;
@@ -198,7 +197,7 @@ public static void dump(String fileName, Writer writer, boolean details) {
                                 mapId,
                                 node ? entries + 1 : entries,
                                 pageSize,
-                                DataUtils.getPageMaxLength(DataUtils.getPagePos(0, 0, pageSize, 0))
+                                DataUtils.getPageMaxLength(DataUtils.composePagePos(0, 0, pageSize, 0))
                         );
                     }
                     p += pageSize;
@@ -264,7 +263,7 @@ public static void dump(String fileName, Writer writer, boolean details) {
                             pw.printf("    %d children >= %s @ chunk %x +%0" +
                                             len + "x%n",
                                     counts[entries],
-                                    keys.length >= entries ? null : keys[entries],
+                                    entries <= keys.length ? null : keys[entries],
                                     DataUtils.getPageChunkId(cp),
                                     DataUtils.getPageOffset(cp));
                         } else {
@@ -350,10 +349,10 @@ public static String info(String fileName, Writer writer) {
         try (MVStore store = new MVStore.Builder().
                 fileName(fileName).recoveryMode().
                 readOnly().open()) {
-            MVMap layout = store.getLayoutMap();
+            Map layout = store.getLayoutMap();
             Map header = store.getStoreHeader();
             long fileCreated = DataUtils.readHexLong(header, "created", 0L);
-            TreeMap chunks = new TreeMap<>();
+            TreeMap> chunks = new TreeMap<>();
             long chunkLength = 0;
             long maxLength = 0;
             long maxLengthLive = 0;
@@ -361,9 +360,9 @@ public static String info(String fileName, Writer writer) {
             for (Entry e : layout.entrySet()) {
                 String k = e.getKey();
                 if (k.startsWith(DataUtils.META_CHUNK)) {
-                    Chunk c = Chunk.fromString(e.getValue());
+                    Chunk c = store.getFileStore().createChunk(e.getValue());
                     chunks.put(c.id, c);
-                    chunkLength += c.len * MVStore.BLOCK_SIZE;
+                    chunkLength += (long)c.len * FileStore.BLOCK_SIZE;
                     maxLength += c.maxLen;
                     maxLengthLive += c.maxLenLive;
                     if (c.maxLenLive > 0) {
@@ -384,8 +383,8 @@ public static String info(String fileName, Writer writer) {
             pw.printf("Chunk fill rate excluding empty chunks: %d%%\n",
                 maxLengthNotEmpty == 0 ? 100 :
                 getPercent(maxLengthLive, maxLengthNotEmpty));
-            for (Entry e : chunks.entrySet()) {
-                Chunk c = e.getValue();
+            for (Entry> e : chunks.entrySet()) {
+                Chunk c = e.getValue();
                 long created = fileCreated + c.time;
                 pw.printf("  Chunk %d: %s, %d%% used, %d blocks",
                         c.id, formatTimestamp(created, fileCreated),
@@ -439,14 +438,25 @@ public static void compact(String fileName, boolean compress) {
         String tempName = fileName + Constants.SUFFIX_MV_STORE_TEMP_FILE;
         FileUtils.delete(tempName);
         compact(fileName, tempName, compress);
+        moveAtomicReplace(tempName, fileName);
+    }
+
+    /**
+     * Rename a file(s) of the named store, and try to atomically replace an
+     * existing file(s) of another store.
+     *
+     * @param sourceName the old fully qualified file name of the store
+     * @param destinationName the new fully qualified file name of the store
+     */
+    public static void moveAtomicReplace(String sourceName, String destinationName) {
         try {
-            FileUtils.moveAtomicReplace(tempName, fileName);
-        } catch (DbException e) {
-            String newName = fileName + Constants.SUFFIX_MV_STORE_NEW_FILE;
+            FileUtils.moveAtomicReplace(sourceName, destinationName);
+        } catch (MVStoreException e) {
+            String newName = destinationName + Constants.SUFFIX_MV_STORE_NEW_FILE;
             FileUtils.delete(newName);
-            FileUtils.move(tempName, newName);
-            FileUtils.delete(fileName);
-            FileUtils.move(newName, fileName);
+            FileUtils.move(sourceName, newName);
+            FileUtils.delete(destinationName);
+            FileUtils.move(newName, destinationName);
         }
     }
 
@@ -507,8 +517,10 @@ public static void compact(String sourceFileName, String targetFileName, boolean
      * @param target the target store
      */
     public static void compact(MVStore source, MVStore target) {
+        target.setCurrentVersion(source.getCurrentVersion());
+        target.adjustLastMapId(source.getLastMapId());
         int autoCommitDelay = target.getAutoCommitDelay();
-        boolean reuseSpace = target.getReuseSpace();
+        boolean reuseSpace = target.isSpaceReused();
         try {
             target.setReuseSpace(false);  // disable unused chunks collection
             target.setAutoCommitDelay(0); // disable autocommit
@@ -610,22 +622,22 @@ public static long rollback(String fileName, long targetVersion, Writer writer)
         }
         FileChannel file = null;
         FileChannel target = null;
-        int blockSize = MVStore.BLOCK_SIZE;
+        int blockSize = FileStore.BLOCK_SIZE;
         try {
             file = FilePath.get(fileName).open("r");
             FilePath.get(fileName + ".temp").delete();
             target = FilePath.get(fileName + ".temp").open("rw");
             long fileSize = file.size();
-            ByteBuffer block = ByteBuffer.allocate(4096);
+            ByteBuffer buffer = ByteBuffer.allocate(4096);
             Chunk newestChunk = null;
             for (long pos = 0; pos < fileSize;) {
-                block.rewind();
-                DataUtils.readFully(file, pos, block);
-                block.rewind();
-                int headerType = block.get();
+                buffer.rewind();
+                DataUtils.readFully(file, pos, buffer);
+                buffer.rewind();
+                int headerType = buffer.get();
                 if (headerType == 'H') {
-                    block.rewind();
-                    target.write(block, pos);
+                    buffer.rewind();
+                    target.write(buffer, pos);
                     pos += blockSize;
                     continue;
                 }
@@ -635,7 +647,7 @@ public static long rollback(String fileName, long targetVersion, Writer writer)
                 }
                 Chunk c;
                 try {
-                    c = Chunk.readChunkHeader(block, pos);
+                    c = new SFChunk(Chunk.readChunkHeader(buffer));
                 } catch (MVStoreException e) {
                     pos += blockSize;
                     continue;
@@ -645,7 +657,7 @@ public static long rollback(String fileName, long targetVersion, Writer writer)
                     pos += blockSize;
                     continue;
                 }
-                int length = c.len * MVStore.BLOCK_SIZE;
+                int length = c.len * FileStore.BLOCK_SIZE;
                 ByteBuffer chunk = ByteBuffer.allocate(length);
                 DataUtils.readFully(file, pos, chunk);
                 if (c.version > targetVersion) {
@@ -661,9 +673,9 @@ public static long rollback(String fileName, long targetVersion, Writer writer)
                 }
                 pos += length;
             }
-            int length = newestChunk.len * MVStore.BLOCK_SIZE;
+            int length = newestChunk.len * FileStore.BLOCK_SIZE;
             ByteBuffer chunk = ByteBuffer.allocate(length);
-            DataUtils.readFully(file, newestChunk.block * MVStore.BLOCK_SIZE, chunk);
+            DataUtils.readFully(file, newestChunk.block * FileStore.BLOCK_SIZE, chunk);
             chunk.rewind();
             target.write(chunk, fileSize);
         } catch (IOException e) {
diff --git a/h2/src/main/org/h2/mvstore/OffHeapStore.java b/h2/src/main/org/h2/mvstore/OffHeapStore.java
index d7aff7e2d7..620294362a 100644
--- a/h2/src/main/org/h2/mvstore/OffHeapStore.java
+++ b/h2/src/main/org/h2/mvstore/OffHeapStore.java
@@ -1,26 +1,41 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
 package org.h2.mvstore;
 
 import java.nio.ByteBuffer;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map.Entry;
 import java.util.TreeMap;
+import java.util.zip.ZipOutputStream;
 
 /**
- * A storage mechanism that "persists" data in the off-heap area of the main
- * memory.
+ * A storage mechanism that "persists" data in the off-heap area of the main memory.
  */
-public class OffHeapStore extends FileStore {
+public class OffHeapStore extends RandomAccessStore {
 
-    private final TreeMap memory =
-            new TreeMap<>();
+    private final TreeMap memory = new TreeMap<>();
+
+    public OffHeapStore() {
+        super(new HashMap<>());
+    }
 
     @Override
     public void open(String fileName, boolean readOnly, char[] encryptionKey) {
+        init();
+    }
+
+    @Override
+    public OffHeapStore open(String fileName, boolean readOnly) {
+        OffHeapStore result = new OffHeapStore();
+        result.init();
+        return result;
+    }
+
+    private void init() {
         memory.clear();
     }
 
@@ -30,7 +45,7 @@ public String toString() {
     }
 
     @Override
-    public ByteBuffer readFully(long pos, int len) {
+    public ByteBuffer readFully(SFChunk chunk, long pos, int len) {
         Entry memEntry = memory.floorEntry(pos);
         if (memEntry == null) {
             throw DataUtils.newMVStoreException(
@@ -49,7 +64,7 @@ public ByteBuffer readFully(long pos, int len) {
 
     @Override
     public void free(long pos, int length) {
-        freeSpace.free(pos, length);
+        super.free(pos, length);
         ByteBuffer buff = memory.remove(pos);
         if (buff == null) {
             // nothing was written (just allocated)
@@ -61,8 +76,8 @@ public void free(long pos, int length) {
     }
 
     @Override
-    public void writeFully(long pos, ByteBuffer src) {
-        fileSize = Math.max(fileSize, pos + src.remaining());
+    public void writeFully(SFChunk chunk, long pos, ByteBuffer src) {
+        setSize(Math.max(size(), pos + src.remaining()));
         Entry mem = memory.floorEntry(pos);
         if (mem == null) {
             // not found: create a new entry
@@ -108,41 +123,34 @@ private void writeNewEntry(long pos, ByteBuffer src) {
     @Override
     public void truncate(long size) {
         writeCount.incrementAndGet();
+        setSize(size);
         if (size == 0) {
-            fileSize = 0;
             memory.clear();
-            return;
-        }
-        fileSize = size;
-        for (Iterator it = memory.keySet().iterator(); it.hasNext();) {
-            long pos = it.next();
-            if (pos < size) {
-                break;
+        } else {
+            for (Iterator it = memory.keySet().iterator(); it.hasNext(); ) {
+                long pos = it.next();
+                if (pos < size) {
+                    break;
+                }
+                ByteBuffer buff = memory.get(pos);
+                if (buff.capacity() > size) {
+                    throw DataUtils.newMVStoreException(
+                            DataUtils.ERROR_READING_FAILED,
+                            "Could not truncate to {0}; " +
+                                    "partial truncate is not supported", pos);
+                }
+                it.remove();
             }
-            ByteBuffer buff = memory.get(pos);
-            if (buff.capacity() > size) {
-                throw DataUtils.newMVStoreException(
-                        DataUtils.ERROR_READING_FAILED,
-                        "Could not truncate to {0}; " +
-                        "partial truncate is not supported", pos);
-            }
-            it.remove();
         }
     }
 
-    @Override
-    public void close() {
-        memory.clear();
-    }
-
-    @Override
-    public void sync() {
-        // nothing to do
-    }
-
     @Override
     public int getDefaultRetentionTime() {
         return 0;
     }
 
+    @Override
+    public void backup(ZipOutputStream out) {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/h2/src/main/org/h2/mvstore/Page.java b/h2/src/main/org/h2/mvstore/Page.java
index 72c9d22058..6ff17ce85b 100644
--- a/h2/src/main/org/h2/mvstore/Page.java
+++ b/h2/src/main/org/h2/mvstore/Page.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -11,9 +11,9 @@
 import static org.h2.mvstore.DataUtils.PAGE_TYPE_LEAF;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import java.util.List;
 import java.util.concurrent.atomic.AtomicLongFieldUpdater;
 import org.h2.compress.Compressor;
+import org.h2.mvstore.FileStore.PageSerializationManager;
 import org.h2.util.Utils;
 
 /**
@@ -47,13 +47,13 @@ public abstract class Page implements Cloneable {
      * or 1 if this page has not been saved yet, but already removed
      * This "removed" flag is to keep track of pages that concurrently
      * changed while they are being stored, in which case the live bookkeeping
-     * needs to be aware of such cases.
-     * Field need to be volatile to avoid races between saving thread setting it
+     * needs to be aware of this fact.
+     * Field needs to be volatile to avoid races between saving thread setting it
      * and other thread reading it to access the page.
      * On top of this update atomicity is required so removal mark and saved position
      * can be set concurrently.
      *
-     * @see DataUtils#getPagePos(int, int, int, int) for field format details
+     * @see DataUtils#composePagePos(int, int, int, int) for field format details
      */
     private volatile long pos;
 
@@ -145,6 +145,9 @@ public abstract class Page implements Cloneable {
     /**
      * Create a new, empty leaf page.
      *
+     * @param  key type
+     * @param  value type
+     *
      * @param map the map
      * @return the new page
      */
@@ -156,6 +159,9 @@ static  Page createEmptyLeaf(MVMap map) {
     /**
      * Create a new, empty internal node page.
      *
+     * @param  key type
+     * @param  value type
+     *
      * @param map the map
      * @return the new page
      */
@@ -188,6 +194,9 @@ public static  Page createNode(MVMap map, K[] keys, PageReference
     /**
      * Create a new leaf page. The arrays are not cloned.
      *
+     * @param  key type
+     * @param  value type
+     *
      * @param map the map
      * @param keys the keys
      * @param values the values
@@ -216,6 +225,9 @@ private void initMemoryAccount(int memoryCount) {
      * Get the value for the given key, or null if not found.
      * Search is done in the tree rooted at given page.
      *
+     * @param  key type
+     * @param  value type
+     *
      * @param key the key
      * @param p the root page
      * @return the value, or null if not found
@@ -235,6 +247,9 @@ static  V get(Page p, K key) {
     /**
      * Read a page.
      *
+     * @param  key type
+     * @param  value type
+     *
      * @param buff ByteBuffer containing serialized page info
      * @param pos the position
      * @param map the map
@@ -248,10 +263,6 @@ static  Page read(ByteBuffer buff, long pos, MVMap map) {
         return p;
     }
 
-//    static  int getMemory(DataType keyType, K key) {
-//        return keyType.getMemory(key);
-//    }
-
     /**
      * Get the id of the page's owner map
      * @return id
@@ -353,7 +364,11 @@ protected void dump(StringBuilder buff) {
         buff.append("pos: ").append(Long.toHexString(pos)).append('\n');
         if (isSaved()) {
             int chunkId = DataUtils.getPageChunkId(pos);
-            buff.append("chunk: ").append(Long.toHexString(chunkId)).append('\n');
+            buff.append("chunk:").append(Long.toHexString(chunkId));
+            if (pageNo >= 0) {
+                buff.append(",no:").append(Long.toHexString(pageNo));
+            }
+            buff.append('\n');
         }
     }
 
@@ -365,6 +380,7 @@ protected void dump(StringBuilder buff) {
     public final Page copy() {
         Page newPage = clone();
         newPage.pos = 0;
+        newPage.pageNo = -1;
         return newPage;
     }
 
@@ -684,16 +700,18 @@ private boolean markAsRemoved() {
     }
 
     /**
-     * Store the page and update the position.
+     * Serializes this page into provided buffer, which represents content of the specified
+     * chunk to be persisted and updates the "position" of the page.
      *
-     * @param chunk the chunk
-     * @param buff the target buffer
-     * @param toc prospective table of content
-     * @return the position of the buffer just after the type
+     * @param pageSerializationManager which provides a target buffer
+     *                                and can be queried for various attributes
+     *                                related to serialization
+     * @return the position of the buffer, where serialized child page references (if any) begin
      */
-    protected final int write(Chunk chunk, WriteBuffer buff, List toc) {
-        pageNo = toc.size();
+    protected final int write(FileStore.PageSerializationManager pageSerializationManager) {
+        pageNo = pageSerializationManager.getPageNo();
         int keyCount = getKeyCount();
+        WriteBuffer buff = pageSerializationManager.getBuffer();
         int start = buff.position();
         buff.putInt(0)          // placeholder for pageLength
             .putShort((byte)0) // placeholder for check
@@ -745,36 +763,20 @@ protected final int write(Chunk chunk, WriteBuffer buff, List toc) {
             }
         }
         int pageLength = buff.position() - start;
-        long tocElement = DataUtils.getTocElement(getMapId(), start, buff.position() - start, type);
-        toc.add(tocElement);
-        int chunkId = chunk.id;
-        int check = DataUtils.getCheckValue(chunkId)
-                ^ DataUtils.getCheckValue(start)
-                ^ DataUtils.getCheckValue(pageLength);
-        buff.putInt(start, pageLength).
-            putShort(start + 4, (short) check);
+        long pagePos = pageSerializationManager.getPagePosition(getMapId(), start, pageLength, type);
         if (isSaved()) {
             throw DataUtils.newMVStoreException(
                     DataUtils.ERROR_INTERNAL, "Page already stored");
         }
-        long pagePos = DataUtils.getPagePos(chunkId, tocElement);
         boolean isDeleted = isRemoved();
         while (!posUpdater.compareAndSet(this, isDeleted ? 1L : 0L, pagePos)) {
             isDeleted = isRemoved();
         }
-        store.cachePage(this);
-        if (type == DataUtils.PAGE_TYPE_NODE) {
-            // cache again - this will make sure nodes stays in the cache
-            // for a longer time
-            store.cachePage(this);
-        }
-        int pageLengthEncoded = DataUtils.getPageMaxLength(pos);
+        int pageLengthDecoded = DataUtils.getPageMaxLength(pagePos);
+        diskSpaceUsed = pageLengthDecoded != DataUtils.PAGE_LARGE ? pageLengthDecoded : pageLength;
         boolean singleWriter = map.isSingleWriter();
-        chunk.accountForWrittenPage(pageLengthEncoded, singleWriter);
-        if (isDeleted) {
-            store.accountForRemovedPage(pagePos, chunk.version + 1, singleWriter, pageNo);
-        }
-        diskSpaceUsed = pageLengthEncoded != DataUtils.PAGE_LARGE ? pageLengthEncoded : pageLength;
+
+        pageSerializationManager.onPageSerialized(this, isDeleted, pageLengthDecoded, singleWriter);
         return childrenPos;
     }
 
@@ -796,11 +798,12 @@ protected final int write(Chunk chunk, WriteBuffer buff, List toc) {
     /**
      * Store this page and all children that are changed, in reverse order, and
      * update the position and the children.
-     * @param chunk the chunk
-     * @param buff the target buffer
-     * @param toc prospective table of content
+     *
+     * @param pageSerializationManager which provides a target buffer
+     *                                and can be queried for various attributes
+     *                                related to serialization
      */
-    abstract void writeUnsavedRecursive(Chunk chunk, WriteBuffer buff, List toc);
+    abstract void writeUnsavedRecursive(PageSerializationManager pageSerializationManager);
 
     /**
      * Unlink the children recursively after all data is written.
@@ -1313,10 +1316,11 @@ protected void writeChildren(WriteBuffer buff, boolean withCounts) {
         }
 
         @Override
-        void writeUnsavedRecursive(Chunk chunk, WriteBuffer buff, List toc) {
+        void writeUnsavedRecursive(PageSerializationManager pageSerializationManager) {
             if (!isSaved()) {
-                int patch = write(chunk, buff, toc);
-                writeChildrenRecursive(chunk, buff, toc);
+                int patch = write(pageSerializationManager);
+                writeChildrenRecursive(pageSerializationManager);
+                WriteBuffer buff = pageSerializationManager.getBuffer();
                 int old = buff.position();
                 buff.position(patch);
                 writeChildren(buff, false);
@@ -1324,13 +1328,13 @@ void writeUnsavedRecursive(Chunk chunk, WriteBuffer buff, List toc) {
             }
         }
 
-        void writeChildrenRecursive(Chunk chunk, WriteBuffer buff, List toc) {
+        void writeChildrenRecursive(PageSerializationManager pageSerializationManager) {
             int len = getRawChildPageCount();
             for (int i = 0; i < len; i++) {
                 PageReference ref = children[i];
                 Page p = ref.getPage();
                 if (p != null) {
-                    p.writeUnsavedRecursive(chunk, buff, toc);
+                    p.writeUnsavedRecursive(pageSerializationManager);
                     ref.resetPos();
                 }
             }
@@ -1388,11 +1392,11 @@ private static  PageReference[] constructEmptyPageRefs(int size) {
         }
 
         @Override
-        void writeUnsavedRecursive(Chunk chunk, WriteBuffer buff, List toc) {
+        void writeUnsavedRecursive(PageSerializationManager pageSerializationManager) {
             if (complete) {
-                super.writeUnsavedRecursive(chunk, buff, toc);
+                super.writeUnsavedRecursive(pageSerializationManager);
             } else if (!isSaved()) {
-                writeChildrenRecursive(chunk, buff, toc);
+                writeChildrenRecursive(pageSerializationManager);
             }
         }
 
@@ -1602,9 +1606,9 @@ protected void writeValues(WriteBuffer buff) {
         protected void writeChildren(WriteBuffer buff, boolean withCounts) {}
 
         @Override
-        void writeUnsavedRecursive(Chunk chunk, WriteBuffer buff, List toc) {
+        void writeUnsavedRecursive(PageSerializationManager pageSerializationManager) {
             if (!isSaved()) {
-                write(chunk, buff, toc);
+                write(pageSerializationManager);
             }
         }
 
diff --git a/h2/src/main/org/h2/mvstore/RandomAccessStore.java b/h2/src/main/org/h2/mvstore/RandomAccessStore.java
new file mode 100644
index 0000000000..8dbc7ee0bf
--- /dev/null
+++ b/h2/src/main/org/h2/mvstore/RandomAccessStore.java
@@ -0,0 +1,783 @@
+/*
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (https://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.mvstore;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.PriorityQueue;
+import java.util.Queue;
+
+/**
+ * Class RandomAccessStore.
+ * 
+ *  4/5/20 2:51 PM initial creation
+ * 
+ *
+ * @author Andrei Tokar
+ */
+public abstract class RandomAccessStore extends FileStore
+{
+    /**
+     * The free spaces between the chunks. The first block to use is block 2
+     * (the first two blocks are the store header).
+     */
+    protected final FreeSpaceBitSet freeSpace = new FreeSpaceBitSet(2, BLOCK_SIZE);
+
+    /**
+     * Allocation mode:
+     * false - new chunk is always allocated at the end of file
+     * true - new chunk is allocated as close to the beginning of file, as possible
+     */
+    private volatile boolean reuseSpace = true;
+
+
+    private long reservedLow;
+    private long reservedHigh;
+
+
+    public RandomAccessStore(Map config) {
+        super(config);
+    }
+
+    @Override
+    protected final SFChunk createChunk(int newChunkId) {
+        return new SFChunk(newChunkId);
+    }
+
+    @Override
+    public SFChunk createChunk(String s) {
+        return new SFChunk(s);
+    }
+
+    @Override
+    protected SFChunk createChunk(Map map) {
+        return new SFChunk(map);
+    }
+
+    /**
+     * Mark the space as in use.
+     *
+     * @param pos the position in bytes
+     * @param length the number of bytes
+     */
+    @Override
+    public void markUsed(long pos, int length) {
+        freeSpace.markUsed(pos, length);
+    }
+
+    /**
+     * Allocate a number of blocks and mark them as used.
+     *
+     * @param length the number of bytes to allocate
+     * @param reservedLow start block index of the reserved area (inclusive)
+     * @param reservedHigh end block index of the reserved area (exclusive),
+     *                     special value -1 means beginning of the infinite free area
+     * @return the start position in bytes
+     */
+    private long allocate(int length, long reservedLow, long reservedHigh) {
+        return freeSpace.allocate(length, reservedLow, reservedHigh);
+    }
+
+    /**
+     * Calculate starting position of the prospective allocation.
+     *
+     * @param blocks the number of blocks to allocate
+     * @param reservedLow start block index of the reserved area (inclusive)
+     * @param reservedHigh end block index of the reserved area (exclusive),
+     *                     special value -1 means beginning of the infinite free area
+     * @return the starting block index
+     */
+    private long predictAllocation(int blocks, long reservedLow, long reservedHigh) {
+        return freeSpace.predictAllocation(blocks, reservedLow, reservedHigh);
+    }
+
+    @Override
+    public boolean shouldSaveNow(int unsavedMemory, int autoCommitMemory) {
+        return unsavedMemory > autoCommitMemory;
+    }
+
+    private boolean isFragmented() {
+        return freeSpace.isFragmented();
+    }
+
+    @Override
+    public boolean isSpaceReused() {
+        return reuseSpace;
+    }
+
+    @Override
+    public void setReuseSpace(boolean reuseSpace) {
+        this.reuseSpace = reuseSpace;
+    }
+
+    @Override
+    protected void freeChunkSpace(Iterable chunks) {
+        for (SFChunk chunk : chunks) {
+            freeChunkSpace(chunk);
+        }
+        assert validateFileLength(String.valueOf(chunks));
+    }
+
+    private void freeChunkSpace(SFChunk chunk) {
+        long start = chunk.block * BLOCK_SIZE;
+        int length = chunk.len * BLOCK_SIZE;
+        free(start, length);
+    }
+
+    /**
+     * Mark the space as free.
+     *
+     * @param pos the position in bytes
+     * @param length the number of bytes
+     */
+    protected void free(long pos, int length) {
+        freeSpace.free(pos, length);
+    }
+
+    @Override
+    public int getFillRate() {
+        saveChunkLock.lock();
+        try {
+            return freeSpace.getFillRate();
+        } finally {
+            saveChunkLock.unlock();
+        }
+    }
+
+    @Override
+    protected final boolean validateFileLength(String msg) {
+        assert saveChunkLock.isHeldByCurrentThread();
+        assert getFileLengthInUse() == measureFileLengthInUse() :
+                getFileLengthInUse() + " != " + measureFileLengthInUse() + " " + msg;
+        return true;
+    }
+
+    private long measureFileLengthInUse() {
+        assert saveChunkLock.isHeldByCurrentThread();
+        long size = 2;
+        for (SFChunk c : getChunks().values()) {
+            if (c.isAllocated()) {
+                size = Math.max(size, c.block + c.len);
+            }
+        }
+        return size * BLOCK_SIZE;
+    }
+
+    long getFirstFree() {
+        return freeSpace.getFirstFree();
+    }
+
+    long getFileLengthInUse() {
+        return freeSpace.getLastFree();
+    }
+
+    @Override
+    protected void readStoreHeader(boolean recoveryMode) {
+        SFChunk newest = null;
+        boolean assumeCleanShutdown = true;
+        boolean validStoreHeader = false;
+        // find out which chunk and version are the newest
+        // read the first two blocks
+        ByteBuffer fileHeaderBlocks = readFully((SFChunk)null, 0, 2 * FileStore.BLOCK_SIZE);
+        byte[] buff = new byte[FileStore.BLOCK_SIZE];
+        for (int i = 0; i <= FileStore.BLOCK_SIZE; i += FileStore.BLOCK_SIZE) {
+            fileHeaderBlocks.get(buff);
+            // the following can fail for various reasons
+            try {
+                HashMap m = DataUtils.parseChecksummedMap(buff);
+                if (m == null) {
+                    assumeCleanShutdown = false;
+                    continue;
+                }
+                long version = DataUtils.readHexLong(m, FileStore.HDR_VERSION, 0);
+                // if both header blocks do agree on version
+                // we'll continue on happy path - assume that previous shutdown was clean
+                assumeCleanShutdown = assumeCleanShutdown && (newest == null || version == newest.version);
+                if (newest == null || version > newest.version) {
+                    validStoreHeader = true;
+                    storeHeader.putAll(m);
+                    int chunkId = DataUtils.readHexInt(m, FileStore.HDR_CHUNK, 0);
+                    long block = DataUtils.readHexLong(m, FileStore.HDR_BLOCK, 2);
+                    SFChunk test = readChunkHeaderAndFooter(block, chunkId);
+                    if (test != null) {
+                        newest = test;
+                    }
+                }
+            } catch (Exception ignore) {
+                assumeCleanShutdown = false;
+            }
+        }
+
+        if (!validStoreHeader) {
+            throw DataUtils.newMVStoreException(
+                    DataUtils.ERROR_FILE_CORRUPT,
+                    "Store header is corrupt: {0}", this);
+        }
+
+        processCommonHeaderAttributes();
+
+        assumeCleanShutdown = assumeCleanShutdown && newest != null && !recoveryMode;
+        if (assumeCleanShutdown) {
+            assumeCleanShutdown = DataUtils.readHexInt(storeHeader, FileStore.HDR_CLEAN, 0) != 0;
+        }
+//        assert getChunks().size() <= 1 : getChunks().size();
+
+        long fileSize = size();
+        long blocksInStore = fileSize / FileStore.BLOCK_SIZE;
+
+        Comparator chunkComparator = (one, two) -> {
+            int result = Long.compare(two.version, one.version);
+            if (result == 0) {
+                // out of two copies of the same chunk we prefer the one
+                // close to the beginning of file (presumably later version)
+                result = Long.compare(one.block, two.block);
+            }
+            return result;
+        };
+
+        Map validChunksByLocation = new HashMap<>();
+        if (assumeCleanShutdown) {
+            // quickly check latest 20 chunks referenced in meta table
+            Queue chunksToVerify = new PriorityQueue<>(20, Collections.reverseOrder(chunkComparator));
+            try {
+                setLastChunk(newest);
+                // load the chunk metadata: although meta's root page resides in the lastChunk,
+                // traversing meta map might recursively load another chunk(s)
+                for (SFChunk c : getChunksFromLayoutMap()) {
+                    // might be there already, due to meta traversal
+                    // see readPage() ... getChunkIfFound()
+                    chunksToVerify.offer(c);
+                    if (chunksToVerify.size() == 20) {
+                        chunksToVerify.poll();
+                    }
+                }
+                SFChunk c;
+                while (assumeCleanShutdown && (c = chunksToVerify.poll()) != null) {
+                    SFChunk test = readChunkHeaderAndFooter(c.block, c.id);
+                    assumeCleanShutdown = test != null;
+                    if (assumeCleanShutdown) {
+                        validChunksByLocation.put(test.block, test);
+                    }
+                }
+            } catch(IllegalStateException ignored) {
+                assumeCleanShutdown = false;
+            }
+        } else {
+            SFChunk tailChunk = discoverChunk(blocksInStore);
+            if (tailChunk != null) {
+                blocksInStore = tailChunk.block; // for a possible full scan later on
+                validChunksByLocation.put(blocksInStore, tailChunk);
+                if (newest == null || tailChunk.version > newest.version) {
+                    newest = tailChunk;
+                }
+            }
+            if (newest != null) {
+                // read the chunk header and footer,
+                // and follow the chain of next chunks
+                while (true) {
+                    validChunksByLocation.put(newest.block, newest);
+                    if (newest.next == 0 || newest.next >= blocksInStore) {
+                        // no (valid) next
+                        break;
+                    }
+                    SFChunk test = readChunkHeaderAndFooter(newest.next, newest.id + 1);
+                    if (test == null || test.version <= newest.version) {
+                        break;
+                    }
+                    newest = test;
+                }
+            }
+        }
+
+        if (!assumeCleanShutdown) {
+            // now we know, that previous shutdown did not go well and file
+            // is possibly corrupted but there is still hope for a quick
+            // recovery
+            boolean quickRecovery = !recoveryMode &&
+                    findLastChunkWithCompleteValidChunkSet(chunkComparator, validChunksByLocation, false);
+            if (!quickRecovery) {
+                // scan whole file and try to fetch chunk header and/or footer out of every block
+                // matching pairs with nothing in-between are considered as valid chunk
+                long block = blocksInStore;
+                SFChunk tailChunk;
+                while ((tailChunk = discoverChunk(block)) != null) {
+                    block = tailChunk.block;
+                    validChunksByLocation.put(block, tailChunk);
+                }
+
+                if (!findLastChunkWithCompleteValidChunkSet(chunkComparator, validChunksByLocation, true)
+                        && hasPersistentData()) {
+                    throw DataUtils.newMVStoreException(
+                            DataUtils.ERROR_FILE_CORRUPT,
+                            "File is corrupted - unable to recover a valid set of chunks");
+                }
+            }
+        }
+
+        clear();
+        // build the free space list
+        for (SFChunk c : getChunks().values()) {
+            if (c.isAllocated()) {
+                long start = c.block * FileStore.BLOCK_SIZE;
+                int length = c.len * FileStore.BLOCK_SIZE;
+                markUsed(start, length);
+            }
+            if (!c.isLive()) {
+                registerDeadChunk(c);
+            }
+        }
+        assert validateFileLength("on open");
+    }
+
+    @Override
+    protected void initializeStoreHeader(long time) {
+        initializeCommonHeaderAttributes(time);
+        writeStoreHeader();
+    }
+
+    @Override
+    protected final void allocateChunkSpace(SFChunk chunk, WriteBuffer buff) {
+        long reservedLow = this.reservedLow;
+        long reservedHigh = this.reservedHigh > 0 ? this.reservedHigh : isSpaceReused() ? 0 : getAfterLastBlock();
+        long filePos = allocate(buff.limit(), reservedLow, reservedHigh);
+        // calculate and set the likely next position
+        if (reservedLow > 0 || reservedHigh == reservedLow) {
+            chunk.next = predictAllocation(chunk.len, 0, 0);
+        } else {
+            // just after this chunk
+            chunk.next = 0;
+        }
+        chunk.block = filePos / BLOCK_SIZE;
+    }
+
+    @Override
+    protected final void writeChunk(SFChunk chunk, WriteBuffer buffer) {
+        long filePos = chunk.block * BLOCK_SIZE;
+        writeFully(chunk, filePos, buffer.getBuffer());
+
+        // end of the used space is not necessarily the end of the file
+        boolean storeAtEndOfFile = filePos + buffer.limit() >= size();
+        boolean shouldWriteStoreHeader = shouldWriteStoreHeader(chunk, storeAtEndOfFile);
+        lastChunk = chunk;
+        if (shouldWriteStoreHeader) {
+            writeStoreHeader();
+        }
+        if (!storeAtEndOfFile) {
+            // may only shrink after the store header was written
+            shrinkStoreIfPossible(1);
+        }
+    }
+
+    private boolean shouldWriteStoreHeader(SFChunk c, boolean storeAtEndOfFile) {
+        // whether we need to write the store header
+        boolean writeStoreHeader = false;
+        if (!storeAtEndOfFile) {
+            SFChunk chunk = lastChunk;
+            if (chunk == null) {
+                writeStoreHeader = true;
+            } else if (chunk.next != c.block) {
+                // the last prediction did not matched
+                writeStoreHeader = true;
+            } else {
+                long headerVersion = DataUtils.readHexLong(storeHeader, HDR_VERSION, 0);
+                if (chunk.version - headerVersion > 20) {
+                    // we write after at least every 20 versions
+                    writeStoreHeader = true;
+                } else {
+                    for (int chunkId = DataUtils.readHexInt(storeHeader, HDR_CHUNK, 0);
+                            !writeStoreHeader && chunkId <= chunk.id; ++chunkId) {
+                        // one of the chunks in between
+                        // was removed
+                        writeStoreHeader = !getChunks().containsKey(chunkId);
+                    }
+                }
+            }
+        }
+
+        if (storeHeader.remove(HDR_CLEAN) != null) {
+            writeStoreHeader = true;
+        }
+        return writeStoreHeader;
+    }
+
+    @Override
+    protected final void writeCleanShutdownMark() {
+        shrinkStoreIfPossible(0);
+        storeHeader.put(HDR_CLEAN, 1);
+        writeStoreHeader();
+    }
+
+    @Override
+    protected final void adjustStoreToLastChunk() {
+        storeHeader.put(HDR_CLEAN, 1);
+        writeStoreHeader();
+        readStoreHeader(false);
+    }
+
+    /**
+     * Compact store file, that is, compact blocks that have a low
+     * fill rate, and move chunks next to each other. This will typically
+     * shrink the file. Changes are flushed to the file, and old
+     * chunks are overwritten.
+     *
+     * @param thresholdFillRate do not compact if store fill rate above this value (0-100)
+     * @param maxCompactTime the maximum time in milliseconds to compact
+     * @param maxWriteSize the maximum amount of data to be written as part of this call
+     */
+    @Override
+    protected void compactStore(int thresholdFillRate, long maxCompactTime, int maxWriteSize, MVStore mvStore) {
+        setRetentionTime(0);
+        long stopAt = System.nanoTime() + maxCompactTime * 1_000_000L;
+        while (compact(thresholdFillRate, maxWriteSize)) {
+            sync();
+            compactMoveChunks(thresholdFillRate, maxWriteSize, mvStore);
+            if (System.nanoTime() - stopAt > 0L) {
+                break;
+            }
+        }
+    }
+
+    /**
+     * Compact the store by moving all chunks next to each other, if there is
+     * free space between chunks. This might temporarily increase the file size.
+     * Chunks are overwritten irrespective of the current retention time. Before
+     * overwriting chunks and before resizing the file, syncFile() is called.
+     *
+     * @param targetFillRate do nothing if the file store fill rate is higher
+     *            than this
+     * @param moveSize the number of bytes to move
+     * @param mvStore owner of this store
+     */
+    public void compactMoveChunks(int targetFillRate, long moveSize, MVStore mvStore) {
+        if (isSpaceReused()) {
+            mvStore.executeFilestoreOperation(() -> {
+                dropUnusedChunks();
+                saveChunkLock.lock();
+                try {
+                    if (hasPersistentData() && getFillRate() <= targetFillRate) {
+                        compactMoveChunks(moveSize);
+                    }
+                } finally {
+                    saveChunkLock.unlock();
+                }
+            });
+        }
+    }
+
+    private void compactMoveChunks(long moveSize) {
+        long start = getFirstFree() / FileStore.BLOCK_SIZE;
+        Iterable chunksToMove = findChunksToMove(start, moveSize);
+        if (chunksToMove != null) {
+            compactMoveChunks(chunksToMove);
+        }
+    }
+
+    private Iterable findChunksToMove(long startBlock, long moveSize) {
+        long maxBlocksToMove = moveSize / FileStore.BLOCK_SIZE;
+        Iterable result = null;
+        if (maxBlocksToMove > 0) {
+            PriorityQueue queue = new PriorityQueue<>(getChunks().size() / 2 + 1,
+                    (o1, o2) -> {
+                        // instead of selection just closest to beginning of the file,
+                        // pick smaller chunk(s) which sit in between bigger holes
+                        int res = Integer.compare(o2.collectPriority, o1.collectPriority);
+                        if (res != 0) {
+                            return res;
+                        }
+                        return Long.signum(o2.block - o1.block);
+                    });
+            long size = 0;
+            for (SFChunk chunk : getChunks().values()) {
+                if (chunk.isAllocated() && chunk.block > startBlock) {
+                    chunk.collectPriority = getMovePriority(chunk);
+                    queue.offer(chunk);
+                    size += chunk.len;
+                    while (size > maxBlocksToMove) {
+                        Chunk removed = queue.poll();
+                        if (removed == null) {
+                            break;
+                        }
+                        size -= removed.len;
+                    }
+                }
+            }
+            if (!queue.isEmpty()) {
+                ArrayList list = new ArrayList<>(queue);
+                list.sort(Chunk.PositionComparator.instance());
+                result = list;
+            }
+        }
+        return result;
+    }
+
+    private int getMovePriority(SFChunk chunk) {
+        return getMovePriority((int)chunk.block);
+    }
+
+    private void compactMoveChunks(Iterable move) {
+        assert saveChunkLock.isHeldByCurrentThread();
+        if (move != null) {
+            // this will ensure better recognition of the last chunk
+            // in case of power failure, since we are going to move older chunks
+            // to the end of the file
+            writeStoreHeader();
+            sync();
+
+            Iterator iterator = move.iterator();
+            assert iterator.hasNext();
+            long leftmostBlock = iterator.next().block;
+            long originalBlockCount = getAfterLastBlock();
+            // we need to ensure that chunks moved within the following loop
+            // do not overlap with space just released by chunks moved before them,
+            // hence the need to reserve this area [leftmostBlock, originalBlockCount)
+            for (SFChunk chunk : move) {
+                moveChunk(chunk, leftmostBlock, originalBlockCount);
+            }
+            // update the metadata (hopefully within the file)
+            store(leftmostBlock, originalBlockCount);
+            sync();
+
+            SFChunk chunkToMove = lastChunk;
+            assert chunkToMove != null;
+            long postEvacuationBlockCount = getAfterLastBlock();
+
+            boolean chunkToMoveIsAlreadyInside = chunkToMove.block < leftmostBlock;
+            boolean movedToEOF = !chunkToMoveIsAlreadyInside;
+            // move all chunks, which previously did not fit before reserved area
+            // now we can re-use previously reserved area [leftmostBlock, originalBlockCount),
+            // but need to reserve [originalBlockCount, postEvacuationBlockCount)
+            for (SFChunk c : move) {
+                if (c.block >= originalBlockCount &&
+                        moveChunk(c, originalBlockCount, postEvacuationBlockCount)) {
+                    assert c.block < originalBlockCount;
+                    movedToEOF = true;
+                }
+            }
+            assert postEvacuationBlockCount >= getAfterLastBlock();
+
+            if (movedToEOF) {
+                boolean moved = moveChunkInside(chunkToMove, originalBlockCount);
+
+                // store a new chunk with updated metadata (hopefully within a file)
+                store(originalBlockCount, postEvacuationBlockCount);
+                sync();
+                // if chunkToMove did not fit within originalBlockCount (move is
+                // false), and since now previously reserved area
+                // [originalBlockCount, postEvacuationBlockCount) also can be
+                // used, lets try to move that chunk into this area, closer to
+                // the beginning of the file
+                long lastBoundary = moved || chunkToMoveIsAlreadyInside ?
+                                        postEvacuationBlockCount : chunkToMove.block;
+                moved = !moved && moveChunkInside(chunkToMove, lastBoundary);
+                if (moveChunkInside(lastChunk, lastBoundary) || moved) {
+                    store(lastBoundary, -1);
+                }
+            }
+
+            shrinkStoreIfPossible(0);
+            sync();
+        }
+    }
+
+    private void writeStoreHeader() {
+        StringBuilder buff = new StringBuilder(112);
+        if (hasPersistentData()) {
+            storeHeader.put(HDR_BLOCK, lastChunk.block);
+            storeHeader.put(HDR_CHUNK, lastChunk.id);
+            storeHeader.put(HDR_VERSION, lastChunk.version);
+        }
+        DataUtils.appendMap(buff, storeHeader);
+        byte[] bytes = buff.toString().getBytes(StandardCharsets.ISO_8859_1);
+        int checksum = DataUtils.getFletcher32(bytes, 0, bytes.length);
+        DataUtils.appendMap(buff, HDR_FLETCHER, checksum);
+        buff.append('\n');
+        bytes = buff.toString().getBytes(StandardCharsets.ISO_8859_1);
+        ByteBuffer header = ByteBuffer.allocate(2 * BLOCK_SIZE);
+        header.put(bytes);
+        header.position(BLOCK_SIZE);
+        header.put(bytes);
+        header.rewind();
+        writeFully(null, 0, header);
+    }
+
+    private void store(long reservedLow, long reservedHigh) {
+        this.reservedLow = reservedLow;
+        this.reservedHigh = reservedHigh;
+        saveChunkLock.unlock();
+        try {
+            store();
+        } finally {
+            saveChunkLock.lock();
+            this.reservedLow = 0;
+            this.reservedHigh = 0;
+        }
+    }
+
+    private boolean moveChunkInside(SFChunk chunkToMove, long boundary) {
+        boolean res = chunkToMove.block >= boundary &&
+                predictAllocation(chunkToMove.len, boundary, -1) < boundary &&
+                moveChunk(chunkToMove, boundary, -1);
+        assert !res || chunkToMove.block + chunkToMove.len <= boundary;
+        return res;
+    }
+
+    /**
+     * Move specified chunk into free area of the file. "Reserved" area
+     * specifies file interval to be avoided, when un-allocated space will be
+     * chosen for a new chunk's location.
+     *
+     * @param chunk            to move
+     * @param reservedAreaLow  low boundary of reserved area, inclusive
+     * @param reservedAreaHigh high boundary of reserved area, exclusive
+     * @return true if block was moved, false otherwise
+     */
+    private boolean moveChunk(SFChunk chunk, long reservedAreaLow, long reservedAreaHigh) {
+        // ignore if already removed during the previous store operations
+        // those are possible either as explicit commit calls
+        // or from meta map updates at the end of this method
+        if (!getChunks().containsKey(chunk.id)) {
+            return false;
+        }
+        long start = chunk.block * FileStore.BLOCK_SIZE;
+        int length = chunk.len * FileStore.BLOCK_SIZE;
+        long pos = allocate(length, reservedAreaLow, reservedAreaHigh);
+        long block = pos / FileStore.BLOCK_SIZE;
+        // in the absence of a reserved area,
+        // block should always move closer to the beginning of the file
+        assert reservedAreaHigh > 0 || block <= chunk.block : block + " " + chunk;
+        ByteBuffer readBuff = readFully(chunk, start, length);
+        writeFully(null, pos, readBuff);
+        free(start, length);
+        // can not set chunk's new block/len until it's fully written at new location,
+        // because concurrent reader can pick it up prematurely,
+        chunk.block = block;
+        chunk.next = 0;
+        saveChunkMetadataChanges(chunk);
+        return true;
+    }
+
+    /**
+     * Shrink the store if possible, and if at least a given percentage can be
+     * saved.
+     *
+     * @param minPercent the minimum percentage to save
+     */
+    @Override
+    protected void shrinkStoreIfPossible(int minPercent) {
+        assert saveChunkLock.isHeldByCurrentThread();
+        long result = getFileLengthInUse();
+        assert result == measureFileLengthInUse() : result + " != " + measureFileLengthInUse();
+        shrinkIfPossible(minPercent);
+    }
+
+    private void shrinkIfPossible(int minPercent) {
+        if (isReadOnly()) {
+            return;
+        }
+        long end = getFileLengthInUse();
+        long fileSize = size();
+        if (end >= fileSize) {
+            return;
+        }
+        if (minPercent > 0 && fileSize - end < BLOCK_SIZE) {
+            return;
+        }
+        int savedPercent = (int) (100 - (end * 100 / fileSize));
+        if (savedPercent < minPercent) {
+            return;
+        }
+        sync();
+        truncate(end);
+    }
+
+    @Override
+    protected void doHousekeeping(MVStore mvStore) throws InterruptedException {
+        int autoCommitMemory = mvStore.getAutoCommitMemory();
+        int fillRate = getFillRate();
+        if (isFragmented() && fillRate < getAutoCompactFillRate()) {
+
+            mvStore.tryExecuteUnderStoreLock(() -> {
+                int moveSize = autoCommitMemory;
+                if (isIdle()) {
+                    moveSize *= 4;
+                }
+                compactMoveChunks(101, moveSize, mvStore);
+                return true;
+            });
+        } else if (fillRate >= getAutoCompactFillRate() && hasPersistentData()) {
+            int chunksFillRate = getRewritableChunksFillRate();
+            int _chunksFillRate = isIdle() ? 100 - (100 - chunksFillRate) / 2 : chunksFillRate;
+            if (_chunksFillRate < getTargetFillRate()) {
+                mvStore.tryExecuteUnderStoreLock(() -> {
+                    int writeLimit = autoCommitMemory * fillRate / Math.max(_chunksFillRate, 1);
+                    if (!isIdle()) {
+                        writeLimit /= 4;
+                    }
+                    if (rewriteChunks(writeLimit, _chunksFillRate)) {
+                        dropUnusedChunks();
+                    }
+                    return true;
+                });
+            }
+        }
+    }
+
+    private int getTargetFillRate() {
+        int targetRate = getAutoCompactFillRate();
+        // use a lower fill rate if there were any file operations since the last time
+        if (!isIdle()) {
+            targetRate /= 2;
+        }
+        return targetRate;
+    }
+
+    protected abstract void truncate(long size);
+
+    /**
+     * Mark the file as empty.
+     */
+    @Override
+    public void clear() {
+        freeSpace.clear();
+    }
+
+    /**
+     * Calculates relative "priority" for chunk to be moved.
+     *
+     * @param block where chunk starts
+     * @return priority, bigger number indicate that chunk need to be moved sooner
+     */
+    public int getMovePriority(int block) {
+        return freeSpace.getMovePriority(block);
+    }
+
+    /**
+     * Get the index of the first block after last occupied one.
+     * It marks the beginning of the last (infinite) free space.
+     *
+     * @return block index
+     */
+    private long getAfterLastBlock() {
+        assert saveChunkLock.isHeldByCurrentThread();
+        return getAfterLastBlock_();
+    }
+
+    protected long getAfterLastBlock_() {
+        return freeSpace.getAfterLastBlock();
+    }
+
+    @Override
+    public Collection getRewriteCandidates() {
+        return isSpaceReused() ? null : Collections.emptyList();
+    }
+}
diff --git a/h2/src/main/org/h2/mvstore/RootReference.java b/h2/src/main/org/h2/mvstore/RootReference.java
index f751e4c74d..3c2825f826 100644
--- a/h2/src/main/org/h2/mvstore/RootReference.java
+++ b/h2/src/main/org/h2/mvstore/RootReference.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/mvstore/SFChunk.java b/h2/src/main/org/h2/mvstore/SFChunk.java
new file mode 100644
index 0000000000..815907b125
--- /dev/null
+++ b/h2/src/main/org/h2/mvstore/SFChunk.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (https://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.mvstore;
+
+import java.nio.ByteBuffer;
+import java.util.Map;
+
+/**
+ * Class SFChunk.
+ * 
+ *  4/23/22 12:58 PM initial creation
+ * 
+ *
+ * @author Andrei Tokar
+ */
+final class SFChunk extends Chunk
+{
+    SFChunk(int id) {
+        super(id);
+    }
+
+    SFChunk(String line) {
+        super(line);
+    }
+
+    SFChunk(Map map) {
+        super(map, false);
+    }
+
+    @Override
+    protected ByteBuffer readFully(FileStore fileStore, long filePos, int length) {
+        return fileStore.readFully(this, filePos, length);
+    }
+}
diff --git a/h2/src/main/org/h2/mvstore/SingleFileStore.java b/h2/src/main/org/h2/mvstore/SingleFileStore.java
new file mode 100644
index 0000000000..cda2433aa7
--- /dev/null
+++ b/h2/src/main/org/h2/mvstore/SingleFileStore.java
@@ -0,0 +1,264 @@
+/*
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (https://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.mvstore;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.nio.channels.OverlappingFileLockException;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+import org.h2.mvstore.cache.FilePathCache;
+import org.h2.store.fs.FilePath;
+import org.h2.store.fs.encrypt.FileEncrypt;
+import org.h2.store.fs.encrypt.FilePathEncrypt;
+import org.h2.util.IOUtils;
+
+/**
+ * The default storage mechanism of the MVStore. This implementation persists
+ * data to a file. The file store is responsible to persist data and for free
+ * space management.
+ */
+public class SingleFileStore extends RandomAccessStore {
+
+    /**
+     * The file.
+     */
+    private FileChannel fileChannel;
+
+    /**
+     * The encrypted file (if encryption is used).
+     */
+    private FileChannel originalFileChannel;
+
+    /**
+     * The file lock.
+     */
+    private FileLock fileLock;
+
+    private final Map config;
+
+
+    public SingleFileStore(Map config) {
+        super(config);
+        this.config = config;
+    }
+
+    @Override
+    public String toString() {
+        return getFileName();
+    }
+
+    @Override
+    public ByteBuffer readFully(SFChunk chunk, long pos, int len) {
+        return readFully(fileChannel, pos, len);
+    }
+
+    @Override
+    protected void writeFully(SFChunk chunk, long pos, ByteBuffer src) {
+        int len = src.remaining();
+        setSize(Math.max(super.size(), pos + len));
+        DataUtils.writeFully(fileChannel, pos, src);
+        writeCount.incrementAndGet();
+        writeBytes.addAndGet(len);
+    }
+
+    /**
+     * Try to open the file.
+     *  @param fileName the file name
+     * @param readOnly whether the file should only be opened in read-only mode,
+     *            even if the file is writable
+     * @param encryptionKey the encryption key, or null if encryption is not
+     */
+    @Override
+    public void open(String fileName, boolean readOnly, char[] encryptionKey) {
+        open(fileName, readOnly,
+                encryptionKey == null ? null
+                        : fileChannel -> new FileEncrypt(fileName, FilePathEncrypt.getPasswordBytes(encryptionKey),
+                                fileChannel));
+    }
+
+    @Override
+    public SingleFileStore open(String fileName, boolean readOnly) {
+        SingleFileStore result = new SingleFileStore(config);
+        result.open(fileName, readOnly, originalFileChannel == null ? null :
+                fileChannel -> new FileEncrypt(fileName, (FileEncrypt)this.fileChannel, fileChannel));
+        return result;
+    }
+
+    private void open(String fileName, boolean readOnly, Function encryptionTransformer) {
+        if (fileChannel != null && fileChannel.isOpen()) {
+            return;
+        }
+        // ensure the Cache file system is registered
+        FilePathCache.INSTANCE.getScheme();
+        FilePath f = FilePath.get(fileName);
+        FilePath parent = f.getParent();
+        if (parent != null && !parent.exists()) {
+            throw DataUtils.newIllegalArgumentException(
+                    "Directory does not exist: {0}", parent);
+        }
+        if (f.exists() && !f.canWrite()) {
+            readOnly = true;
+        }
+        init(fileName, readOnly);
+        try {
+            fileChannel = f.open(readOnly ? "r" : "rw");
+            if (encryptionTransformer != null) {
+                originalFileChannel = fileChannel;
+                fileChannel = encryptionTransformer.apply(fileChannel);
+            }
+            fileLock = lockFileChannel(fileChannel, readOnly, fileName);
+            saveChunkLock.lock();
+            try {
+                setSize(fileChannel.size());
+            } finally {
+                saveChunkLock.unlock();
+            }
+        } catch (IOException e) {
+            try { close(); } catch (Exception ignore) {}
+            throw DataUtils.newMVStoreException(
+                    DataUtils.ERROR_READING_FAILED,
+                    "Could not open file {0}", fileName, e);
+        }
+    }
+
+    private FileLock lockFileChannel(FileChannel fileChannel, boolean readOnly, String fileName) throws IOException {
+        FileLock fileLock;
+        try {
+            fileLock = fileChannel.tryLock(0L, Long.MAX_VALUE, readOnly);
+        } catch (OverlappingFileLockException e) {
+            throw DataUtils.newMVStoreException(
+                    DataUtils.ERROR_FILE_LOCKED,
+                    "The file is locked: {0}", fileName, e);
+        }
+        if (fileLock == null) {
+            try { close(); } catch (Exception ignore) {}
+            throw DataUtils.newMVStoreException(
+                    DataUtils.ERROR_FILE_LOCKED,
+                    "The file is locked: {0}", fileName);
+        }
+        return fileLock;
+    }
+
+    /**
+     * Close this store.
+     */
+    @Override
+    public void close() {
+        try {
+            if(fileChannel.isOpen()) {
+                if (fileLock != null) {
+                    fileLock.release();
+                }
+                fileChannel.close();
+            }
+        } catch (Exception e) {
+            throw DataUtils.newMVStoreException(
+                    DataUtils.ERROR_WRITING_FAILED,
+                    "Closing failed for file {0}", getFileName(), e);
+        } finally {
+            fileLock = null;
+            super.close();
+        }
+    }
+
+    /**
+     * Flush all changes.
+     */
+    @Override
+    public void sync() {
+        if (fileChannel.isOpen()) {
+            try {
+                fileChannel.force(true);
+            } catch (IOException e) {
+                throw DataUtils.newMVStoreException(
+                        DataUtils.ERROR_WRITING_FAILED,
+                        "Could not sync file {0}", getFileName(), e);
+            }
+        }
+    }
+
+    /**
+     * Truncate the file.
+     *
+     * @param size the new file size
+     */
+    @Override
+    @SuppressWarnings("ThreadPriorityCheck")
+    public void truncate(long size) {
+        int attemptCount = 0;
+        while (true) {
+            try {
+                writeCount.incrementAndGet();
+                fileChannel.truncate(size);
+                setSize(Math.min(super.size(), size));
+                return;
+            } catch (IOException e) {
+                if (++attemptCount == 10) {
+                    throw DataUtils.newMVStoreException(
+                            DataUtils.ERROR_WRITING_FAILED,
+                            "Could not truncate file {0} to size {1}",
+                            getFileName(), size, e);
+                }
+                System.gc();
+                Thread.yield();
+            }
+        }
+    }
+
+    /**
+     * Calculates relative "priority" for chunk to be moved.
+     *
+     * @param block where chunk starts
+     * @return priority, bigger number indicate that chunk need to be moved sooner
+     */
+    @Override
+    public int getMovePriority(int block) {
+        return freeSpace.getMovePriority(block);
+    }
+
+    @Override
+    protected long getAfterLastBlock_() {
+        return freeSpace.getAfterLastBlock();
+    }
+
+    @Override
+    public void backup(ZipOutputStream out) throws IOException {
+        boolean before = isSpaceReused();
+        setReuseSpace(false);
+        try {
+            backupFile(out, getFileName(), originalFileChannel != null ? originalFileChannel : fileChannel);
+        } finally {
+            setReuseSpace(before);
+        }
+    }
+
+    private static void backupFile(ZipOutputStream out, String fileName, FileChannel in) throws IOException {
+        String f = FilePath.get(fileName).toRealPath().getName();
+        f = correctFileName(f);
+        out.putNextEntry(new ZipEntry(f));
+        IOUtils.copy(in, out);
+        out.closeEntry();
+    }
+
+    /**
+     * Fix the file name, replacing backslash with slash.
+     *
+     * @param f the file name
+     * @return the corrected file name
+     */
+    public static String correctFileName(String f) {
+        f = f.replace('\\', '/');
+        if (f.startsWith("/")) {
+            f = f.substring(1);
+        }
+        return f;
+    }
+}
diff --git a/h2/src/main/org/h2/mvstore/StreamStore.java b/h2/src/main/org/h2/mvstore/StreamStore.java
index 117e256a9c..3fb6ab5850 100644
--- a/h2/src/main/org/h2/mvstore/StreamStore.java
+++ b/h2/src/main/org/h2/mvstore/StreamStore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -14,6 +14,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.IntConsumer;
 
 /**
  * A facility to store streams in a map. Streams are split into blocks, which
@@ -34,14 +35,14 @@
  * encoded as 2, the total length (a variable size long), and the key of the
  * block that contains the id (a variable size long).
  */
-public class StreamStore {
-
+public final class StreamStore
+{
     private final Map map;
-    private int minBlockSize = 256;
-    private int maxBlockSize = 256 * 1024;
+    private final int minBlockSize;
+    private final int maxBlockSize;
     private final AtomicLong nextKey = new AtomicLong();
-    private final AtomicReference nextBuffer =
-            new AtomicReference<>();
+    private final AtomicReference nextBuffer = new AtomicReference<>();
+    private final IntConsumer onStoreCallback;
 
     /**
      * Create a stream store instance.
@@ -49,7 +50,22 @@ public class StreamStore {
      * @param map the map to store blocks of data
      */
     public StreamStore(Map map) {
+        this(map, 256, 256 * 1024, null);
+    }
+
+    public StreamStore(Map map, int minBlockSize, int maxBlockSize) {
+        this(map, minBlockSize, maxBlockSize, null);
+    }
+
+    public StreamStore(Map map, IntConsumer onStoreCallback) {
+        this(map, 256, 256 * 1024, onStoreCallback);
+    }
+
+    public StreamStore(Map map, int minBlockSize, int maxBlockSize, IntConsumer onStoreCallback) {
         this.map = map;
+        this.minBlockSize = minBlockSize;
+        this.maxBlockSize = maxBlockSize;
+        this.onStoreCallback = onStoreCallback;
     }
 
     public Map getMap() {
@@ -64,28 +80,10 @@ public long getNextKey() {
         return nextKey.get();
     }
 
-    /**
-     * Set the minimum block size. The default is 256 bytes.
-     *
-     * @param minBlockSize the new value
-     */
-    public void setMinBlockSize(int minBlockSize) {
-        this.minBlockSize = minBlockSize;
-    }
-
     public int getMinBlockSize() {
         return minBlockSize;
     }
 
-    /**
-     * Set the maximum block size. The default is 256 KB.
-     *
-     * @param maxBlockSize the new value
-     */
-    public void setMaxBlockSize(int maxBlockSize) {
-        this.maxBlockSize = maxBlockSize;
-    }
-
     public long getMaxBlockSize() {
         return maxBlockSize;
     }
@@ -97,7 +95,6 @@ public long getMaxBlockSize() {
      * @return the id (potentially an empty array)
      * @throws IOException If an I/O error occurs
      */
-    @SuppressWarnings("resource")
     public byte[] put(InputStream in) throws IOException {
         ByteArrayOutputStream id = new ByteArrayOutputStream();
         int level = 0;
@@ -195,21 +192,12 @@ private ByteArrayOutputStream putIndirectId(ByteArrayOutputStream id)
     private long writeBlock(byte[] data) {
         long key = getAndIncrementNextKey();
         map.put(key, data);
-        onStore(data.length);
+        if (onStoreCallback != null) {
+            onStoreCallback.accept(data.length);
+        }
         return key;
     }
 
-    /**
-     * This method is called after a block of data is stored. Override this
-     * method to persist data if necessary.
-     *
-     * @param len the length of the stored block.
-     */
-    @SuppressWarnings("unused")
-    protected void onStore(int len) {
-        // do nothing by default
-    }
-
     /**
      * Generate a new key.
      *
diff --git a/h2/src/main/org/h2/mvstore/WriteBuffer.java b/h2/src/main/org/h2/mvstore/WriteBuffer.java
index 7b6690d12c..ed5d80ba3d 100644
--- a/h2/src/main/org/h2/mvstore/WriteBuffer.java
+++ b/h2/src/main/org/h2/mvstore/WriteBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/mvstore/cache/CacheLongKeyLIRS.java b/h2/src/main/org/h2/mvstore/cache/CacheLongKeyLIRS.java
index b470122833..77faf1e9bc 100644
--- a/h2/src/main/org/h2/mvstore/cache/CacheLongKeyLIRS.java
+++ b/h2/src/main/org/h2/mvstore/cache/CacheLongKeyLIRS.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -150,7 +150,7 @@ public V put(long key, V value) {
      * @param memory the memory used for the given entry
      * @return the old value, or null if there was no resident entry
      */
-    public V put(long key, V value, int memory) {
+    public V put(long key, V value, long memory) {
         if (value == null) {
             throw DataUtils.newIllegalArgumentException(
                     "The value may not be null");
@@ -184,14 +184,14 @@ private Segment resizeIfNeeded(Segment s, int segmentIndex) {
     }
 
     /**
-     * Get the size of the given value. The default implementation returns 1.
+     * Get the size of the given value. The default implementation returns 16.
      *
      * @param value the value
      * @return the size
      */
     @SuppressWarnings("unused")
-    protected int sizeOf(V value) {
-        return 1;
+    protected long sizeOf(V value) {
+        return 16;
     }
 
     /**
@@ -220,9 +220,18 @@ public V remove(long key) {
      * @param key the key (may not be null)
      * @return the memory, or 0 if there is no resident entry
      */
-    public int getMemory(long key) {
+    public long getMemory(long key) {
         Entry e = find(key);
-        return e == null ? 0 : e.getMemory();
+        return e == null ? 0L : e.getMemory();
+    }
+
+    /**
+     * Get the memory overhead per value.
+     *
+     * @return the memory overhead per value
+     */
+    public static int getMemoryOverhead() {
+        return Entry.TOTAL_MEMORY_OVERHEAD;
     }
 
     /**
@@ -787,7 +796,7 @@ private void access(Entry e) {
          * @param memory the memory used for the given entry
          * @return the old value, or null if there was no resident entry
          */
-        synchronized V put(long key, int hash, V value, int memory) {
+        synchronized V put(long key, int hash, V value, long memory) {
             Entry e = find(key, hash);
             boolean existed = e != null;
             V old = null;
@@ -795,7 +804,7 @@ synchronized V put(long key, int hash, V value, int memory) {
                 old = e.getValue();
                 remove(key, hash);
             }
-            if (memory > maxMemory) {
+            if (memory + Entry.TOTAL_MEMORY_OVERHEAD > maxMemory) {
                 // the new entry is too big to fit
                 return old;
             }
@@ -803,7 +812,7 @@ synchronized V put(long key, int hash, V value, int memory) {
             int index = hash & mask;
             e.mapNext = entries[index];
             entries[index] = e;
-            usedMemory += memory;
+            usedMemory += e.memory;
             if (usedMemory > maxMemory) {
                 // old entries needs to be removed
                 evict();
@@ -1088,6 +1097,8 @@ void setMaxMemory(long maxMemory) {
      */
     static class Entry {
 
+        static final int TOTAL_MEMORY_OVERHEAD = 112;
+
         /**
          * The key.
          */
@@ -1106,7 +1117,7 @@ static class Entry {
         /**
          * The estimated memory used.
          */
-        final int memory;
+        final long memory;
 
         /**
          * When the item was last moved to the top of the stack.
@@ -1141,17 +1152,19 @@ static class Entry {
 
 
         Entry() {
-            this(0L, null, 0);
+            this(0L, null, 0L);
         }
 
-        Entry(long key, V value, int memory) {
+        Entry(long key, V value, long memory) {
             this.key = key;
-            this.memory = memory;
+            this.memory = memory + TOTAL_MEMORY_OVERHEAD;
             this.value = value;
         }
 
         Entry(Entry old) {
-            this(old.key, old.value, old.memory);
+            this.key = old.key;
+            this.memory = old.memory;
+            this.value = old.value;
             this.reference = old.reference;
             this.topMove = old.topMove;
         }
@@ -1169,8 +1182,8 @@ V getValue() {
             return value == null ? reference.get() : value;
         }
 
-        int getMemory() {
-            return value == null ? 0 : memory;
+        long getMemory() {
+            return value == null ? 0L : memory;
         }
     }
 
diff --git a/h2/src/main/org/h2/mvstore/cache/FilePathCache.java b/h2/src/main/org/h2/mvstore/cache/FilePathCache.java
index 1b646700cd..72ef5cc1b9 100644
--- a/h2/src/main/org/h2/mvstore/cache/FilePathCache.java
+++ b/h2/src/main/org/h2/mvstore/cache/FilePathCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -108,7 +108,7 @@ public synchronized int read(ByteBuffer dst, long position) throws IOException {
                 }
                 int read = buff.position();
                 if (read == CACHE_BLOCK_SIZE) {
-                    cache.put(cachePos, buff, CACHE_BLOCK_SIZE);
+                    cache.put(cachePos, buff, CACHE_BLOCK_SIZE + 80);
                 } else {
                     if (read <= 0) {
                         return -1;
diff --git a/h2/src/main/org/h2/mvstore/cache/package.html b/h2/src/main/org/h2/mvstore/cache/package.html
index 6fb2940964..a7e436a0a4 100644
--- a/h2/src/main/org/h2/mvstore/cache/package.html
+++ b/h2/src/main/org/h2/mvstore/cache/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/main/org/h2/mvstore/db/LobStorageMap.java b/h2/src/main/org/h2/mvstore/db/LobStorageMap.java
index cee7cdbf26..1632f9cbd1 100644
--- a/h2/src/main/org/h2/mvstore/db/LobStorageMap.java
+++ b/h2/src/main/org/h2/mvstore/db/LobStorageMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -15,6 +15,11 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.atomic.AtomicLong;
 import org.h2.api.ErrorCode;
 import org.h2.engine.Database;
@@ -22,6 +27,7 @@
 import org.h2.mvstore.DataUtils;
 import org.h2.mvstore.MVMap;
 import org.h2.mvstore.MVStore;
+import org.h2.mvstore.MVStoreException;
 import org.h2.mvstore.StreamStore;
 import org.h2.mvstore.WriteBuffer;
 import org.h2.mvstore.tx.TransactionStore;
@@ -34,6 +40,7 @@
 import org.h2.store.RangeInputStream;
 import org.h2.util.IOUtils;
 import org.h2.util.StringUtils;
+import org.h2.util.Utils;
 import org.h2.value.Value;
 import org.h2.value.ValueBlob;
 import org.h2.value.ValueClob;
@@ -53,6 +60,8 @@ public final class LobStorageMap implements LobStorageInterface
     private final Database database;
     final MVStore mvStore;
     private final AtomicLong nextLobId = new AtomicLong(0);
+    private final ThreadPoolExecutor cleanupExecutor;
+
 
     /**
      * The lob metadata map. It contains the mapping from the lob id
@@ -78,6 +87,7 @@ public final class LobStorageMap implements LobStorageInterface
 
     private final StreamStore streamStore;
 
+    private final Queue pendingLobRemovals = new ConcurrentLinkedQueue<>();
 
     /**
      * Open map used to store LOB metadata
@@ -102,6 +112,24 @@ public LobStorageMap(Database database) {
         Store s = database.getStore();
         TransactionStore txStore = s.getTransactionStore();
         mvStore = s.getMvStore();
+        if (mvStore.isVersioningRequired()) {
+            cleanupExecutor = Utils.createSingleThreadExecutor("H2-lob-cleaner", new SynchronousQueue<>());
+            mvStore.setOldestVersionTracker(oldestVersionToKeep -> {
+                if (needCleanup()) {
+                    try {
+                        cleanupExecutor.execute(() -> {
+                            try {
+                                cleanup(oldestVersionToKeep);
+                            } catch (MVStoreException e) {
+                                mvStore.panic(e);
+                            }
+                        });
+                    } catch (RejectedExecutionException ignore) {/**/}
+                }
+            });
+        } else {
+            cleanupExecutor = null;
+        }
         MVStore.TxCounter txCounter = mvStore.registerVersionUsage();
         try {
             lobMap = openLobMap(txStore);
@@ -355,7 +383,7 @@ public void removeAllForTable(int tableId) {
                 final Iterator iter = tempLobMap.keyIterator(0L);
                 while (iter.hasNext()) {
                     long lobId = iter.next();
-                    removeLob(tableId, lobId);
+                    doRemoveLob(tableId, lobId);
                 }
                 tempLobMap.clear();
             } else {
@@ -370,7 +398,7 @@ public void removeAllForTable(int tableId) {
                     }
                 }
                 for (long lobId : list) {
-                    removeLob(tableId, lobId);
+                    doRemoveLob(tableId, lobId);
                 }
             }
         } finally {
@@ -380,18 +408,50 @@ public void removeAllForTable(int tableId) {
 
     @Override
     public void removeLob(ValueLob lob) {
+        LobDataDatabase lobData = (LobDataDatabase) lob.getLobData();
+        int tableId = lobData.getTableId();
+        long lobId = lobData.getLobId();
+        requestLobRemoval(tableId, lobId);
+    }
+
+    private void requestLobRemoval(int tableId, long lobId) {
+        pendingLobRemovals.offer(new LobRemovalInfo(mvStore.getCurrentVersion(), lobId, tableId));
+    }
+
+    private boolean needCleanup() {
+        return !pendingLobRemovals.isEmpty();
+    }
+
+    @Override
+    public void close() {
+        mvStore.setOldestVersionTracker(null);
+        Utils.shutdownExecutor(cleanupExecutor);
+        if (!mvStore.isClosed() && mvStore.isVersioningRequired()) {
+            // remove all session variables and temporary lobs
+            removeAllForTable(LobStorageFrontend.TABLE_ID_SESSION_VARIABLE);
+            // remove all dead LOBs, even deleted in current version, before the store closed
+            cleanup(mvStore.getCurrentVersion() + 1);
+        }
+    }
+
+    private void cleanup(long oldestVersionToKeep) {
         MVStore.TxCounter txCounter = mvStore.registerVersionUsage();
         try {
-            LobDataDatabase lobData = (LobDataDatabase) lob.getLobData();
-            int tableId = lobData.getTableId();
-            long lobId = lobData.getLobId();
-            removeLob(tableId, lobId);
+            LobRemovalInfo lobRemovalInfo;
+            while ((lobRemovalInfo = pendingLobRemovals.poll()) != null
+                    && lobRemovalInfo.version < oldestVersionToKeep) {
+                doRemoveLob(lobRemovalInfo.mapId, lobRemovalInfo.lobId);
+            }
+            if (lobRemovalInfo != null) {
+                pendingLobRemovals.offer(lobRemovalInfo);
+            }
         } finally {
-            mvStore.deregisterVersionUsage(txCounter);
+            // we can not call deregisterVersionUsage() due to a possible infinite recursion
+            mvStore.decrementVersionUsageCounter(txCounter);
         }
     }
 
-    private void removeLob(int tableId, long lobId) {
+    private void doRemoveLob(int tableId, long lobId) {
         if (TRACE) {
             trace("remove " + tableId + "/" + lobId);
         }
@@ -560,4 +620,17 @@ public BlobMeta[] createStorage(int size) {
             }
         }
     }
+
+    private static final class LobRemovalInfo
+    {
+        final long version;
+        final long lobId;
+        final int mapId;
+
+        LobRemovalInfo(long version, long lobId, int mapId) {
+            this.version = version;
+            this.lobId = lobId;
+            this.mapId = mapId;
+        }
+    }
 }
diff --git a/h2/src/main/org/h2/mvstore/db/MVDelegateIndex.java b/h2/src/main/org/h2/mvstore/db/MVDelegateIndex.java
index 112649958e..5297922dbd 100644
--- a/h2/src/main/org/h2/mvstore/db/MVDelegateIndex.java
+++ b/h2/src/main/org/h2/mvstore/db/MVDelegateIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/mvstore/db/MVInDoubtTransaction.java b/h2/src/main/org/h2/mvstore/db/MVInDoubtTransaction.java
index 591db9bfd7..7fc8eaad15 100644
--- a/h2/src/main/org/h2/mvstore/db/MVInDoubtTransaction.java
+++ b/h2/src/main/org/h2/mvstore/db/MVInDoubtTransaction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/mvstore/db/MVIndex.java b/h2/src/main/org/h2/mvstore/db/MVIndex.java
index f0efa24f23..0c1cf5d4eb 100644
--- a/h2/src/main/org/h2/mvstore/db/MVIndex.java
+++ b/h2/src/main/org/h2/mvstore/db/MVIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/mvstore/db/MVPlainTempResult.java b/h2/src/main/org/h2/mvstore/db/MVPlainTempResult.java
index 19c5b9d0b5..8bbc814eef 100644
--- a/h2/src/main/org/h2/mvstore/db/MVPlainTempResult.java
+++ b/h2/src/main/org/h2/mvstore/db/MVPlainTempResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/mvstore/db/MVPrimaryIndex.java b/h2/src/main/org/h2/mvstore/db/MVPrimaryIndex.java
index b94a31c00b..6ecce77c54 100644
--- a/h2/src/main/org/h2/mvstore/db/MVPrimaryIndex.java
+++ b/h2/src/main/org/h2/mvstore/db/MVPrimaryIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -209,19 +209,22 @@ public void update(SessionLocal session, Row oldRow, Row newRow) {
      *
      * @param session database session
      * @param row to lock
+     * @param timeoutMillis
+     *            timeout in milliseconds, {@code -1} for default, {@code -2} to
+     *            skip locking if row is already locked by another session
      * @return row object if it exists
      */
-    Row lockRow(SessionLocal session, Row row) {
+    Row lockRow(SessionLocal session, Row row, int timeoutMillis) {
         TransactionMap map = getMap(session);
         long key = row.getKey();
-        return lockRow(map, key);
+        return lockRow(map, key, timeoutMillis);
     }
 
-    private Row lockRow(TransactionMap map, long key) {
+    private Row lockRow(TransactionMap map, long key, int timeoutMillis) {
         try {
-            return setRowKey((Row) map.lock(key), key);
+            return setRowKey((Row) map.lock(key, timeoutMillis), key);
         } catch (MVStoreException ex) {
-            throw mvTable.convertException(ex);
+            throw mvTable.convertLockException(ex);
         }
     }
 
diff --git a/h2/src/main/org/h2/mvstore/db/MVSecondaryIndex.java b/h2/src/main/org/h2/mvstore/db/MVSecondaryIndex.java
index 67aa2c1ca1..e111e59d7b 100644
--- a/h2/src/main/org/h2/mvstore/db/MVSecondaryIndex.java
+++ b/h2/src/main/org/h2/mvstore/db/MVSecondaryIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -135,7 +135,7 @@ public void addBufferedRows(List bufferNames) {
                 Source s = queue.poll();
                 SearchRow row = s.next();
 
-                if (uniqueColumnColumn > 0 && !mayHaveNullDuplicates(row)) {
+                if (needsUniqueCheck(row)) {
                     checkUnique(false, dataMap, row, Long.MIN_VALUE);
                 }
 
@@ -178,7 +178,7 @@ public void close(SessionLocal session) {
     public void add(SessionLocal session, Row row) {
         TransactionMap map = getMap(session);
         SearchRow key = convertToKey(row, null);
-        boolean checkRequired = uniqueColumnColumn > 0 && !mayHaveNullDuplicates(row);
+        boolean checkRequired = needsUniqueCheck(row);
         if (checkRequired) {
             boolean repeatableRead = !session.getTransaction().allowNonRepeatableRead();
             checkUnique(repeatableRead, map, row, Long.MIN_VALUE);
diff --git a/h2/src/main/org/h2/mvstore/db/MVSortedTempResult.java b/h2/src/main/org/h2/mvstore/db/MVSortedTempResult.java
index a37679f790..7476c8509f 100644
--- a/h2/src/main/org/h2/mvstore/db/MVSortedTempResult.java
+++ b/h2/src/main/org/h2/mvstore/db/MVSortedTempResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/mvstore/db/MVSpatialIndex.java b/h2/src/main/org/h2/mvstore/db/MVSpatialIndex.java
index b91f3ccafd..eb9a62b4ed 100644
--- a/h2/src/main/org/h2/mvstore/db/MVSpatialIndex.java
+++ b/h2/src/main/org/h2/mvstore/db/MVSpatialIndex.java
@@ -1,11 +1,10 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
 package org.h2.mvstore.db;
 
-import org.h2.mvstore.rtree.Spatial;
 import static org.h2.util.geometry.GeometryUtils.MAX_X;
 import static org.h2.util.geometry.GeometryUtils.MAX_Y;
 import static org.h2.util.geometry.GeometryUtils.MIN_X;
@@ -27,6 +26,7 @@
 import org.h2.mvstore.Page;
 import org.h2.mvstore.rtree.MVRTreeMap;
 import org.h2.mvstore.rtree.MVRTreeMap.RTreeCursor;
+import org.h2.mvstore.rtree.Spatial;
 import org.h2.mvstore.tx.Transaction;
 import org.h2.mvstore.tx.TransactionMap;
 import org.h2.mvstore.tx.VersionedValueType;
diff --git a/h2/src/main/org/h2/mvstore/db/MVTable.java b/h2/src/main/org/h2/mvstore/db/MVTable.java
index f38604da78..073048d2e9 100644
--- a/h2/src/main/org/h2/mvstore/db/MVTable.java
+++ b/h2/src/main/org/h2/mvstore/db/MVTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -162,34 +162,22 @@ public String getMapName() {
     }
 
     @Override
-    public boolean lock(SessionLocal session, boolean exclusive,
-            boolean forceLockEvenInMvcc) {
-        int lockMode = database.getLockMode();
-        if (lockMode == Constants.LOCK_MODE_OFF) {
+    public boolean lock(SessionLocal session, int lockType) {
+        if (database.getLockMode() == Constants.LOCK_MODE_OFF) {
             session.registerTableAsUpdated(this);
             return false;
         }
-        if (!forceLockEvenInMvcc) {
-            // MVCC: update, delete, and insert use a shared lock.
-            // Select doesn't lock except when using FOR UPDATE and
-            // the system property h2.selectForUpdateMvcc
-            // is not enabled
-            if (exclusive) {
-                exclusive = false;
-            } else {
-                if (lockExclusiveSession == null) {
-                    return false;
-                }
-            }
+        if (lockType == Table.READ_LOCK && lockExclusiveSession == null) {
+            return false;
         }
         if (lockExclusiveSession == session) {
             return true;
         }
-        if (!exclusive && lockSharedSessions.containsKey(session)) {
+        if (lockType != Table.EXCLUSIVE_LOCK && lockSharedSessions.containsKey(session)) {
             return true;
         }
         synchronized (this) {
-            if (!exclusive && lockSharedSessions.containsKey(session)) {
+            if (lockType != Table.EXCLUSIVE_LOCK && lockSharedSessions.containsKey(session)) {
                 return true;
             }
             session.setWaitForLock(this, Thread.currentThread());
@@ -198,7 +186,7 @@ public boolean lock(SessionLocal session, boolean exclusive,
             }
             waitingSessions.addLast(session);
             try {
-                doLock1(session, exclusive);
+                doLock1(session, lockType);
             } finally {
                 session.setWaitForLock(null, null);
                 if (SysProperties.THREAD_DEADLOCK_DETECTOR) {
@@ -210,15 +198,15 @@ public boolean lock(SessionLocal session, boolean exclusive,
         return false;
     }
 
-    private void doLock1(SessionLocal session, boolean exclusive) {
-        traceLock(session, exclusive, TraceLockEvent.TRACE_LOCK_REQUESTING_FOR, NO_EXTRA_INFO);
+    private void doLock1(SessionLocal session, int lockType) {
+        traceLock(session, lockType, TraceLockEvent.TRACE_LOCK_REQUESTING_FOR, NO_EXTRA_INFO);
         // don't get the current time unless necessary
         long max = 0L;
         boolean checkDeadlock = false;
         while (true) {
             // if I'm the next one in the queue
-            if (waitingSessions.getFirst() == session) {
-                if (doLock2(session, exclusive)) {
+            if (waitingSessions.getFirst() == session && lockExclusiveSession == null) {
+                if (doLock2(session, lockType)) {
                     return;
                 }
             }
@@ -226,7 +214,7 @@ private void doLock1(SessionLocal session, boolean exclusive) {
                 ArrayList sessions = checkDeadlock(session, null, null);
                 if (sessions != null) {
                     throw DbException.get(ErrorCode.DEADLOCK_1,
-                            getDeadlockDetails(sessions, exclusive));
+                            getDeadlockDetails(sessions, lockType));
                 }
             } else {
                 // check for deadlocks from now on
@@ -237,12 +225,12 @@ private void doLock1(SessionLocal session, boolean exclusive) {
                 // try at least one more time
                 max = Utils.nanoTimePlusMillis(now, session.getLockTimeout());
             } else if (now - max >= 0L) {
-                traceLock(session, exclusive,
-                        TraceLockEvent.TRACE_LOCK_TIMEOUT_AFTER, NO_EXTRA_INFO+session.getLockTimeout());
+                traceLock(session, lockType,
+                        TraceLockEvent.TRACE_LOCK_TIMEOUT_AFTER, Integer.toString(session.getLockTimeout()));
                 throw DbException.get(ErrorCode.LOCK_TIMEOUT_1, getName());
             }
             try {
-                traceLock(session, exclusive, TraceLockEvent.TRACE_LOCK_WAITING_FOR, NO_EXTRA_INFO);
+                traceLock(session, lockType, TraceLockEvent.TRACE_LOCK_WAITING_FOR, NO_EXTRA_INFO);
                 // don't wait too long so that deadlocks are detected early
                 long sleep = Math.min(Constants.DEADLOCK_CHECK, (max - now) / 1_000_000L);
                 if (sleep == 0) {
@@ -255,55 +243,48 @@ private void doLock1(SessionLocal session, boolean exclusive) {
         }
     }
 
-    private boolean doLock2(SessionLocal session, boolean exclusive) {
-        if (lockExclusiveSession == null) {
-            if (exclusive) {
-                if (lockSharedSessions.isEmpty()) {
-                    traceLock(session, exclusive, TraceLockEvent.TRACE_LOCK_ADDED_FOR, NO_EXTRA_INFO);
-                    session.registerTableAsLocked(this);
-                    lockExclusiveSession = session;
-                    if (SysProperties.THREAD_DEADLOCK_DETECTOR) {
-                        if (EXCLUSIVE_LOCKS.get() == null) {
-                            EXCLUSIVE_LOCKS.set(new ArrayList<>());
-                        }
-                        EXCLUSIVE_LOCKS.get().add(getName());
-                    }
-                    return true;
-                } else if (lockSharedSessions.size() == 1 &&
-                        lockSharedSessions.containsKey(session)) {
-                    traceLock(session, exclusive, TraceLockEvent.TRACE_LOCK_ADD_UPGRADED_FOR, NO_EXTRA_INFO);
-                    lockExclusiveSession = session;
-                    if (SysProperties.THREAD_DEADLOCK_DETECTOR) {
-                        if (EXCLUSIVE_LOCKS.get() == null) {
-                            EXCLUSIVE_LOCKS.set(new ArrayList<>());
-                        }
-                        EXCLUSIVE_LOCKS.get().add(getName());
-                    }
-                    return true;
-                }
+    private boolean doLock2(SessionLocal session, int lockType) {
+        switch (lockType) {
+        case Table.EXCLUSIVE_LOCK:
+            int size = lockSharedSessions.size();
+            if (size == 0) {
+                traceLock(session, lockType, TraceLockEvent.TRACE_LOCK_ADDED_FOR, NO_EXTRA_INFO);
+                session.registerTableAsLocked(this);
+            } else if (size == 1 && lockSharedSessions.containsKey(session)) {
+                traceLock(session, lockType, TraceLockEvent.TRACE_LOCK_ADD_UPGRADED_FOR, NO_EXTRA_INFO);
             } else {
-                if (lockSharedSessions.putIfAbsent(session, session) == null) {
-                    traceLock(session, exclusive, TraceLockEvent.TRACE_LOCK_OK, NO_EXTRA_INFO);
-                    session.registerTableAsLocked(this);
-                    if (SysProperties.THREAD_DEADLOCK_DETECTOR) {
-                        ArrayList list = SHARED_LOCKS.get();
-                        if (list == null) {
-                            list = new ArrayList<>();
-                            SHARED_LOCKS.set(list);
-                        }
-                        list.add(getName());
-                    }
+                return false;
+            }
+            lockExclusiveSession = session;
+            if (SysProperties.THREAD_DEADLOCK_DETECTOR) {
+                addLockToDebugList(EXCLUSIVE_LOCKS);
+            }
+            break;
+        case Table.WRITE_LOCK:
+            if (lockSharedSessions.putIfAbsent(session, session) == null) {
+                traceLock(session, lockType, TraceLockEvent.TRACE_LOCK_OK, NO_EXTRA_INFO);
+                session.registerTableAsLocked(this);
+                if (SysProperties.THREAD_DEADLOCK_DETECTOR) {
+                    addLockToDebugList(SHARED_LOCKS);
                 }
-                return true;
             }
         }
-        return false;
+        return true;
     }
 
-    private void traceLock(SessionLocal session, boolean exclusive, TraceLockEvent eventEnum, String extraInfo) {
+    private void addLockToDebugList(DebuggingThreadLocal> locks) {
+        ArrayList list = locks.get();
+        if (list == null) {
+            list = new ArrayList<>();
+            locks.set(list);
+        }
+        list.add(getName());
+    }
+
+    private void traceLock(SessionLocal session, int lockType, TraceLockEvent eventEnum, String extraInfo) {
         if (traceLock.isDebugEnabled()) {
             traceLock.debug("{0} {1} {2} {3} {4}", session.getId(),
-                    exclusive ? "exclusive write lock" : "shared read lock", eventEnum.getEventText(),
+                    lockTypeToString(lockType), eventEnum.getEventText(),
                     getName(), extraInfo);
         }
     }
@@ -311,25 +292,28 @@ private void traceLock(SessionLocal session, boolean exclusive, TraceLockEvent e
     @Override
     public void unlock(SessionLocal s) {
         if (database != null) {
-            boolean wasLocked = lockExclusiveSession == s;
-            traceLock(s, wasLocked, TraceLockEvent.TRACE_LOCK_UNLOCK, NO_EXTRA_INFO);
-            if (wasLocked) {
+            int lockType;
+            if (lockExclusiveSession == s) {
+                lockType = Table.EXCLUSIVE_LOCK;
                 lockSharedSessions.remove(s);
                 lockExclusiveSession = null;
                 if (SysProperties.THREAD_DEADLOCK_DETECTOR) {
-                    if (EXCLUSIVE_LOCKS.get() != null) {
-                        EXCLUSIVE_LOCKS.get().remove(getName());
+                    ArrayList exclusiveLocks = EXCLUSIVE_LOCKS.get();
+                    if (exclusiveLocks != null) {
+                        exclusiveLocks.remove(getName());
                     }
                 }
             } else {
-                wasLocked = lockSharedSessions.remove(s) != null;
+                lockType = lockSharedSessions.remove(s) != null ? Table.WRITE_LOCK : Table.READ_LOCK;
                 if (SysProperties.THREAD_DEADLOCK_DETECTOR) {
-                    if (SHARED_LOCKS.get() != null) {
-                        SHARED_LOCKS.get().remove(getName());
+                    ArrayList sharedLocks = SHARED_LOCKS.get();
+                    if (sharedLocks != null) {
+                        sharedLocks.remove(getName());
                     }
                 }
             }
-            if (wasLocked && !waitingSessions.isEmpty()) {
+            traceLock(s, lockType, TraceLockEvent.TRACE_LOCK_UNLOCK, NO_EXTRA_INFO);
+            if (lockType != Table.READ_LOCK && !waitingSessions.isEmpty()) {
                 synchronized (this) {
                     notifyAll();
                 }
@@ -434,7 +418,7 @@ private void rebuildIndexBlockMerge(SessionLocal session, MVIndex index) {
         long i = 0;
         Store store = session.getDatabase().getStore();
 
-        int bufferSize = database.getMaxMemoryRows() / 2;
+        int bufferSize = (int) Math.min(total, database.getMaxMemoryRows() / 2);
         ArrayList buffer = new ArrayList<>(bufferSize);
         String n = getName() + ':' + index.getName();
         ArrayList bufferNames = Utils.newSmallArrayList();
@@ -567,8 +551,8 @@ public void updateRow(SessionLocal session, Row oldRow, Row newRow) {
     }
 
     @Override
-    public Row lockRow(SessionLocal session, Row row) {
-        Row lockedRow = primaryIndex.lockRow(session, row);
+    public Row lockRow(SessionLocal session, Row row, int timeoutMillis) {
+        Row lockedRow = primaryIndex.lockRow(session, row, timeoutMillis);
         if (lockedRow == null || !row.hasSharedData(lockedRow)) {
             syncLastModificationIdWithDatabase();
         }
@@ -691,14 +675,28 @@ private void syncLastModificationIdWithDatabase() {
      * @return the database exception
      */
     DbException convertException(MVStoreException e) {
+        return convertException(e, false);
+    }
+
+    /**
+     * Convert the MVStoreException from attempt to lock a row to a database
+     * exception.
+     *
+     * @param e the illegal state exception
+     * @return the database exception
+     */
+    DbException convertLockException(MVStoreException e) {
+        return convertException(e, true);
+    }
+
+    private DbException convertException(MVStoreException e, boolean lockException) {
         int errorCode = e.getErrorCode();
         if (errorCode == DataUtils.ERROR_TRANSACTION_LOCKED) {
-            throw DbException.get(ErrorCode.CONCURRENT_UPDATE_1,
+            return DbException.get(lockException ? ErrorCode.LOCK_TIMEOUT_1 : ErrorCode.CONCURRENT_UPDATE_1,
                     e, getName());
         }
         if (errorCode == DataUtils.ERROR_TRANSACTIONS_DEADLOCK) {
-            throw DbException.get(ErrorCode.DEADLOCK_1,
-                    e, getName());
+            return DbException.get(ErrorCode.DEADLOCK_1, e, getName());
         }
         return store.convertMVStoreException(e);
     }
@@ -732,11 +730,11 @@ private static void addRowsToIndex(SessionLocal session, ArrayList list, In
      *
      * @param sessions
      *            the list of sessions
-     * @param exclusive
-     *            true if waiting for exclusive lock, false otherwise
+     * @param lockType
+     *            the type of lock
      * @return formatted details of a deadlock
      */
-    private static String getDeadlockDetails(ArrayList sessions, boolean exclusive) {
+    private static String getDeadlockDetails(ArrayList sessions, int lockType) {
         // We add the thread details here to make it easier for customers to
         // match up these error messages with their own logs.
         StringBuilder builder = new StringBuilder();
@@ -745,7 +743,7 @@ private static String getDeadlockDetails(ArrayList sessions, boole
             Thread thread = s.getWaitForLockThread();
             builder.append("\nSession ").append(s).append(" on thread ").append(thread.getName())
                     .append(" is waiting to lock ").append(lock.toString())
-                    .append(exclusive ? " (exclusive)" : " (shared)").append(" while locking ");
+                    .append(" (").append(lockTypeToString(lockType)).append(") while locking ");
             boolean addComma = false;
             for (Table t : s.getLocks()) {
                 if (addComma) {
@@ -766,6 +764,11 @@ private static String getDeadlockDetails(ArrayList sessions, boole
         return builder.toString();
     }
 
+    private static String lockTypeToString(int lockType) {
+        return lockType == Table.READ_LOCK ? "shared read"
+                : lockType == Table.WRITE_LOCK ? "shared write" : "exclusive";
+    }
+
     /**
      * Sorts the specified list of rows for a specified index.
      *
diff --git a/h2/src/main/org/h2/mvstore/db/MVTempResult.java b/h2/src/main/org/h2/mvstore/db/MVTempResult.java
index 046949fea8..787359a923 100644
--- a/h2/src/main/org/h2/mvstore/db/MVTempResult.java
+++ b/h2/src/main/org/h2/mvstore/db/MVTempResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -13,8 +13,8 @@
 import org.h2.engine.Database;
 import org.h2.expression.Expression;
 import org.h2.message.DbException;
+import org.h2.mvstore.FileStore;
 import org.h2.mvstore.MVStore;
-import org.h2.mvstore.MVStore.Builder;
 import org.h2.result.ResultExternal;
 import org.h2.result.SortOrder;
 import org.h2.store.fs.FileUtils;
@@ -176,11 +176,10 @@ public static ResultExternal of(Database database, Expression[] expressions, boo
         this.database = database;
         try {
             String fileName = FileUtils.createTempFile("h2tmp", Constants.SUFFIX_TEMP_FILE, true);
-            Builder builder = new MVStore.Builder().fileName(fileName).cacheSize(0).autoCommitDisabled();
-            byte[] key = database.getFileEncryptionKey();
-            if (key != null) {
-                builder.encryptionKey(Store.decodePassword(key));
-            }
+
+            FileStore fileStore = database.getStore().getMvStore().getFileStore().open(fileName, false);
+            MVStore.Builder builder = new MVStore.Builder().adoptFileStore(fileStore).cacheSize(0)
+                    .autoCommitDisabled();
             store = builder.open();
             this.expressions = expressions;
             this.visibleColumnCount = visibleColumnCount;
diff --git a/h2/src/main/org/h2/mvstore/db/NullValueDataType.java b/h2/src/main/org/h2/mvstore/db/NullValueDataType.java
index c976651eab..588a3df1cb 100644
--- a/h2/src/main/org/h2/mvstore/db/NullValueDataType.java
+++ b/h2/src/main/org/h2/mvstore/db/NullValueDataType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/mvstore/db/RowDataType.java b/h2/src/main/org/h2/mvstore/db/RowDataType.java
index 9603f7ce4d..e8adf46d3c 100644
--- a/h2/src/main/org/h2/mvstore/db/RowDataType.java
+++ b/h2/src/main/org/h2/mvstore/db/RowDataType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/mvstore/db/SpatialKey.java b/h2/src/main/org/h2/mvstore/db/SpatialKey.java
index afe080b904..0c39442c84 100644
--- a/h2/src/main/org/h2/mvstore/db/SpatialKey.java
+++ b/h2/src/main/org/h2/mvstore/db/SpatialKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/mvstore/db/Store.java b/h2/src/main/org/h2/mvstore/db/Store.java
index ffd4942204..f5ea475cbb 100644
--- a/h2/src/main/org/h2/mvstore/db/Store.java
+++ b/h2/src/main/org/h2/mvstore/db/Store.java
@@ -1,12 +1,10 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
 package org.h2.mvstore.db;
 
-import java.io.InputStream;
-import java.nio.channels.FileChannel;
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.HashMap;
@@ -29,10 +27,13 @@
 import org.h2.mvstore.tx.TransactionStore;
 import org.h2.mvstore.type.MetaType;
 import org.h2.store.InDoubtTransaction;
-import org.h2.store.fs.FileChannelInputStream;
 import org.h2.store.fs.FileUtils;
+import org.h2.util.HasSQL;
 import org.h2.util.StringUtils;
 import org.h2.util.Utils;
+import org.h2.value.TypeInfo;
+import org.h2.value.Typed;
+import org.h2.value.Value;
 
 /**
  * A store with open tables.
@@ -48,7 +49,7 @@ public final class Store {
     static char[] decodePassword(byte[] key) {
         char[] password = new char[key.length / 2];
         for (int i = 0; i < password.length; i++) {
-            password[i] = (char) (((key[i + i] & 255) << 16) | ((key[i + i + 1]) & 255));
+            password[i] = (char) (((key[i + i] & 255) << 16) | (key[i + i + 1] & 255));
         }
         return password;
     }
@@ -81,14 +82,15 @@ static char[] decodePassword(byte[] key) {
      * Creates the store.
      *
      * @param db the database
+     * @param key for file encryption
      */
-    public Store(Database db) {
-        byte[] key = db.getFileEncryptionKey();
+    public Store(Database db, byte[] key) {
         String dbPath = db.getDatabasePath();
         MVStore.Builder builder = new MVStore.Builder();
         boolean encrypted = false;
         if (dbPath != null) {
             String fileName = dbPath + Constants.SUFFIX_MV_FILE;
+            this.fileName = fileName;
             MVStoreTool.compactCleanUp(fileName);
             builder.fileName(fileName);
             builder.pageSplitSize(db.getPageSize());
@@ -123,12 +125,12 @@ public Store(Database db) {
             // otherwise background thread would compete for store lock
             // with maps opening procedure
             builder.autoCommitDisabled();
+        } else {
+            fileName = null;
         }
         this.encrypted = encrypted;
         try {
             this.mvStore = builder.open();
-            FileStore fs = mvStore.getFileStore();
-            fileName = fs != null ? fs.getFileName() : null;
             if (!db.getSettings().reuseSpace) {
                 mvStore.setReuseSpace(false);
             }
@@ -152,6 +154,8 @@ DbException convertMVStoreException(MVStoreException e) {
         switch (e.getErrorCode()) {
         case DataUtils.ERROR_CLOSED:
             throw DbException.get(ErrorCode.DATABASE_IS_CLOSED, e, fileName);
+        case DataUtils.ERROR_UNSUPPORTED_FORMAT:
+            throw DbException.get(ErrorCode.FILE_VERSION_ERROR_1, e, fileName);
         case DataUtils.ERROR_FILE_CORRUPT:
             if (encrypted) {
                 throw DbException.get(ErrorCode.FILE_ENCRYPTION_ERROR_1, e, fileName);
@@ -167,6 +171,22 @@ DbException convertMVStoreException(MVStoreException e) {
         }
     }
 
+    /**
+     * Gets a SQL exception meaning the type of expression is invalid or unknown.
+     *
+     * @param param the name of the parameter
+     * @param e the expression
+     * @return the exception
+     */
+    public static DbException getInvalidExpressionTypeException(String param, Typed e) {
+        TypeInfo type = e.getType();
+        if (type.getValueType() == Value.UNKNOWN) {
+            return DbException.get(ErrorCode.UNKNOWN_DATA_TYPE_1,
+                                    (e instanceof HasSQL ? (HasSQL) e : type).getTraceSQL());
+        }
+        return DbException.get(ErrorCode.INVALID_VALUE_2, type.getTraceSQL(), param);
+    }
+
     public MVStore getMvStore() {
         return mvStore;
     }
@@ -218,11 +238,7 @@ public void removeTable(MVTable table) {
      * Store all pending changes.
      */
     public void flush() {
-        FileStore s = mvStore.getFileStore();
-        if (s == null || s.isReadOnly()) {
-            return;
-        }
-        if (!mvStore.compact(50, 4 * 1024 * 1024)) {
+        if (mvStore.isPersistent() && !mvStore.isReadOnly()) {
             mvStore.commit();
         }
     }
@@ -231,9 +247,7 @@ public void flush() {
      * Close the store, without persisting changes.
      */
     public void closeImmediately() {
-        if (!mvStore.isClosed()) {
-            mvStore.closeImmediately();
-        }
+        mvStore.closeImmediately();
     }
 
     /**
@@ -293,15 +307,7 @@ public ArrayList getInDoubtTransactions() {
      * @param kb the maximum size in KB
      */
     public void setCacheSize(int kb) {
-        mvStore.setCacheSize(Math.max(1, kb / 1024));
-    }
-
-    public InputStream getInputStream() {
-        FileChannel fc = mvStore.getFileStore().getEncryptedFile();
-        if (fc == null) {
-            fc = mvStore.getFileStore().getFile();
-        }
-        return new FileChannelInputStream(fc, false);
+        mvStore.setCacheSize(kb);
     }
 
     /**
@@ -327,19 +333,14 @@ public void compactFile(int maxCompactTime) {
 
     /**
      * Close the store. Pending changes are persisted.
-     * If time is allocated for housekeeping, chunks with a low
-     * fill rate are compacted, and some chunks are put next to each other.
-     * If time is unlimited then full compaction is performed, which uses
-     * different algorithm - opens alternative temp store and writes all live
-     * data there, then replaces this store with a new one.
      *
-     * @param allowedCompactionTime time (in milliseconds) alloted for file
-     *                              compaction activity, 0 means no compaction,
-     *                              -1 means unlimited time (full compaction)
+     * @param allowedCompactionTime time (in milliseconds) allotted for store
+     *                              housekeeping activity, 0 means none,
+     *                              -1 means unlimited time (i.e.full compaction)
      */
     public void close(int allowedCompactionTime) {
         try {
-            FileStore fileStore = mvStore.getFileStore();
+            FileStore fileStore = mvStore.getFileStore();
             if (!mvStore.isClosed() && fileStore != null) {
                 boolean compactFully = allowedCompactionTime == -1;
                 if (fileStore.isReadOnly()) {
@@ -351,32 +352,48 @@ public void close(int allowedCompactionTime) {
                     allowedCompactionTime = 0;
                 }
 
+                String fileName = null;
+                FileStore targetFileStore = null;
+                if (compactFully) {
+                    fileName = fileStore.getFileName();
+                    String tempName = fileName + Constants.SUFFIX_MV_STORE_TEMP_FILE;
+                    FileUtils.delete(tempName);
+                    targetFileStore = fileStore.open(tempName, false);
+                }
+
                 mvStore.close(allowedCompactionTime);
 
-                String fileName = fileStore.getFileName();
                 if (compactFully && FileUtils.exists(fileName)) {
                     // the file could have been deleted concurrently,
                     // so only compact if the file still exists
-                    MVStoreTool.compact(fileName, true);
+                    compact(fileName, targetFileStore);
                 }
             }
         } catch (MVStoreException e) {
-            int errorCode = e.getErrorCode();
-            if (errorCode == DataUtils.ERROR_WRITING_FAILED) {
-                // disk full - ok
-            } else if (errorCode == DataUtils.ERROR_FILE_CORRUPT) {
-                // wrong encryption key - ok
-            }
             mvStore.closeImmediately();
             throw DbException.get(ErrorCode.IO_EXCEPTION_1, e, "Closing");
         }
     }
 
+
+    private static void compact(String sourceFilename, FileStore targetFileStore) {
+        MVStore.Builder targetBuilder = new MVStore.Builder().compress().adoptFileStore(targetFileStore);
+        try (MVStore targetMVStore = targetBuilder.open()) {
+            FileStore sourceFileStore = targetFileStore.open(sourceFilename, true);
+            MVStore.Builder sourceBuilder = new MVStore.Builder();
+            sourceBuilder.readOnly().adoptFileStore(sourceFileStore);
+            try (MVStore sourceMVStore = sourceBuilder.open()) {
+                MVStoreTool.compact(sourceMVStore, targetMVStore);
+            }
+        }
+        MVStoreTool.moveAtomicReplace(targetFileStore.getFileName(), sourceFilename);
+    }
+
     /**
      * Start collecting statistics.
      */
     public void statisticsStart() {
-        FileStore fs = mvStore.getFileStore();
+        FileStore fs = mvStore.getFileStore();
         statisticsStart = fs == null ? 0 : fs.getReadCount();
     }
 
@@ -387,7 +404,7 @@ public void statisticsStart() {
      */
     public Map statisticsEnd() {
         HashMap map = new HashMap<>();
-        FileStore fs = mvStore.getFileStore();
+        FileStore fs = mvStore.getFileStore();
         int reads = fs == null ? 0 : (int) (fs.getReadCount() - statisticsStart);
         map.put("reads", reads);
         return map;
diff --git a/h2/src/main/org/h2/mvstore/db/ValueDataType.java b/h2/src/main/org/h2/mvstore/db/ValueDataType.java
index 65595edd72..db9a6e4588 100644
--- a/h2/src/main/org/h2/mvstore/db/ValueDataType.java
+++ b/h2/src/main/org/h2/mvstore/db/ValueDataType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -528,7 +528,7 @@ public void write(WriteBuffer buff, Value v) {
                 ordinal = ~ordinal;
             }
             buff.put(INTERVAL).
-                put((byte) (ordinal)).
+                put((byte) ordinal).
                 putVarLong(interval.getLeading()).
                 putVarLong(interval.getRemaining());
             break;
diff --git a/h2/src/main/org/h2/mvstore/db/package.html b/h2/src/main/org/h2/mvstore/db/package.html
index 37a213550d..41e6b4df2b 100644
--- a/h2/src/main/org/h2/mvstore/db/package.html
+++ b/h2/src/main/org/h2/mvstore/db/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/main/org/h2/mvstore/package.html b/h2/src/main/org/h2/mvstore/package.html
index 562ce8458a..7a37e10ab4 100644
--- a/h2/src/main/org/h2/mvstore/package.html
+++ b/h2/src/main/org/h2/mvstore/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/main/org/h2/mvstore/rtree/DefaultSpatial.java b/h2/src/main/org/h2/mvstore/rtree/DefaultSpatial.java
index ede7d5fe03..c9c243f71e 100644
--- a/h2/src/main/org/h2/mvstore/rtree/DefaultSpatial.java
+++ b/h2/src/main/org/h2/mvstore/rtree/DefaultSpatial.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/mvstore/rtree/MVRTreeMap.java b/h2/src/main/org/h2/mvstore/rtree/MVRTreeMap.java
index 90ebeca89b..63dc0d8461 100644
--- a/h2/src/main/org/h2/mvstore/rtree/MVRTreeMap.java
+++ b/h2/src/main/org/h2/mvstore/rtree/MVRTreeMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -69,7 +69,7 @@ public RTreeCursor findContainedKeys(Spatial x) {
         return new ContainsRTreeCursor<>(getRootPage(), x, keyType);
     }
 
-    private boolean contains(Page p, int index, Object key) {
+    private boolean contains(Page p, int index, Spatial key) {
         return keyType.contains(p.getKey(index), key);
     }
 
@@ -149,9 +149,7 @@ public V operate(Spatial key, V value, DecisionMaker decisionMaker) {
                 children[1] = new Page.PageReference<>(split);
                 children[2] = Page.PageReference.empty();
                 p = Page.createNode(this, keys, children, totalCount, 0);
-                if(isPersistent()) {
-                    store.registerUnsavedMemory(p.getMemory());
-                }
+                registerUnsavedMemory(p.getMemory());
             }
 
             if (removedPages == null) {
@@ -169,7 +167,7 @@ public V operate(Spatial key, V value, DecisionMaker decisionMaker) {
                                 unsavedMemory += page.removePage(version);
                             }
                         }
-                        store.registerUnsavedMemory(unsavedMemory);
+                        registerUnsavedMemory(unsavedMemory);
                     } finally {
                         unlockRoot(p);
                     }
@@ -234,7 +232,7 @@ private V operate(Page p, Spatial key, V value, DecisionMaker split(Page p) {
 
     private Page splitLinear(Page p) {
         int keyCount = p.getKeyCount();
-        ArrayListCommand line options[-dump <fileName>] Dump the contends of the file
[-info <fileName>] tables;
+
+    private long lastModificationCheck;
+
+    private long maxDataModificationId;
+
+    QueryExpressionTable(Schema schema, int id, String name) {
+        super(schema, id, name, false, true);
+    }
+
+    Column[] initColumns(SessionLocal session, Column[] columnTemplates, Query query, boolean isDerivedTable) {
+        ArrayList expressions = query.getExpressions();
+        final int count = query.getColumnCount();
+        ArrayList list = new ArrayList<>(count);
+        for (int i = 0; i < count; i++) {
+            Expression expr = expressions.get(i);
+            String name = null;
+            TypeInfo type = TypeInfo.TYPE_UNKNOWN;
+            if (columnTemplates != null && columnTemplates.length > i) {
+                name = columnTemplates[i].getName();
+                type = columnTemplates[i].getType();
+            }
+            if (name == null) {
+                name = isDerivedTable ? expr.getAlias(session, i) : expr.getColumnNameForView(session, i);
+            }
+            if (type.getValueType() == Value.UNKNOWN) {
+                type = expr.getType();
+            }
+            list.add(new Column(name, type, this, i));
+        }
+        return list.toArray(new Column[0]);
+    }
+
+    public final Query getQuery() {
+        return viewQuery;
+    }
+
+    public abstract Query getTopQuery();
+
+    @Override
+    public final void close(SessionLocal session) {
+        // nothing to do
+    }
+
+    @Override
+    public final Index addIndex(SessionLocal session, String indexName, int indexId, IndexColumn[] cols,
+            int uniqueColumnCount, IndexType indexType, boolean create, String indexComment) {
+        throw DbException.getUnsupportedException(getClass().getSimpleName() + ".addIndex");
+    }
+
+    @Override
+    public final boolean isView() {
+        return true;
+    }
+
+    @Override
+    public final PlanItem getBestPlanItem(SessionLocal session, int[] masks, TableFilter[] filters, int filter,
+            SortOrder sortOrder, AllColumnsForPlan allColumnsSet) {
+        final CacheKey cacheKey = new CacheKey(masks, this);
+        Map indexCache = session.getViewIndexCache(getTableType() == null);
+        QueryExpressionIndex i = indexCache.get(cacheKey);
+        if (i == null || i.isExpired()) {
+            i = new QueryExpressionIndex(this, index, session, masks, filters, filter, sortOrder);
+            indexCache.put(cacheKey, i);
+        }
+        PlanItem item = new PlanItem();
+        item.cost = i.getCost(session, masks, filters, filter, sortOrder, allColumnsSet);
+        item.setIndex(i);
+        return item;
+    }
+
+    @Override
+    public boolean isQueryComparable() {
+        for (Table t : tables) {
+            if (!t.isQueryComparable()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public final boolean isInsertable() {
+        return false;
+    }
+
+    @Override
+    public final void removeRow(SessionLocal session, Row row) {
+        throw DbException.getUnsupportedException(getClass().getSimpleName() + ".removeRow");
+    }
+
+    @Override
+    public final void addRow(SessionLocal session, Row row) {
+        throw DbException.getUnsupportedException(getClass().getSimpleName() + ".addRow");
+    }
+
+    @Override
+    public final void checkSupportAlter() {
+        throw DbException.getUnsupportedException(getClass().getSimpleName() + ".checkSupportAlter");
+    }
+
+    @Override
+    public final long truncate(SessionLocal session) {
+        throw DbException.getUnsupportedException(getClass().getSimpleName() + ".truncate");
+    }
+
+    @Override
+    public final long getRowCount(SessionLocal session) {
+        throw DbException.getInternalError(toString());
+    }
+
+    @Override
+    public final boolean canGetRowCount(SessionLocal session) {
+        // TODO could get the row count, but not that easy
+        return false;
+    }
+
+    @Override
+    public final long getRowCountApproximation(SessionLocal session) {
+        return ROW_COUNT_APPROXIMATION;
+    }
+
+    /**
+     * Get the index of the first parameter.
+     *
+     * @param additionalParameters
+     *            additional parameters
+     * @return the index of the first parameter
+     */
+    public final int getParameterOffset(ArrayList additionalParameters) {
+        Query topQuery = getTopQuery();
+        int result = topQuery == null ? -1 : getMaxParameterIndex(topQuery.getParameters());
+        if (additionalParameters != null) {
+            result = Math.max(result, getMaxParameterIndex(additionalParameters));
+        }
+        return result + 1;
+    }
+
+    @Override
+    public final boolean canReference() {
+        return false;
+    }
+
+    @Override
+    public final ArrayList getIndexes() {
+        return null;
+    }
+
+    @Override
+    public long getMaxDataModificationId() {
+        // if nothing was modified in the database since the last check, and the
+        // last is known, then we don't need to check again
+        // this speeds up nested views
+        long dbMod = database.getModificationDataId();
+        if (dbMod > lastModificationCheck && maxDataModificationId <= dbMod) {
+            maxDataModificationId = viewQuery.getMaxDataModificationId();
+            lastModificationCheck = dbMod;
+        }
+        return maxDataModificationId;
+    }
+
+    @Override
+    public final Index getScanIndex(SessionLocal session) {
+        return getBestPlanItem(session, null, null, -1, null, null).getIndex();
+    }
+
+    @Override
+    public Index getScanIndex(SessionLocal session, int[] masks, TableFilter[] filters, int filter, //
+            SortOrder sortOrder, AllColumnsForPlan allColumnsSet) {
+        return getBestPlanItem(session, masks, filters, filter, sortOrder, allColumnsSet).getIndex();
+    }
+
+    @Override
+    public boolean isDeterministic() {
+        return viewQuery.isEverything(ExpressionVisitor.DETERMINISTIC_VISITOR);
+    }
+
+    @Override
+    public final void addDependencies(HashSet dependencies) {
+        super.addDependencies(dependencies);
+        if (tables != null) {
+            for (Table t : tables) {
+                if (TableType.VIEW != t.getTableType()) {
+                    t.addDependencies(dependencies);
+                }
+            }
+        }
+    }
+
+}
diff --git a/h2/src/main/org/h2/table/RangeTable.java b/h2/src/main/org/h2/table/RangeTable.java
index 1b9f6c39a9..037faf58f2 100644
--- a/h2/src/main/org/h2/table/RangeTable.java
+++ b/h2/src/main/org/h2/table/RangeTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/table/Table.java b/h2/src/main/org/h2/table/Table.java
index 5db5f418c2..8e11241917 100644
--- a/h2/src/main/org/h2/table/Table.java
+++ b/h2/src/main/org/h2/table/Table.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -59,6 +59,21 @@ public abstract class Table extends SchemaObject {
      */
     public static final int TYPE_MEMORY = 1;
 
+    /**
+     * Read lock.
+     */
+    public static final int READ_LOCK = 0;
+
+    /**
+     * Write lock.
+     */
+    public static final int WRITE_LOCK = 1;
+
+    /**
+     * Exclusive lock.
+     */
+    public static final int EXCLUSIVE_LOCK = 2;
+
     /**
      * The columns of this table.
      */
@@ -85,6 +100,10 @@ public abstract class Table extends SchemaObject {
      * views that depend on this table
      */
     private final CopyOnWriteArrayList dependentViews = new CopyOnWriteArrayList<>();
+    /**
+     * materialized views that depend on this table
+     */
+    private final CopyOnWriteArrayList dependentMaterializedViews = new CopyOnWriteArrayList<>();
     private ArrayList synonyms;
     /** Is foreign key constraint checking enabled for this table. */
     private boolean checkForeignKeyConstraints = true;
@@ -120,12 +139,11 @@ public boolean isView() {
      * This method waits until the lock is granted.
      *
      * @param session the session
-     * @param exclusive true for write locks, false for read locks
-     * @param forceLockEvenInMvcc lock even in the MVCC mode
+     * @param lockType the type of lock
      * @return true if the table was already exclusively locked by this session.
      * @throws DbException if a lock timeout occurred
      */
-    public boolean lock(SessionLocal session, boolean exclusive, boolean forceLockEvenInMvcc) {
+    public boolean lock(SessionLocal session, int lockType) {
         return false;
     }
 
@@ -194,9 +212,12 @@ public boolean isInsertable() {
      *
      * @param session the session
      * @param row to lock
-     * @return locked row, or null if row does not exist anymore
+     * @param timeoutMillis
+     *            timeout in milliseconds, {@code -1} for default, {@code -2} to
+     *            skip locking if row is already locked by another session
+     * @return locked row, or null if row does not exist anymore or if it was skipped
      */
-    public Row lockRow(SessionLocal session, Row row) {
+    public Row lockRow(SessionLocal session, Row row, int timeoutMillis) {
         throw DbException.getUnsupportedException("lockRow()");
     }
 
@@ -387,11 +408,6 @@ public Column getRowIdColumn() {
         return null;
     }
 
-    @Override
-    public String getCreateSQLForCopy(Table table, String quotedName) {
-        throw DbException.getInternalError(toString());
-    }
-
     /**
      * Check whether the table (or view) contains no columns that prevent index
      * conditions to be used. For example, a view that contains the ROWNUM()
@@ -566,11 +582,14 @@ public CopyOnWriteArrayList getDependentViews() {
         return dependentViews;
     }
 
+    public CopyOnWriteArrayList getDependentMaterializedViews() {
+        return dependentMaterializedViews;
+    }
+
     @Override
     public void removeChildrenAndResources(SessionLocal session) {
         while (!dependentViews.isEmpty()) {
-            TableView view = dependentViews.get(0);
-            dependentViews.remove(0);
+            TableView view = dependentViews.remove(0);
             database.removeSchemaObject(session, view);
         }
         while (synonyms != null && !synonyms.isEmpty()) {
@@ -746,7 +765,7 @@ public Column getColumn(String columnName) {
      * Get the column with the given name.
      *
      * @param columnName the column name
-     * @param ifExists if (@code true) return {@code null} if column does not exist
+     * @param ifExists if {@code true} return {@code null} if column does not exist
      * @return the column
      * @throws DbException if the column was not found
      */
@@ -1003,6 +1022,15 @@ public void removeDependentView(TableView view) {
         dependentViews.remove(view);
     }
 
+    /**
+     * Remove the given view from the dependent views list.
+     *
+     * @param view the view to remove
+     */
+    public void removeDependentMaterializedView(MaterializedView view) {
+        dependentMaterializedViews.remove(view);
+    }
+
     /**
      * Remove the given view from the list.
      *
@@ -1048,6 +1076,15 @@ public void addDependentView(TableView view) {
         dependentViews.add(view);
     }
 
+    /**
+     * Add a materialized view to this table.
+     *
+     * @param view the view to add
+     */
+    public void addDependentMaterializedView(MaterializedView view) {
+        this.dependentMaterializedViews.add(view);
+    }
+
     /**
      * Add a synonym to this table.
      *
diff --git a/h2/src/main/org/h2/table/TableBase.java b/h2/src/main/org/h2/table/TableBase.java
index a52d53df4a..7bafe43938 100644
--- a/h2/src/main/org/h2/table/TableBase.java
+++ b/h2/src/main/org/h2/table/TableBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/table/TableFilter.java b/h2/src/main/org/h2/table/TableFilter.java
index a62abffcd3..a45058234e 100644
--- a/h2/src/main/org/h2/table/TableFilter.java
+++ b/h2/src/main/org/h2/table/TableFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -194,7 +194,7 @@ public Table getTable() {
      * @param s the session
      */
     public void lock(SessionLocal s) {
-        table.lock(s, false, false);
+        table.lock(s, Table.READ_LOCK);
         if (join != null) {
             join.lock(s);
         }
@@ -964,7 +964,7 @@ public boolean hasDerivedColumnList() {
      * @param columnName
      *            the column name
      * @param ifExists
-     *            if (@code true) return {@code null} if column does not exist
+     *            if {@code true} return {@code null} if column does not exist
      * @return the column
      * @throws DbException
      *             if the column was not found and {@code ifExists} is
@@ -1167,7 +1167,10 @@ public int hashCode() {
     public boolean hasInComparisons() {
         for (IndexCondition cond : indexConditions) {
             int compareType = cond.getCompareType();
-            if (compareType == Comparison.IN_QUERY || compareType == Comparison.IN_LIST) {
+            switch (compareType) {
+            case Comparison.IN_LIST:
+            case Comparison.IN_ARRAY:
+            case Comparison.IN_QUERY:
                 return true;
             }
         }
diff --git a/h2/src/main/org/h2/table/TableLink.java b/h2/src/main/org/h2/table/TableLink.java
index 0dd71fb3a2..2c3f8fd16a 100644
--- a/h2/src/main/org/h2/table/TableLink.java
+++ b/h2/src/main/org/h2/table/TableLink.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -19,13 +19,16 @@
 
 import org.h2.api.ErrorCode;
 import org.h2.command.Prepared;
+import org.h2.engine.NullsDistinct;
 import org.h2.engine.SessionLocal;
 import org.h2.index.Index;
 import org.h2.index.IndexType;
 import org.h2.index.LinkedIndex;
 import org.h2.jdbc.JdbcConnection;
+import org.h2.jdbc.JdbcResultSet;
 import org.h2.message.DbException;
 import org.h2.result.LocalResult;
+import org.h2.result.ResultInterface;
 import org.h2.result.Row;
 import org.h2.schema.Schema;
 import org.h2.util.JdbcUtils;
@@ -60,6 +63,7 @@ public class TableLink extends Table {
     private boolean storesMixedCase;
     private boolean storesMixedCaseQuoted;
     private boolean supportsMixedCaseIdentifiers;
+    private String identifierQuoteString;
     private boolean globalTemporary;
     private boolean readOnly;
     private final boolean targetsMySql;
@@ -123,6 +127,7 @@ private void readMetaData() throws SQLException {
         storesMixedCase = meta.storesMixedCaseIdentifiers();
         storesMixedCaseQuoted = meta.storesMixedCaseQuotedIdentifiers();
         supportsMixedCaseIdentifiers = meta.supportsMixedCaseIdentifiers();
+        identifierQuoteString = meta.getIdentifierQuoteString();
         ArrayList columnList = Utils.newSmallArrayList();
         HashMap columnMap = new HashMap<>();
         String schema = null;
@@ -177,10 +182,20 @@ private void readMetaData() throws SQLException {
 
         try (Statement stat = conn.getConnection().createStatement();
                 ResultSet rs = stat.executeQuery("SELECT * FROM " + qualifiedTableName + " T WHERE 1=0")) {
-            if (columnList.isEmpty()) {
+            if (rs instanceof JdbcResultSet) {
+                ResultInterface result = ((JdbcResultSet) rs).getResult();
+                columnList.clear();
+                columnMap.clear();
+                for (int i = 0, l = result.getVisibleColumnCount(); i < l;) {
+                    String n = result.getColumnName(i);
+                    Column col = new Column(n, result.getColumnType(i), this, ++i);
+                    columnList.add(col);
+                    columnMap.put(n, col);
+                }
+            } else if (columnList.isEmpty()) {
                 // alternative solution
                 ResultSetMetaData rsMeta = rs.getMetaData();
-                for (int i = 0; i < rsMeta.getColumnCount();) {
+                for (int i = 0, l = rsMeta.getColumnCount(); i < l;) {
                     String n = rsMeta.getColumnName(i + 1);
                     n = convertColumnName(n);
                     int sqlType = rsMeta.getColumnType(i + 1);
@@ -279,8 +294,9 @@ private void readIndexes(ResultSet rs, HashMap columnMap, String
             if (!rs.getBoolean("NON_UNIQUE")) {
                 uniqueColumnCount++;
             }
-            indexType = uniqueColumnCount > 0 ? IndexType.createUnique(false, false) :
-                    IndexType.createNonUnique(false);
+            indexType = uniqueColumnCount > 0
+                    ? IndexType.createUnique(false, false, uniqueColumnCount, /* TODO */ NullsDistinct.NOT_DISTINCT)
+                    : IndexType.createNonUnique(false);
             String col = rs.getString("COLUMN_NAME");
             col = convertColumnName(col);
             Column column = columnMap.get(col);
@@ -456,8 +472,8 @@ public void close(SessionLocal session) {
 
     @Override
     public synchronized long getRowCount(SessionLocal session) {
-        //The foo alias is used to support the PostgreSQL syntax
-        String sql = "SELECT COUNT(*) FROM " + qualifiedTableName + " as foo";
+        //The T alias is used to support the PostgreSQL syntax
+        String sql = "SELECT COUNT(*) FROM " + qualifiedTableName + " T";
         try {
             PreparedStatement prep = execute(sql, null, false, session);
             ResultSet rs = prep.getResultSet();
@@ -725,4 +741,13 @@ public int getFetchSize() {
         return fetchSize;
     }
 
+    /**
+     * Returns the identifier quote string or space.
+     *
+     * @return the identifier quote string or space
+     */
+    public String getIdentifierQuoteString() {
+        return identifierQuoteString;
+    }
+
 }
diff --git a/h2/src/main/org/h2/table/TableLinkConnection.java b/h2/src/main/org/h2/table/TableLinkConnection.java
index 1090ae3bdf..ba984a034a 100644
--- a/h2/src/main/org/h2/table/TableLinkConnection.java
+++ b/h2/src/main/org/h2/table/TableLinkConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/table/TableSynonym.java b/h2/src/main/org/h2/table/TableSynonym.java
index b82e6f1cbf..9cd32de80b 100644
--- a/h2/src/main/org/h2/table/TableSynonym.java
+++ b/h2/src/main/org/h2/table/TableSynonym.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/table/TableType.java b/h2/src/main/org/h2/table/TableType.java
index a20ae62d80..eb8eb72157 100644
--- a/h2/src/main/org/h2/table/TableType.java
+++ b/h2/src/main/org/h2/table/TableType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -33,7 +33,12 @@ public enum TableType {
     /**
      * The table type name for external table engines.
      */
-    EXTERNAL_TABLE_ENGINE;
+    EXTERNAL_TABLE_ENGINE,
+
+    /**
+     * The table type name for materialized views.
+     */
+    MATERIALIZED_VIEW;
 
     @Override
     public String toString() {
@@ -43,6 +48,8 @@ public String toString() {
             return "SYSTEM TABLE";
         } else if (this == TABLE_LINK) {
             return "TABLE LINK";
+        } else if (this == MATERIALIZED_VIEW) {
+            return "MATERIALIZED VIEW";
         } else {
             return super.toString();
         }
diff --git a/h2/src/main/org/h2/table/TableValueConstructorTable.java b/h2/src/main/org/h2/table/TableValueConstructorTable.java
index d5a0ad035e..3c45b33c7f 100644
--- a/h2/src/main/org/h2/table/TableValueConstructorTable.java
+++ b/h2/src/main/org/h2/table/TableValueConstructorTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/table/TableView.java b/h2/src/main/org/h2/table/TableView.java
index d9a3a37471..ed4e6ff5fa 100644
--- a/h2/src/main/org/h2/table/TableView.java
+++ b/h2/src/main/org/h2/table/TableView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -7,9 +7,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 
 import org.h2.api.ErrorCode;
 import org.h2.command.Prepared;
@@ -17,45 +15,28 @@
 import org.h2.command.query.AllColumnsForPlan;
 import org.h2.command.query.Query;
 import org.h2.engine.Database;
-import org.h2.engine.DbObject;
 import org.h2.engine.SessionLocal;
-import org.h2.engine.User;
-import org.h2.expression.Expression;
-import org.h2.expression.ExpressionVisitor;
 import org.h2.expression.Parameter;
 import org.h2.index.Index;
-import org.h2.index.IndexType;
-import org.h2.index.ViewIndex;
+import org.h2.index.QueryExpressionIndex;
 import org.h2.message.DbException;
 import org.h2.result.ResultInterface;
-import org.h2.result.Row;
 import org.h2.result.SortOrder;
 import org.h2.schema.Schema;
 import org.h2.util.StringUtils;
 import org.h2.util.Utils;
-import org.h2.value.TypeInfo;
-import org.h2.value.Value;
 
 /**
  * A view is a virtual table that is defined by a query.
  * @author Thomas Mueller
  * @author Nicolas Fortin, Atelier SIG, IRSTV FR CNRS 24888
  */
-public class TableView extends Table {
-
-    private static final long ROW_COUNT_APPROXIMATION = 100;
+public final class TableView extends QueryExpressionTable {
 
     private String querySQL;
-    private ArrayList tables;
     private Column[] columnTemplates;
-    private Query viewQuery;
-    private ViewIndex index;
     private boolean allowRecursive;
     private DbException createException;
-    private long lastModificationCheck;
-    private long maxDataModificationId;
-    private User owner;
-    private Query topQuery;
     private ResultInterface recursiveResult;
     private boolean isRecursiveQueryDetected;
     private boolean isTableExpression;
@@ -63,7 +44,7 @@ public class TableView extends Table {
     public TableView(Schema schema, int id, String name, String querySQL,
             ArrayList params, Column[] columnTemplates, SessionLocal session,
             boolean allowRecursive, boolean literalsChecked, boolean isTableExpression, boolean isTemporary) {
-        super(schema, id, name, false, true);
+        super(schema, id, name);
         setTemporary(isTemporary);
         init(querySQL, params, columnTemplates, session, allowRecursive, literalsChecked, isTableExpression);
     }
@@ -102,7 +83,7 @@ private synchronized void init(String querySQL, ArrayList params,
         this.allowRecursive = allowRecursive;
         this.isRecursiveQueryDetected = false;
         this.isTableExpression = isTableExpression;
-        index = new ViewIndex(this, querySQL, params, allowRecursive);
+        index = new QueryExpressionIndex(this, querySQL, params, allowRecursive);
         initColumnsAndTables(session, literalsChecked);
     }
 
@@ -165,26 +146,7 @@ private void initColumnsAndTables(SessionLocal session, boolean literalsChecked)
             Query compiledQuery = compileViewQuery(session, querySQL, literalsChecked);
             this.querySQL = compiledQuery.getPlanSQL(DEFAULT_SQL_FLAGS);
             tables = new ArrayList<>(compiledQuery.getTables());
-            ArrayList expressions = compiledQuery.getExpressions();
-            final int count = compiledQuery.getColumnCount();
-            ArrayList list = new ArrayList<>(count);
-            for (int i = 0; i < count; i++) {
-                Expression expr = expressions.get(i);
-                String name = null;
-                TypeInfo type = TypeInfo.TYPE_UNKNOWN;
-                if (columnTemplates != null && columnTemplates.length > i) {
-                    name = columnTemplates[i].getName();
-                    type = columnTemplates[i].getType();
-                }
-                if (name == null) {
-                    name = expr.getColumnNameForView(session, i);
-                }
-                if (type.getValueType() == Value.UNKNOWN) {
-                    type = expr.getType();
-                }
-                list.add(new Column(name, type, this, i));
-            }
-            cols = list.toArray(new Column[0]);
+            cols = initColumns(session, columnTemplates, compiledQuery, false);
             createException = null;
             viewQuery = compiledQuery;
         } catch (DbException e) {
@@ -218,11 +180,6 @@ private void initColumnsAndTables(SessionLocal session, boolean literalsChecked)
         }
     }
 
-    @Override
-    public boolean isView() {
-        return true;
-    }
-
     /**
      * Check if this view is currently invalid.
      *
@@ -233,41 +190,8 @@ public boolean isInvalid() {
     }
 
     @Override
-    public PlanItem getBestPlanItem(SessionLocal session, int[] masks,
-            TableFilter[] filters, int filter, SortOrder sortOrder,
-            AllColumnsForPlan allColumnsSet) {
-        final CacheKey cacheKey = new CacheKey(masks, this);
-        Map indexCache = session.getViewIndexCache(topQuery != null);
-        ViewIndex i = indexCache.get(cacheKey);
-        if (i == null || i.isExpired()) {
-            i = new ViewIndex(this, index, session, masks, filters, filter, sortOrder);
-            indexCache.put(cacheKey, i);
-        }
-        PlanItem item = new PlanItem();
-        item.cost = i.getCost(session, masks, filters, filter, sortOrder, allColumnsSet);
-        item.setIndex(i);
-        return item;
-    }
-
-    @Override
-    public boolean isQueryComparable() {
-        if (!super.isQueryComparable()) {
-            return false;
-        }
-        for (Table t : tables) {
-            if (!t.isQueryComparable()) {
-                return false;
-            }
-        }
-        if (topQuery != null &&
-                !topQuery.isEverything(ExpressionVisitor.QUERY_COMPARABLE_VISITOR)) {
-            return false;
-        }
-        return true;
-    }
-
     public Query getTopQuery() {
-        return topQuery;
+        return null;
     }
 
     @Override
@@ -326,53 +250,6 @@ private String getCreateSQL(boolean orReplace, boolean force, String quotedName)
         return builder.append(" AS\n").append(querySQL).toString();
     }
 
-    @Override
-    public void close(SessionLocal session) {
-        // nothing to do
-    }
-
-    @Override
-    public Index addIndex(SessionLocal session, String indexName, int indexId, IndexColumn[] cols,
-            int uniqueColumnCount, IndexType indexType, boolean create, String indexComment) {
-        throw DbException.getUnsupportedException("VIEW");
-    }
-
-    @Override
-    public boolean isInsertable() {
-        return false;
-    }
-
-    @Override
-    public void removeRow(SessionLocal session, Row row) {
-        throw DbException.getUnsupportedException("VIEW");
-    }
-
-    @Override
-    public void addRow(SessionLocal session, Row row) {
-        throw DbException.getUnsupportedException("VIEW");
-    }
-
-    @Override
-    public void checkSupportAlter() {
-        throw DbException.getUnsupportedException("VIEW");
-    }
-
-    @Override
-    public long truncate(SessionLocal session) {
-        throw DbException.getUnsupportedException("VIEW");
-    }
-
-    @Override
-    public long getRowCount(SessionLocal session) {
-        throw DbException.getInternalError(toString());
-    }
-
-    @Override
-    public boolean canGetRowCount(SessionLocal session) {
-        // TODO view: could get the row count, but not that easy
-        return false;
-    }
-
     @Override
     public boolean canDrop() {
         return true;
@@ -387,7 +264,6 @@ public TableType getTableType() {
     public void removeChildrenAndResources(SessionLocal session) {
         removeCurrentViewFromOtherTables();
         super.removeChildrenAndResources(session);
-        database.removeMeta(session, getId());
         querySQL = null;
         index = null;
         clearIndexCaches(database);
@@ -414,15 +290,10 @@ public StringBuilder getSQL(StringBuilder builder, int sqlFlags) {
         return super.getSQL(builder, sqlFlags);
     }
 
-    public String getQuery() {
+    public String getQuerySQL() {
         return querySQL;
     }
 
-    @Override
-    public Index getScanIndex(SessionLocal session) {
-        return getBestPlanItem(session, null, null, -1, null, null).getIndex();
-    }
-
     @Override
     public Index getScanIndex(SessionLocal session, int[] masks,
             TableFilter[] filters, int filter, SortOrder sortOrder,
@@ -431,37 +302,15 @@ public Index getScanIndex(SessionLocal session, int[] masks,
             String msg = createException.getMessage();
             throw DbException.get(ErrorCode.VIEW_IS_INVALID_2, createException, getTraceSQL(), msg);
         }
-        PlanItem item = getBestPlanItem(session, masks, filters, filter, sortOrder, allColumnsSet);
-        return item.getIndex();
-    }
-
-    @Override
-    public boolean canReference() {
-        return false;
-    }
-
-    @Override
-    public ArrayList getIndexes() {
-        return null;
+        return super.getScanIndex(session, masks, filters, filter, sortOrder, allColumnsSet);
     }
 
     @Override
     public long getMaxDataModificationId() {
-        if (createException != null) {
-            return Long.MAX_VALUE;
-        }
-        if (viewQuery == null) {
+        if (createException != null || viewQuery == null) {
             return Long.MAX_VALUE;
         }
-        // if nothing was modified in the database since the last check, and the
-        // last is known, then we don't need to check again
-        // this speeds up nested views
-        long dbMod = database.getModificationDataId();
-        if (dbMod > lastModificationCheck && maxDataModificationId <= dbMod) {
-            maxDataModificationId = viewQuery.getMaxDataModificationId();
-            lastModificationCheck = dbMod;
-        }
-        return maxDataModificationId;
+        return super.getMaxDataModificationId();
     }
 
     private void removeCurrentViewFromOtherTables() {
@@ -479,73 +328,6 @@ private void addDependentViewToTables() {
         }
     }
 
-    private void setOwner(User owner) {
-        this.owner = owner;
-    }
-
-    public User getOwner() {
-        return owner;
-    }
-
-    /**
-     * Create a temporary view out of the given query.
-     *
-     * @param session the session
-     * @param owner the owner of the query
-     * @param name the view name
-     * @param columnTemplates column templates, or {@code null}
-     * @param query the query
-     * @param topQuery the top level query
-     * @return the view table
-     */
-    public static TableView createTempView(SessionLocal session, User owner,
-            String name, Column[] columnTemplates, Query query, Query topQuery) {
-        Schema mainSchema = session.getDatabase().getMainSchema();
-        String querySQL = query.getPlanSQL(DEFAULT_SQL_FLAGS);
-        TableView v = new TableView(mainSchema, 0, name,
-                querySQL, query.getParameters(), columnTemplates, session,
-                false/* allow recursive */, true /* literals have already been checked when parsing original query */,
-                false /* is table expression */, true/*temporary*/);
-        if (v.createException != null) {
-            throw v.createException;
-        }
-        v.setTopQuery(topQuery);
-        v.setOwner(owner);
-        v.setTemporary(true);
-        return v;
-    }
-
-    private void setTopQuery(Query topQuery) {
-        this.topQuery = topQuery;
-    }
-
-    @Override
-    public long getRowCountApproximation(SessionLocal session) {
-        return ROW_COUNT_APPROXIMATION;
-    }
-
-    /**
-     * Get the index of the first parameter.
-     *
-     * @param additionalParameters additional parameters
-     * @return the index of the first parameter
-     */
-    public int getParameterOffset(ArrayList additionalParameters) {
-        int result = topQuery == null ? -1 : getMaxParameterIndex(topQuery.getParameters());
-        if (additionalParameters != null) {
-            result = Math.max(result, getMaxParameterIndex(additionalParameters));
-        }
-        return result + 1;
-    }
-
-    private static int getMaxParameterIndex(ArrayList parameters) {
-        int result = -1;
-        for (Parameter p : parameters) {
-            result = Math.max(result, p.getIndex());
-        }
-        return result;
-    }
-
     public boolean isRecursive() {
         return allowRecursive;
     }
@@ -555,7 +337,7 @@ public boolean isDeterministic() {
         if (allowRecursive || viewQuery == null) {
             return false;
         }
-        return viewQuery.isEverything(ExpressionVisitor.DETERMINISTIC_VISITOR);
+        return super.isDeterministic();
     }
 
     public void setRecursiveResult(ResultInterface value) {
@@ -569,59 +351,6 @@ public ResultInterface getRecursiveResult() {
         return recursiveResult;
     }
 
-    @Override
-    public void addDependencies(HashSet dependencies) {
-        super.addDependencies(dependencies);
-        if (tables != null) {
-            for (Table t : tables) {
-                if (TableType.VIEW != t.getTableType()) {
-                    t.addDependencies(dependencies);
-                }
-            }
-        }
-    }
-
-    /**
-     * The key of the index cache for views.
-     */
-    private static final class CacheKey {
-
-        private final int[] masks;
-        private final TableView view;
-
-        CacheKey(int[] masks, TableView view) {
-            this.masks = masks;
-            this.view = view;
-        }
-
-        @Override
-        public int hashCode() {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + Arrays.hashCode(masks);
-            result = prime * result + view.hashCode();
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (this == obj) {
-                return true;
-            }
-            if (obj == null) {
-                return false;
-            }
-            if (getClass() != obj.getClass()) {
-                return false;
-            }
-            CacheKey other = (CacheKey) obj;
-            if (view != other.view) {
-                return false;
-            }
-            return Arrays.equals(masks, other.masks);
-        }
-    }
-
     /**
      * Was query recursion detected during compiling.
      *
@@ -688,7 +417,7 @@ public static TableView createTableViewMaybeRecursive(Schema schema, int id, Str
             if (!isTemporary) {
                 withQuery.setSession(session);
             }
-            columnTemplateList = TableView.createQueryColumnTemplateList(columnNames.toArray(new String[1]),
+            columnTemplateList = createQueryColumnTemplateList(columnNames.toArray(new String[1]),
                     (Query) withQuery, querySQLOutput);
 
         } finally {
@@ -705,7 +434,7 @@ public static TableView createTableViewMaybeRecursive(Schema schema, int id, Str
         if (!view.isRecursiveQueryDetected()) {
             if (!isTemporary) {
                 db.addSchemaObject(session, view);
-                view.lock(session, true, true);
+                view.lock(session, Table.EXCLUSIVE_LOCK);
                 session.getDatabase().removeSchemaObject(session, view);
 
                 // during database startup - this method does not normally get called - and it
@@ -723,40 +452,6 @@ public static TableView createTableViewMaybeRecursive(Schema schema, int id, Str
         return view;
     }
 
-
-    /**
-     * Creates a list of column templates from a query (usually from WITH query,
-     * but could be any query)
-     *
-     * @param cols - an optional list of column names (can be specified by WITH
-     *            clause overriding usual select names)
-     * @param theQuery - the query object we want the column list for
-     * @param querySQLOutput - array of length 1 to receive extra 'output' field
-     *            in addition to return value - containing the SQL query of the
-     *            Query object
-     * @return a list of column object returned by withQuery
-     */
-    public static List createQueryColumnTemplateList(String[] cols,
-            Query theQuery, String[] querySQLOutput) {
-        List columnTemplateList = new ArrayList<>();
-        theQuery.prepare();
-        // String array of length 1 is to receive extra 'output' field in addition to
-        // return value
-        querySQLOutput[0] = StringUtils.cache(theQuery.getPlanSQL(ADD_PLAN_INFORMATION));
-        SessionLocal session = theQuery.getSession();
-        ArrayList withExpressions = theQuery.getExpressions();
-        for (int i = 0; i < withExpressions.size(); ++i) {
-            Expression columnExp = withExpressions.get(i);
-            // use the passed in column name if supplied, otherwise use alias
-            // (if found) otherwise use column name derived from column
-            // expression
-            String columnName = cols != null && cols.length > i ? cols[i] : columnExp.getColumnNameForView(session, i);
-            columnTemplateList.add(new Column(columnName, columnExp.getType()));
-
-        }
-        return columnTemplateList;
-    }
-
     /**
      * Create a table for a recursive query.
      *
@@ -807,7 +502,7 @@ public static void destroyShadowTableForRecursiveExpression(boolean isTemporary,
             Table recursiveTable) {
         if (recursiveTable != null) {
             if (!isTemporary) {
-                recursiveTable.lock(targetSession, true, true);
+                recursiveTable.lock(targetSession, Table.EXCLUSIVE_LOCK);
                 targetSession.getDatabase().removeSchemaObject(targetSession, recursiveTable);
 
             } else {
diff --git a/h2/src/main/org/h2/table/VirtualConstructedTable.java b/h2/src/main/org/h2/table/VirtualConstructedTable.java
index 3618a7b87e..ff1d4f73ff 100644
--- a/h2/src/main/org/h2/table/VirtualConstructedTable.java
+++ b/h2/src/main/org/h2/table/VirtualConstructedTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/table/VirtualTable.java b/h2/src/main/org/h2/table/VirtualTable.java
index b3b6b0a35b..e89e3d9b20 100644
--- a/h2/src/main/org/h2/table/VirtualTable.java
+++ b/h2/src/main/org/h2/table/VirtualTable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/table/package.html b/h2/src/main/org/h2/table/package.html
index 5c491fbfe3..2f57e5595b 100644
--- a/h2/src/main/org/h2/table/package.html
+++ b/h2/src/main/org/h2/table/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/main/org/h2/tools/Backup.java b/h2/src/main/org/h2/tools/Backup.java
index f531561eab..19f8e53cdd 100644
--- a/h2/src/main/org/h2/tools/Backup.java
+++ b/h2/src/main/org/h2/tools/Backup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -30,8 +30,6 @@
  * responding, creating a backup using the Backup tool is possible by using the
  * quiet mode. However, if the database is changed while the backup is running
  * in quiet mode, the backup could be corrupt.
- *
- * @h2.resource
  */
 public class Backup extends Tool {
 
@@ -50,7 +48,6 @@ public class Backup extends Tool {
      * 
      * 
      * [-quiet] Do not print progress information
-     * @h2.resource
      *
      * @param args the command line arguments
      * @throws SQLException on failure
diff --git a/h2/src/main/org/h2/tools/ChangeFileEncryption.java b/h2/src/main/org/h2/tools/ChangeFileEncryption.java
index d3a7ee9fb1..0b558bcacf 100644
--- a/h2/src/main/org/h2/tools/ChangeFileEncryption.java
+++ b/h2/src/main/org/h2/tools/ChangeFileEncryption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -28,7 +28,6 @@
  *
  * This tool can not be used to change a password of a user.
  * The database must be closed before using this tool.
- * @h2.resource
  */
 public class ChangeFileEncryption extends Tool {
 
@@ -56,7 +55,6 @@ public class ChangeFileEncryption extends Tool {
      * [-quiet]
      * Do not print progress information
      * 
-     * @h2.resource
      *
      * @param args the command line arguments
      */
diff --git a/h2/src/main/org/h2/tools/CompressTool.java b/h2/src/main/org/h2/tools/CompressTool.java
index 916dfafecd..98e07bf26a 100644
--- a/h2/src/main/org/h2/tools/CompressTool.java
+++ b/h2/src/main/org/h2/tools/CompressTool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/tools/Console.java b/h2/src/main/org/h2/tools/Console.java
index a19a7d1af3..86f025c849 100644
--- a/h2/src/main/org/h2/tools/Console.java
+++ b/h2/src/main/org/h2/tools/Console.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -16,7 +16,6 @@
 
 /**
  * Starts the H2 Console (web-) server, as well as the TCP and PG server.
- * @h2.resource
  *
  * @author Thomas Mueller, Ridvan Agar
  */
@@ -59,7 +58,6 @@ public class Console extends Tool implements ShutdownHandler {
      * for details, see the Server tool.
      * If a service can not be started, the program
      * terminates with an exit code of 1.
-     * @h2.resource
      *
      * @param args the command line arguments
      * @throws SQLException on failure
@@ -115,6 +113,8 @@ public void runTool(String... args) throws SQLException {
                 } else if ("-webAllowOthers".equals(arg)) {
                     // no parameters
                     webAllowOthers = true;
+                } else if ("-webExternalNames".equals(arg)) {
+                    i++;
                 } else if ("-webDaemon".equals(arg)) {
                     // no parameters
                 } else if ("-webSSL".equals(arg)) {
diff --git a/h2/src/main/org/h2/tools/ConvertTraceFile.java b/h2/src/main/org/h2/tools/ConvertTraceFile.java
index 1a7600436a..ca9dc66c61 100644
--- a/h2/src/main/org/h2/tools/ConvertTraceFile.java
+++ b/h2/src/main/org/h2/tools/ConvertTraceFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -22,7 +22,6 @@
  * Converts a .trace.db file to a SQL script and Java source code.
  *
  * SQL statement statistics are listed as well.
- * @h2.resource
  */
 public class ConvertTraceFile extends Tool {
 
@@ -67,7 +66,6 @@ public int compareTo(Stat other) {
      * [-javaClass <file>]
      * The Java directory and class file name (default: Test)
      * 
-     * @h2.resource
      *
      * @param args the command line arguments
      * @throws SQLException on failure
diff --git a/h2/src/main/org/h2/tools/CreateCluster.java b/h2/src/main/org/h2/tools/CreateCluster.java
index 13a4e21d3c..ac18ead124 100644
--- a/h2/src/main/org/h2/tools/CreateCluster.java
+++ b/h2/src/main/org/h2/tools/CreateCluster.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -22,7 +22,6 @@
  * Creates a cluster from a stand-alone database.
  *
  * Copies a database to another location if required.
- * @h2.resource
  */
 public class CreateCluster extends Tool {
 
@@ -43,7 +42,6 @@ public class CreateCluster extends Tool {
      * [-serverList <list>]
      * The comma separated list of host names or IP addresses
      * 
-     * @h2.resource
      *
      * @param args the command line arguments
      * @throws SQLException on failure
@@ -104,7 +102,7 @@ private static void process(String urlSource, String urlTarget,
             String user, String password, String serverList) throws SQLException {
         // use cluster='' so connecting is possible
         // even if the cluster is enabled
-        try (JdbcConnection connSource = new JdbcConnection(urlSource + ";CLUSTER=''", null, user, password);
+        try (JdbcConnection connSource = new JdbcConnection(urlSource + ";CLUSTER=''", null, user, password, false);
                 Statement statSource = connSource.createStatement()) {
             // enable the exclusive mode and close other connections,
             // so that data can't change while restoring the second database
@@ -122,7 +120,7 @@ private static void performTransfer(Statement statSource, String urlTarget, Stri
             String serverList) throws SQLException {
 
         // Delete the target database first.
-        try (JdbcConnection connTarget = new JdbcConnection(urlTarget + ";CLUSTER=''", null, user, password);
+        try (JdbcConnection connTarget = new JdbcConnection(urlTarget + ";CLUSTER=''", null, user, password, false);
                 Statement statTarget = connTarget.createStatement()) {
             statTarget.execute("DROP ALL OBJECTS DELETE FILES");
         }
@@ -131,7 +129,7 @@ private static void performTransfer(Statement statSource, String urlTarget, Stri
             Future threadFuture = startWriter(pipeReader, statSource);
 
             // Read data from pipe reader, restore on target.
-            try (JdbcConnection connTarget = new JdbcConnection(urlTarget, null, user, password);
+            try (JdbcConnection connTarget = new JdbcConnection(urlTarget, null, user, password, false);
                     Statement statTarget = connTarget.createStatement()) {
                 RunScript.execute(connTarget, pipeReader);
 
diff --git a/h2/src/main/org/h2/tools/Csv.java b/h2/src/main/org/h2/tools/Csv.java
index dfcde5cc2f..5065729bf8 100644
--- a/h2/src/main/org/h2/tools/Csv.java
+++ b/h2/src/main/org/h2/tools/Csv.java
@@ -1,21 +1,20 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
 package org.h2.tools;
 
-import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
@@ -57,7 +56,7 @@ public class Csv implements SimpleRowSource {
     private String nullString = "";
 
     private String fileName;
-    private Reader input;
+    private BufferedReader input;
     private char[] inputBuffer;
     private int inputBufferPos;
     private int inputBufferStart = -1;
@@ -71,10 +70,8 @@ private int writeResultSet(ResultSet rs) throws SQLException {
             ResultSetMetaData meta = rs.getMetaData();
             int columnCount = meta.getColumnCount();
             String[] row = new String[columnCount];
-            int[] sqlTypes = new int[columnCount];
             for (int i = 0; i < columnCount; i++) {
                 row[i] = meta.getColumnLabel(i + 1);
-                sqlTypes[i] = meta.getColumnType(i + 1);
             }
             if (writeColumnHeader) {
                 writeRow(row);
@@ -198,7 +195,8 @@ public ResultSet read(String inputFileName, String[] colNames,
      */
     public ResultSet read(Reader reader, String[] colNames) throws IOException {
         init(null, null);
-        this.input = reader;
+        this.input = reader instanceof BufferedReader ? (BufferedReader) reader
+                : new BufferedReader(reader, Constants.IO_BUFFER_SIZE);
         return readResultSet(colNames);
     }
 
@@ -300,17 +298,13 @@ private String escape(String data) {
     private void initRead() throws IOException {
         if (input == null) {
             try {
-                InputStream in = FileUtils.newInputStream(fileName);
-                in = new BufferedInputStream(in, Constants.IO_BUFFER_SIZE);
-                input = characterSet != null ? new InputStreamReader(in, characterSet) : new InputStreamReader(in);
+                input = FileUtils.newBufferedReader(fileName,
+                        characterSet != null ? Charset.forName(characterSet) : StandardCharsets.UTF_8);
             } catch (IOException e) {
                 close();
                 throw e;
             }
         }
-        if (!input.markSupported()) {
-            input = new BufferedReader(input);
-        }
         input.mark(1);
         int bom = input.read();
         if (bom != 0xfeff) {
@@ -561,7 +555,12 @@ public Object[] readRow() throws SQLException {
                     }
                 }
                 if (i < row.length) {
-                    row[i++] = v;
+                    // Empty Strings should be NULL
+                    // in order to prevent conversion of zero-length String
+                    // to Number
+                    row[i++] = v!=null && v.length() > 0
+                            ? v
+                            : null;
                 }
                 if (endOfLine) {
                     break;
@@ -819,7 +818,7 @@ public String setOptions(String options) {
                 continue;
             }
             int index = pair.indexOf('=');
-            String key = StringUtils.trim(pair.substring(0, index), true, true, " ");
+            String key = StringUtils.trimSubstring(pair, 0, index);
             String value = pair.substring(index + 1);
             char ch = value.isEmpty() ? 0 : value.charAt(0);
             if (isParam(key, "escape", "esc", "escapeCharacter")) {
diff --git a/h2/src/main/org/h2/tools/DeleteDbFiles.java b/h2/src/main/org/h2/tools/DeleteDbFiles.java
index 3bcc4ca86b..a7672d3428 100644
--- a/h2/src/main/org/h2/tools/DeleteDbFiles.java
+++ b/h2/src/main/org/h2/tools/DeleteDbFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -17,7 +17,6 @@
  * Deletes all files belonging to a database.
  *
  * The database must be closed before calling this tool.
- * @h2.resource
  */
 public class DeleteDbFiles extends Tool {
 
@@ -34,7 +33,6 @@ public class DeleteDbFiles extends Tool {
      * [-quiet]
      * Do not print progress information
      * 
-     * @h2.resource
      *
      * @param args the command line arguments
      * @throws SQLException on failure
diff --git a/h2/src/main/org/h2/tools/GUIConsole.java b/h2/src/main/org/h2/tools/GUIConsole.java
index d029542c62..4572601f12 100644
--- a/h2/src/main/org/h2/tools/GUIConsole.java
+++ b/h2/src/main/org/h2/tools/GUIConsole.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -464,7 +464,7 @@ private void createDatabase() {
         }
         String url = "jdbc:h2:" + path;
         try {
-            new JdbcConnection(url, null, user, password).close();
+            new JdbcConnection(url, null, user, password, false).close();
             errorArea.setForeground(new Color(0, 0x99, 0));
             errorArea.setText("Database was created successfully.\n\n"
                     + "JDBC URL for H2 Console:\n"
diff --git a/h2/src/main/org/h2/tools/MultiDimension.java b/h2/src/main/org/h2/tools/MultiDimension.java
index 6cc4802ee3..08c0004613 100644
--- a/h2/src/main/org/h2/tools/MultiDimension.java
+++ b/h2/src/main/org/h2/tools/MultiDimension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -310,7 +310,7 @@ private void addMortonRanges(ArrayList list, int[] min, int[] max,
     }
 
     private static int roundUp(int x, int blockSizePowerOf2) {
-        return (x + blockSizePowerOf2 - 1) & (-blockSizePowerOf2);
+        return (x + blockSizePowerOf2 - 1) & -blockSizePowerOf2;
     }
 
     private static int findMiddle(int a, int b) {
diff --git a/h2/src/main/org/h2/tools/Recover.java b/h2/src/main/org/h2/tools/Recover.java
index 5324451b84..475a813e6a 100644
--- a/h2/src/main/org/h2/tools/Recover.java
+++ b/h2/src/main/org/h2/tools/Recover.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -63,7 +63,6 @@
 
 /**
  * Helps recovering a corrupted database.
- * @h2.resource
  */
 public class Recover extends Tool implements DataHandler {
 
@@ -95,7 +94,6 @@ public class Recover extends Tool implements DataHandler {
      * Print the transaction log
      * 
      * Encrypted databases need to be decrypted first.
-     * @h2.resource
      *
      * @param args the command line arguments
      * @throws SQLException on failure
@@ -406,7 +404,7 @@ private void dumpMVStoreFile(PrintWriter writer, String fileName) {
     }
 
     private static void dumpLayout(PrintWriter writer, MVStore mv) {
-        MVMap layout = mv.getLayoutMap();
+        Map layout = mv.getLayoutMap();
         for (Entry e : layout.entrySet()) {
             writer.println("-- " + e.getKey() + " = " + e.getValue());
         }
diff --git a/h2/src/main/org/h2/tools/Restore.java b/h2/src/main/org/h2/tools/Restore.java
index 27f98cb475..f5ed708651 100644
--- a/h2/src/main/org/h2/tools/Restore.java
+++ b/h2/src/main/org/h2/tools/Restore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -20,7 +20,6 @@
 
 /**
  * Restores a H2 database by extracting the database files from a .zip file.
- * @h2.resource
  */
 public class Restore extends Tool {
 
@@ -39,7 +38,6 @@ public class Restore extends Tool {
      * [-quiet]
      * Do not print progress information
      * 
-     * @h2.resource
      *
      * @param args the command line arguments
      * @throws SQLException on failure
diff --git a/h2/src/main/org/h2/tools/RunScript.java b/h2/src/main/org/h2/tools/RunScript.java
index 7553241d5f..de394ae606 100644
--- a/h2/src/main/org/h2/tools/RunScript.java
+++ b/h2/src/main/org/h2/tools/RunScript.java
@@ -1,15 +1,13 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
 package org.h2.tools;
 
-import java.io.BufferedInputStream;
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -19,7 +17,6 @@
 import java.sql.Statement;
 import java.util.concurrent.TimeUnit;
 
-import org.h2.engine.Constants;
 import org.h2.message.DbException;
 import org.h2.store.fs.FileUtils;
 import org.h2.util.IOUtils;
@@ -30,7 +27,6 @@
 
 /**
  * Runs a SQL script against a database.
- * @h2.resource
  */
 public class RunScript extends Tool {
 
@@ -62,7 +58,6 @@ public class RunScript extends Tool {
      * [-options ...]
      * RUNSCRIPT options (embedded H2; -*Results not supported)
      * 
-     * @h2.resource
      *
      * @param args the command line arguments
      * @throws SQLException on failure
@@ -186,14 +181,11 @@ public static ResultSet execute(Connection conn, Reader reader)
     private void process(Connection conn, String fileName,
             boolean continueOnError, Charset charset) throws SQLException,
             IOException {
-        InputStream in = FileUtils.newInputStream(fileName);
-        String path = FileUtils.getParent(fileName);
+        BufferedReader reader = FileUtils.newBufferedReader(fileName, charset);
         try {
-            in = new BufferedInputStream(in, Constants.IO_BUFFER_SIZE);
-            Reader reader = new InputStreamReader(in, charset);
-            process(conn, continueOnError, path, reader, charset);
+            process(conn, continueOnError, FileUtils.getParent(fileName), reader, charset);
         } finally {
-            IOUtils.closeSilently(in);
+            IOUtils.closeSilently(reader);
         }
     }
 
diff --git a/h2/src/main/org/h2/tools/Script.java b/h2/src/main/org/h2/tools/Script.java
index 2ae6573f75..73ac773158 100644
--- a/h2/src/main/org/h2/tools/Script.java
+++ b/h2/src/main/org/h2/tools/Script.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -14,7 +14,6 @@
 
 /**
  * Creates a SQL script file by extracting the schema and data of a database.
- * @h2.resource
  */
 public class Script extends Tool {
 
@@ -37,7 +36,6 @@ public class Script extends Tool {
      * [-quiet]
      * Do not print progress information
      * 
-     * @h2.resource
      *
      * @param args the command line arguments
      * @throws SQLException on failure
diff --git a/h2/src/main/org/h2/tools/Server.java b/h2/src/main/org/h2/tools/Server.java
index 1f271e7eb8..be6076fa38 100644
--- a/h2/src/main/org/h2/tools/Server.java
+++ b/h2/src/main/org/h2/tools/Server.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -23,13 +23,13 @@
 
 /**
  * Starts the H2 Console (web-) server, TCP, and PG server.
- * @h2.resource
  */
 public class Server extends Tool implements Runnable, ShutdownHandler {
 
     private final Service service;
     private Server web, tcp, pg;
     private ShutdownHandler shutdownHandler;
+    private boolean fromCommandLine;
     private boolean started;
 
     public Server() {
@@ -66,6 +66,9 @@ public Server(Service service, String... args) throws SQLException {
      * Start the web server with the H2 Console
      * [-webAllowOthers]
      * Allow other computers to connect - see below
+     * [-webExternalNames <names>]
+     * The comma-separated list of external names and IP addresses of this server,
+     * used together with -webAllowOthers
      * [-webDaemon]
      * Use a daemon thread
      * [-webPort <port>]
@@ -73,7 +76,11 @@ public Server(Service service, String... args) throws SQLException {
      * [-webSSL]
      * Use encrypted (HTTPS) connections
      * [-webAdminPassword]
-     * Password of DB Console administrator
+     * Hash of password of DB Console administrator, can be generated with
+     * {@linkplain WebServer#encodeAdminPassword(String)}. Can be passed only to
+     * the {@link #runTool(String...)} method, this method rejects it. It is
+     * also possible to store this setting in configuration file of H2
+     * Console.
      * [-browser]
      * Start a browser connecting to the web server
      * [-tcp]
@@ -116,13 +123,14 @@ public Server(Service service, String... args) throws SQLException {
      * The options -xAllowOthers are potentially risky.
      *
      * For details, see Advanced Topics / Protection against Remote Access.
-     * @h2.resource
      *
      * @param args the command line arguments
      * @throws SQLException on failure
      */
     public static void main(String... args) throws SQLException {
-        new Server().runTool(args);
+        Server server = new Server();
+        server.fromCommandLine = true;
+        server.runTool(args);
     }
 
     private void verifyArgs(String... args) throws SQLException {
@@ -136,13 +144,18 @@ private void verifyArgs(String... args) throws SQLException {
                     // ok
                 } else if ("-webAllowOthers".equals(arg)) {
                     // no parameters
-                } else if ("-webDaemon".equals(arg)) {
+                } else if ("-webExternalNames".equals(arg)) {
+                    i++;
+                }  else if ("-webDaemon".equals(arg)) {
                     // no parameters
                 } else if ("-webSSL".equals(arg)) {
                     // no parameters
                 } else if ("-webPort".equals(arg)) {
                     i++;
                 } else if ("-webAdminPassword".equals(arg)) {
+                    if (fromCommandLine) {
+                        throwUnsupportedOption(arg);
+                    }
                     i++;
                 } else {
                     throwUnsupportedOption(arg);
@@ -237,6 +250,8 @@ public void runTool(String... args) throws SQLException {
                     webStart = true;
                 } else if ("-webAllowOthers".equals(arg)) {
                     // no parameters
+                } else if ("-webExternalNames".equals(arg)) {
+                    i++;
                 } else if ("-webDaemon".equals(arg)) {
                     // no parameters
                 } else if ("-webSSL".equals(arg)) {
@@ -244,6 +259,9 @@ public void runTool(String... args) throws SQLException {
                 } else if ("-webPort".equals(arg)) {
                     i++;
                 } else if ("-webAdminPassword".equals(arg)) {
+                    if (fromCommandLine) {
+                        throwUnsupportedOption(arg);
+                    }
                     i++;
                 } else {
                     showUsageAndThrowUnsupportedOption(arg);
diff --git a/h2/src/main/org/h2/tools/Shell.java b/h2/src/main/org/h2/tools/Shell.java
index b13523c248..2a7bed7890 100644
--- a/h2/src/main/org/h2/tools/Shell.java
+++ b/h2/src/main/org/h2/tools/Shell.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -32,7 +32,6 @@
 
 /**
  * Interactive command line tool to access a database using JDBC.
- * @h2.resource
  */
 public class Shell extends Tool implements Runnable {
 
@@ -73,7 +72,6 @@ public class Shell extends Tool implements Runnable {
      * 
      * If special characters don't work as expected, you may need to use
      * -Dfile.encoding=UTF-8 (Mac OS X) or CP850 (Windows).
-     * @h2.resource
      *
      * @param args the command line arguments
      * @throws SQLException on failure
diff --git a/h2/src/main/org/h2/tools/SimpleResultSet.java b/h2/src/main/org/h2/tools/SimpleResultSet.java
index 48a22fca43..2d0bbffbe3 100644
--- a/h2/src/main/org/h2/tools/SimpleResultSet.java
+++ b/h2/src/main/org/h2/tools/SimpleResultSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/tools/SimpleRowSource.java b/h2/src/main/org/h2/tools/SimpleRowSource.java
index 6724d8b2a7..18a3fa777c 100644
--- a/h2/src/main/org/h2/tools/SimpleRowSource.java
+++ b/h2/src/main/org/h2/tools/SimpleRowSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/tools/TriggerAdapter.java b/h2/src/main/org/h2/tools/TriggerAdapter.java
index ed02b99c4c..c168259dec 100644
--- a/h2/src/main/org/h2/tools/TriggerAdapter.java
+++ b/h2/src/main/org/h2/tools/TriggerAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/tools/Upgrade.java b/h2/src/main/org/h2/tools/Upgrade.java
index e4c7d2f5b8..e7d5002556 100644
--- a/h2/src/main/org/h2/tools/Upgrade.java
+++ b/h2/src/main/org/h2/tools/Upgrade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -118,6 +118,15 @@ public final class Upgrade {
             /* 1.4.198 */ "32dd6b149cb722aa4c2dd4d40a74a9cd41e32ac59a4e755a66e5753660d61d46",
             /* 1.4.199 */ "3125a16743bc6b4cfbb61abba783203f1fb68230aa0fdc97898f796f99a5d42e",
             /* 1.4.200 */ "3ad9ac4b6aae9cd9d3ac1c447465e1ed06019b851b893dd6a8d76ddb6d85bca6",
+            /* 2.0.202 */ "95090f0609aacb0ee339128ef04077145ef28320ee874ea2e33a692938da5b97",
+            /* 2.0.204 */ "712a616409580bd4ac7c10e48f2599cc32ba3a433a1804da619c3f0a5ef66a04",
+            /* 2.0.206 */ "3b9607c5673fd8b87e49e3ac46bd88fd3561e863dce673a35234e8b5708f3deb",
+            /* 2.0.208 */ null,
+            /* 2.1.210 */ "edc57299926297fd9315e04de75f8538c4cb5fe97fd3da2a1e5cee6a4c98b5cd",
+            /* 2.1.212 */ "db9284c6ff9bf3bc0087851edbd34563f1180df3ae87c67c5fe2203c0e67a536",
+            /* 2.1.214 */ "d623cdc0f61d218cf549a8d09f1c391ff91096116b22e2475475fce4fbe72bd0",
+            /* 2.1.216 */ null,
+            /* 2.1.218 */ null,
             //
     };
 
@@ -163,7 +172,7 @@ public static boolean upgrade(String url, Properties info, int version) throws E
             unloadH2(driver);
         }
         rename(name, false);
-        try (JdbcConnection conn = new JdbcConnection(url, info, null, null)) {
+        try (JdbcConnection conn = new JdbcConnection(url, info, null, null, false)) {
             StringBuilder builder = StringUtils.quoteStringSQL(new StringBuilder("RUNSCRIPT FROM "), script)
                     .append(scriptCommandSuffix);
             if (version <= 200) {
@@ -227,7 +236,9 @@ public static java.sql.Driver loadH2(int version) throws IOException, Reflective
             if ((version & 1) != 0 || version > Constants.BUILD_ID) {
                 throw new IllegalArgumentException("version=" + version);
             }
-            prefix = "2.0.";
+            int major = version / 100;
+            int minor = version / 10 % 10;
+            prefix = new StringBuilder().append(major).append('.').append(minor).append('.').toString();
         } else if (version >= 177) {
             prefix = "1.4.";
         } else if (version >= 146 && version != 147) {
@@ -238,7 +249,8 @@ public static java.sql.Driver loadH2(int version) throws IOException, Reflective
             throw new IllegalArgumentException("version=" + version);
         }
         String fullVersion = prefix + version;
-        byte[] data = downloadUsingMaven("com.h2database", "h2", fullVersion, CHECKSUMS[version - 120]);
+        byte[] data = downloadUsingMaven("com.h2database", "h2", fullVersion,
+                CHECKSUMS[version >= 202 ? (version >>> 1) - 20 : version - 120]);
         ZipInputStream is = new ZipInputStream(new ByteArrayInputStream(data));
         HashMap map = new HashMap<>(version >= 198 ? 2048 : 1024);
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
diff --git a/h2/src/main/org/h2/tools/package.html b/h2/src/main/org/h2/tools/package.html
index dabbb7f312..f086738cd8 100644
--- a/h2/src/main/org/h2/tools/package.html
+++ b/h2/src/main/org/h2/tools/package.html
@@ -1,6 +1,6 @@
 
 
diff --git a/h2/src/main/org/h2/util/AbbaDetector.java b/h2/src/main/org/h2/util/AbbaDetector.java
index 4f200873c2..240b8a4907 100644
--- a/h2/src/main/org/h2/util/AbbaDetector.java
+++ b/h2/src/main/org/h2/util/AbbaDetector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/AbbaLockingDetector.java b/h2/src/main/org/h2/util/AbbaLockingDetector.java
index a67c042744..0639413022 100644
--- a/h2/src/main/org/h2/util/AbbaLockingDetector.java
+++ b/h2/src/main/org/h2/util/AbbaLockingDetector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/Bits.java b/h2/src/main/org/h2/util/Bits.java
index ff1ac0ac4e..6249241acd 100644
--- a/h2/src/main/org/h2/util/Bits.java
+++ b/h2/src/main/org/h2/util/Bits.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/ByteStack.java b/h2/src/main/org/h2/util/ByteStack.java
index e3e979b5e5..736d4ef2b7 100644
--- a/h2/src/main/org/h2/util/ByteStack.java
+++ b/h2/src/main/org/h2/util/ByteStack.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/Cache.java b/h2/src/main/org/h2/util/Cache.java
index 335c7f5df3..5d5002a287 100644
--- a/h2/src/main/org/h2/util/Cache.java
+++ b/h2/src/main/org/h2/util/Cache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/CacheHead.java b/h2/src/main/org/h2/util/CacheHead.java
index 40f53269cd..0447500d37 100644
--- a/h2/src/main/org/h2/util/CacheHead.java
+++ b/h2/src/main/org/h2/util/CacheHead.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/CacheLRU.java b/h2/src/main/org/h2/util/CacheLRU.java
index b83b3fd6cb..4c570f186e 100644
--- a/h2/src/main/org/h2/util/CacheLRU.java
+++ b/h2/src/main/org/h2/util/CacheLRU.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/CacheObject.java b/h2/src/main/org/h2/util/CacheObject.java
index 390c3ba6ce..70c82f8b2d 100644
--- a/h2/src/main/org/h2/util/CacheObject.java
+++ b/h2/src/main/org/h2/util/CacheObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/CacheSecondLevel.java b/h2/src/main/org/h2/util/CacheSecondLevel.java
index 39e7040e09..e295e41a20 100644
--- a/h2/src/main/org/h2/util/CacheSecondLevel.java
+++ b/h2/src/main/org/h2/util/CacheSecondLevel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: Jan Kotek
  */
diff --git a/h2/src/main/org/h2/util/CacheTQ.java b/h2/src/main/org/h2/util/CacheTQ.java
index 9aa7142453..75d3381670 100644
--- a/h2/src/main/org/h2/util/CacheTQ.java
+++ b/h2/src/main/org/h2/util/CacheTQ.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/CacheWriter.java b/h2/src/main/org/h2/util/CacheWriter.java
index e634c591bf..2e6ba257cb 100644
--- a/h2/src/main/org/h2/util/CacheWriter.java
+++ b/h2/src/main/org/h2/util/CacheWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/CloseWatcher.java b/h2/src/main/org/h2/util/CloseWatcher.java
index dd4ffd9c86..9f83b2829f 100644
--- a/h2/src/main/org/h2/util/CloseWatcher.java
+++ b/h2/src/main/org/h2/util/CloseWatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  * Iso8601:
diff --git a/h2/src/main/org/h2/util/DateTimeTemplate.java b/h2/src/main/org/h2/util/DateTimeTemplate.java
new file mode 100644
index 0000000000..62d810ae96
--- /dev/null
+++ b/h2/src/main/org/h2/util/DateTimeTemplate.java
@@ -0,0 +1,858 @@
+/*
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * and the EPL 1.0 (https://h2database.com/html/license.html).
+ * Initial Developer: H2 Group
+ */
+package org.h2.util;
+
+import static org.h2.util.DateTimeTemplate.FieldType.AMPM;
+import static org.h2.util.DateTimeTemplate.FieldType.DAY_OF_MONTH;
+import static org.h2.util.DateTimeTemplate.FieldType.DAY_OF_YEAR;
+import static org.h2.util.DateTimeTemplate.FieldType.DELIMITER;
+import static org.h2.util.DateTimeTemplate.FieldType.FRACTION;
+import static org.h2.util.DateTimeTemplate.FieldType.HOUR12;
+import static org.h2.util.DateTimeTemplate.FieldType.HOUR24;
+import static org.h2.util.DateTimeTemplate.FieldType.MINUTE;
+import static org.h2.util.DateTimeTemplate.FieldType.MONTH;
+import static org.h2.util.DateTimeTemplate.FieldType.ROUNDED_YEAR;
+import static org.h2.util.DateTimeTemplate.FieldType.SECOND_OF_DAY;
+import static org.h2.util.DateTimeTemplate.FieldType.SECOND_OF_MINUTE;
+import static org.h2.util.DateTimeTemplate.FieldType.TIME_ZONE_HOUR;
+import static org.h2.util.DateTimeTemplate.FieldType.TIME_ZONE_MINUTE;
+import static org.h2.util.DateTimeTemplate.FieldType.TIME_ZONE_SECOND;
+import static org.h2.util.DateTimeTemplate.FieldType.YEAR;
+import static org.h2.util.DateTimeUtils.FRACTIONAL_SECONDS_TABLE;
+import static org.h2.util.DateTimeUtils.*;
+import static org.h2.util.DateTimeUtils.NANOS_PER_MINUTE;
+import static org.h2.util.DateTimeUtils.NANOS_PER_SECOND;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.h2.api.ErrorCode;
+import org.h2.engine.CastDataProvider;
+import org.h2.message.DbException;
+import org.h2.value.TypeInfo;
+import org.h2.value.Value;
+import org.h2.value.ValueDate;
+import org.h2.value.ValueTime;
+import org.h2.value.ValueTimeTimeZone;
+import org.h2.value.ValueTimestamp;
+import org.h2.value.ValueTimestampTimeZone;
+
+/**
+ * Date-time template.
+ */
+public final class DateTimeTemplate {
+
+    public static final class FieldType {
+
+        static final int YEAR = 0, ROUNDED_YEAR = 1, MONTH = 2, DAY_OF_MONTH = 3, DAY_OF_YEAR = 4;
+
+        static final int HOUR12 = 5, HOUR24 = 6, MINUTE = 7, SECOND_OF_MINUTE = 8, SECOND_OF_DAY = 9, FRACTION = 10,
+                AMPM = 11;
+
+        static final int TIME_ZONE_HOUR = 12, TIME_ZONE_MINUTE = 13, TIME_ZONE_SECOND = 14;
+
+        static final int DELIMITER = 15;
+
+    }
+
+    private static final class Scanner {
+
+        final String string;
+
+        private int offset;
+
+        private final int length;
+
+        Scanner(String string) {
+            this.string = string;
+            this.length = string.length();
+        }
+
+        int readChar() {
+            return offset < length ? string.charAt(offset++) : -1;
+        }
+
+        void readChar(char c) {
+            if (offset >= length || string.charAt(offset) != c) {
+                throw DbException.get(ErrorCode.PARSE_ERROR_1, string);
+            }
+            offset++;
+        }
+
+        boolean readCharIf(char c) {
+            if (offset < length && string.charAt(offset) == c) {
+                offset++;
+                return true;
+            }
+            return false;
+        }
+
+        int readPositiveInt(int digits, boolean delimited) {
+            int start = offset, end;
+            if (delimited) {
+                end = start;
+                for (char c; end < length && (c = string.charAt(end)) >= '0' && c <= '9'; end++) {
+                }
+                if (start == end) {
+                    throw DbException.get(ErrorCode.PARSE_ERROR_1, string);
+                }
+            } else {
+                end = start + digits;
+                if (end > length) {
+                    throw DbException.get(ErrorCode.PARSE_ERROR_1, string);
+                }
+            }
+            try {
+                return StringUtils.parseUInt31(string, start, offset = end);
+            } catch (NumberFormatException e) {
+                throw DbException.get(ErrorCode.PARSE_ERROR_1, string);
+            }
+        }
+
+        int readNanos(int digits, boolean delimited) {
+            int start = offset, end = start;
+            int nanos = 0, mul = 100_000_000;
+            if (delimited) {
+                end = start;
+                for (char c; end < length && (c = string.charAt(end)) >= '0' && c <= '9'; end++) {
+                    nanos += mul * (c - '0');
+                    mul /= 10;
+                }
+                if (start == end) {
+                    throw DbException.get(ErrorCode.PARSE_ERROR_1, string);
+                }
+            } else {
+                end = start + digits;
+                if (end > length) {
+                    throw DbException.get(ErrorCode.PARSE_ERROR_1, string);
+                }
+                for (; start < end; start++) {
+                    char c = string.charAt(start);
+                    if (c < '0' || c > '9') {
+                        throw DbException.get(ErrorCode.PARSE_ERROR_1, string);
+                    }
+                    nanos += mul * (c - '0');
+                    mul /= 10;
+                }
+            }
+            offset = end;
+            return nanos;
+        }
+
+    }
+
+    private static abstract class Part {
+
+        Part() {
+        }
+
+        abstract int type();
+
+        abstract void format(StringBuilder builder, long dateValue, long timeNanos, int offsetSeconds);
+
+        abstract void parse(int[] target, Scanner s, boolean delimited, int year);
+
+    }
+
+    private static final class Delimiter extends Part {
+
+        static final Delimiter MINUS_SIGN = new Delimiter('-'), PERIOD = new Delimiter('.'),
+                SOLIDUS = new Delimiter('/'), COMMA = new Delimiter(','), APOSTROPHE = new Delimiter('\''),
+                SEMICOLON = new Delimiter(';'), COLON = new Delimiter(':'), SPACE = new Delimiter(' ');
+
+        private final char delimiter;
+
+        private Delimiter(char delimiter) {
+            this.delimiter = delimiter;
+        }
+
+        @Override
+        int type() {
+            return DELIMITER;
+        }
+
+        @Override
+        public void format(StringBuilder builder, long dateValue, long timeNanos, int offsetSeconds) {
+            builder.append(delimiter);
+        }
+
+        @Override
+        public void parse(int[] target, Scanner s, boolean delimited, int year) {
+            s.readChar(delimiter);
+        }
+
+    }
+
+    private static final class Field extends Part {
+
+        static final Field Y = new Field(YEAR, 1), YY = new Field(YEAR, 2), YYY = new Field(YEAR, 3),
+                YYYY = new Field(YEAR, 4);
+
+        static final Field RR = new Field(ROUNDED_YEAR, 2), RRRR = new Field(ROUNDED_YEAR, 4);
+
+        static final Field MM = new Field(MONTH, 2);
+
+        static final Field DD = new Field(DAY_OF_MONTH, 2);
+
+        static final Field DDD = new Field(DAY_OF_YEAR, 3);
+
+        static final Field HH12 = new Field(HOUR12, 2);
+
+        static final Field HH24 = new Field(HOUR24, 2);
+
+        static final Field MI = new Field(MINUTE, 2);
+
+        static final Field SS = new Field(SECOND_OF_MINUTE, 2);
+
+        static final Field SSSSS = new Field(SECOND_OF_DAY, 5);
+
+        private static final Field FF[];
+
+        static final Field AM_PM = new Field(AMPM, 4);
+
+        static final Field TZH = new Field(TIME_ZONE_HOUR, 2);
+
+        static final Field TZM = new Field(TIME_ZONE_MINUTE, 2);
+
+        static final Field TZS = new Field(TIME_ZONE_SECOND, 2);
+
+        static {
+            Field[] ff = new Field[9];
+            for (int i = 0; i < 9;) {
+                ff[i] = new Field(FRACTION, ++i);
+            }
+            FF = ff;
+        }
+
+        static Field ff(int digits) {
+            return FF[digits - 1];
+        }
+
+        private final int type;
+
+        private final int digits;
+
+        Field(int type, int digits) {
+            this.type = type;
+            this.digits = digits;
+        }
+
+        @Override
+        int type() {
+            return type;
+        }
+
+        @Override
+        void format(StringBuilder builder, long dateValue, long timeNanos, int offsetSeconds) {
+            switch (type) {
+            case YEAR:
+            case ROUNDED_YEAR: {
+                int y = DateTimeUtils.yearFromDateValue(dateValue);
+                if (y < 0) {
+                    builder.append('-');
+                    y = -y;
+                }
+                switch (digits) {
+                case 1:
+                    y %= 10;
+                    break;
+                case 2:
+                    y %= 100;
+                    break;
+                case 3:
+                    y %= 1_000;
+                }
+                formatLast(builder, y, digits);
+                break;
+            }
+            case MONTH:
+                StringUtils.appendTwoDigits(builder, DateTimeUtils.monthFromDateValue(dateValue));
+                break;
+            case DAY_OF_MONTH:
+                StringUtils.appendTwoDigits(builder, DateTimeUtils.dayFromDateValue(dateValue));
+                break;
+            case DAY_OF_YEAR:
+                StringUtils.appendZeroPadded(builder, 3, DateTimeUtils.getDayOfYear(dateValue));
+                break;
+            case HOUR12: {
+                int h = (int) (timeNanos / NANOS_PER_HOUR);
+                if (h == 0) {
+                    h = 12;
+                } else if (h > 12) {
+                    h -= 12;
+                }
+                StringUtils.appendTwoDigits(builder, h);
+                break;
+            }
+            case HOUR24:
+                StringUtils.appendTwoDigits(builder, (int) (timeNanos / NANOS_PER_HOUR));
+                break;
+            case MINUTE:
+                StringUtils.appendTwoDigits(builder, (int) (timeNanos / NANOS_PER_MINUTE % 60));
+                break;
+            case SECOND_OF_MINUTE:
+                StringUtils.appendTwoDigits(builder, (int) (timeNanos / NANOS_PER_SECOND % 60));
+                break;
+            case SECOND_OF_DAY:
+                StringUtils.appendZeroPadded(builder, 5, (int) (timeNanos / NANOS_PER_SECOND));
+                break;
+            case FRACTION:
+                formatLast(builder, (int) (timeNanos % NANOS_PER_SECOND) / FRACTIONAL_SECONDS_TABLE[digits], digits);
+                break;
+            case AMPM: {
+                int h = (int) (timeNanos / NANOS_PER_HOUR);
+                builder.append(h < 12 ? "A.M." : "P.M.");
+                break;
+            }
+            case TIME_ZONE_HOUR: {
+                int h = offsetSeconds / 3_600;
+                if (offsetSeconds >= 0) {
+                    builder.append('+');
+                } else {
+                    h = -h;
+                    builder.append('-');
+                }
+                StringUtils.appendTwoDigits(builder, h);
+                break;
+            }
+            case TIME_ZONE_MINUTE:
+                StringUtils.appendTwoDigits(builder, Math.abs(offsetSeconds % 3_600 / 60));
+                break;
+            case TIME_ZONE_SECOND: {
+                StringUtils.appendTwoDigits(builder, Math.abs(offsetSeconds % 60));
+            }
+            }
+        }
+
+        private static void formatLast(StringBuilder builder, int value, int digits) {
+            if (digits == 2) {
+                StringUtils.appendTwoDigits(builder, value);
+            } else {
+                StringUtils.appendZeroPadded(builder, digits, value);
+            }
+        }
+
+        @Override
+        void parse(int[] target, Scanner s, boolean delimited, int year) {
+            switch (type) {
+            case YEAR:
+            case ROUNDED_YEAR: {
+                boolean negative = s.readCharIf('-');
+                if (!negative) {
+                    s.readCharIf('+');
+                }
+                int v = s.readPositiveInt(digits, delimited);
+                if (negative) {
+                    if (digits < 4 || type == ROUNDED_YEAR) {
+                        throw DbException.get(ErrorCode.PARSE_ERROR_1, s.string);
+                    }
+                    v = -v;
+                } else if (digits < 4) {
+                    if (digits == 1) {
+                        if (v > 9) {
+                            throw DbException.get(ErrorCode.PARSE_ERROR_1, s.string);
+                        }
+                        v += year / 10 * 10;
+                    } else if (digits == 2) {
+                        if (v > 99) {
+                            throw DbException.get(ErrorCode.PARSE_ERROR_1, s.string);
+                        }
+                        v += year / 100 * 100;
+                        if (type == ROUNDED_YEAR) {
+                            if (v > year + 50) {
+                                v -= 100;
+                            } else if (v < year - 49) {
+                                year += 100;
+                            }
+                        }
+                    } else if (digits == 3) {
+                        if (v > 999) {
+                            throw DbException.get(ErrorCode.PARSE_ERROR_1, s.string);
+                        }
+                        v += year / 1_000 * 1_000;
+                    }
+                }
+                target[type] = v;
+                break;
+            }
+            case MONTH:
+            case DAY_OF_MONTH:
+            case DAY_OF_YEAR:
+            case HOUR12:
+            case HOUR24:
+            case MINUTE:
+            case SECOND_OF_MINUTE:
+            case SECOND_OF_DAY:
+            case TIME_ZONE_MINUTE:
+            case TIME_ZONE_SECOND:
+                target[type] = s.readPositiveInt(digits, delimited);
+                break;
+            case FRACTION:
+                target[FRACTION] = s.readNanos(digits, delimited);
+                break;
+            case AMPM: {
+                int v;
+                if (s.readCharIf('A')) {
+                    v = 0;
+                } else {
+                    s.readChar('P');
+                    v = 1;
+                }
+                s.readChar('.');
+                s.readChar('M');
+                s.readChar('.');
+                target[AMPM] = v;
+                break;
+            }
+            case TIME_ZONE_HOUR: {
+                boolean negative = s.readCharIf('-');
+                if (!negative) {
+                    if (!s.readCharIf('+')) {
+                        s.readChar(' ');
+                    }
+                }
+                int v = s.readPositiveInt(digits, delimited);
+                if (v > 18) {
+                    throw DbException.get(ErrorCode.PARSE_ERROR_1, s.string);
+                }
+                target[TIME_ZONE_HOUR] = negative ? (v == 0 ? -100 : -v) : v;
+            }
+            }
+        }
+
+    }
+
+    private static final SmallLRUCache CACHE = SmallLRUCache.newInstance(100);
+
+    public static DateTimeTemplate of(String template) {
+        synchronized (CACHE) {
+            DateTimeTemplate t = CACHE.get(template);
+            if (t != null) {
+                return t;
+            }
+        }
+        DateTimeTemplate t = parseTemplate(template), old;
+        synchronized (CACHE) {
+            old = CACHE.putIfAbsent(template, t);
+        }
+        return old != null ? old : t;
+    }
+
+    private static DateTimeTemplate parseTemplate(String template) {
+        ArrayList parts = new ArrayList<>();
+        Scanner s = new Scanner(template);
+        int usedFields = 0;
+        for (int c; (c = s.readChar()) >= 0;) {
+            Part part;
+            switch (c) {
+            case '-':
+                part = Delimiter.MINUS_SIGN;
+                break;
+            case '.':
+                part = Delimiter.PERIOD;
+                break;
+            case '/':
+                part = Delimiter.SOLIDUS;
+                break;
+            case ',':
+                part = Delimiter.COMMA;
+                break;
+            case '\'':
+                part = Delimiter.APOSTROPHE;
+                break;
+            case ';':
+                part = Delimiter.SEMICOLON;
+                break;
+            case ':':
+                part = Delimiter.COLON;
+                break;
+            case ' ':
+                part = Delimiter.SPACE;
+                break;
+            case 'Y':
+                usedFields = checkUsed(usedFields, YEAR, template);
+                if (s.readCharIf('Y')) {
+                    if (s.readCharIf('Y')) {
+                        part = s.readCharIf('Y') ? Field.YYYY : Field.YYY;
+                    } else {
+                        part = Field.YY;
+                    }
+                } else {
+                    part = Field.Y;
+                }
+                break;
+            case 'R':
+                // Year and rounded year may not be used together, mark both as
+                // YEAR
+                usedFields = checkUsed(usedFields, YEAR, template);
+                s.readChar('R');
+                if (s.readCharIf('R')) {
+                    s.readChar('R');
+                    part = Field.RRRR;
+                } else {
+                    part = Field.RR;
+                }
+                break;
+            case 'M':
+                if (s.readCharIf('I')) {
+                    usedFields = checkUsed(usedFields, MINUTE, template);
+                    part = Field.MI;
+                } else {
+                    s.readChar('M');
+                    usedFields = checkUsed(usedFields, MONTH, template);
+                    part = Field.MM;
+                }
+                break;
+            case 'D':
+                s.readChar('D');
+                if (s.readCharIf('D')) {
+                    usedFields = checkUsed(usedFields, DAY_OF_YEAR, template);
+                    part = Field.DDD;
+                } else {
+                    usedFields = checkUsed(usedFields, DAY_OF_MONTH, template);
+                    part = Field.DD;
+                }
+                break;
+            case 'H':
+                s.readChar('H');
+                if (s.readCharIf('2')) {
+                    s.readChar('4');
+                    usedFields = checkUsed(usedFields, HOUR24, template);
+                    part = Field.HH24;
+                } else {
+                    if (s.readCharIf('1')) {
+                        s.readChar('2');
+                    }
+                    usedFields = checkUsed(usedFields, HOUR12, template);
+                    part = Field.HH12;
+                }
+                break;
+            case 'S':
+                s.readChar('S');
+                if (s.readCharIf('S')) {
+                    s.readChar('S');
+                    s.readChar('S');
+                    usedFields = checkUsed(usedFields, SECOND_OF_DAY, template);
+                    part = Field.SSSSS;
+                } else {
+                    usedFields = checkUsed(usedFields, SECOND_OF_MINUTE, template);
+                    part = Field.SS;
+                }
+                break;
+            case 'F':
+                s.readChar('F');
+                c = s.readChar();
+                if (c < '1' || c > '9') {
+                    throw DbException.get(ErrorCode.PARSE_ERROR_1, template);
+                }
+                usedFields = checkUsed(usedFields, FRACTION, template);
+                part = Field.ff(c - '0');
+                break;
+            case 'A':
+            case 'P':
+                s.readChar('.');
+                s.readChar('M');
+                s.readChar('.');
+                usedFields = checkUsed(usedFields, AMPM, template);
+                part = Field.AM_PM;
+                break;
+            case 'T':
+                s.readChar('Z');
+                if (s.readCharIf('H')) {
+                    usedFields = checkUsed(usedFields, TIME_ZONE_HOUR, template);
+                    part = Field.TZH;
+                } else if (s.readCharIf('M')) {
+                    usedFields = checkUsed(usedFields, TIME_ZONE_MINUTE, template);
+                    part = Field.TZM;
+                } else {
+                    s.readChar('S');
+                    usedFields = checkUsed(usedFields, TIME_ZONE_SECOND, template);
+                    part = Field.TZS;
+                }
+                break;
+            default:
+                throw DbException.get(ErrorCode.PARSE_ERROR_1, template);
+            }
+            parts.add(part);
+        }
+        if (((usedFields & (1 << DAY_OF_YEAR)) != 0 //
+                && (usedFields & (1 << MONTH | 1 << DAY_OF_MONTH)) != 0)
+
+                || (((usedFields & (1 << HOUR12)) != 0) //
+                        != ((usedFields & (1 << AMPM)) != 0))
+
+                || ((usedFields & (1 << HOUR24)) != 0 //
+                        && (usedFields & (1 << HOUR12)) != 0)
+
+                || ((usedFields & (1 << SECOND_OF_DAY)) != 0 //
+                        && ((usedFields & (1 << HOUR12 | 1 << HOUR24 | 1 << MINUTE | 1 << SECOND_OF_MINUTE)) != 0))
+
+                || ((usedFields & (1 << TIME_ZONE_SECOND)) != 0 //
+                        && !((usedFields & (1 << TIME_ZONE_MINUTE)) != 0))
+
+                || ((usedFields & (1 << TIME_ZONE_MINUTE)) != 0 //
+                        && !((usedFields & (1 << TIME_ZONE_HOUR)) != 0))) {
+            throw DbException.get(ErrorCode.PARSE_ERROR_1, template);
+        }
+        return new DateTimeTemplate(parts.toArray(new Part[0]), //
+                (usedFields & (1 << YEAR | 1 << MONTH | 1 << DAY_OF_MONTH | 1 << DAY_OF_YEAR)) != 0,
+                (usedFields & (1 << HOUR24 | 1 << HOUR12 | 1 << MINUTE | 1 << SECOND_OF_MINUTE | 1 << SECOND_OF_DAY
+                        | 1 << AMPM)) != 0,
+                (usedFields & (1 << TIME_ZONE_HOUR | 1 << TIME_ZONE_MINUTE | 1 << TIME_ZONE_SECOND)) != 0);
+    }
+
+    private static int checkUsed(int usedFields, int type, String template) {
+        int newUsedFields = usedFields | (1 << type);
+        if (usedFields == newUsedFields) {
+            throw DbException.get(ErrorCode.PARSE_ERROR_1, template);
+        }
+        return newUsedFields;
+    }
+
+    private final Part[] parts;
+
+    private final boolean containsDate, containsTime, containsTimeZone;
+
+    private DateTimeTemplate(Part[] parts, boolean containsDate, boolean containsTime, boolean containsTimeZone) {
+        this.parts = parts;
+        this.containsDate = containsDate;
+        this.containsTime = containsTime;
+        this.containsTimeZone = containsTimeZone;
+    }
+
+    public String format(Value value) {
+        long dateValue, nanoOfDay;
+        int offsetSeconds;
+        switch (value.getValueType()) {
+        case Value.NULL:
+            return null;
+        case Value.DATE:
+            if (containsTime || containsTimeZone) {
+                throw DbException.get(ErrorCode.PARSE_ERROR_1, "time or time zone fields with DATE");
+            }
+            dateValue = ((ValueDate) value).getDateValue();
+            nanoOfDay = 0L;
+            offsetSeconds = 0;
+            break;
+        case Value.TIME:
+            if (containsDate || containsTimeZone) {
+                throw DbException.get(ErrorCode.PARSE_ERROR_1, "date or time zone fields with TIME");
+            }
+            dateValue = 0L;
+            nanoOfDay = ((ValueTime) value).getNanos();
+            offsetSeconds = 0;
+            break;
+        case Value.TIME_TZ: {
+            if (containsDate) {
+                throw DbException.get(ErrorCode.PARSE_ERROR_1, "date fields with TIME WITH TIME ZONE");
+            }
+            ValueTimeTimeZone vt = (ValueTimeTimeZone) value;
+            dateValue = 0L;
+            nanoOfDay = vt.getNanos();
+            offsetSeconds = vt.getTimeZoneOffsetSeconds();
+            break;
+        }
+        case Value.TIMESTAMP: {
+            if (containsTimeZone) {
+                throw DbException.get(ErrorCode.PARSE_ERROR_1, "time zone fields with TIMESTAMP");
+            }
+            ValueTimestamp vt = (ValueTimestamp) value;
+            dateValue = vt.getDateValue();
+            nanoOfDay = vt.getTimeNanos();
+            offsetSeconds = 0;
+            break;
+        }
+        case Value.TIMESTAMP_TZ: {
+            ValueTimestampTimeZone vt = (ValueTimestampTimeZone) value;
+            dateValue = vt.getDateValue();
+            nanoOfDay = vt.getTimeNanos();
+            offsetSeconds = vt.getTimeZoneOffsetSeconds();
+            break;
+        }
+        default:
+            throw DbException.getUnsupportedException(value.getType().getTraceSQL());
+        }
+        StringBuilder builder = new StringBuilder();
+        for (Part part : parts) {
+            part.format(builder, dateValue, nanoOfDay, offsetSeconds);
+        }
+        return builder.toString();
+    }
+
+    public Value parse(String string, TypeInfo targetType, CastDataProvider provider) {
+        switch (targetType.getValueType()) {
+        case Value.DATE: {
+            if (containsTime || containsTimeZone) {
+                throw DbException.get(ErrorCode.PARSE_ERROR_1, "time or time zone fields with DATE");
+            }
+            int[] yearMonth = yearMonth(provider);
+            return ValueDate.fromDateValue(constructDate(parse(string, yearMonth[0]), yearMonth));
+        }
+        case Value.TIME:
+            if (containsDate || containsTimeZone) {
+                throw DbException.get(ErrorCode.PARSE_ERROR_1, "date or time zone fields with TIME");
+            }
+            return ValueTime.fromNanos(constructTime(parse(string, 0)));
+        case Value.TIME_TZ: {
+            if (containsDate) {
+                throw DbException.get(ErrorCode.PARSE_ERROR_1, "date fields with TIME WITH TIME ZONE");
+            }
+            int[] target = parse(string, 0);
+            return ValueTimeTimeZone.fromNanos(constructTime(target), constructOffset(target));
+        }
+        case Value.TIMESTAMP: {
+            if (containsTimeZone) {
+                throw DbException.get(ErrorCode.PARSE_ERROR_1, "time zone fields with TIMESTAMP");
+            }
+            int[] yearMonth = yearMonth(provider);
+            int[] target = parse(string, yearMonth[0]);
+            return ValueTimestamp.fromDateValueAndNanos(constructDate(target, yearMonth), constructTime(target));
+        }
+        case Value.TIMESTAMP_TZ: {
+            int[] yearMonth = yearMonth(provider);
+            int[] target = parse(string, yearMonth[0]);
+            return ValueTimestampTimeZone.fromDateValueAndNanos(constructDate(target, yearMonth), //
+                    constructTime(target), constructOffset(target));
+        }
+        default:
+            throw DbException.getUnsupportedException(targetType.getTraceSQL());
+        }
+    }
+
+    private static int[] yearMonth(CastDataProvider provider) {
+        long dateValue = provider.currentTimestamp().getDateValue();
+        return new int[] { DateTimeUtils.yearFromDateValue(dateValue), DateTimeUtils.monthFromDateValue(dateValue) };
+    }
+
+    private int[] parse(String string, int year) {
+        int[] target = new int[15];
+        Arrays.fill(target, Integer.MIN_VALUE);
+        Scanner s = new Scanner(string);
+        for (int i = 0, l = parts.length - 1; i <= l; i++) {
+            Part part = parts[i];
+            part.parse(target, s, //
+                    // Left-delimited
+                    (i == 0 //
+                            || ((1 << part.type()) & (1 << AMPM | 1 << TIME_ZONE_HOUR)) != 0
+                            || ((1 << parts[i - 1].type()) & (1 << DELIMITER | 1 << AMPM)) != 0)
+                            // Right-delimited
+                            && (i == l //
+                                    || part.type() == AMPM //
+                                    || ((1 << parts[i + 1].type())
+                                            & (1 << DELIMITER | 1 << AMPM | 1 << TIME_ZONE_HOUR)) != 0),
+                    year);
+        }
+        return target;
+    }
+
+    private static long constructDate(int[] target, int[] yearMonth) {
+        int year = target[YEAR];
+        if (year == Integer.MIN_VALUE) {
+            year = target[ROUNDED_YEAR];
+        }
+        if (year == Integer.MIN_VALUE) {
+            year = yearMonth[0];
+        }
+        int dayOfYear = target[DAY_OF_YEAR];
+        if (dayOfYear != Integer.MIN_VALUE) {
+            if (dayOfYear < 1 || dayOfYear > (DateTimeUtils.isLeapYear(year) ? 366 : 365)) {
+                throw DbException.get(ErrorCode.PARSE_ERROR_1, "Day of year " + dayOfYear);
+            }
+            return DateTimeUtils.dateValueFromAbsoluteDay(DateTimeUtils.absoluteDayFromYear(year) + dayOfYear - 1);
+        }
+        int month = target[MONTH];
+        if (month == Integer.MIN_VALUE) {
+            month = yearMonth[1];
+        }
+        int day = target[DAY_OF_MONTH];
+        if (day == Integer.MIN_VALUE) {
+            day = 1;
+        }
+        if (!DateTimeUtils.isValidDate(year, month, day)) {
+            throw DbException.get(ErrorCode.PARSE_ERROR_1,
+                    "Invalid date, year=" + year + ", month=" + month + ", day=" + day);
+        }
+        return DateTimeUtils.dateValue(year, month, day);
+    }
+
+    private static long constructTime(int[] target) {
+        int secondOfDay = target[SECOND_OF_DAY];
+        if (secondOfDay == Integer.MIN_VALUE) {
+            int hour = target[HOUR24];
+            if (hour == Integer.MIN_VALUE) {
+                hour = target[HOUR12];
+                if (hour == Integer.MIN_VALUE) {
+                    hour = 0;
+                } else {
+                    if (hour < 1 || hour > 12) {
+                        throw DbException.get(ErrorCode.PARSE_ERROR_1, "Hour(12) " + hour);
+                    }
+                    if (hour == 12) {
+                        hour = 0;
+                    }
+                    hour += target[AMPM] * 12;
+                }
+            } else {
+                if (hour < 0 || hour > 23) {
+                    throw DbException.get(ErrorCode.PARSE_ERROR_1, "Hour(24) " + hour);
+                }
+            }
+            int minute = target[MINUTE];
+            if (minute == Integer.MIN_VALUE) {
+                minute = 0;
+            } else if (minute < 0 || minute > 59) {
+                throw DbException.get(ErrorCode.PARSE_ERROR_1, "Minute " + minute);
+            }
+            int second = target[SECOND_OF_MINUTE];
+            if (second == Integer.MIN_VALUE) {
+                second = 0;
+            } else if (second < 0 || second > 59) {
+                throw DbException.get(ErrorCode.PARSE_ERROR_1, "Second of minute " + second);
+            }
+            secondOfDay = (hour * 60 + minute) * 60 + second;
+        } else if (secondOfDay < 0 || secondOfDay >= SECONDS_PER_DAY) {
+            throw DbException.get(ErrorCode.PARSE_ERROR_1, "Second of day " + secondOfDay);
+        }
+        int fraction = target[FRACTION];
+        if (fraction == Integer.MIN_VALUE) {
+            fraction = 0;
+        }
+        return secondOfDay * NANOS_PER_SECOND + fraction;
+    }
+
+    private static int constructOffset(int[] target) {
+        int hour = target[TIME_ZONE_HOUR];
+        if (hour == Integer.MIN_VALUE) {
+            return 0;
+        }
+        boolean negative = hour < 0;
+        if (negative) {
+            if (hour == -100) {
+                hour = 0;
+            } else {
+                hour = -hour;
+            }
+        }
+        int minute = target[TIME_ZONE_MINUTE];
+        if (minute == Integer.MIN_VALUE) {
+            minute = 0;
+        } else if (minute > 59) {
+            throw DbException.get(ErrorCode.PARSE_ERROR_1, "Time zone minute " + minute);
+        }
+        int second = target[TIME_ZONE_SECOND];
+        if (second == Integer.MIN_VALUE) {
+            second = 0;
+        } else if (second > 59) {
+            throw DbException.get(ErrorCode.PARSE_ERROR_1, "Time zone second " + second);
+        }
+        int offset = (hour * 60 + minute) * 60 + second;
+        if (offset > 18 * 60 * 60) {
+            throw DbException.get(ErrorCode.PARSE_ERROR_1, "Time zone offset is too large");
+        }
+        return negative ? -offset : offset;
+    }
+
+}
diff --git a/h2/src/main/org/h2/util/DateTimeUtils.java b/h2/src/main/org/h2/util/DateTimeUtils.java
index 13785f0ca2..5ac68c26dc 100644
--- a/h2/src/main/org/h2/util/DateTimeUtils.java
+++ b/h2/src/main/org/h2/util/DateTimeUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0, and the
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0, and the
  * EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  * Iso8601: Initial Developer: Robert Rathsack (firstName dot lastName at gmx
@@ -89,7 +89,7 @@ public class DateTimeUtils {
      * Multipliers for {@link #convertScale(long, int, long)} and
      * {@link #appendNanos(StringBuilder, int)}.
      */
-    private static final int[] FRACTIONAL_SECONDS_TABLE = { 1_000_000_000, 100_000_000,
+    static final int[] FRACTIONAL_SECONDS_TABLE = { 1_000_000_000, 100_000_000,
             10_000_000, 1_000_000, 100_000, 10_000, 1_000, 100, 10, 1 };
 
     private static volatile TimeZoneProvider LOCAL;
@@ -396,17 +396,20 @@ public static Value parseTimestamp(String s, CastDataProvider provider, boolean
     }
 
     /**
-     * Parses TIME WITH TIME ZONE value from the specified string.
+     * Parses time value from the specified string.
      *
      * @param s
      *            string to parse
      * @param provider
      *            the cast information provider, or {@code null}
-     * @return parsed time with time zone
+     * @param withTimeZone
+     *            if {@code true} return {@link ValueTimeTimeZone} instead of
+     *            {@link ValueTime}
+     * @return parsed time
      */
-    public static ValueTimeTimeZone parseTimeWithTimeZone(String s, CastDataProvider provider) {
+    public static Value parseTime(String s, CastDataProvider provider, boolean withTimeZone) {
         int timeEnd;
-        TimeZoneProvider tz;
+        TimeZoneProvider tz = null;
         if (s.endsWith("Z")) {
             tz = TimeZoneProvider.UTC;
             timeEnd = s.length() - 1;
@@ -427,14 +430,26 @@ public static ValueTimeTimeZone parseTimeWithTimeZone(String s, CastDataProvider
                     tz = TimeZoneProvider.ofId(s.substring(timeZoneStart + 1));
                     timeEnd = timeZoneStart;
                 } else {
-                    throw DbException.get(ErrorCode.INVALID_DATETIME_CONSTANT_2, "TIME WITH TIME ZONE", s);
+                    timeEnd = s.length();
                 }
             }
-            if (!tz.hasFixedOffset()) {
+            if (tz != null && !tz.hasFixedOffset()) {
                 throw DbException.get(ErrorCode.INVALID_DATETIME_CONSTANT_2, "TIME WITH TIME ZONE", s);
             }
         }
-        return ValueTimeTimeZone.fromNanos(parseTimeNanos(s, 0, timeEnd), tz.getTimeZoneOffsetUTC(0L));
+        long nanos = parseTimeNanos(s, 0, timeEnd);
+        if (withTimeZone) {
+            return ValueTimeTimeZone.fromNanos(nanos,
+                    tz != null ? tz.getTimeZoneOffsetUTC(0L)
+                            : (provider != null ? provider.currentTimestamp() : currentTimestamp(getTimeZone()))
+                                    .getTimeZoneOffsetSeconds());
+        }
+        if (tz != null) {
+            nanos = normalizeNanosOfDay(
+                    nanos + ((provider != null ? provider.currentTimestamp() : currentTimestamp(getTimeZone()))
+                            .getTimeZoneOffsetSeconds() - tz.getTimeZoneOffsetUTC(0L)) * NANOS_PER_SECOND);
+        }
+        return ValueTime.fromNanos(nanos);
     }
 
     /**
@@ -696,7 +711,11 @@ public static int getDaysInMonth(int year, int month) {
         if (month != 2) {
             return NORMAL_DAYS_PER_MONTH[month];
         }
-        return (year & 3) == 0 && (year % 100 != 0 || year % 400 == 0) ? 29 : 28;
+        return isLeapYear(year) ? 29 : 28;
+    }
+
+    static boolean isLeapYear(int year) {
+        return (year & 3) == 0 && (year % 100 != 0 || year % 400 == 0);
     }
 
     /**
diff --git a/h2/src/main/org/h2/util/DbDriverActivator.java b/h2/src/main/org/h2/util/DbDriverActivator.java
index bdfe31fe4d..a36373d0f4 100644
--- a/h2/src/main/org/h2/util/DbDriverActivator.java
+++ b/h2/src/main/org/h2/util/DbDriverActivator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/DebuggingThreadLocal.java b/h2/src/main/org/h2/util/DebuggingThreadLocal.java
index dbe37834db..dbdfc8f7fd 100644
--- a/h2/src/main/org/h2/util/DebuggingThreadLocal.java
+++ b/h2/src/main/org/h2/util/DebuggingThreadLocal.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/HasSQL.java b/h2/src/main/org/h2/util/HasSQL.java
index 91188715ef..776341e5d8 100644
--- a/h2/src/main/org/h2/util/HasSQL.java
+++ b/h2/src/main/org/h2/util/HasSQL.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/IOUtils.java b/h2/src/main/org/h2/util/IOUtils.java
index 79899bf731..25d822c0df 100644
--- a/h2/src/main/org/h2/util/IOUtils.java
+++ b/h2/src/main/org/h2/util/IOUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -19,6 +19,8 @@
 import java.io.Reader;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
 import java.nio.charset.StandardCharsets;
 
 import org.h2.engine.Constants;
@@ -187,6 +189,57 @@ public static long copy(InputStream in, OutputStream out, long length)
         }
     }
 
+    /**
+     * Copy all data from the input FileChannel to the output stream. Both source and destination
+     * are kept open.
+     *
+     * @param in the input FileChannel
+     * @param out the output stream (null if writing is not required)
+     * @return the number of bytes copied
+     * @throws IOException on failure
+     */
+    public static long copy(FileChannel in, OutputStream out)
+            throws IOException {
+        return copy(in, out, Long.MAX_VALUE);
+    }
+
+    /**
+     * Copy all data from the input FileChannel to the output stream. Both source and destination
+     * are kept open.
+     *
+     * @param in the input FileChannel
+     * @param out the output stream (null if writing is not required)
+     * @param length the maximum number of bytes to copy
+     * @return the number of bytes copied
+     * @throws IOException on failure
+     */
+    public static long copy(FileChannel in, OutputStream out, long length)
+            throws IOException {
+        try {
+            long copied = 0;
+            byte[] buffer = new byte[(int) Math.min(length, Constants.IO_BUFFER_SIZE)];
+            ByteBuffer wrap = ByteBuffer.wrap(buffer);
+            while (length > 0) {
+                int len = in.read(wrap, copied);
+                if (len < 0) {
+                    break;
+                }
+                if (out != null) {
+                    out.write(buffer, 0, len);
+                }
+                copied += len;
+                length -= len;
+                wrap.rewind();
+                if (length < wrap.limit()) {
+                    wrap.limit((int)length);
+                }
+            }
+            return copied;
+        } catch (Exception e) {
+            throw DataUtils.convertToIOException(e);
+        }
+    }
+
     /**
      * Copy all data from the reader to the writer and close the reader.
      * Exceptions while closing are ignored.
diff --git a/h2/src/main/org/h2/util/IntArray.java b/h2/src/main/org/h2/util/IntArray.java
index 01e3c95141..f27bbd19de 100644
--- a/h2/src/main/org/h2/util/IntArray.java
+++ b/h2/src/main/org/h2/util/IntArray.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/IntervalUtils.java b/h2/src/main/org/h2/util/IntervalUtils.java
index b2a1651dcb..dd41459b98 100644
--- a/h2/src/main/org/h2/util/IntervalUtils.java
+++ b/h2/src/main/org/h2/util/IntervalUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/JSR310Utils.java b/h2/src/main/org/h2/util/JSR310Utils.java
index d6b4516fb4..f5b109f653 100644
--- a/h2/src/main/org/h2/util/JSR310Utils.java
+++ b/h2/src/main/org/h2/util/JSR310Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/JdbcUtils.java b/h2/src/main/org/h2/util/JdbcUtils.java
index 45a2f2875c..bd60ac1aca 100644
--- a/h2/src/main/org/h2/util/JdbcUtils.java
+++ b/h2/src/main/org/h2/util/JdbcUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -267,7 +267,7 @@ public static void closeSilently(ResultSet rs) {
      */
     public static Connection getConnection(String driver, String url,
             String user, String password) throws SQLException {
-        return getConnection(driver, url, user, password, null);
+        return getConnection(driver, url, user, password, null, false);
     }
 
     /**
@@ -278,13 +278,14 @@ public static Connection getConnection(String driver, String url,
      * @param user the user name or {@code null}
      * @param password the password or {@code null}
      * @param networkConnectionInfo the network connection information, or {@code null}
+     * @param forbidCreation whether database creation is forbidden
      * @return the database connection
      * @throws SQLException on failure
      */
     public static Connection getConnection(String driver, String url, String user, String password,
-            NetworkConnectionInfo networkConnectionInfo) throws SQLException {
+            NetworkConnectionInfo networkConnectionInfo, boolean forbidCreation) throws SQLException {
         if (url.startsWith(Constants.START_URL)) {
-            JdbcConnection connection = new JdbcConnection(url, null, user, password);
+            JdbcConnection connection = new JdbcConnection(url, null, user, password, forbidCreation);
             if (networkConnectionInfo != null) {
                 connection.getSession().setNetworkConnectionInfo(networkConnectionInfo);
             }
@@ -315,6 +316,9 @@ public static Connection getConnection(String driver, String url, String user, S
                     }
                     throw new SQLException("Driver " + driver + " is not suitable for " + url, "08001");
                 } else if (javax.naming.Context.class.isAssignableFrom(d)) {
+                    if (!url.startsWith("java:")) {
+                        throw new SQLException("Only java scheme is supported for JNDI lookups", "08001");
+                    }
                     // JNDI context
                     Context context = (Context) d.getDeclaredConstructor().newInstance();
                     DataSource ds = (DataSource) context.lookup(url);
diff --git a/h2/src/main/org/h2/util/LegacyDateTimeUtils.java b/h2/src/main/org/h2/util/LegacyDateTimeUtils.java
index b611819f27..94bcebcaaa 100644
--- a/h2/src/main/org/h2/util/LegacyDateTimeUtils.java
+++ b/h2/src/main/org/h2/util/LegacyDateTimeUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/MathUtils.java b/h2/src/main/org/h2/util/MathUtils.java
index 9ade0a8a61..e5ef85f951 100644
--- a/h2/src/main/org/h2/util/MathUtils.java
+++ b/h2/src/main/org/h2/util/MathUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -44,7 +44,7 @@ private MathUtils() {
      * @return the rounded value
      */
     public static int roundUpInt(int x, int blockSizePowerOf2) {
-        return (x + blockSizePowerOf2 - 1) & (-blockSizePowerOf2);
+        return (x + blockSizePowerOf2 - 1) & -blockSizePowerOf2;
     }
 
     /**
@@ -58,7 +58,7 @@ public static int roundUpInt(int x, int blockSizePowerOf2) {
      * @return the rounded value
      */
     public static long roundUpLong(long x, long blockSizePowerOf2) {
-        return (x + blockSizePowerOf2 - 1) & (-blockSizePowerOf2);
+        return (x + blockSizePowerOf2 - 1) & -blockSizePowerOf2;
     }
 
     private static synchronized SecureRandom getSecureRandom() {
diff --git a/h2/src/main/org/h2/util/MemoryEstimator.java b/h2/src/main/org/h2/util/MemoryEstimator.java
index 754012fb44..007b53bc62 100644
--- a/h2/src/main/org/h2/util/MemoryEstimator.java
+++ b/h2/src/main/org/h2/util/MemoryEstimator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -14,12 +14,12 @@
 /**
  * Class MemoryEstimator.
  *
- * Calculation of the amount of memory taken by keys, values and pages of the MVTable
+ * Calculation of the amount of memory occupied by keys, values and pages of the MVTable
  * may become expensive operation for complex data types like Row.
  * On the other hand, result of the calculation is used by page cache to limit it's size
  * and determine when eviction is needed. Another usage is to trigger auto commit,
  * based on amount of unsaved changes. In both cases reasonable (lets say ~30%) approximation
- * would be good enough and do the job.
+ * would be good enough and will do the job.
  * This class replaces exact calculation with an estimate based on
  * a sliding window average of last 256 values.
  * If estimation gets close to the exact value, then next N calculations are skipped
@@ -30,10 +30,10 @@
 public final class MemoryEstimator {
 
     // Structure of statsData long value:
-    // 0 - 7   skip counter (how many more requests will skip calculation and use estimate instead)
+    // 0 - 7   skip counter (how many more requests will skip calculation and use an estimate instead)
     // 8 - 23  total number of skips between last 256 calculations
     //         (used for sampling percentage calculation only)
-    // 24      bit is 0 when window is not completely filled yet, 1 when it become full
+    // 24      bit is 0 when window is not completely filled yet, 1 once it become full
     // 25 - 31 unused
     // 32 - 63 sliding window sum of estimated values
 
@@ -63,7 +63,7 @@ public static  int estimateMemory(AtomicLong stats, DataType dataType, T d
         int counter = getCounter(statsData);
         int skipSum = getSkipSum(statsData);
         long initialized = statsData & INIT_BIT;
-        long sum = statsData >> SUM_SHIFT;
+        long sum = statsData >>> SUM_SHIFT;
         int mem = 0;
         int cnt = 0;
         if (initialized == 0 || counter-- == 0) {
@@ -103,7 +103,7 @@ public static  int estimateMemory(AtomicLong stats, DataType dataType, T[]
         int counter = getCounter(statsData);
         int skipSum = getSkipSum(statsData);
         long initialized = statsData & INIT_BIT;
-        long sum = statsData >> SUM_SHIFT;
+        long sum = statsData >>> SUM_SHIFT;
         int index = 0;
         int memSum = 0;
         if (initialized != 0 && counter >= count) {
@@ -172,7 +172,7 @@ private static long updateStatsData(AtomicLong stats, long statsData, long updat
                                         int itemsCount, int itemsMem) {
         while (!stats.compareAndSet(statsData, updatedStatsData)) {
             statsData = stats.get();
-            long sum = statsData >> SUM_SHIFT;
+            long sum = statsData >>> SUM_SHIFT;
             if (itemsCount > 0) {
                 sum += itemsMem - ((sum * itemsCount + WINDOW_HALF_SIZE) >> WINDOW_SHIFT);
             }
@@ -190,6 +190,6 @@ private static int getSkipSum(long statsData) {
     }
 
     private static int getAverage(long updatedStatsData) {
-        return (int)(updatedStatsData >> (SUM_SHIFT + WINDOW_SHIFT));
+        return (int)(updatedStatsData >>> (SUM_SHIFT + WINDOW_SHIFT));
     }
 }
diff --git a/h2/src/main/org/h2/util/MemoryUnmapper.java b/h2/src/main/org/h2/util/MemoryUnmapper.java
index 36f4be44c8..2439c00194 100644
--- a/h2/src/main/org/h2/util/MemoryUnmapper.java
+++ b/h2/src/main/org/h2/util/MemoryUnmapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/NetUtils.java b/h2/src/main/org/h2/util/NetUtils.java
index 421993be9e..f66230e176 100644
--- a/h2/src/main/org/h2/util/NetUtils.java
+++ b/h2/src/main/org/h2/util/NetUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -345,7 +345,7 @@ public static StringBuilder ipToShortForm(StringBuilder builder, byte[] address,
                     .append(address[0] & 0xff).append('.') //
                     .append(address[1] & 0xff).append('.') //
                     .append(address[2] & 0xff).append('.') //
-                    .append(address[3] & 0xff).toString();
+                    .append(address[3] & 0xff);
             break;
         case 16:
             short[] a = new short[8];
diff --git a/h2/src/main/org/h2/util/NetworkConnectionInfo.java b/h2/src/main/org/h2/util/NetworkConnectionInfo.java
index d4f6d3183e..365d8db665 100644
--- a/h2/src/main/org/h2/util/NetworkConnectionInfo.java
+++ b/h2/src/main/org/h2/util/NetworkConnectionInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/OsgiDataSourceFactory.java b/h2/src/main/org/h2/util/OsgiDataSourceFactory.java
index 098192bc49..c567ee24c0 100644
--- a/h2/src/main/org/h2/util/OsgiDataSourceFactory.java
+++ b/h2/src/main/org/h2/util/OsgiDataSourceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -289,7 +289,7 @@ private static void rejectPoolingOptions(Properties p)
      */
     static void registerService(BundleContext bundleContext,
             org.h2.Driver driver) {
-        Hashtable properties = new Hashtable<>();
+        Hashtable properties = new Hashtable<>();
         properties.put(
                 DataSourceFactory.OSGI_JDBC_DRIVER_CLASS,
                 org.h2.Driver.class.getName());
@@ -299,6 +299,12 @@ static void registerService(BundleContext bundleContext,
         properties.put(
                 DataSourceFactory.OSGI_JDBC_DRIVER_VERSION,
                 Constants.FULL_VERSION);
+        properties.put(DataSourceFactory.OSGI_JDBC_CAPABILITY, new String[] {
+                DataSourceFactory.OSGI_JDBC_CAPABILITY_DRIVER,
+                DataSourceFactory.OSGI_JDBC_CAPABILITY_DATASOURCE,
+                DataSourceFactory.OSGI_JDBC_CAPABILITY_CONNECTIONPOOLDATASOURCE,
+                DataSourceFactory.OSGI_JDBC_CAPABILITY_XADATASOURCE
+        });
         bundleContext.registerService(
                 DataSourceFactory.class.getName(),
                 new OsgiDataSourceFactory(driver), properties);
diff --git a/h2/src/main/org/h2/util/ParserUtil.java b/h2/src/main/org/h2/util/ParserUtil.java
index ede561989b..6e95c0ccce 100644
--- a/h2/src/main/org/h2/util/ParserUtil.java
+++ b/h2/src/main/org/h2/util/ParserUtil.java
@@ -1,10 +1,12 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
 package org.h2.util;
 
+import java.util.HashMap;
+
 public class ParserUtil {
 
     /**
@@ -224,15 +226,10 @@ public class ParserUtil {
      */
     public static final int INTERSECT = INNER + 1;
 
-    /**
-     * The token "INTERSECTS".
-     */
-    public static final int INTERSECTS = INTERSECT + 1;
-
     /**
      * The token "INTERVAL".
      */
-    public static final int INTERVAL = INTERSECTS + 1;
+    public static final int INTERVAL = INTERSECT + 1;
 
     /**
      * The token "IS".
@@ -481,6 +478,114 @@ public class ParserUtil {
      */
     public static final int LAST_KEYWORD = _ROWID_;
 
+    private static final HashMap KEYWORDS;
+
+    static {
+        HashMap map = new HashMap<>(256);
+        map.put("ALL", ALL);
+        map.put("AND", AND);
+        map.put("ANY", ANY);
+        map.put("ARRAY", ARRAY);
+        map.put("AS", AS);
+        map.put("ASYMMETRIC", ASYMMETRIC);
+        map.put("AUTHORIZATION", AUTHORIZATION);
+        map.put("BETWEEN", BETWEEN);
+        map.put("CASE", CASE);
+        map.put("CAST", CAST);
+        map.put("CHECK", CHECK);
+        map.put("CONSTRAINT", CONSTRAINT);
+        map.put("CROSS", CROSS);
+        map.put("CURRENT_CATALOG", CURRENT_CATALOG);
+        map.put("CURRENT_DATE", CURRENT_DATE);
+        map.put("CURRENT_PATH", CURRENT_PATH);
+        map.put("CURRENT_ROLE", CURRENT_ROLE);
+        map.put("CURRENT_SCHEMA", CURRENT_SCHEMA);
+        map.put("CURRENT_TIME", CURRENT_TIME);
+        map.put("CURRENT_TIMESTAMP", CURRENT_TIMESTAMP);
+        map.put("CURRENT_USER", CURRENT_USER);
+        map.put("DAY", DAY);
+        map.put("DEFAULT", DEFAULT);
+        map.put("DISTINCT", DISTINCT);
+        map.put("ELSE", ELSE);
+        map.put("END", END);
+        map.put("EXCEPT", EXCEPT);
+        map.put("EXISTS", EXISTS);
+        map.put("FALSE", FALSE);
+        map.put("FETCH", FETCH);
+        map.put("FOR", FOR);
+        map.put("FOREIGN", FOREIGN);
+        map.put("FROM", FROM);
+        map.put("FULL", FULL);
+        map.put("GROUP", GROUP);
+        map.put("HAVING", HAVING);
+        map.put("HOUR", HOUR);
+        map.put("IF", IF);
+        map.put("IN", IN);
+        map.put("INNER", INNER);
+        map.put("INTERSECT", INTERSECT);
+        map.put("INTERVAL", INTERVAL);
+        map.put("IS", IS);
+        map.put("JOIN", JOIN);
+        map.put("KEY", KEY);
+        map.put("LEFT", LEFT);
+        map.put("LIKE", LIKE);
+        map.put("LIMIT", LIMIT);
+        map.put("LOCALTIME", LOCALTIME);
+        map.put("LOCALTIMESTAMP", LOCALTIMESTAMP);
+        map.put("MINUS", MINUS);
+        map.put("MINUTE", MINUTE);
+        map.put("MONTH", MONTH);
+        map.put("NATURAL", NATURAL);
+        map.put("NOT", NOT);
+        map.put("NULL", NULL);
+        map.put("OFFSET", OFFSET);
+        map.put("ON", ON);
+        map.put("OR", OR);
+        map.put("ORDER", ORDER);
+        map.put("PRIMARY", PRIMARY);
+        map.put("QUALIFY", QUALIFY);
+        map.put("RIGHT", RIGHT);
+        map.put("ROW", ROW);
+        map.put("ROWNUM", ROWNUM);
+        map.put("SECOND", SECOND);
+        map.put("SELECT", SELECT);
+        map.put("SESSION_USER", SESSION_USER);
+        map.put("SET", SET);
+        map.put("SOME", SOME);
+        map.put("SYMMETRIC", SYMMETRIC);
+        map.put("SYSTEM_USER", SYSTEM_USER);
+        map.put("TABLE", TABLE);
+        map.put("TO", TO);
+        map.put("TRUE", TRUE);
+        map.put("UESCAPE", UESCAPE);
+        map.put("UNION", UNION);
+        map.put("UNIQUE", UNIQUE);
+        map.put("UNKNOWN", UNKNOWN);
+        map.put("USER", USER);
+        map.put("USING", USING);
+        map.put("VALUE", VALUE);
+        map.put("VALUES", VALUES);
+        map.put("WHEN", WHEN);
+        map.put("WHERE", WHERE);
+        map.put("WINDOW", WINDOW);
+        map.put("WITH", WITH);
+        map.put("YEAR", YEAR);
+        map.put("_ROWID_", _ROWID_);
+        // Additional keywords
+        map.put("BOTH", KEYWORD);
+        map.put("GROUPS", KEYWORD);
+        map.put("ILIKE", KEYWORD);
+        map.put("LEADING", KEYWORD);
+        map.put("OVER", KEYWORD);
+        map.put("PARTITION", KEYWORD);
+        map.put("RANGE", KEYWORD);
+        map.put("REGEXP", KEYWORD);
+        map.put("ROWS", KEYWORD);
+        map.put("TOP", KEYWORD);
+        map.put("TRAILING", KEYWORD);
+        KEYWORDS = map;
+    }
+
     private ParserUtil() {
         // utility class
     }
@@ -513,7 +618,7 @@ public static StringBuilder quoteIdentifier(StringBuilder builder, String s, int
      * @return true if it is a keyword
      */
     public static boolean isKeyword(String s, boolean ignoreCase) {
-        return getTokenType(s, ignoreCase, 0, s.length(), false) != IDENTIFIER;
+        return getTokenType(s, ignoreCase, false) != IDENTIFIER;
     }
 
     /**
@@ -539,7 +644,7 @@ public static boolean isSimpleIdentifier(String s, boolean databaseToUpper, bool
                 return false;
             }
         }
-        return getTokenType(s, !databaseToUpper, 0, length, true) == IDENTIFIER;
+        return getTokenType(s, !databaseToUpper, true) == IDENTIFIER;
     }
 
     private static boolean checkLetter(boolean databaseToUpper, boolean databaseToLower, char c) {
@@ -565,379 +670,25 @@ private static boolean checkLetter(boolean databaseToUpper, boolean databaseToLo
      * @param s the string with token
      * @param ignoreCase true if case should be ignored, false if only upper case
      *            tokens are detected as keywords
-     * @param start start index of token
-     * @param length length of token; must be positive
      * @param additionalKeywords
      *            whether context-sensitive keywords are returned as
      *            {@link #KEYWORD}
      * @return the token type
      */
-    public static int getTokenType(String s, boolean ignoreCase, int start, int length, boolean additionalKeywords) {
+    public static int getTokenType(String s, boolean ignoreCase, boolean additionalKeywords) {
+        int length = s.length();
         if (length <= 1 || length > 17) {
             return IDENTIFIER;
         }
-        /*
-         * DatabaseMetaLocal.getSQLKeywords() and tests should be updated when new
-         * non-SQL:2003 keywords are introduced here.
-         */
-        char c1 = s.charAt(start);
         if (ignoreCase) {
-            // Convert a-z to A-Z and 0x7f to _ (need special handling).
-            c1 &= 0xffdf;
-        }
-        if (length == 2) {
-            char c2 = s.charAt(start + 1);
-            if (ignoreCase) {
-                c2 &= 0xffdf;
-            }
-            switch (c1) {
-            case 'A':
-                if (c2 == 'S') {
-                    return AS;
-                }
-                return IDENTIFIER;
-            case 'I':
-                if (c2 == 'F') {
-                    return IF;
-                } else if (c2 == 'N') {
-                    return IN;
-                } else if (c2 == 'S') {
-                    return IS;
-                }
-                return IDENTIFIER;
-            case 'O':
-                if (c2 == 'N') {
-                    return ON;
-                } else if (c2 == 'R') {
-                    return OR;
-                }
-                return IDENTIFIER;
-            case 'T':
-                if (c2 == 'O') {
-                    return TO;
-                }
-                //$FALL-THROUGH$
-            default:
-                return IDENTIFIER;
-            }
+            s = StringUtils.toUpperEnglish(s);
         }
-        switch (c1) {
-        case 'A':
-            if (eq("ALL", s, ignoreCase, start, length)) {
-                return ALL;
-            } else if (eq("AND", s, ignoreCase, start, length)) {
-                return AND;
-            } else if (eq("ANY", s, ignoreCase, start, length)) {
-                return ANY;
-            } else if (eq("ARRAY", s, ignoreCase, start, length)) {
-                return ARRAY;
-            } else if (eq("ASYMMETRIC", s, ignoreCase, start, length)) {
-                return ASYMMETRIC;
-            } else if (eq("AUTHORIZATION", s, ignoreCase, start, length)) {
-                return AUTHORIZATION;
-            }
-            return IDENTIFIER;
-        case 'B':
-            if (eq("BETWEEN", s, ignoreCase, start, length)) {
-                return BETWEEN;
-            }
-            if (additionalKeywords) {
-                if (eq("BOTH", s, ignoreCase, start, length)) {
-                    return KEYWORD;
-                }
-            }
-            return IDENTIFIER;
-        case 'C':
-            if (eq("CASE", s, ignoreCase, start, length)) {
-                return CASE;
-            } else if (eq("CAST", s, ignoreCase, start, length)) {
-                return CAST;
-            } else if (eq("CHECK", s, ignoreCase, start, length)) {
-                return CHECK;
-            } else if (eq("CONSTRAINT", s, ignoreCase, start, length)) {
-                return CONSTRAINT;
-            } else if (eq("CROSS", s, ignoreCase, start, length)) {
-                return CROSS;
-            } else if (length >= 12 && "CURRENT_".regionMatches(ignoreCase, 1, s, start + 1, 7)) {
-                return getTokenTypeCurrent(s, ignoreCase, start, length);
-            }
-            return IDENTIFIER;
-        case 'D':
-            if (eq("DAY", s, ignoreCase, start, length)) {
-                return DAY;
-            } else if (eq("DEFAULT", s, ignoreCase, start, length)) {
-                return DEFAULT;
-            } else if (eq("DISTINCT", s, ignoreCase, start, length)) {
-                return DISTINCT;
-            }
-            return IDENTIFIER;
-        case 'E':
-            if (eq("ELSE", s, ignoreCase, start, length)) {
-                return ELSE;
-            } else if (eq("END", s, ignoreCase, start, length)) {
-                return END;
-            } else if (eq("EXCEPT", s, ignoreCase, start, length)) {
-                return EXCEPT;
-            } else if (eq("EXISTS", s, ignoreCase, start, length)) {
-                return EXISTS;
-            }
+        Integer type = KEYWORDS.get(s);
+        if (type == null) {
             return IDENTIFIER;
-        case 'F':
-            if (eq("FETCH", s, ignoreCase, start, length)) {
-                return FETCH;
-            } else if (eq("FROM", s, ignoreCase, start, length)) {
-                return FROM;
-            } else if (eq("FOR", s, ignoreCase, start, length)) {
-                return FOR;
-            } else if (eq("FOREIGN", s, ignoreCase, start, length)) {
-                return FOREIGN;
-            } else if (eq("FULL", s, ignoreCase, start, length)) {
-                return FULL;
-            } else if (eq("FALSE", s, ignoreCase, start, length)) {
-                return FALSE;
-            }
-            if (additionalKeywords) {
-                if (eq("FILTER", s, ignoreCase, start, length)) {
-                    return KEYWORD;
-                }
-            }
-            return IDENTIFIER;
-        case 'G':
-            if (eq("GROUP", s, ignoreCase, start, length)) {
-                return GROUP;
-            }
-            if (additionalKeywords) {
-                if (eq("GROUPS", s, ignoreCase, start, length)) {
-                    return KEYWORD;
-                }
-            }
-            return IDENTIFIER;
-        case 'H':
-            if (eq("HAVING", s, ignoreCase, start, length)) {
-                return HAVING;
-            } else if (eq("HOUR", s, ignoreCase, start, length)) {
-                return HOUR;
-            }
-            return IDENTIFIER;
-        case 'I':
-            if (eq("INNER", s, ignoreCase, start, length)) {
-                return INNER;
-            } else if (eq("INTERSECT", s, ignoreCase, start, length)) {
-                return INTERSECT;
-            } else if (eq("INTERSECTS", s, ignoreCase, start, length)) {
-                return INTERSECTS;
-            } else if (eq("INTERVAL", s, ignoreCase, start, length)) {
-                return INTERVAL;
-            }
-            if (additionalKeywords) {
-                if (eq("ILIKE", s, ignoreCase, start, length)) {
-                    return KEYWORD;
-                }
-            }
-            return IDENTIFIER;
-        case 'J':
-            if (eq("JOIN", s, ignoreCase, start, length)) {
-                return JOIN;
-            }
-            return IDENTIFIER;
-        case 'K':
-            if (eq("KEY", s, ignoreCase, start, length)) {
-                return KEY;
-            }
-            return IDENTIFIER;
-        case 'L':
-            if (eq("LEFT", s, ignoreCase, start, length)) {
-                return LEFT;
-            } else if (eq("LIMIT", s, ignoreCase, start, length)) {
-                return LIMIT;
-            } else if (eq("LIKE", s, ignoreCase, start, length)) {
-                return LIKE;
-            } else if (eq("LOCALTIME", s, ignoreCase, start, length)) {
-                return LOCALTIME;
-            } else if (eq("LOCALTIMESTAMP", s, ignoreCase, start, length)) {
-                return LOCALTIMESTAMP;
-            }
-            if (additionalKeywords) {
-                if (eq("LEADING", s, ignoreCase, start, length)) {
-                    return KEYWORD;
-                }
-            }
-            return IDENTIFIER;
-        case 'M':
-            if (eq("MINUS", s, ignoreCase, start, length)) {
-                return MINUS;
-            } else if (eq("MINUTE", s, ignoreCase, start, length)) {
-                return MINUTE;
-            } else if (eq("MONTH", s, ignoreCase, start, length)) {
-                return MONTH;
-            }
-            return IDENTIFIER;
-        case 'N':
-            if (eq("NOT", s, ignoreCase, start, length)) {
-                return NOT;
-            } else if (eq("NATURAL", s, ignoreCase, start, length)) {
-                return NATURAL;
-            } else if (eq("NULL", s, ignoreCase, start, length)) {
-                return NULL;
-            }
-            return IDENTIFIER;
-        case 'O':
-            if (eq("OFFSET", s, ignoreCase, start, length)) {
-                return OFFSET;
-            } else if (eq("ORDER", s, ignoreCase, start, length)) {
-                return ORDER;
-            }
-            if (additionalKeywords) {
-                if (eq("OVER", s, ignoreCase, start, length)) {
-                    return KEYWORD;
-                }
-            }
-            return IDENTIFIER;
-        case 'P':
-            if (eq("PRIMARY", s, ignoreCase, start, length)) {
-                return PRIMARY;
-            }
-            if (additionalKeywords) {
-                if (eq("PARTITION", s, ignoreCase, start, length)) {
-                    return KEYWORD;
-                }
-            }
-            return IDENTIFIER;
-        case 'Q':
-            if (eq("QUALIFY", s, ignoreCase, start, length)) {
-                return QUALIFY;
-            }
-            return IDENTIFIER;
-        case 'R':
-            if (eq("RIGHT", s, ignoreCase, start, length)) {
-                return RIGHT;
-            } else if (eq("ROW", s, ignoreCase, start, length)) {
-                return ROW;
-            } else if (eq("ROWNUM", s, ignoreCase, start, length)) {
-                return ROWNUM;
-            }
-            if (additionalKeywords) {
-                if (eq("RANGE", s, ignoreCase, start, length) || eq("REGEXP", s, ignoreCase, start, length)
-                        || eq("ROWS", s, ignoreCase, start, length)) {
-                    return KEYWORD;
-                }
-            }
-            return IDENTIFIER;
-        case 'S':
-            if (eq("SECOND", s, ignoreCase, start, length)) {
-                return SECOND;
-            } else if (eq("SELECT", s, ignoreCase, start, length)) {
-                return SELECT;
-            } else if (eq("SESSION_USER", s, ignoreCase, start, length)) {
-                return SESSION_USER;
-            } else if (eq("SET", s, ignoreCase, start, length)) {
-                return SET;
-            } else if (eq("SOME", s, ignoreCase, start, length)) {
-                return SOME;
-            } else if (eq("SYMMETRIC", s, ignoreCase, start, length)) {
-                return SYMMETRIC;
-            } else if (eq("SYSTEM_USER", s, ignoreCase, start, length)) {
-                return SYSTEM_USER;
-            }
-            return IDENTIFIER;
-        case 'T':
-            if (eq("TABLE", s, ignoreCase, start, length)) {
-                return TABLE;
-            } else if (eq("TRUE", s, ignoreCase, start, length)) {
-                return TRUE;
-            }
-            if (additionalKeywords) {
-                if (eq("TOP", s, ignoreCase, start, length) || eq("TRAILING", s, ignoreCase, start, length)) {
-                    return KEYWORD;
-                }
-            }
-            return IDENTIFIER;
-        case 'U':
-            if (eq("UESCAPE", s, ignoreCase, start, length)) {
-                return UESCAPE;
-            } else if (eq("UNION", s, ignoreCase, start, length)) {
-                return UNION;
-            } else if (eq("UNIQUE", s, ignoreCase, start, length)) {
-                return UNIQUE;
-            } else if (eq("UNKNOWN", s, ignoreCase, start, length)) {
-                return UNKNOWN;
-            } else if (eq("USER", s, ignoreCase, start, length)) {
-                return USER;
-            } else if (eq("USING", s, ignoreCase, start, length)) {
-                return USING;
-            }
-            return IDENTIFIER;
-        case 'V':
-            if (eq("VALUE", s, ignoreCase, start, length)) {
-                return VALUE;
-            } else if (eq("VALUES", s, ignoreCase, start, length)) {
-                return VALUES;
-            }
-            return IDENTIFIER;
-        case 'W':
-            if (eq("WHEN", s, ignoreCase, start, length)) {
-                return WHEN;
-            } else if (eq("WHERE", s, ignoreCase, start, length)) {
-                return WHERE;
-            } else if (eq("WINDOW", s, ignoreCase, start, length)) {
-                return WINDOW;
-            } else if (eq("WITH", s, ignoreCase, start, length)) {
-                return WITH;
-            }
-            return IDENTIFIER;
-        case 'Y':
-            if (eq("YEAR", s, ignoreCase, start, length)) {
-                return YEAR;
-            }
-            return IDENTIFIER;
-        case '_':
-            // Cannot use eq() because 0x7f can be converted to '_' (0x5f)
-            if (length == 7 && "_ROWID_".regionMatches(ignoreCase, 0, s, start, 7)) {
-                return _ROWID_;
-            }
-            //$FALL-THROUGH$
-        default:
-            return IDENTIFIER;
-        }
-    }
-
-    private static boolean eq(String expected, String s, boolean ignoreCase, int start, int length) {
-        // First letter was already checked
-        return length == expected.length() && expected.regionMatches(ignoreCase, 1, s, start + 1, length - 1);
-    }
-
-    private static int getTokenTypeCurrent(String s, boolean ignoreCase, int start, int length) {
-        start += 8;
-        switch (length -= 8) {
-        case 4:
-            if ("CURRENT_DATE".regionMatches(ignoreCase, 8, s, start, length)) {
-                return CURRENT_DATE;
-            } else if ("CURRENT_PATH".regionMatches(ignoreCase, 8, s, start, length)) {
-                return CURRENT_PATH;
-            } else if ("CURRENT_ROLE".regionMatches(ignoreCase, 8, s, start, length)) {
-                return CURRENT_ROLE;
-            } else if ("CURRENT_TIME".regionMatches(ignoreCase, 8, s, start, length)) {
-                return CURRENT_TIME;
-            } else if ("CURRENT_USER".regionMatches(ignoreCase, 8, s, start, length)) {
-                return CURRENT_USER;
-            }
-            break;
-        case 6:
-            if ("CURRENT_SCHEMA".regionMatches(ignoreCase, 8, s, start, length)) {
-                return CURRENT_SCHEMA;
-            }
-            break;
-        case 7:
-            if ("CURRENT_CATALOG".regionMatches(ignoreCase, 8, s, start, length)) {
-                return CURRENT_CATALOG;
-            }
-            break;
-        case 9:
-            if ("CURRENT_TIMESTAMP".regionMatches(ignoreCase, 8, s, start, length)) {
-                return CURRENT_TIMESTAMP;
-            }
         }
-        return IDENTIFIER;
+        int t = type;
+        return t == KEYWORD && !additionalKeywords ? IDENTIFIER : t;
     }
 
 }
diff --git a/h2/src/main/org/h2/util/Permutations.java b/h2/src/main/org/h2/util/Permutations.java
index 90ec967002..2426ed591e 100644
--- a/h2/src/main/org/h2/util/Permutations.java
+++ b/h2/src/main/org/h2/util/Permutations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  *
diff --git a/h2/src/main/org/h2/util/Profiler.java b/h2/src/main/org/h2/util/Profiler.java
index 374939a1eb..77bee9f3b8 100644
--- a/h2/src/main/org/h2/util/Profiler.java
+++ b/h2/src/main/org/h2/util/Profiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/ScriptReader.java b/h2/src/main/org/h2/util/ScriptReader.java
index 56ede3dd9f..4ca0987ea2 100644
--- a/h2/src/main/org/h2/util/ScriptReader.java
+++ b/h2/src/main/org/h2/util/ScriptReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/SimpleColumnInfo.java b/h2/src/main/org/h2/util/SimpleColumnInfo.java
index 4299aced04..08e17e4187 100644
--- a/h2/src/main/org/h2/util/SimpleColumnInfo.java
+++ b/h2/src/main/org/h2/util/SimpleColumnInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/SmallLRUCache.java b/h2/src/main/org/h2/util/SmallLRUCache.java
index c90f5d243c..6963939ff0 100644
--- a/h2/src/main/org/h2/util/SmallLRUCache.java
+++ b/h2/src/main/org/h2/util/SmallLRUCache.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/SmallMap.java b/h2/src/main/org/h2/util/SmallMap.java
index 9306dcfc05..8415128ddf 100644
--- a/h2/src/main/org/h2/util/SmallMap.java
+++ b/h2/src/main/org/h2/util/SmallMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/SoftValuesHashMap.java b/h2/src/main/org/h2/util/SoftValuesHashMap.java
index 359a41d1f6..a05c3ce545 100644
--- a/h2/src/main/org/h2/util/SoftValuesHashMap.java
+++ b/h2/src/main/org/h2/util/SoftValuesHashMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
diff --git a/h2/src/main/org/h2/util/SortedProperties.java b/h2/src/main/org/h2/util/SortedProperties.java
index b6830d22e3..17a9670dda 100644
--- a/h2/src/main/org/h2/util/SortedProperties.java
+++ b/h2/src/main/org/h2/util/SortedProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2021 H2 Group. Multiple-Licensed under the MPL 2.0,
+ * Copyright 2004-2023 H2 Group. Multiple-Licensed under the MPL 2.0,
  * and the EPL 1.0 (https://h2database.com/html/license.html).
  * Initial Developer: H2 Group
  */
@@ -16,12 +16,12 @@
 import java.io.PrintWriter;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.TreeMap;
-import java.util.Vector;
 import org.h2.store.fs.FileUtils;
 
 /**
@@ -34,12 +34,12 @@ public class SortedProperties extends Properties {
 
     @Override
     public synchronized Enumeration

[-dump <fileName>]	Dump the contends of the file
[-info <fileName>]

Keywords / Reserved Words

Keywords / Reserved Words

Keywords / Reserved Words

Keywords / Reserved Words

Keywords / Reserved Words

Keywords / Reserved Words

Standards Compliance

Protection against Remote Access

Limits and Limitations

Introduction

Top-down Overview

Top-down Overview

JDBC Driver

JDBC Driver

Connection/session management

Connection/session management

Parser

Command execution and planning

Table/Index/Constraints

Table/Index/Constraints

Undo log, redo log, and transactions layer

Build

Portability

Environment

Using Snapshot Version

Native Image

Using Eclipse

Next Version (unreleased)

Version 2.0.204 (2021-12-21)

Version 2.0.202 (2021-11-25)

Version 2.2.220 (2023-07-04)

Version 1.4.200 (2019-10-14)

Version 2.1.214 (2022-06-13)

Version 2.1.212 (2022-04-09)

Version 2.1.210 (2022-01-17)

Version 2.0.206 (2022-01-04)

Version 1.4.199 (2019-03-13)

Version 2.0.204 (2021-12-21)

Distribution

Version ${version} (${versionDate})

Version ${stableVersion} (${stableVersionDate}), Last Stable

Version 2.1.214 (2022-06-13)

Archive Downloads

Compatibility

Compatibility Modes

Compatibility Modes

REGULAR Compatibility mode

STRICT Compatibility Mode

STRICT Compatibility Mode

LEGACY Compatibility Mode

LEGACY Compatibility Mode

DB2 Compatibility Mode

DB2 Compatibility Mode

HSQLDB Compatibility Mode

MS SQL Server Compatibility Mode

MariaDB Compatibility Mode

MySQL Compatibility Mode

Oracle Compatibility Mode

PostgreSQL Compatibility Mode

PostgreSQL Compatibility Mode

Contents

Introduction

Upgrading

MVStore file format

MVStore file format

Date / Time / Timestamp

Data types

Identity columns and sequences

INFORMATION_SCHEMA

General

MySQL

SQLite

Firebird

Settings of the H2 Console

Using a Servlet Listener to Start and Stop a Database

Using the H2 Console Servlet

User-Defined Variables

Date and Time

Using Spring

Using the TCP Server