Skip to content

Commit d5893dc

Browse files
toburgertoburger
committed
Fix places where the parameterPlaceholder is hardcoded to a ? 
1 parent e0430a3 commit d5893dc

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

‎QueryBuilder/Compilers/Compiler.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ protected virtual SqlResult CompileRaw(Query query)
127127
ctx = CompileCteQuery(ctx, query);
128128
}
129129

130-
ctx.RawSql = Helper.ExpandParameters(ctx.RawSql, "?", ctx.Bindings.ToArray());
130+
ctx.RawSql = Helper.ExpandParameters(ctx.RawSql, parameterPlaceholder, ctx.Bindings.ToArray());
131131

132132
return ctx;
133133
}
@@ -214,7 +214,7 @@ protected virtual SqlResult CompileAdHocQuery(AdHocTableFromClause adHoc)
214214
{
215215
var ctx = new SqlResult();
216216

217-
var row = "SELECT " + string.Join(", ", adHoc.Columns.Select(col => $"? AS {Wrap(col)}"));
217+
var row = "SELECT " + string.Join(", ", adHoc.Columns.Select(col => $"{parameterPlaceholder} AS {Wrap(col)}"));
218218

219219
var fromTable = SingleRowDummyTableName;
220220

@@ -780,19 +780,19 @@ public virtual string CompileLimit(SqlResult ctx)
780780
if (offset == 0)
781781
{
782782
ctx.Bindings.Add(limit);
783-
return "LIMIT ?";
783+
return $"LIMIT {parameterPlaceholder}";
784784
}
785785

786786
if (limit == 0)
787787
{
788788
ctx.Bindings.Add(offset);
789-
return "OFFSET ?";
789+
return $"OFFSET {parameterPlaceholder}";
790790
}
791791

792792
ctx.Bindings.Add(limit);
793793
ctx.Bindings.Add(offset);
794794

795-
return "LIMIT ? OFFSET ?";
795+
return $"LIMIT {parameterPlaceholder} OFFSET {parameterPlaceholder}";
796796
}
797797

798798
/// <summary>
@@ -935,11 +935,11 @@ public virtual string Parameter(SqlResult ctx, object parameter)
935935
{
936936
var value = ctx.Query.FindVariable(variable.Name);
937937
ctx.Bindings.Add(value);
938-
return "?";
938+
return parameterPlaceholder;
939939
}
940940

941941
ctx.Bindings.Add(parameter);
942-
return "?";
942+
return parameterPlaceholder;
943943
}
944944

945945
/// <summary>

‎QueryBuilder/Compilers/MySqlCompiler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public override string CompileLimit(SqlResult ctx)
2424
if (offset == 0)
2525
{
2626
ctx.Bindings.Add(limit);
27-
return "LIMIT ?";
27+
return $"LIMIT {parameterPlaceholder}";
2828
}
2929

3030
if (limit == 0)
@@ -34,15 +34,15 @@ public override string CompileLimit(SqlResult ctx)
3434
// to avoid this error.
3535

3636
ctx.Bindings.Add(offset);
37-
return "LIMIT 18446744073709551615 OFFSET ?";
37+
return $"LIMIT 18446744073709551615 OFFSET {parameterPlaceholder}";
3838
}
3939

4040
// We have both values
4141

4242
ctx.Bindings.Add(limit);
4343
ctx.Bindings.Add(offset);
4444

45-
return "LIMIT ? OFFSET ?";
45+
return $"LIMIT {parameterPlaceholder} OFFSET {parameterPlaceholder}";
4646

4747
}
4848
}

‎QueryBuilder/Compilers/OracleCompiler.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ public override string CompileLimit(SqlResult ctx)
5858
if (limit == 0)
5959
{
6060
ctx.Bindings.Add(offset);
61-
return $"{safeOrder}OFFSET ? ROWS";
61+
return $"{safeOrder}OFFSET {parameterPlaceholder} ROWS";
6262
}
6363

6464
ctx.Bindings.Add(offset);
6565
ctx.Bindings.Add(limit);
6666

67-
return $"{safeOrder}OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
67+
return $"{safeOrder}OFFSET {parameterPlaceholder} ROWS FETCH NEXT {parameterPlaceholder} ROWS ONLY";
6868
}
6969

