Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get rid of the MVCC connection option for H2

This commit is contained in:
Christian Beikov 2022-01-19 10:44:09 +01:00 committed by Sanne Grinovero
parent 2f17b1a951
commit 0fc59729da
22 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/resources/hibernate.cfg.xml
View File

@ -15,7 +15,7 @@
<!-- Database connection settings -->
<property name="connection.driver_class">org.h2.Driver</property>
<property name="connection.url">jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE</property>
<property name="connection.url">jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1</property>
<property name="connection.username">sa</property>
<property name="connection.password"></property>

2
documentation/src/main/asciidoc/quickstart/tutorials/basic/src/test/resources/hibernate.cfg.xml
View File

@ -15,7 +15,7 @@
<!-- Database connection settings -->
<property name="connection.driver_class">org.h2.Driver</property>
<property name="connection.url">jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE</property>
<property name="connection.url">jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1</property>
<property name="connection.username">sa</property>
<property name="connection.password"/>

2
documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml
View File

@ -18,7 +18,7 @@
<properties>
<property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE" />
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1" />
<property name="javax.persistence.jdbc.user" value="sa" />
<property name="javax.persistence.jdbc.password" value="" />

2
documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/resources/META-INF/persistence.xml
View File

@ -18,7 +18,7 @@
<properties>
<property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE" />
<property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1" />
<property name="javax.persistence.jdbc.user" value="sa" />
<property name="javax.persistence.jdbc.password" value="" />

2
documentation/src/main/asciidoc/quickstart/tutorials/osgi/datasource-h2.xml
View File

@ -15,7 +15,7 @@ Then copy this file to the deploy folder
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
<bean id="dataSource" class="org.h2.jdbcx.JdbcDataSource">
<property name="URL" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE"/>
<property name="URL" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1"/>
<property name="user" value="sa"/>
<property name="password" value=""/>
</bean>

2
documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml
View File

@ -15,7 +15,7 @@
<properties>
<property name="hibernate.connection.driver_class" value="org.h2.Driver"/>
<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
<property name="hibernate.connection.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE"/>
<property name="hibernate.connection.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1"/>
<property name="hibernate.connection.username" value="sa"/>
<property name="hibernate.connection.password" value=""/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>

2
documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml
View File

@ -12,7 +12,7 @@
<hibernate-configuration>
<session-factory>
<property name="hibernate.connection.driver_class">org.h2.Driver</property>
<property name="hibernate.connection.url">jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE</property>
<property name="hibernate.connection.url">jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1</property>
<property name="hibernate.connection.username">sa</property>
<property name="hibernate.connection.password"></property>
<property name="hibernate.dialect">org.hibernate.dialect.H2Dialect</property>

2
documentation/src/main/asciidoc/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/pool-one.properties
View File

@ -5,7 +5,7 @@
# See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
#
jdbc-0.proxool.alias=pool-one
jdbc-0.proxool.driver-url=jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE
jdbc-0.proxool.driver-url=jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1
jdbc-0.proxool.driver-class=org.h2.Driver
jdbc-0.user=sa
jdbc-0.password=

2
documentation/src/main/asciidoc/userguide/chapters/bootstrap/extras/persistence-external.xml
View File

@ -18,7 +18,7 @@
value="org.h2.Driver" />
<property name="javax.persistence.jdbc.url"
value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE" />
value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1" />
<property name="javax.persistence.jdbc.user"
value="sa" />

2
documentation/src/main/asciidoc/userguide/chapters/bootstrap/extras/persistence.xml
View File

@ -18,7 +18,7 @@
value="org.h2.Driver" />
<property name="javax.persistence.jdbc.url"
value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE" />
value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1" />
<property name="javax.persistence.jdbc.user"
value="sa" />

2
documentation/src/main/asciidoc/userguide/chapters/osgi/extras/datasource-h2.xml
View File

@ -8,7 +8,7 @@ Then copy this file to the deploy folder
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
<bean id="dataSource" class="org.h2.jdbcx.JdbcDataSource">
<property name="URL" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE"/>
<property name="URL" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1"/>
<property name="user" value="sa"/>
<property name="password" value=""/>
</bean>

2
hibernate-core/src/test/java/org/hibernate/jpa/test/schemagen/JpaSchemaGeneratorTest.java
View File

@ -154,7 +154,7 @@ public class JpaSchemaGeneratorTest extends BaseEntityManagerFunctionalTestCase
// We want a fresh db after emf close
// Unfortunately we have to use this dirty hack because the db seems not to be closed otherwise
settings.put( "hibernate.connection.url", "jdbc:h2:mem:db-schemagen" + schemagenNumber++
+ ";MVCC=TRUE;LOCK_TIMEOUT=10000" );
+ ";LOCK_TIMEOUT=10000" );
EntityManagerFactoryBuilder emfb = Bootstrap.getEntityManagerFactoryBuilder( buildPersistenceUnitDescriptor(),
settings );
EntityManagerFactory emf = emfb.build();

2
hibernate-core/src/test/java/org/hibernate/test/cache/RefreshUpdatedDataTest.java vendored
View File

