Mailing List Archive

Author: jesse
Date: Fri Sep 3 16:35:38 2004
New Revision: 1415

Modified:
rt/branches/3.3-TESTING/ (props changed)
rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm
Log:
----------------------------------------------------------------------
r10116@tinbook: jesse | 2004-09-02T21:14:26.642415Z

----------------------------------------------------------------------
r10144@tinbook: jesse | 2004-09-03T20:32:06.311337Z
Query builder fixes (merge bug)

----------------------------------------------------------------------


Modified: rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm (original)
+++ rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay_SQL.pm Fri Sep 3 16:35:38 2004
@@ -232,9 +232,9 @@
$current = KEYWORD if $val =~ /^$re_keyword$/io && ($want & KEYWORD);
$current = AGGREG if $val =~ /^$re_aggreg$/io;
$current = PAREN if $val =~ /^$re_paren$/io;
- $current = COLUMN if _match($re_keyword,$val) && ($want & COLUMN);
- $current = WHERE if _match($re_where,$val) && ($want & WHERE);
- $current = SELECT if _match($re_select,$val);
+ $current = COLUMN if $val =~ /^$re_keyword$/io && ($want & COLUMN);
+ $current = WHERE if $val =~ /^$re_where$/io && ($want & WHERE);
+ $current = SELECT if $val =~ /^$re_select$/io;


unless ($current && $want & $current) {
@@ -502,7 +502,7 @@
$self->{_sql_query} = $query;
eval { $self->_parser( $query ); };
if ($@) {
- $RT::Logger->error( $@ );
+ $RT::Logger->error( "Query error in <<$query>>:\n$@" );
return(0,$@);
}
# We only want to look at EffectiveId's (mostly) for these searches.
_______________________________________________
Rt-commit mailing list
Rt-commit@lists.bestpractical.com
http://lists.bestpractical.com/cgi-bin/mailman/listinfo/rt-commit