Support for older Informix which doesn't support count(1)

VladoKuruc · VladoKuruc · commit 5737da614bcb · 2025-08-07T14:11:11.000+02:00
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/hql/BulkManipulationTest.java
@@ -89,10 +89,10 @@ public void testUpdateWithSubquery() {
 		s.beginTransaction();
 
 		// just checking parsing and syntax...
-		s.createQuery( "update Human h set h.bodyWeight = h.bodyWeight + (select count(1) from IntegerVersioned)" )
+		s.createQuery( "update Human h set h.bodyWeight = h.bodyWeight + (select count(*) from IntegerVersioned)" )
 				.executeUpdate();
 		s.createQuery(
-				"update Human h set h.bodyWeight = h.bodyWeight + (select count(1) from IntegerVersioned) where h.description = 'abc'" )
+				"update Human h set h.bodyWeight = h.bodyWeight + (select count(*) from IntegerVersioned) where h.description = 'abc'" )
 				.executeUpdate();
 
 		s.getTransaction().commit();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableInheritance.java
@@ -87,12 +87,12 @@ public void testBatchingAmongstSubClasses() {
 
 		sessionFactoryScope().inTransaction( (session) -> {
 			final Long specialPersonCount = session
-					.createSelectionQuery( "select count(1) from SpecialPerson", Long.class )
+					.createSelectionQuery( "select count(*) from SpecialPerson", Long.class )
 					.getSingleResult();
 			assertThat( specialPersonCount ).isEqualTo( 12L );
 
 			final Long addressCount = session
-					.createSelectionQuery( "select count(1) from Address", Long.class )
+					.createSelectionQuery( "select count(*) from Address", Long.class )
 					.getSingleResult();
 			assertThat( addressCount ).isEqualTo( 24L );
 		} );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java b/hibernate-core/src/test/java/org/hibernate/orm/test/insertordering/InsertOrderingWithJoinedTableMultiLevelInheritance.java
@@ -91,22 +91,22 @@ public void testBatchingAmongstSubClasses() {
 			// 1 AnotherPerson per loop (2)
 			// 1 President per loop (2)
 			final Long addressCount = session
-					.createSelectionQuery( "select count(1) from Address", Long.class )
+					.createSelectionQuery( "select count(*) from Address", Long.class )
 					.getSingleResult();
 			assertThat( addressCount ).isEqualTo( 4L );
 
 			final Long officeCount = session
-					.createSelectionQuery( "select count(1) from Office", Long.class )
+					.createSelectionQuery( "select count(*) from Office", Long.class )
 					.getSingleResult();
 			assertThat( officeCount ).isEqualTo( 2L );
 
 			final Long presidentCount = session
-					.createSelectionQuery( "select count(1) from President", Long.class )
+					.createSelectionQuery( "select count(*) from President", Long.class )
 					.getSingleResult();
 			assertThat( presidentCount ).isEqualTo( 2L );
 
 			final Long anotherPersonCount = session
-					.createSelectionQuery( "select count(1) from AnotherPerson", Long.class )
+					.createSelectionQuery( "select count(*) from AnotherPerson", Long.class )
 					.getSingleResult();
 			assertThat( presidentCount ).isEqualTo( 2L );
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BooleanMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BooleanMappingTests.java
@@ -315,7 +315,7 @@ public void testNegatedCriteriaUsage(SessionFactoryScope scope) {
 	private int countByCriteria(String attributeName, boolean matchValue, SessionImplementor session) {
 		final HibernateCriteriaBuilder builder = session.getCriteriaBuilder();
 		final JpaCriteriaQuery<Long> criteria = builder.createQuery( Long.class );
-		criteria.select( builder.count( builder.literal( 1 ) ) );
+		criteria.select( builder.count( builder.literal( "*" ) ) );
 		final JpaRoot<EntityOfBooleans> root = criteria.from( EntityOfBooleans.class );
 		final JpaPath<Boolean> convertedYesNo = root.get( attributeName );
 		if ( matchValue ) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableCompositeIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableCompositeIdTest.java
@@ -132,7 +132,7 @@ private void dropTestData(SessionFactoryScope scope) {
 			session.createQuery( "from Author", Author.class ).list().forEach( session::remove );
 		} );
 		scope.inTransaction( (session) -> {
-			final Long bookCount = session.createSelectionQuery( "select count(1) from Book", Long.class ).uniqueResult();
+			final Long bookCount = session.createSelectionQuery( "select count(*) from Book", Long.class ).uniqueResult();
 			assertThat( bookCount ).isEqualTo( 0L );
 		} );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableSimpleIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/manytoone/jointable/InverseManyToOneJoinTableSimpleIdTest.java
@@ -106,7 +106,7 @@ private void dropTestData(SessionFactoryScope scope) {
 			session.createQuery( "from Author", Author.class ).list().forEach( session::remove );
 		} );
 		scope.inTransaction( (session) -> {
-			final Long bookCount = session.createSelectionQuery( "select count(1) from Book", Long.class ).uniqueResult();
+			final Long bookCount = session.createSelectionQuery( "select count(*) from Book", Long.class ).uniqueResult();
 			assertThat( bookCount ).isEqualTo( 0L );
 		} );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/GroupByTest.java
@@ -48,7 +48,7 @@ public void testGroupByAliasedBasicPart(SessionFactoryScope scope) {
 		sqlStatementInspector.clear();
 
 		scope.inSession( (session) -> {
-			final String qryString = "select c.id as id_alias, count(1) as occurrences"
+			final String qryString = "select c.id as id_alias, count(*) as occurrences"
 					+ " from Contact c"
 					+ " group by id_alias"
 					+ " order by id_alias";
@@ -69,7 +69,7 @@ public void testGroupByAliasedCompositePart(SessionFactoryScope scope) {
 		sqlStatementInspector.clear();
 
 		scope.inTransaction( (session) -> {
-			final String qryString = "select c.name as name_alias, count(1) as occurrences"
+			final String qryString = "select c.name as name_alias, count(*) as occurrences"
 					+ " from Contact c"
 					+ " group by name_alias"
 					+ " order by name_alias";
@@ -94,7 +94,7 @@ public void testGroupByMultipleAliases(SessionFactoryScope scope) {
 		sqlStatementInspector.clear();
 
 		scope.inTransaction( (session) -> {
-			final String qryString = "select c.id as id_alias, c.gender as gender_alias, count(1) as occurrences"
+			final String qryString = "select c.id as id_alias, c.gender as gender_alias, count(*) as occurrences"
 					+ " from Contact c"
 					+ " group by id_alias, gender_alias"
 					+ " order by id_alias, gender_alias";
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/StandardFunctionTests.java
@@ -893,6 +893,15 @@ public void testSimpleCountFunctions(SessionFactoryScope scope) {
 				session -> {
 					session.createQuery("select count(*) from EntityOfBasics e")
 							.list();
+				}
+		);
+	}
+
+	@Test
+	@SkipForDialect( dialectClass = InformixDialect.class, majorVersion = 11, minorVersion = 50, reason = "Informix does not support count(1) function")
+	public void testSimpleCount1Functions(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
 					session.createQuery("select count(1) from EntityOfBasics e")
 							.list();
 				}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/SecondaryRowTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/secondarytable/SecondaryRowTest.java
@@ -83,7 +83,7 @@ private static void verifySecondaryRows(String table, int expectedCount, Session
 	}
 
 	private static void verifySecondaryRows(String table, int expectedCount, SessionImplementor session) {
-		final String sql = "select count(1) from " + table;
+		final String sql = "select count(*) from " + table;
 		final int count = (int) session.createNativeQuery( sql, Integer.class ).getSingleResult();
 		assertThat( count ).isEqualTo( expectedCount );
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/ImplicitSoftDeleteTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/softdelete/ImplicitSoftDeleteTests.java
@@ -52,7 +52,7 @@ void createTestData(SessionFactoryScope scope) {
 			// make sure all 3 are still physically there
 			session.doWork( (connection) -> {
 				final Statement statement = connection.createStatement();
-				final ResultSet resultSet = statement.executeQuery( "select count(1) from implicit_entities" );
+				final ResultSet resultSet = statement.executeQuery( "select count(*) from implicit_entities" );
 				resultSet.next();
 				final int count = resultSet.getInt( 1 );
 				assertThat( count ).isEqualTo( 3 );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/ParameterMarkerStrategyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/ParameterMarkerStrategyTests.java
@@ -132,7 +132,7 @@ public void testNativeQuery(SessionFactoryScope scope) {
 
 		statementInspector.clear();
 		scope.inTransaction( (session) -> {
-			session.createNativeQuery( "select count(1) from filtered_entity e where e.region = :region" )
+			session.createNativeQuery( "select count(*) from filtered_entity e where e.region = :region" )
 					.setParameter( "region", "ABC" )
 					.uniqueResult();
 
@@ -143,7 +143,7 @@ public void testNativeQuery(SessionFactoryScope scope) {
 
 		statementInspector.clear();
 		scope.inTransaction( (session) -> {
-			session.createNativeQuery( "select count(1) from filtered_entity e where e.region in (:region)" )
+			session.createNativeQuery( "select count(*) from filtered_entity e where e.region in (:region)" )
 					.setParameterList( "region", List.of( "ABC", "DEF" ) )
 					.uniqueResult();
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/OptionalTableUpdateTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/OptionalTableUpdateTests.java
@@ -43,7 +43,7 @@ void testUpsertInsert(SessionFactoryScope scope) {
 
 
 	private static void verifySecondaryRows(String table, int expectedCount, SessionFactoryScope sfScope) {
-		final String sql = "select count(1) from " + table;
+		final String sql = "select count(*) from " + table;
 		sfScope.inTransaction( (session) -> {
 			final int count = (int) session.createNativeQuery( sql, Integer.class ).getSingleResult();
 			assertThat( count ).isEqualTo( expectedCount );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableStaticInsertTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableStaticInsertTests.java
@@ -74,7 +74,7 @@ public void verify(SessionFactoryScope scope, int expectedPrepCount) {
 
 		scope.inTransaction( (session) -> {
 			final Long count = session
-					.createSelectionQuery( "select count(1) from SimpleEntity", Long.class )
+					.createSelectionQuery( "select count(*) from SimpleEntity", Long.class )
 					.getSingleResult();
 			assertThat( count ).isEqualTo( 3L );
 		} );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableWithSecondaryTableStaticInsertTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/write/staticinsert/SingleTableWithSecondaryTableStaticInsertTests.java
@@ -81,7 +81,7 @@ private void verify(SessionFactoryScope scope, int expectedPrepCount) {
 
 		scope.inTransaction( (session) -> {
 			final Long count = session
-					.createSelectionQuery( "select count(1) from Vendor", Long.class )
+					.createSelectionQuery( "select count(*) from Vendor", Long.class )
 					.getSingleResult();
 
 			assertThat( count ).isEqualTo( 2 );

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ private void dropTestData(SessionFactoryScope scope) {`
`132`	`132`	`session.createQuery( "from Author", Author.class ).list().forEach( session::remove );`
`133`	`133`	`} );`
`134`	`134`	`scope.inTransaction( (session) -> {`
`135`		`- final Long bookCount = session.createSelectionQuery( "select count(1) from Book", Long.class ).uniqueResult();`
	`135`	`+ final Long bookCount = session.createSelectionQuery( "select count(*) from Book", Long.class ).uniqueResult();`
`136`	`136`	`assertThat( bookCount ).isEqualTo( 0L );`
`137`	`137`	`} );`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ private void dropTestData(SessionFactoryScope scope) {`
`106`	`106`	`session.createQuery( "from Author", Author.class ).list().forEach( session::remove );`
`107`	`107`	`} );`
`108`	`108`	`scope.inTransaction( (session) -> {`
`109`		`- final Long bookCount = session.createSelectionQuery( "select count(1) from Book", Long.class ).uniqueResult();`
	`109`	`+ final Long bookCount = session.createSelectionQuery( "select count(*) from Book", Long.class ).uniqueResult();`
`110`	`110`	`assertThat( bookCount ).isEqualTo( 0L );`
`111`	`111`	`} );`
`112`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ private static void verifySecondaryRows(String table, int expectedCount, Session`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`private static void verifySecondaryRows(String table, int expectedCount, SessionImplementor session) {`
`86`		`- final String sql = "select count(1) from " + table;`
	`86`	`+ final String sql = "select count(*) from " + table;`
`87`	`87`	`final int count = (int) session.createNativeQuery( sql, Integer.class ).getSingleResult();`
`88`	`88`	`assertThat( count ).isEqualTo( expectedCount );`
`89`	`89`	`}`