fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-13 07:22:13 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue 1548 Syntax error on query cache with using alias.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10216 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2012-02-27 08:23:03 +00:00
parent 88823b908c
commit 80b8a46e0c
8 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

14
classes/xml/xmlquery/queryargument/QueryArgument.class.php
View file

@ -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 @@
}
?>
?>