fix firebird support

Author: marschall

pom.xml

@@ -237,6 +237,12 @@
       <version>${hibernate.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hibernate.orm</groupId>
+      <artifactId>hibernate-community-dialects</artifactId>
+      <version>${hibernate.version}</version>
+      <scope>provided</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.junit.jupiter</groupId>

src/main/java/com/github/marschall/hibernate/batchsequencegenerator/BatchSequenceGenerator.java

@@ -202,17 +202,17 @@ private static String buildSelect(String sequenceName, Dialect dialect) {
       // https://stackoverflow.com/questions/44472280/cte-based-sequence-generation-with-hsqldb/52329862
       return "SELECT " + dialect.getSequenceSupport().getSelectSequenceNextValString(sequenceName) + " FROM UNNEST(SEQUENCE_ARRAY(1, ?, 1))";
     }
-//    if (dialect instanceof org.hibernate.dialect.FirebirdDialect) {
-//      return "WITH RECURSIVE t(n, level_num) AS ("
-//              + "SELECT " + dialect.getSequenceSupport().getSelectSequenceNextValString(sequenceName) + " as n, 1 as level_num "
-//              // difference
-//              + " FROM rdb$database "
-//              + "UNION ALL "
-//              + "SELECT " + dialect.getSequenceSupport().getSelectSequenceNextValString(sequenceName) + " as n, level_num + 1 as level_num "
-//              + " FROM t "
-//              + " WHERE level_num < ?) "
-//              + "SELECT n FROM t";
-//    }
+    if (dialect instanceof org.hibernate.community.dialect.FirebirdDialect) {
+      return "WITH RECURSIVE t(n, level_num) AS ("
+              + "SELECT " + dialect.getSequenceSupport().getSelectSequenceNextValString(sequenceName) + " as n, 1 as level_num "
+              // difference
+              + " FROM rdb$database "
+              + "UNION ALL "
+              + "SELECT " + dialect.getSequenceSupport().getSelectSequenceNextValString(sequenceName) + " as n, level_num + 1 as level_num "
+              + " FROM t "
+              + " WHERE level_num < ?) "
+              + "SELECT n FROM t";
+    }
     return "WITH RECURSIVE t(n, level_num) AS ("
             + "SELECT " + dialect.getSequenceSupport().getSelectSequenceNextValString(sequenceName) + " as n, 1 as level_num "
             + "UNION ALL "

src/test/java/com/github/marschall/hibernate/batchsequencegenerator/BatchSequenceGeneratorIntegrationTest.java

@@ -31,6 +31,7 @@
 import org.springframework.transaction.support.TransactionTemplate;
 
 import com.github.marschall.hibernate.batchsequencegenerator.configurations.Db2Configuration;
+import com.github.marschall.hibernate.batchsequencegenerator.configurations.FirebirdConfiguration;
 import com.github.marschall.hibernate.batchsequencegenerator.configurations.H2Configuration;
 import com.github.marschall.hibernate.batchsequencegenerator.configurations.HibernateConfiguration;
 import com.github.marschall.hibernate.batchsequencegenerator.configurations.HsqlConfiguration;
@@ -58,8 +59,8 @@ public static List<Arguments> parameters() {
     parameters.add(Arguments.of(Db2Configuration.class, "db2-batched"));
     parameters.add(Arguments.of(MariaDbConfiguration.class, "maria-default"));
     parameters.add(Arguments.of(MariaDbConfiguration.class, "maria-batched"));
-//    parameters.add(Arguments.of(FirebirdConfiguration.class, "firebird-default"));
-//    parameters.add(Arguments.of(FirebirdConfiguration.class, "firebird-batched"));
+    parameters.add(Arguments.of(FirebirdConfiguration.class, "firebird-default"));
+    parameters.add(Arguments.of(FirebirdConfiguration.class, "firebird-batched"));
     parameters.add(Arguments.of(HsqlConfiguration.class, "hsql-default"));
     parameters.add(Arguments.of(HsqlConfiguration.class, "hsql-batched"));
     parameters.add(Arguments.of(H2Configuration.class, "h2-default"));

src/test/resources/META-INF/persistence.xml

@@ -141,7 +141,7 @@
     <class>com.github.marschall.hibernate.batchsequencegenerators.entities.ChildEntity</class>
 
     <properties>
-      <property name="hibernate.dialect" value="org.hibernate.dialect.FirebirdDialect" />
+      <property name="hibernate.dialect" value="org.hibernate.community.dialect.FirebirdDialect" />
     </properties>
   </persistence-unit>
 
@@ -152,7 +152,7 @@
     <class>com.github.marschall.hibernate.batchsequencegenerators.entities.ChildEntity</class>
 
     <properties>
-      <property name="hibernate.dialect" value="org.hibernate.dialect.FirebirdDialect" />
+      <property name="hibernate.dialect" value="org.hibernate.community.dialect.FirebirdDialect" />
       <property name="hibernate.jdbc.batch_size" value="50" />
       <property name="hibernate.order_inserts" value="true" />
       <property name="hibernate.order_updates" value="true" />