@ -49,7 +49,7 @@ public class RefreshUpdatedDataTest extends BaseCoreFunctionalTestCase {
super.configure( cfg );
Properties properties = Environment.getProperties();
if ( H2Dialect.class.getName().equals( properties.get( Environment.DIALECT ) ) ) {
cfg.setProperty( Environment.URL, "jdbc:h2:mem:db-mvcc;MVCC=true" );
cfg.setProperty( Environment.URL, "jdbc:h2:mem:db-mvcc" );
}
cfg.setProperty( Environment.CACHE_REGION_PREFIX, "" );
cfg.setProperty( Environment.GENERATE_STATISTICS, "true" );

2
hibernate-ehcache/src/test/java/org/hibernate/cache/ehcache/test/TestHelper.java vendored
View File

@ -80,7 +80,7 @@ public class TestHelper {
.applySetting( AvailableSettings.HBM2DDL_AUTO, "create-drop" );
if ( H2Dialect.class.equals( Dialect.getDialect().getClass() ) ) {
ssrb.applySetting( AvailableSettings.URL, "jdbc:h2:mem:db-mvcc;MVCC=true" );
ssrb.applySetting( AvailableSettings.URL, "jdbc:h2:mem:db-mvcc" );
}
return ssrb;
}

2
hibernate-envers/src/demo/resources/META-INF/persistence.xml
View File

@ -13,7 +13,7 @@
<exclude-unlisted-classes />
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
<property name="hibernate.connection.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE"/>
<property name="hibernate.connection.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1"/>
<property name="hibernate.connection.driver_class" value="org.h2.Driver"/>
<property name="hibernate.connection.username" value="sa"/>
<property name="hibernate.connection.password" value=""/>

2
hibernate-integrationtest-java-modules/src/test/resources/META-INF/persistence.xml
View File

@ -14,7 +14,7 @@
<properties>
<property name="hibernate.connection.driver_class" value="org.h2.Driver"/>
<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
<property name="hibernate.connection.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE"/>
<property name="hibernate.connection.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1"/>
<property name="hibernate.connection.username" value="sa"/>
<property name="hibernate.connection.password" value=""/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>

2
hibernate-jcache/src/test/java/org/hibernate/jcache/test/RefreshUpdatedDataTest.java
View File

@ -52,7 +52,7 @@ public class RefreshUpdatedDataTest extends BaseUnitTestCase {
.configure( "hibernate-config/hibernate.cfg.xml" );
if ( H2Dialect.class.equals( Dialect.getDialect().getClass() ) ) {
ssrb.applySetting( AvailableSettings.URL, "jdbc:h2:mem:db-mvcc;MVCC=true" );
ssrb.applySetting( AvailableSettings.URL, "jdbc:h2:mem:db-mvcc" );
}
ssrb.applySetting( AvailableSettings.GENERATE_STATISTICS, "true" );

2
hibernate-jcache/src/test/java/org/hibernate/jcache/test/TestHelper.java
View File

@ -122,7 +122,7 @@ public class TestHelper {
.applySetting( AvailableSettings.HBM2DDL_AUTO, "create-drop" );
if ( H2Dialect.class.equals( Dialect.getDialect().getClass() ) ) {
ssrb.applySetting( AvailableSettings.URL, "jdbc:h2:mem:db-mvcc;MVCC=true" );
ssrb.applySetting( AvailableSettings.URL, "jdbc:h2:mem:db-mvcc" );
}
return ssrb;
}

2
hibernate-osgi/src/test/resources/META-INF/persistence.xml
View File

@ -15,7 +15,7 @@
<properties>
<property name="hibernate.connection.driver_class" value="org.h2.Driver"/>
<property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
<property name="hibernate.connection.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE"/>
<property name="hibernate.connection.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1"/>
<property name="hibernate.connection.username" value="sa"/>
<property name="hibernate.connection.password" value=""/>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>

2
hibernate-spatial/databases/h2geodb/resources/hibernate.properties
View File

@ -7,7 +7,7 @@
hibernate.dialect org.hibernate.spatial.dialect.h2geodb.GeoDBDialect
hibernate.connection.driver_class org.h2.Driver
hibernate.connection.url jdbc:h2:mem:testhbs;DB_CLOSE_DELAY=-1;MVCC=true
hibernate.connection.url jdbc:h2:mem:testhbs;DB_CLOSE_DELAY=-1
hibernate.connection.username sa
hibernate.connection.password sa

2
hibernate-spatial/src/test/resources/hibernate.properties
View File

@ -29,7 +29,7 @@ hibernate.connection.password=@jdbc.pass@
##
#hibernate.dialect org.hibernate.spatial.dialect.h2geodb.GeoDBDialect
#hibernate.connection.driver_class org.h2.Driver
#hibernate.connection.url jdbc:h2:mem:testhbs;DB_CLOSE_DELAY=-1;MVCC=true
#hibernate.connection.url jdbc:h2:mem:testhbs;DB_CLOSE_DELAY=-1
#hibernate.connection.username sa
#hibernate.connection.password sa
##

2
hibernate-testing/src/main/java/org/hibernate/testing/env/TestingDatabaseInfo.java vendored
View File

@ -16,7 +16,7 @@ import org.hibernate.dialect.H2Dialect;
*/
public final class TestingDatabaseInfo {
public static volatile String DRIVER = "org.h2.Driver";
public static volatile String URL = "jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE";
public static volatile String URL = "jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1";
public static volatile String USER = "sa";
public static volatile String PASS = "";