Skip to content

HHH-14744 : Refactor contextual information for SchemaManagementTool to be more easily extended by Hibernate Reactive #4106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Aug 25, 2021
Merged

HHH-14744 : Refactor contextual information for SchemaManagementTool to be more easily extended by Hibernate Reactive #4106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8065436
HHH-14744 : Refactor contextual information for SchemaManagementTool …
gbadner Jun 11, 2021
87b5b8d
HHH-14744 : Checkstyle fixes
gbadner Jul 24, 2021
5b8d67b
HHH-14744 : Refactor contextual information for SchemaManagementTool …
gbadner Jul 29, 2021
e80712c
HHH-14744 : Refactor contextual information for SchemaManagementTool …
gbadner Aug 3, 2021
a64d010
HHH-14744 : Refactor contextual information for SchemaManagementTool …
gbadner Aug 3, 2021
b63d6e8
HHH-14744 : HHH-14744 : Refactor contextual information for SchemaMan…
gbadner Aug 5, 2021
7f316ae
HHH-14744 : HHH-14744 : Refactor contextual information for SchemaMan…
gbadner Aug 13, 2021
4180195
HHH-14744 : Refactor contextual information for SchemaManagementTool …
gbadner Aug 13, 2021
1083534
HHH-14744 : Refactor contextual information for SchemaManagementTool …
gbadner Aug 16, 2021
64421a8
HHH-14744 : Refactor contextual information for SchemaManagementTool …
gbadner Aug 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion databases/pgsql/resources/hibernate.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ hibernate.cache.region_prefix hibernate.test
hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory

hibernate.service.allow_crawling=false
hibernate.session.events.log=true
hibernate.session.events.log=true

23 changes: 23 additions & 0 deletions hibernate-core/src/main/java/org/hibernate/dialect/CockroachDB192Dialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
import org.hibernate.dialect.pagination.AbstractLimitHandler;
import org.hibernate.dialect.pagination.LimitHandler;
import org.hibernate.dialect.pagination.LimitHelper;
import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;
import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder;
import org.hibernate.engine.jdbc.env.spi.NameQualifierSupport;
import org.hibernate.engine.spi.RowSelection;
import org.hibernate.exception.LockAcquisitionException;
import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
Expand Down Expand Up @@ -658,4 +662,23 @@ public boolean doesReadCommittedCauseWritersToBlockReaders() {
public boolean canCreateSchema() {
return false;
}

@Override
public NameQualifierSupport getNameQualifierSupport() {
// This method is overridden so the correct value will be returned when
// DatabaseMetaData is not available.
return NameQualifierSupport.SCHEMA;
}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
throws SQLException {

if ( dbMetaData == null ) {
builder.setUnquotedCaseStrategy( IdentifierCaseStrategy.LOWER );
builder.setQuotedCaseStrategy( IdentifierCaseStrategy.MIXED );
}

return super.buildIdentifierHelper( builder, dbMetaData );
}
}
6 changes: 6 additions & 0 deletions hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;
import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder;
import org.hibernate.engine.jdbc.env.spi.NameQualifierSupport;
import org.hibernate.engine.spi.RowSelection;
import org.hibernate.exception.LockAcquisitionException;
import org.hibernate.exception.LockTimeoutException;
Expand Down Expand Up @@ -566,6 +567,11 @@ public JDBCException convert(SQLException sqlException, String message, String s
};
}

@Override
public NameQualifierSupport getNameQualifierSupport() {
return NameQualifierSupport.CATALOG;
Copy link

@yodous yodous Dec 14, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copying comment from initial commit:

Shouldn't it be NameQualifierSupport.SCHEMA and not CATALOG (since MySQL use the concept of schema and not the catalogs).
Whenever there would be an Entity class annotated with @Table(schema = "tech", name = "point"), the class QualifiedObjectNameFormatterStandardImpl would format the name into point and not the tech.point (since it does not define catalog)

}

@Override
public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, DatabaseMetaData dbMetaData)
throws SQLException {
Expand Down
13 changes: 13 additions & 0 deletions hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQL81Dialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.hibernate.engine.jdbc.env.spi.IdentifierCaseStrategy;
import org.hibernate.engine.jdbc.env.spi.IdentifierHelper;
import org.hibernate.engine.jdbc.env.spi.IdentifierHelperBuilder;
import org.hibernate.engine.jdbc.env.spi.NameQualifierSupport;
import org.hibernate.engine.spi.RowSelection;
import org.hibernate.exception.LockAcquisitionException;
import org.hibernate.exception.spi.SQLExceptionConversionDelegate;
Expand Down Expand Up @@ -215,6 +216,18 @@ public SqlTypeDescriptor getSqlTypeDescriptorOverride(int sqlCode) {
return descriptor;
}

@Override
public NameQualifierSupport getNameQualifierSupport() {
// This method is overridden so the correct value will be returned when
// DatabaseMetaData is not available.
return NameQualifierSupport.SCHEMA;
}

@Override
public String getCurrentSchemaCommand() {
return "select current_schema()";
}

@Override
public String getAddColumnString() {
return "add column";
Expand Down
Loading