Commit ba8f3fad authored by jods's avatar jods

Non-greedy match for comments regex

Fixes #436, #280
My editor has also normalized a few line endings to LF like 99% of the
file was.
parent 6e03f898
......@@ -20,7 +20,7 @@ class Clauses : List<Clause>
{
private readonly string _joiner;
private readonly string _prefix;
private readonly string _postfix;
private readonly string _postfix;
public Clauses(string joiner, string prefix = "", string postfix = "")
{
......@@ -55,8 +55,8 @@ public class Template
private readonly string _sql;
private readonly SqlBuilder _builder;
private readonly object _initParams;
private int _dataSeq = -1; // Unresolved
private int _dataSeq = -1; // Unresolved
public Template(SqlBuilder builder, string sql, dynamic parameters)
{
_initParams = parameters;
......@@ -64,7 +64,7 @@ public Template(SqlBuilder builder, string sql, dynamic parameters)
_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()
{
......@@ -136,7 +136,7 @@ public SqlBuilder RightJoin(string sql, dynamic parameters = null)
}
public SqlBuilder Where(string sql, dynamic parameters = null)
{
{
AddClause("where", sql, parameters, " AND ", "WHERE ", "\n", false);
return this;
}
......@@ -148,13 +148,13 @@ public SqlBuilder OrWhere(string sql, dynamic parameters = null)
}
public SqlBuilder OrderBy(string sql, dynamic parameters = null)
{
{
AddClause("orderby", sql, parameters, " , ", "ORDER BY ", "\n", false);
return this;
}
public SqlBuilder Select(string sql, dynamic parameters = null)
{
{
AddClause("select", sql, parameters, " , ", "", "\n", false);
return this;
}
......@@ -178,7 +178,7 @@ public SqlBuilder GroupBy(string sql, dynamic parameters = null)
}
public SqlBuilder Having(string sql, dynamic parameters = null)
{
{
AddClause("having", sql, parameters, "\nAND ", "HAVING ", "\n", false);
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