Change the way like expressions work

- Add `LikeExpression` to `ISqlBuilder` - Remove `lower()` from startswith/endswith/contains-expressions since that doesn't work well with indexed columns - Use `ilike` for Postgres to make like queries case-insensitive - Bump package version to 3.0 as it's a breaking change
henkmollema · Dec 21, 2021 · bf98b3b · bf98b3b
1 parent fc56abd
commit bf98b3b
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 20 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Copyright>Copyright © Henk Mollema 2014</Copyright>
-    <VersionPrefix>2.4.0</VersionPrefix>
+    <VersionPrefix>3.0.0</VersionPrefix>
     <Authors>Henk Mollema</Authors>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>

diff --git a/src/Dommel/ISqlBuilder.cs b/src/Dommel/ISqlBuilder.cs
@@ -41,9 +41,17 @@ public interface ISqlBuilder
     string QuoteIdentifier(string identifier);
 
     /// <summary>
-    /// Adds a limit clause to query.
+    /// Returns a limit clause for the specified <paramref name="count"/>.
     /// </summary>
     /// <param name="count">The count of limit clause.</param>
     /// <returns>A limit clause of the specified count.</returns>
     string LimitClause(int count);
+
+    /// <summary>
+    /// Returns a like-expresion for the specified <paramref name="columnName"/> and <paramref name="parameterName"/>.
+    /// </summary>
+    /// <param name="columnName">The column name of the like-expression.</param>
+    /// <param name="parameterName">The parameter name of the like-expression.</param>
+    /// <returns>A like-expression.</returns>
+    string LikeExpression(string columnName, string parameterName);
 }
diff --git a/src/Dommel/MySqlSqlBuilder.cs b/src/Dommel/MySqlSqlBuilder.cs
@@ -26,4 +26,7 @@ public virtual string BuildPaging(string? orderBy, int pageNumber, int pageSize)
 
     /// <inheritdoc/>
     public string LimitClause(int count) => $"limit {count}";
+
+    /// <inheritdoc/>
+    public string LikeExpression(string columnName, string parameterName) => $"{columnName} like {parameterName}";
 }
diff --git a/src/Dommel/PostgresSqlBuilder.cs b/src/Dommel/PostgresSqlBuilder.cs
@@ -42,4 +42,7 @@ public virtual string BuildPaging(string? orderBy, int pageNumber, int pageSize)
 
     /// <inheritdoc/>
     public string LimitClause(int count) => $"limit {count}";
+
+    /// <inheritdoc/>
+    public string LikeExpression(string columnName, string parameterName) => $"{columnName} ilike {parameterName}";
 }
diff --git a/src/Dommel/SqlExpression.cs b/src/Dommel/SqlExpression.cs
@@ -393,8 +393,7 @@ protected virtual object VisitContainsExpression(MethodCallExpression expression
         };
         AddParameter(textLike, out var paramName);
 
-        // Use lower() to make the queries case-insensitive
-        return $"lower({column}) like lower({paramName})";
+        return SqlBuilder.LikeExpression(column.ToString(), paramName);
     }
 
     /// <summary>

diff --git a/src/Dommel/SqlServerCeSqlBuilder.cs b/src/Dommel/SqlServerCeSqlBuilder.cs
@@ -26,4 +26,7 @@ public virtual string BuildPaging(string? orderBy, int pageNumber, int pageSize)
 
     /// <inheritdoc/>
     public string LimitClause(int count) => $"order by 1 offset 0 rows fetch next {count} rows only";
+
+    /// <inheritdoc/>
+    public string LikeExpression(string columnName, string parameterName) => $"{columnName} like {parameterName}";
 }
diff --git a/src/Dommel/SqlServerSqlBuilder.cs b/src/Dommel/SqlServerSqlBuilder.cs
@@ -26,4 +26,7 @@ public virtual string BuildPaging(string? orderBy, int pageNumber, int pageSize)
 
     /// <inheritdoc/>
     public string LimitClause(int count) => $"order by 1 offset 0 rows fetch next {count} rows only";
+
+    /// <inheritdoc/>
+    public string LikeExpression(string columnName, string parameterName) => $"{columnName} like {parameterName}";
 }
diff --git a/src/Dommel/SqliteSqlBuilder.cs b/src/Dommel/SqliteSqlBuilder.cs
@@ -26,4 +26,7 @@ public virtual string BuildPaging(string? orderBy, int pageNumber, int pageSize)
 
     /// <inheritdoc/>
     public string LimitClause(int count) => $"limit {count}";
+
+    /// <inheritdoc/>
+    public string LikeExpression(string columnName, string parameterName) => $"{columnName} like {parameterName}";
 }
diff --git a/test/Dommel.Json.IntegrationTests/Infrastructure/JsonDatabaseTestData.cs b/test/Dommel.Json.IntegrationTests/Infrastructure/JsonDatabaseTestData.cs
@@ -12,10 +12,10 @@ public JsonDatabaseTestData()
         // DatabaseFixture as well.
         if (!CI.IsTravis)
         {
-            //Add(new JsonSqlServerDatabaseDriver());
+            Add(new JsonSqlServerDatabaseDriver());
         }
 
         Add(new JsonMySqlDatabaseDriver());
