Skip to content

Commit 3dec1ca

Browse files
jrenaatbeikov
authored andcommitted
HHH-15447 - Remove references to deprecated dialects
Signed-off-by: Jan Schatteman <jschatte@redhat.com>
1 parent 89f9011 commit 3dec1ca

File tree

43 files changed

+174
-139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+174
-139
lines changed

documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ strategy Class name::
2121
[[configurations-general]]
2222
=== General configuration
2323

24-
`*hibernate.dialect*` (e.g. `org.hibernate.dialect.PostgreSQL94Dialect`)::
24+
`*hibernate.dialect*` (e.g. `org.hibernate.dialect.PostgreSQLDialect`)::
2525
The class name of a Hibernate https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/dialect/Dialect.html[`Dialect`] from which Hibernate can generate SQL optimized for a particular relational database.
2626
+
2727
In most cases, Hibernate can choose the correct https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/dialect/Dialect.html[`Dialect`] implementation based on the JDBC metadata returned by the JDBC driver.

documentation/src/test/java/org/hibernate/userguide/mapping/generated/GeneratedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import org.hibernate.annotations.Generated;
1414
import org.hibernate.annotations.GenerationTime;
15-
import org.hibernate.dialect.SQLServer2005Dialect;
15+
import org.hibernate.dialect.SQLServerDialect;
1616

1717
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
1818
import org.hibernate.testing.orm.junit.Jpa;
@@ -24,7 +24,7 @@
2424
/**
2525
* @author Vlad Mihalcea
2626
*/
27-
@RequiresDialect(value = SQLServer2005Dialect.class, majorVersion = 9)
27+
@RequiresDialect(value = SQLServerDialect.class)
2828
@Jpa(
2929
annotatedClasses = GeneratedTest.Person.class
3030
)

etc/hibernate.properties

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,7 @@ hibernate.connection.url jdbc:hsqldb:./build/db/hsqldb/hibernate
6161

6262
## Oracle
6363

64-
#hibernate.dialect org.hibernate.dialect.Oracle8iDialect
65-
#hibernate.dialect org.hibernate.dialect.Oracle9iDialect
66-
#hibernate.dialect org.hibernate.dialect.Oracle10gDialect
64+
#hibernate.dialect org.hibernate.dialect.OracleDialect
6765
#hibernate.connection.driver_class oracle.jdbc.OracleDriver
6866
#hibernate.connection.username ora
6967
#hibernate.connection.password ora
@@ -100,7 +98,7 @@ hibernate.connection.url jdbc:hsqldb:./build/db/hsqldb/hibernate
10098

10199
## DB2/400
102100

103-
#hibernate.dialect org.hibernate.dialect.DB2400Dialect
101+
#hibernate.dialect org.hibernate.dialect.DB2iDialect
104102
#hibernate.connection.username user
105103
#hibernate.connection.password password
106104

etc/hibernate.properties.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ hibernate.connection.url @DB_URL@
8282

8383
## DB2/400
8484

85-
#hibernate.dialect org.hibernate.dialect.DB2400Dialect
85+
#hibernate.dialect org.hibernate.dialect.DB2iDialect
8686
#hibernate.connection.username user
8787
#hibernate.connection.password password
8888

hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/JdbcCompatibilityTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*
2626
* @author Vlad Mihalcea
2727
*/
28-
@RequiresDialect(value = SQLServerDialect.class, majorVersion = 9)
28+
@RequiresDialect(value = SQLServerDialect.class)
2929
@DomainModel(
3030
annotatedClasses = { IrrelevantEntity.class }
3131
)

hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/unit/lockhint/SQLServer2005LockHintsTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.hibernate.community.dialect.SQLServerLegacyDialect;
1212
import org.hibernate.dialect.DatabaseVersion;
1313
import org.hibernate.dialect.Dialect;
14-
import org.hibernate.dialect.SQLServer2005Dialect;
1514
import org.hibernate.orm.test.dialect.unit.lockhint.AbstractLockHintTest;
1615

1716
/**
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
55
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
66
*/
7-
package org.hibernate.orm.test.dialect.unit.sequence;
7+
package org.hibernate.community.dialect.unit.sequence;
88

9-
import org.hibernate.dialect.DB2390Dialect;
9+
import org.hibernate.community.dialect.DB2zLegacyDialect;
1010
import org.hibernate.dialect.Dialect;
11+
import org.hibernate.orm.test.dialect.unit.sequence.AbstractSequenceInformationExtractorTest;
1112
import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl;
1213
import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
1314

@@ -21,7 +22,7 @@ public class DB2390SequenceInformationExtractorTest extends AbstractSequenceInfo
2122

2223
@Override
2324
public Dialect getDialect() {
24-
return new DB2390Dialect();
25+
return new DB2zLegacyDialect();
2526
}
2627

2728
@Override
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
55
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
66
*/
7-
package org.hibernate.orm.test.dialect.unit.sequence;
7+
package org.hibernate.community.dialect.unit.sequence;
88

9-
import org.hibernate.dialect.DB2400Dialect;
9+
import org.hibernate.community.dialect.DB2iLegacyDialect;
1010
import org.hibernate.dialect.Dialect;
11+
import org.hibernate.orm.test.dialect.unit.sequence.AbstractSequenceInformationExtractorTest;
1112
import org.hibernate.tool.schema.extract.internal.SequenceInformationExtractorNoOpImpl;
1213
import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor;
1314

@@ -22,7 +23,7 @@ public class DB2400SequenceInformationExtractorTest extends AbstractSequenceInfo
2223

2324
@Override
2425
public Dialect getDialect() {
25-
return new DB2400Dialect();
26+
return new DB2iLegacyDialect();
2627
}
2728

2829
@Override

hibernate-core/src/main/java/org/hibernate/dialect/DB2390Dialect.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
package org.hibernate.dialect;
88

9-
import org.hibernate.dialect.identity.DB2390IdentityColumnSupport;
9+
import org.hibernate.dialect.identity.DB2zIdentityColumnSupport;
1010
import org.hibernate.dialect.identity.IdentityColumnSupport;
1111
import org.hibernate.dialect.pagination.FetchLimitHandler;
1212
import org.hibernate.dialect.pagination.LimitHandler;
@@ -64,6 +64,6 @@ public LimitHandler getLimitHandler() {
6464

6565
@Override
6666
public IdentityColumnSupport getIdentityColumnSupport() {
67-
return new DB2390IdentityColumnSupport();
67+
return new DB2zIdentityColumnSupport();
6868
}
6969
}

hibernate-core/src/main/java/org/hibernate/dialect/DB2400Dialect.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
package org.hibernate.dialect;
88

9-
import org.hibernate.dialect.identity.DB2390IdentityColumnSupport;
9+
import org.hibernate.dialect.identity.DB2zIdentityColumnSupport;
1010
import org.hibernate.dialect.identity.IdentityColumnSupport;
1111
import org.hibernate.dialect.pagination.FetchLimitHandler;
1212
import org.hibernate.dialect.pagination.LimitHandler;
@@ -48,6 +48,6 @@ public LimitHandler getLimitHandler() {
4848

4949
@Override
5050
public IdentityColumnSupport getIdentityColumnSupport() {
51-
return new DB2390IdentityColumnSupport();
51+
return new DB2zIdentityColumnSupport();
5252
}
5353
}

0 commit comments

Comments
 (0)