HHH-16454 PostgreSQL ILIKE Keyword is considered a column name when d…

…educing alias injection points
hibernate · Feb 8, 2024 · 6057d99 · 6057d99
1 parent a2d3315
commit 6057d99
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/...ate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java b/...ate-community-dialects/src/main/java/org/hibernate/community/dialect/H2LegacyDialect.java
@@ -940,4 +940,19 @@ public String rowId(String rowId) {
 	public int rowIdSqlType() {
 		return BIGINT;
 	}
+
+	@Override
+	public String getCaseInsensitiveLike() {
+		if ( getVersion().isSameOrAfter( 1, 4, 194 ) ) {
+			return "ilike";
+		}
+		else {
+			return super.getCaseInsensitiveLike();
+		}
+	}
+
+	@Override
+	public boolean supportsCaseInsensitiveLike() {
+		return getVersion().isSameOrAfter( 1, 4, 194 );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java
@@ -935,4 +935,15 @@ public String createMarker(int position, JdbcType jdbcType) {
 			return "?" + position;
 		}
 	}
+
+	@Override
+	public String getCaseInsensitiveLike() {
+		return "ilike";
+	}
+
+	@Override
+	public boolean supportsCaseInsensitiveLike(){
+		return true;
+	}
+
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
@@ -153,6 +153,7 @@ public PostgreSQLDialect() {
 
 	public PostgreSQLDialect(DialectResolutionInfo info) {
 		this( info, PostgreSQLDriverKind.determineKind( info ) );
+		registerKeywords( info );
 	}
 
 	public PostgreSQLDialect(DatabaseVersion version) {