7070
internal void ApplyLegacyLimit(SqlResult ctx)
@@ -80,17 +80,17 @@ internal void ApplyLegacyLimit(SqlResult ctx)
8080
string newSql;
8181
if (limit == 0)
8282
{
83-
newSql = $"SELECT * FROM (SELECT \"results_wrapper\".*, ROWNUM \"row_num\" FROM ({ctx.RawSql}) \"results_wrapper\") WHERE \"row_num\" > ?";
83+
newSql = $"SELECT * FROM (SELECT \"results_wrapper\".*, ROWNUM \"row_num\" FROM ({ctx.RawSql}) \"results_wrapper\") WHERE \"row_num\" > {parameterPlaceholder}";
8484
ctx.Bindings.Add(offset);
8585
}
8686
else if (offset == 0)
8787
{
88-
newSql = $"SELECT * FROM ({ctx.RawSql}) WHERE ROWNUM <= ?";
88+
newSql = $"SELECT * FROM ({ctx.RawSql}) WHERE ROWNUM <= {parameterPlaceholder}";
8989
ctx.Bindings.Add(limit);
9090
}
9191
else
9292
{
93-
newSql = $"SELECT * FROM (SELECT \"results_wrapper\".*, ROWNUM \"row_num\" FROM ({ctx.RawSql}) \"results_wrapper\" WHERE ROWNUM <= ?) WHERE \"row_num\" > ?";
93+
newSql = $"SELECT * FROM (SELECT \"results_wrapper\".*, ROWNUM \"row_num\" FROM ({ctx.RawSql}) \"results_wrapper\" WHERE ROWNUM <= {parameterPlaceholder}) WHERE \"row_num\" > {parameterPlaceholder}";
9494
ctx.Bindings.Add(limit + offset);
9595
ctx.Bindings.Add(offset);
9696
}

‎QueryBuilder/Compilers/SqlServerCompiler.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ protected override SqlResult CompileSelectQuery(Query query)
4848

4949
if (limit == 0)
5050
{
51-
result.RawSql = $"SELECT * FROM ({result.RawSql}) AS [results_wrapper] WHERE [row_num] >= ?";
51+
result.RawSql = $"SELECT * FROM ({result.RawSql}) AS [results_wrapper] WHERE [row_num] >= {parameterPlaceholder}";
5252
result.Bindings.Add(offset + 1);
5353
}
5454
else
5555
{
56-
result.RawSql = $"SELECT * FROM ({result.RawSql}) AS [results_wrapper] WHERE [row_num] BETWEEN ? AND ?";
56+
result.RawSql = $"SELECT * FROM ({result.RawSql}) AS [results_wrapper] WHERE [row_num] BETWEEN {parameterPlaceholder} AND {parameterPlaceholder}";
5757
result.Bindings.Add(offset + 1);
5858
result.Bindings.Add(limit + offset);
5959
}
@@ -86,10 +86,10 @@ protected override string CompileColumns(SqlResult ctx)
8686
// handle distinct
8787
if (compiled.IndexOf("SELECT DISTINCT") == 0)
8888
{
89-
return "SELECT DISTINCT TOP (?)" + compiled.Substring(15);
89+
return $"SELECT DISTINCT TOP ({parameterPlaceholder}){compiled.Substring(15)}";
9090
}
9191

92-
return "SELECT TOP (?)" + compiled.Substring(6);
92+
return $"SELECT TOP ({parameterPlaceholder}){compiled.Substring(6)}";
9393
}
9494

9595
return compiled;
@@ -121,13 +121,13 @@ public override string CompileLimit(SqlResult ctx)
121121
if (limit == 0)
122122
{
123123
ctx.Bindings.Add(offset);
124-
return $"{safeOrder}OFFSET ? ROWS";
124+
return $"{safeOrder}OFFSET {parameterPlaceholder} ROWS";
125125
}
126126

127127
ctx.Bindings.Add(offset);
128128
ctx.Bindings.Add(limit);
129129

130-
return $"{safeOrder}OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
130+
return $"{safeOrder}OFFSET {parameterPlaceholder} ROWS FETCH NEXT {parameterPlaceholder} ROWS ONLY";
131131
}
132132

133133
public override string CompileRandom(string seed)
@@ -177,7 +177,7 @@ protected override SqlResult CompileAdHocQuery(AdHocTableFromClause adHoc)
177177

178178
var colNames = string.Join(", ", adHoc.Columns.Select(Wrap));
179179

180-
var valueRow = string.Join(", ", Enumerable.Repeat("?", adHoc.Columns.Count));
180+
var valueRow = string.Join(", ", Enumerable.Repeat(parameterPlaceholder, adHoc.Columns.Count));
181181
var valueRows = string.Join(", ", Enumerable.Repeat($"({valueRow})", adHoc.Values.Count / adHoc.Columns.Count));
182182
var sql = $"SELECT {colNames} FROM (VALUES {valueRows}) AS tbl ({colNames})";
183183

0 commit comments

Comments
 (0)