-        //Add(new JsonPostgresDatabaseDriver());
+        Add(new JsonPostgresDatabaseDriver());
     }
 }
diff --git a/test/Dommel.Json.Tests/LikeTests.cs b/test/Dommel.Json.Tests/LikeTests.cs
@@ -16,7 +16,7 @@ public void LikeOperandContains_WithConstant()
         var sql = expression.ToSql(out var dynamicParameters);
 
         // Assert
-        Assert.Equal("where (lower(`Leads`.`Data`->'$.FirstName') like lower(@p1))", sql.Trim());
+        Assert.Equal("where (`Leads`.`Data`->'$.FirstName' like @p1)", sql.Trim());
         Assert.Single(dynamicParameters.ParameterNames);
         Assert.Equal("%test%", dynamicParameters.Get<string>("p1"));
     }
@@ -33,7 +33,7 @@ public void LikeOperand_WithVariable()
         var sql = expression.ToSql(out var dynamicParameters);
 
         // Assert
-        Assert.Equal("where (lower(`Leads`.`Data`->'$.FirstName') like lower(@p1))", sql.Trim());
+        Assert.Equal("where (`Leads`.`Data`->'$.FirstName' like @p1)", sql.Trim());
         Assert.Single(dynamicParameters.ParameterNames);
         Assert.Equal("%test%", dynamicParameters.Get<string>("p1"));
     }
@@ -49,7 +49,7 @@ public void LikeOperandStartsWith_WithConstant()
         var sql = expression.ToSql(out var dynamicParameters);
 
         // Assert
-        Assert.Equal("where (lower(`Leads`.`Data`->'$.FirstName') like lower(@p1))", sql.Trim());
+        Assert.Equal("where (`Leads`.`Data`->'$.FirstName' like @p1)", sql.Trim());
         Assert.Single(dynamicParameters.ParameterNames);
         Assert.Equal("test%", dynamicParameters.Get<string>("p1"));
     }
@@ -66,7 +66,7 @@ public void LikeOperandStartsWith_WithVariable()
         var sql = expression.ToSql(out var dynamicParameters);
 
         // Assert
-        Assert.Equal("where (lower(`Leads`.`Data`->'$.FirstName') like lower(@p1))", sql.Trim());
+        Assert.Equal("where (`Leads`.`Data`->'$.FirstName' like @p1)", sql.Trim());
         Assert.Single(dynamicParameters.ParameterNames);
         Assert.Equal("test%", dynamicParameters.Get<string>("p1"));
     }
@@ -82,7 +82,7 @@ public void LikeOperandEndsWith_WithConstant()
         var sql = expression.ToSql(out var dynamicParameters);
 
         // Assert
-        Assert.Equal("where (lower(`Leads`.`Data`->'$.FirstName') like lower(@p1))", sql.Trim());
+        Assert.Equal("where (`Leads`.`Data`->'$.FirstName' like @p1)", sql.Trim());
         Assert.Single(dynamicParameters.ParameterNames);
         Assert.Equal("%test", dynamicParameters.Get<string>("p1"));
     }
@@ -99,7 +99,7 @@ public void LikeOperandEndsWith_WithVariable()
         var sql = expression.ToSql(out var dynamicParameters);
 
         // Assert
-        Assert.Equal("where (lower(`Leads`.`Data`->'$.FirstName') like lower(@p1))", sql.Trim());
+        Assert.Equal("where (`Leads`.`Data`->'$.FirstName' like @p1)", sql.Trim());
         Assert.Single(dynamicParameters.ParameterNames);
         Assert.Equal("%test", dynamicParameters.Get<string>("p1"));
     }

diff --git a/test/Dommel.Tests/DummySqlBuilder.cs b/test/Dommel.Tests/DummySqlBuilder.cs
@@ -23,4 +23,7 @@ public string BuildPaging(string? orderBy, int pageNumber, int pageSize)
 
     /// <inheritdoc/>
     public string LimitClause(int count) => $"limit {count}";
+
+    /// <inheritdoc/>
+    public string LikeExpression(string columnName, string parameterName) => $"{columnName} like {parameterName}";
 }
diff --git a/test/Dommel.Tests/SqlExpressions/DynamicExpressionTests.cs b/test/Dommel.Tests/SqlExpressions/DynamicExpressionTests.cs
@@ -18,7 +18,7 @@ public void CommonAndExpression()
         var dommelExpression = _sqlExpression.Where(p => p.Id == 1 && p.Bar.Contains("test"));
         var sql = dommelExpression.ToSql(out var dynamicParameters);
 
