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

Changed code to use dbParser as singleton - instead of passing it in the constructor every time.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0-DB@8392 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
mosmartin 2011-05-23 09:01:00 +00:00
parent abba8761cc
commit 52c3d503bc
20 changed files with 82 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

23
classes/xml/xmlquery/QueryParser.class.php
View file

@ -17,16 +17,12 @@ class QueryParser {
var $action;
var $query_id;
var $dbParser;
var $column_type;
function QueryParser($query, $dbParser){
function QueryParser($query){
$this->query = $query;
$this->action = $this->query->attrs->action;
$this->query_id = $this->query->attrs->id;
$this->dbParser = $dbParser;
}
function getQueryId(){
@ -97,20 +93,20 @@ class QueryParser {
function toString(){
if($this->action == 'select'){
$columns = new SelectColumnsTag($this->query->columns->column, $this->dbParser);
$columns = new SelectColumnsTag($this->query->columns->column);
}else if($this->action == 'insert'){
$columns = new InsertColumnsTag($this->query->columns->column, $this->dbParser);
$columns = new InsertColumnsTag($this->query->columns->column);
}else if($this->action == 'update') {
$columns = new UpdateColumnsTag($this->query->columns->column, $this->dbParser);
$columns = new UpdateColumnsTag($this->query->columns->column);
}else if($this->action == 'delete') {
$columns = new DeleteColumnsTag($this->query->columns->column, $this->dbParser);
$columns = new DeleteColumnsTag($this->query->columns->column);
}
$tables = new TablesTag($this->query->tables->table, $this->dbParser);
$conditions = new ConditionsTag($this->query->conditions, $this->dbParser);
$groups = new GroupsTag($this->query->groups->group, $this->dbParser);
$navigation = new NavigationTag($this->query->navigation, $this->dbParser);
$tables = new TablesTag($this->query->tables->table);
$conditions = new ConditionsTag($this->query->conditions);
$groups = new GroupsTag($this->query->groups->group);
$navigation = new NavigationTag($this->query->navigation);
$this->setTableColumnTypes($tables);
@ -139,7 +135,6 @@ class QueryParser {
$buff .= '$output->orderby = ' . $navigation->getOrderByString() .';';
return "<?php if(!defined('__ZBXE__')) exit();\n"
. "\$dbParser = new DBParser('".$this->dbParser->getEscapeChar()."');\n"
. sprintf('$output->query_id = "%s";%s', $this->query_id, "\n")
. sprintf('$output->action = "%s";%s', $this->action, "\n")
. $prebuff