Merge branch 'main' into dependabot/maven/hibernate.version-6.4.1.Final

liquibase · Jan 5, 2024 · 31a6115 · 31a6115
2 parents f942e7d + a363db4
commit 31a6115
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 8 deletions.
diff --git a/.github/workflows/attach-artifact-release.yml b/.github/workflows/attach-artifact-release.yml
@@ -11,5 +11,5 @@ on:
 jobs:
 
   attach-artifact-to-release:
-    uses: liquibase/build-logic/.github/workflows/extension-attach-artifact-release.yml@v0.5.9
+    uses: liquibase/build-logic/.github/workflows/extension-attach-artifact-release.yml@v0.6.0
     secrets: inherit
diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
     nightly-build:
-      uses: liquibase/build-logic/.github/workflows/os-extension-test.yml@v0.5.9
+      uses: liquibase/build-logic/.github/workflows/os-extension-test.yml@v0.6.0
       with:
         nightly: true
         java: '[17, 21]'

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -12,5 +12,5 @@ permissions:
 
 jobs:
   create-release:
-    uses: liquibase/build-logic/.github/workflows/create-release.yml@v0.5.9
+    uses: liquibase/build-logic/.github/workflows/create-release.yml@v0.6.0
     secrets: inherit
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,8 +16,16 @@ permissions:
   pull-requests: write
 
 jobs:
+
+  authorize:
+    environment: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository && 'external' || 'internal' }}
+    runs-on: ubuntu-latest
+    steps:
+      - run: true
+
   build-test:
-    uses: liquibase/build-logic/.github/workflows/[email protected]
+    needs: authorize
+    uses: liquibase/build-logic/.github/workflows/[email protected]
     secrets: inherit
     with:
       java: '[17, 21]'
@@ -60,5 +68,5 @@ jobs:
 
   dependabot:
     needs: hibernate-test
-    uses: liquibase/build-logic/.github/workflows/dependabot-automerge.yml@v0.5.9
+    uses: liquibase/build-logic/.github/workflows/dependabot-automerge.yml@v0.6.0
     secrets: inherit
diff --git a/src/main/java/liquibase/ext/hibernate/database/HibernateClassicDatabase.java b/src/main/java/liquibase/ext/hibernate/database/HibernateClassicDatabase.java
@@ -44,7 +44,7 @@ protected void configureSources(MetadataSources sources) throws DatabaseExceptio
         Configuration config = new Configuration(sources);
         config.configure(getHibernateConnection().getPath());
 
-        config.setProperty("hibernate.temp.use_jdbc_metadata_defaults", "false");
+        config.setProperty(HibernateDatabase.HIBERNATE_TEMP_USE_JDBC_METADATA_DEFAULTS, Boolean.FALSE.toString());
         config.setProperty("hibernate.cache.use_second_level_cache", "false");
 
         ServiceRegistry standardRegistry = configuration.getStandardServiceRegistryBuilder()

diff --git a/src/main/java/liquibase/ext/hibernate/database/HibernateDatabase.java b/src/main/java/liquibase/ext/hibernate/database/HibernateDatabase.java
@@ -37,6 +37,7 @@ public abstract class HibernateDatabase extends AbstractJdbcDatabase {
 
     private boolean indexesForForeignKeys = false;
     public static final String DEFAULT_SCHEMA = "HIBERNATE";
+    public static final String HIBERNATE_TEMP_USE_JDBC_METADATA_DEFAULTS = "hibernate.temp.use_jdbc_metadata_defaults";
 
     public HibernateDatabase() {
         setDefaultCatalogName(DEFAULT_SCHEMA);
@@ -186,6 +187,7 @@ protected MetadataSources createMetadataSources() throws DatabaseException {
 
         ServiceRegistry standardRegistry = new StandardServiceRegistryBuilder()
                 .applySetting(AvailableSettings.DIALECT, dialect)
+                .applySetting(HibernateDatabase.HIBERNATE_TEMP_USE_JDBC_METADATA_DEFAULTS, Boolean.FALSE.toString())
                 .addService(ConnectionProvider.class, new NoOpConnectionProvider())
                 .addService(MultiTenantConnectionProvider.class, new NoOpConnectionProvider())
                 .build();

diff --git a/src/main/java/liquibase/ext/hibernate/database/HibernateEjb3Database.java b/src/main/java/liquibase/ext/hibernate/database/HibernateEjb3Database.java
@@ -77,6 +77,7 @@ protected EntityManagerFactoryBuilderImpl createEntityManagerFactoryBuilder() {
         MyHibernatePersistenceProvider persistenceProvider = new MyHibernatePersistenceProvider();
 
         Map<String, Object> properties = new HashMap<>();
+        properties.put(HibernateDatabase.HIBERNATE_TEMP_USE_JDBC_METADATA_DEFAULTS, Boolean.FALSE.toString());
         properties.put(AvailableSettings.USE_SECOND_LEVEL_CACHE, Boolean.FALSE.toString());
         properties.put(AvailableSettings.USE_NATIONALIZED_CHARACTER_DATA, getProperty(AvailableSettings.USE_NATIONALIZED_CHARACTER_DATA));
 

diff --git a/src/main/java/liquibase/ext/hibernate/database/HibernateSpringPackageDatabase.java b/src/main/java/liquibase/ext/hibernate/database/HibernateSpringPackageDatabase.java
@@ -91,6 +91,7 @@ protected EntityManagerFactoryBuilderImpl createEntityManagerFactoryBuilder() {
 
         Map<String, String> map = new HashMap<>();
         map.put(AvailableSettings.DIALECT, getProperty(AvailableSettings.DIALECT));
+        map.put(HibernateDatabase.HIBERNATE_TEMP_USE_JDBC_METADATA_DEFAULTS, Boolean.FALSE.toString());
         map.put(AvailableSettings.USE_SECOND_LEVEL_CACHE, Boolean.FALSE.toString());
         map.put(AvailableSettings.PHYSICAL_NAMING_STRATEGY, getHibernateConnection().getProperties().getProperty(AvailableSettings.PHYSICAL_NAMING_STRATEGY));
         map.put(AvailableSettings.IMPLICIT_NAMING_STRATEGY, getHibernateConnection().getProperties().getProperty(AvailableSettings.IMPLICIT_NAMING_STRATEGY));

diff --git a/src/main/java/liquibase/ext/hibernate/database/JpaPersistenceDatabase.java b/src/main/java/liquibase/ext/hibernate/database/JpaPersistenceDatabase.java
@@ -1,6 +1,6 @@
 package liquibase.ext.hibernate.database;
 
-import java.util.Collections;
+import java.util.Map;
 
 import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
 import org.hibernate.jpa.boot.spi.Bootstrap;
@@ -50,7 +50,8 @@ protected EntityManagerFactoryBuilderImpl createEntityManagerFactoryBuilder() {
         internalPersistenceUnitManager.preparePersistenceUnitInfos();
         PersistenceUnitInfo persistenceUnitInfo = internalPersistenceUnitManager.obtainDefaultPersistenceUnitInfo();
 
-        EntityManagerFactoryBuilderImpl builder = (EntityManagerFactoryBuilderImpl) Bootstrap.getEntityManagerFactoryBuilder(persistenceUnitInfo, Collections.emptyMap());
+        EntityManagerFactoryBuilderImpl builder = (EntityManagerFactoryBuilderImpl) Bootstrap.getEntityManagerFactoryBuilder(persistenceUnitInfo, Map.of(
+                HibernateDatabase.HIBERNATE_TEMP_USE_JDBC_METADATA_DEFAULTS, Boolean.FALSE.toString()));
         return builder;
     }