Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
Dapper
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
tsai
Dapper
Commits
99e6b963
Commit
99e6b963
authored
Oct 06, 2016
by
Marc Gravell
Committed by
GitHub
Oct 06, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #625 from jods4/patch-280
Non-greedy match for comments regex
parents
6e03f898
ba8f3fad
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
SqlBuilder.cs
Dapper.SqlBuilder/SqlBuilder.cs
+8
-8
No files found.
Dapper.SqlBuilder/SqlBuilder.cs
View file @
99e6b963
...
...
@@ -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
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment