Update of /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17119
Modified Files:
PgCommand.cs
Log Message:
2004-06-12 Carlos Guzman Alvarez <car...@te...>
* PostgreSql.Data.PgSqlClient/PgCommand.cs:
- Fix regex usage (it waqs working in .NET but not in mono
i have sent an email to the mono list and i'm wainting for response
for now if it's a mono problem)
Index: PgCommand.cs
===================================================================
RCS file: /cvsroot/pgsqlclient/pgsqlclient_10/PostgreSql.Data.PgSqlClient/source/PgCommand.cs,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** PgCommand.cs 10 Jun 2004 08:33:01 -0000 1.37
--- PgCommand.cs 12 Jun 2004 14:18:57 -0000 1.38
***************
*** 545,549 ****
this.statement = null;
! if ((behavior & CommandBehavior.SingleResult) != CommandBehavior.SingleResult)
{
this.actualCommand++;
--- 545,549 ----
this.statement = null;
! if ((this.commandBehavior & CommandBehavior.SingleResult) != CommandBehavior.SingleResult)
{
this.actualCommand++;
***************
*** 682,686 ****
string pattern = @"(('[^']*?\@[^']*')*[^'@]*?)*(?<param>@\w+)*([^'@]*?('[^']*?\@*[^']*'))*";
! Regex r = new Regex(pattern, RegexOptions.ExplicitCapture);
MatchEvaluator me = new MatchEvaluator(matchEvaluator);
--- 682,686 ----
string pattern = @"(('[^']*?\@[^']*')*[^'@]*?)*(?<param>@\w+)*([^'@]*?('[^']*?\@*[^']*'))*";
! Regex r = new Regex(pattern, RegexOptions.ExplicitCapture | RegexOptions.Multiline);
MatchEvaluator me = new MatchEvaluator(matchEvaluator);
***************
*** 707,711 ****
this.namedParameters.Add(g.Value);
! replace = "$" + ((this.matchIndex++) + 1).ToString();
this.matchReplaces.Add(g.Value, replace);
--- 707,711 ----
this.namedParameters.Add(g.Value);
! replace = "$$" + ((this.matchIndex++) + 1).ToString();
this.matchReplaces.Add(g.Value, replace);
|
