Fix bad merge

Author: jdaugherty

grails-data-hibernate5/dbmigration/build.gradle

@@ -79,7 +79,6 @@ dependencies {
 
     // Liquibase uses JUL for logging -> redirect it to SLF4J to reliably capture its output
     testRuntimeOnly 'org.slf4j:jul-to-slf4j'
-    testRuntimeOnly 'org.slf4j:slf4j-simple'
 }
 
 tasks.named('test', Test) {

grails-test-examples/hibernate5/criteria-extension/src/main/groovy/example/extensions/CriteriaBuilderExtensions.groovy

@@ -20,10 +20,10 @@
 package example.extensions
 
 import groovy.transform.CompileStatic
-import grails.gorm.CriteriaBuilder
+import org.grails.datastore.mapping.query.api.Criteria
 
 /**
- * Groovy extension module methods added to CriteriaBuilder.
+ * Groovy extension module methods added to Criteria.
  *
  * Registered via META-INF/groovy/org.codehaus.groovy.runtime.ExtensionModule.
  */
@@ -40,7 +40,7 @@ class CriteriaBuilderExtensions {
      * @param value     the candidate value; null or blank strings are ignored
      * @param trim      whether to trim String values before the null check (default true)
      */
-    static void eqIf(CriteriaBuilder self, String attribute, Object value, boolean trim = true) {
+    static void eqIf(Criteria self, String attribute, Object value, boolean trim = true) {
         Object sanitized = sanitize(value, trim)
         if (sanitized != null) {
             self.eq attribute, sanitized

grails-test-examples/hibernate5/criteria-extension/src/test/groovy/example/NumberLikeExpressionSpec.groovy

@@ -54,11 +54,11 @@ class NumberLikeExpressionSpec extends Specification {
 
         where:
         value       || expectedSql
-        '100'       || "trim(to_char(trunc(price_col,0), '999999999999999999999999990')) like ?"
-        '99.9'      || "trim(to_char(trunc(price_col,1), '999999999999999999999999990.9')) like ?"
-        '99.99'     || "trim(to_char(trunc(price_col,2), '999999999999999999999999990.99')) like ?"
-        '1%'        || "trim(to_char(trunc(price_col,0), '999999999999999999999999990')) like ?"
-        '9.9%'      || "trim(to_char(trunc(price_col,1), '999999999999999999999999990.9')) like ?"
+        '100'       || 'cast(price_col as varchar) like ?'
+        '99.9'      || 'cast(price_col as varchar) like ?'
+        '99.99'     || 'cast(price_col as varchar) like ?'
+        '1%'        || 'cast(price_col as varchar) like ?'
+        '9.9%'      || 'cast(price_col as varchar) like ?'
     }
 
     void "toSqlString strips commas from value in constructor"() {
@@ -70,7 +70,7 @@ class NumberLikeExpressionSpec extends Specification {
         String sql = expr.toSqlString(criteria, criteriaQuery)
 
         then:
-        sql == "trim(to_char(trunc(price_col,2), '999999999999999999999999990.99')) like ?"
+        sql == 'cast(price_col as varchar) like ?'
     }
 
     void "toSqlString throws HibernateException for multi-column properties"() {