Item13122: add mysql-safeId-sign to regex

removed boolean where expression - threw MySql-Error use META:FORM for undefined queries
foswiki · Nov 28, 2014 · 9ebb0c5 · 9ebb0c5
1 parent 74d36a5
commit 9ebb0c5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/Foswiki/Contrib/DBIStoreContrib/HoistSQL.pm b/lib/Foswiki/Contrib/DBIStoreContrib/HoistSQL.pm
@@ -125,7 +125,7 @@ sub _AS {
     while ( my ( $what, $alias ) = each %args ) {
         if ( defined $alias ) {
             $what = "($what)"
-              if $what !~ /^\w+$/
+              if $what !~ /^[\w`]+$/
               && $what !~ /^(["']).*\1$/
               && $what !~ /^\([^()]*\)$/;
             push( @terms, "$what AS $alias" );
@@ -686,7 +686,7 @@ sub _hoist {
                 );
                 my $where = "($lhs_alias.tid=$rhs_alias.tid)";
                 if ( $optype == BOOLEAN ) {
-                    $where .= " AND ($expr)";
+                    #$where .= " AND ($expr)";
                     $expr   = $TRUE;
                     $optype = $TRUE_TYPE;
                 }
@@ -890,7 +890,7 @@ sub _rewrite {
                     else {
                         $node = _rewrite(
                             $parser->parse(
-                                "META:FIELD[name='$node->{params}[0]'].value"),
+                                "META:FORM[name='$node->{params}[0]']"),
                             $context
                         );
                         $rewrote = __LINE__;