Updated the query parts that work with arguments (conditions, update and insert expressions) to work with QueryArgument objects instead of string values.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0-DB@8457 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2011-06-07 17:18:32 +00:00
parent e41c45433e
commit 313bfca8e8
18 changed files with 120 additions and 169 deletions

View file

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

View file

@ -21,7 +21,7 @@
}
function getExpressionString(){
return sprintf('new UpdateExpression(\'%s\', $%s_argument->getValue())'
return sprintf('new UpdateExpression(\'%s\', $%s_argument)'
, $this->name
, $this->argument->argument_name);
}

View file

@ -50,7 +50,7 @@
function getConditionString(){
return sprintf("new Condition('%s',%s,%s%s)"
, $this->column_name
, $this->default_column ? "'" . $this->default_column . "'" : '$' . $this->argument_name . '_argument->getValue()'
, $this->default_column ? "'" . $this->default_column . "'" : '$' . $this->argument_name . '_argument'
, '"'.$this->operation.'"'
, $this->pipe ? ", '" . $this->pipe . "'" : ''
);

View file

@ -26,7 +26,7 @@
}
function toString(){
return sprintf("new OrderByColumn(\$%s_argument->getValue(), %s)", $this->argument_name, $this->sort_order);
return sprintf("new OrderByColumn(\$%s_argument, %s)", $this->argument_name, $this->sort_order);
}
function getArguments(){

View file

@ -21,8 +21,8 @@
}
function toString(){
if ($this->page)return sprintf("new Limit(\$%s_argument->getValue(), \$%s_argument->getValue(), \$%s_argument->getValue())",$this->list_count->var, $this->page->var, $this->page_count->var);
else return sprintf("new Limit(\$%s_argument->getValue())", $this->list_count->var);
if ($this->page)return sprintf("new Limit(\$%s_argument, \$%s_argument, \$%s_argument)",$this->list_count->var, $this->page->var, $this->page_count->var);
else return sprintf("new Limit(\$%s_argument)", $this->list_count->var);
}
function getArguments(){