[Jifty-commit] r5739 - Jifty-DBI/branches/tisql/lib/Jifty/DBI

[Jifty commits]

Author: ruz
Date: Sun Aug 17 02:56:16 2008
New Revision: 5739

Modified:
   Jifty-DBI/branches/tisql/lib/Jifty/DBI/Tisql.pm

Log:
* change some regular expression

Modified: Jifty-DBI/branches/tisql/lib/Jifty/DBI/Tisql.pm
==============================================================================
--- Jifty-DBI/branches/tisql/lib/Jifty/DBI/Tisql.pm	(original)
+++ Jifty-DBI/branches/tisql/lib/Jifty/DBI/Tisql.pm	Sun Aug 17 02:56:16 2008
@@ -12,13 +12,13 @@
 my $re_delim      = qr{$RE{delimited}{-delim=>qq{\'\"}}};
 my $re_field      = qr{[a-zA-Z][a-zA-Z0-9_]*};
 my $re_alias_name = $re_field;
-my $re_ph         = qr{_[1-9][0-9]+_};
+my $re_ph         = qr{%[1-9][0-9]*};
 
 my $re_value      = qr{$re_delim|[0-9.]+};
 my $re_value_ph   = qr{$re_value|$re_ph};
 my $re_cs_values  = qr{$re_value(?:\s*,\s*$re_value)*};
 my $re_ph_access  = qr{{\s*(?:$re_cs_values|$re_ph)?\s*}};
-my $re_column     = qr{$re_alias_name?(?:\.$re_field$re_ph_access?)+};
+my $re_column     = qr{$re_alias_name?(?:\.$re_field$re_ph_access*)+};
 my $re_alias      = qr{$re_column\s+AS\s+$re_alias_name}i;
 
 my $re_sql_op_bin = qr{!?=|<>|>=?|<=?|(?:NOT )?LIKE}i;