Issue 1548 Syntax error on query cache with using alias.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10216 201d5d3c-b55e-5fd7-737f-ddc643e51545

classes/xml/xmlquery/queryargument/QueryArgument.class.php

@@ -55,7 +55,7 @@
 		function toString(){
                     if($this->isConditionArgument()){
                             // Instantiation
-                            $arg = sprintf("\n$%s_argument = new ConditionArgument('%s', %s, '%s');\n"
+                            $arg = sprintf("\n" . '${\'%s_argument\'} = new ConditionArgument(\'%s\', %s, \'%s\');' . "\n"
                                                     , $this->argument_name
                                                     , $this->variable_name
                                                     , '$args->'.$this->variable_name
@@ -65,25 +65,25 @@
                             $arg .= $this->argument_validator->toString();
 
                             // Prepare condition string
-                            $arg .= sprintf("$%s_argument->createConditionValue();\n"
+                            $arg .= sprintf('${\'%s_argument\'}->createConditionValue();' . "\n"
                                     , $this->argument_name
                                     );
 
                             // Check that argument passed validation, else return
-                            $arg .= sprintf("if(!$%s_argument->isValid()) return $%s_argument->getErrorMessage();\n"
+                            $arg .= sprintf('if(!${\'%s_argument\'}->isValid()) return ${\'%s_argument\'}->getErrorMessage();' . "\n"
                                             , $this->argument_name
                                             , $this->argument_name
                                             );
                     }
                     else {
-                            $arg = sprintf("\n$%s_argument = new Argument('%s', %s);\n"
+                            $arg = sprintf("\n" . '${\'%s_argument\'} = new Argument(\'%s\', %s);' . "\n"
                                                     , $this->argument_name
                                                     , $this->variable_name
                                                     , $this->ignore_value ? 'null' : '$args->'.$this->variable_name);
 
                             $arg .= $this->argument_validator->toString();
 
-                            $arg .= sprintf("if(!$%s_argument->isValid()) return $%s_argument->getErrorMessage();\n"
+                            $arg .= sprintf('if(!${\'%s_argument\'}->isValid()) return ${\'%s_argument\'}->getErrorMessage();' . "\n"
                                             , $this->argument_name
                                             , $this->argument_name
                                             );
@@ -93,7 +93,7 @@
                     if($this->argument_validator->isIgnorable()){
                         $arg = sprintf("if(isset(%s)) {", '$args->'.$this->variable_name)
                                 . $arg
-                                . sprintf("} else \n$%s_argument = null;", $this->argument_name);
+                                . sprintf("} else\n" . '${\'%s_argument\'} = null;', $this->argument_name);
                     }
 
                     return $arg;
@@ -101,4 +101,4 @@
 
 	}
 
-?>
+?>

classes/xml/xmlquery/queryargument/SortQueryArgument.class.php

@@ -2,7 +2,7 @@
 
 	class SortQueryArgument extends QueryArgument{
             function toString(){
-                $arg = sprintf("\n$%s_argument = new SortArgument('%s', %s);\n"
+                $arg = sprintf("\n" . '${\'%s_argument\'} = new SortArgument(\'%s\', %s);' . "\n"
                                         , $this->argument_name
                                         , $this->argument_name
                                         , '$args->'.$this->variable_name);
@@ -10,7 +10,7 @@
 
                 $arg .= $this->argument_validator->toString();
 
-                $arg .= sprintf("if(!$%s_argument->isValid()) return $%s_argument->getErrorMessage();\n"
+                $arg .= sprintf('if(!${\'%s_argument\'}->isValid()) return ${\'%s_argument\'}->getErrorMessage();' . "\n"
                                     , $this->argument_name
                                     , $this->argument_name
                                     );

classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php

@@ -30,19 +30,19 @@
 		function toString(){
 			$validator = '';
 			if($this->filter){
-				$validator .= sprintf("$%s_argument->checkFilter('%s');\n"
+				$validator .= sprintf('${\'%s_argument\'}->checkFilter(\'%s\');' . "\n"
 					, $this->argument_name
 					, $this->filter
 					);
 			}
 			if($this->min_length){
-				$validator .= sprintf("$%s_argument->checkMinLength(%s);\n"
+				$validator .= sprintf('${\'%s_argument\'}->checkMinLength(%s);' . "\n"
 					, $this->argument_name
 					, $this->min_length
 					);
 			}
 			if($this->max_length){
-				$validator .= sprintf("$%s_argument->checkMaxLength(%s);\n"
+				$validator .= sprintf('${\'%s_argument\'}->checkMaxLength(%s);'. "\n"
 					, $this->argument_name
 					, $this->max_length
 					);
@@ -52,17 +52,17 @@
                                 if($this->default_value->isSequence())
                                         $validator .= '$db = &DB::getInstance(); $sequence = $db->getNextSequence(); ';
                                 if($this->default_value->isOperation())
-                                        $validator .= sprintf("$%s_argument->setColumnOperation('%s');\n"
+                                        $validator .= sprintf('${\'%s_argument\'}->setColumnOperation(\'%s\');' . "\n"
                                                 , $this->argument_name
                                                 , $this->default_value->getOperation()
                                                 );
-                                $validator .= sprintf("$%s_argument->ensureDefaultValue(%s);\n"
+                                $validator .= sprintf('${\'%s_argument\'}->ensureDefaultValue(%s);' . "\n"
                                         , $this->argument_name
                                         , $this->default_value->toString()
                                         );
 			}
 			if($this->notnull){
-				$validator .= sprintf("$%s_argument->checkNotNull();\n"
+				$validator .= sprintf('${\'%s_argument\'}->checkNotNull();' . "\n"
 					, $this->argument_name
 					);
 			}
@@ -70,4 +70,4 @@
 		}
 	}
 
-?>
+?>

classes/xml/xmlquery/tags/column/InsertColumnTag.class.php

@@ -18,7 +18,7 @@
 		}
 
 		function getExpressionString(){
-			return sprintf('new InsertExpression(\'%s\', $%s_argument)'
+			return sprintf('new InsertExpression(\'%s\', ${\'%s_argument\'})'
 						, $this->name
 						, $this->argument->argument_name);
 		}
@@ -28,4 +28,4 @@
 		}
 
 	}
-?>
+?>

classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php

@@ -44,7 +44,7 @@
 
 		function getExpressionString(){
                     if($this->argument)
-			return sprintf('new UpdateExpression(\'%s\', $%s_argument)'
+			return sprintf('new UpdateExpression(\'%s\', ${\'%s_argument\'})'
 						, $this->name
 						, $this->argument->argument_name);
                     else {
@@ -59,4 +59,4 @@
 		}
 	}
 
-?>
+?>

classes/xml/xmlquery/tags/navigation/IndexTag.class.php

@@ -28,7 +28,7 @@
 		}
 
 		function toString(){
-			return sprintf("new OrderByColumn(\$%s_argument, %s)", $this->argument->getArgumentName(), $this->sort_order);
+			return sprintf('new OrderByColumn(${\'%s_argument\'}, %s)', $this->argument->getArgumentName(), $this->sort_order);
 		}
 
 		function getArguments(){
@@ -40,4 +40,4 @@
 		}
 	}
 
-?>
+?>

classes/xml/xmlquery/tags/navigation/LimitTag.class.php

@@ -19,12 +19,12 @@
 		}
 
 		function toString(){
-			if ($this->page)return sprintf("new Limit(\$%s_argument, \$%s_argument, \$%s_argument)", $this->list_count->getArgumentName(), $this->page->getArgumentName(),  $this->page_count->getArgumentName());
+			if ($this->page)return sprintf('new Limit(${\'%s_argument\'}, ${\'%s_argument\'}, ${\'%s_argument\'})', $this->list_count->getArgumentName(), $this->page->getArgumentName(),  $this->page_count->getArgumentName());
-			else return sprintf("new Limit(\$%s_argument)", $this->list_count->getArgumentName());
+			else return sprintf('new Limit(${\'%s_argument\'})', $this->list_count->getArgumentName());
 		}
 
 		function getArguments(){
 			return $this->arguments;
 		}
 	}
-?>
+?>

classes/xml/xmlquery/tags/query/QueryTag.class.php

@@ -99,7 +99,7 @@ class QueryTag {
                             $prebuff .= $argument->toString();
                             $column_type = $this->column_type[$this->getQueryId()][$argument->getColumnName()];
                             if(isset($column_type))
-                                $prebuff .= sprintf("if($%s_argument !== null) $%s_argument->setColumnType('%s');\n"
+                                $prebuff .= sprintf('if(${\'%s_argument\'} !== null) ${\'%s_argument\'}->setColumnType(\'%s\');' . "\n"
                                         , $arg_name
                                         , $arg_name
                                         , $column_type );