-        Assert.Equal("where ([tblFoo].[Id] = @p1 and lower([tblFoo].[Bar]) like lower(@p2))", sql.Trim());
+        Assert.Equal("where ([tblFoo].[Id] = @p1 and [tblFoo].[Bar] like @p2)", sql.Trim());
         Assert.Equal(1, dynamicParameters.Get<int>("p1"));
         Assert.Equal("%test%", dynamicParameters.Get<string>("p2"));
     }
@@ -32,7 +32,7 @@ public void AndExpression()
         var dommelExpression = _sqlExpression.Where(expression);
         var sql = dommelExpression.ToSql(out var dynamicParameters);
 
-        Assert.Equal("where ([tblFoo].[Id] = @p1 and lower([tblFoo].[Bar]) like lower(@p2))", sql.Trim());
+        Assert.Equal("where ([tblFoo].[Id] = @p1 and [tblFoo].[Bar] like @p2)", sql.Trim());
         Assert.Equal(1, dynamicParameters.Get<int>("p1"));
         Assert.Equal("%test%", dynamicParameters.Get<string>("p2"));
     }
@@ -43,7 +43,7 @@ public void CommonOrExpression()
         var dommelExpression = _sqlExpression.Where(p => p.Id == 1 || p.Bar.Contains("testOr"));
         var sql = dommelExpression.ToSql(out var dynamicParameters);
 
-        Assert.Equal("where ([tblFoo].[Id] = @p1 or lower([tblFoo].[Bar]) like lower(@p2))", sql.Trim());
+        Assert.Equal("where ([tblFoo].[Id] = @p1 or [tblFoo].[Bar] like @p2)", sql.Trim());
         Assert.Equal(1, dynamicParameters.Get<int>("p1"));
         Assert.Equal("%testOr%", dynamicParameters.Get<string>("p2"));
     }
@@ -79,7 +79,7 @@ public void InExpression()
         var dommelExpression = _sqlExpression.Where(expression);
         var sql = dommelExpression.ToSql(out var dynamicParameters);
 
-        Assert.Equal("where ([tblFoo].[Id] in (@p1,@p2) or [tblFoo].[StringId] in (@p3,@p4) or [tblFoo].[DecimalId] in (@p5,@p6) or [tblFoo].[Guid] in (@p7,@p8) or lower([tblFoo].[Bar]) like lower(@p9))", sql.Trim());
+        Assert.Equal("where ([tblFoo].[Id] in (@p1,@p2) or [tblFoo].[StringId] in (@p3,@p4) or [tblFoo].[DecimalId] in (@p5,@p6) or [tblFoo].[Guid] in (@p7,@p8) or [tblFoo].[Bar] like @p9)", sql.Trim());
         Assert.Equal(1, dynamicParameters.Get<int>("p1"));
         Assert.Equal(2, dynamicParameters.Get<int>("p2"));
         Assert.Equal("1", dynamicParameters.Get<string>("p3"));

diff --git a/test/Dommel.Tests/SqlExpressions/LikeTests.cs b/test/Dommel.Tests/SqlExpressions/LikeTests.cs
@@ -16,7 +16,7 @@ public void LikeOperandContains()
         var sql = expression.ToSql(out var dynamicParameters);
 
         // Assert
-        Assert.Equal("where (lower([tblFoo].[Bar]) like lower(@p1))", sql.Trim());
+        Assert.Equal("where ([tblFoo].[Bar] like @p1)", sql.Trim());
         Assert.Single(dynamicParameters.ParameterNames);
         Assert.Equal("%test%", dynamicParameters.Get<string>("p1"));
     }
@@ -33,7 +33,7 @@ public void LikeOperandContainsVariable()
         var sql = expression.ToSql(out var dynamicParameters);
 
         // Assert
-        Assert.Equal("where (lower([tblFoo].[Bar]) like lower(@p1))", sql.Trim());
+        Assert.Equal("where ([tblFoo].[Bar] like @p1)", sql.Trim());
         Assert.Single(dynamicParameters.ParameterNames);
         Assert.Equal("%test%", dynamicParameters.Get<string>("p1"));
     }
@@ -49,7 +49,7 @@ public void LikeOperandStartsWith()
         var sql = expression.ToSql(out var dynamicParameters);
 
         // Assert
-        Assert.Equal("where (lower([tblFoo].[Bar]) like lower(@p1))", sql.Trim());
+        Assert.Equal("where ([tblFoo].[Bar] like @p1)", sql.Trim());
         Assert.Single(dynamicParameters.ParameterNames);
         Assert.Equal("test%", dynamicParameters.Get<string>("p1"));
     }
@@ -65,7 +65,7 @@ public void LikeOperandEndsWith()
         var sql = expression.ToSql(out var dynamicParameters);
 
         // Assert
-        Assert.Equal("where (lower([tblFoo].[Bar]) like lower(@p1))", sql.Trim());
+        Assert.Equal("where ([tblFoo].[Bar] like @p1)", sql.Trim());
         Assert.Single(dynamicParameters.ParameterNames);
         Assert.Equal("%test", dynamicParameters.Get<string>("p1"));
     }