Commit 99e6b963 authored by Marc Gravell's avatar Marc Gravell Committed by GitHub

Merge pull request #625 from jods4/patch-280

Non-greedy match for comments regex
parents 6e03f898 ba8f3fad
...@@ -20,7 +20,7 @@ class Clauses : List<Clause> ...@@ -20,7 +20,7 @@ class Clauses : List<Clause>
{ {
private readonly string _joiner; private readonly string _joiner;
private readonly string _prefix; private readonly string _prefix;
private readonly string _postfix; private readonly string _postfix;
public Clauses(string joiner, string prefix = "", string postfix = "") public Clauses(string joiner, string prefix = "", string postfix = "")
{ {
...@@ -55,8 +55,8 @@ public class Template ...@@ -55,8 +55,8 @@ public class Template
private readonly string _sql; private readonly string _sql;
private readonly SqlBuilder _builder; private readonly SqlBuilder _builder;
private readonly object _initParams; private readonly object _initParams;
private int _dataSeq = -1; // Unresolved private int _dataSeq = -1; // Unresolved
public Template(SqlBuilder builder, string sql, dynamic parameters) public Template(SqlBuilder builder, string sql, dynamic parameters)
{ {
_initParams = parameters; _initParams = parameters;
...@@ -64,7 +64,7 @@ public Template(SqlBuilder builder, string sql, dynamic parameters) ...@@ -64,7 +64,7 @@ public Template(SqlBuilder builder, string sql, dynamic parameters)
_builder = builder; _builder = builder;
} }
private static readonly Regex _regex = new Regex(@"\/\*\*.+\*\*\/", RegexOptions.Compiled | RegexOptions.Multiline); private static readonly Regex _regex = new Regex(@"\/\*\*.+?\*\*\/", RegexOptions.Compiled | RegexOptions.Multiline);
void ResolveSql() void ResolveSql()
{ {
...@@ -136,7 +136,7 @@ public SqlBuilder RightJoin(string sql, dynamic parameters = null) ...@@ -136,7 +136,7 @@ public SqlBuilder RightJoin(string sql, dynamic parameters = null)
} }
public SqlBuilder Where(string sql, dynamic parameters = null) public SqlBuilder Where(string sql, dynamic parameters = null)
{ {
AddClause("where", sql, parameters, " AND ", "WHERE ", "\n", false); AddClause("where", sql, parameters, " AND ", "WHERE ", "\n", false);
return this; return this;
} }
...@@ -148,13 +148,13 @@ public SqlBuilder OrWhere(string sql, dynamic parameters = null) ...@@ -148,13 +148,13 @@ public SqlBuilder OrWhere(string sql, dynamic parameters = null)
} }
public SqlBuilder OrderBy(string sql, dynamic parameters = null) public SqlBuilder OrderBy(string sql, dynamic parameters = null)
{ {
AddClause("orderby", sql, parameters, " , ", "ORDER BY ", "\n", false); AddClause("orderby", sql, parameters, " , ", "ORDER BY ", "\n", false);
return this; return this;
} }
public SqlBuilder Select(string sql, dynamic parameters = null) public SqlBuilder Select(string sql, dynamic parameters = null)
{ {
AddClause("select", sql, parameters, " , ", "", "\n", false); AddClause("select", sql, parameters, " , ", "", "\n", false);
return this; return this;
} }
...@@ -178,7 +178,7 @@ public SqlBuilder GroupBy(string sql, dynamic parameters = null) ...@@ -178,7 +178,7 @@ public SqlBuilder GroupBy(string sql, dynamic parameters = null)
} }
public SqlBuilder Having(string sql, dynamic parameters = null) public SqlBuilder Having(string sql, dynamic parameters = null)
{ {
AddClause("having", sql, parameters, "\nAND ", "HAVING ", "\n", false); AddClause("having", sql, parameters, "\nAND ", "HAVING ", "\n", false);
return this; return this;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment