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

Moved call to getDBParser from XmlQueryParser.class.php to DB.class.php - because otherwise the XmlQueryParser would have been included even when it was not needed.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9139 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2011-09-09 15:05:29 +00:00
parent b012937719
commit e1bf4523c7
15 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
classes/db/DB.class.php
View file

@ -21,7 +21,6 @@
require(_XE_PATH_.'classes/xml/xmlquery/argument/Argument.class.php'); require(_XE_PATH_.'classes/xml/xmlquery/argument/Argument.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/argument/SortArgument.class.php'); require(_XE_PATH_.'classes/xml/xmlquery/argument/SortArgument.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/argument/ConditionArgument.class.php'); require(_XE_PATH_.'classes/xml/xmlquery/argument/ConditionArgument.class.php');
require(_XE_PATH_.'classes/xml/XmlQueryParser.class.php');
require(_XE_PATH_.'classes/db/queryparts/expression/Expression.class.php'); require(_XE_PATH_.'classes/db/queryparts/expression/Expression.class.php');
require(_XE_PATH_.'classes/db/queryparts/expression/SelectExpression.class.php'); require(_XE_PATH_.'classes/db/queryparts/expression/SelectExpression.class.php');
@ -76,7 +75,7 @@
var $cache_file = 'files/cache/queries/'; ///< location of query cache var $cache_file = 'files/cache/queries/'; ///< location of query cache
var $db_type; ///< stores database type: 'mysql','cubrid','mssql' etc. or 'db' when database is not yet set var $db_type; ///< stores database type: 'mysql','cubrid','mssql' etc. or 'db' when database is not yet set
/** /**
* @brief returns instance of certain db type * @brief returns instance of certain db type
* @param[in] $db_type type of db * @param[in] $db_type type of db

2
classes/db/queryparts/Query.class.php
View file

@ -51,7 +51,7 @@
$this->columnList = $columnList; $this->columnList = $columnList;
if(count($this->columnList) > 0) { if(count($this->columnList) > 0) {
$selectColumns = array(); $selectColumns = array();
$dbParser = XmlQueryParser::getDBParser(); $dbParser = DB::getParser();
foreach($this->columnList as $columnName){ foreach($this->columnList as $columnName){
$columnName = $dbParser->escapeColumn($columnName); $columnName = $dbParser->escapeColumn($columnName);

2
classes/xml/xmlquery/argument/Argument.class.php
View file

@ -63,7 +63,7 @@
function escapeValue($value){ function escapeValue($value){
if($this->getType() == 'column_name'){ if($this->getType() == 'column_name'){
$dbParser = XmlQueryParser::getDBParser(); $dbParser = DB::getParser();
return $dbParser->parseExpression($value); return $dbParser->parseExpression($value);
} }
if(!isset($value)) return null; if(!isset($value)) return null;

2
classes/xml/xmlquery/queryargument/DefaultValue.class.php
View file

@ -8,7 +8,7 @@
var $operation = ''; var $operation = '';
function DefaultValue($column_name, $value){ function DefaultValue($column_name, $value){
$dbParser = &XmlQueryParser::getDBParser(); $dbParser = &DB::getParser();
$this->column_name = $dbParser->parseColumnName($column_name); $this->column_name = $dbParser->parseColumnName($column_name);
$this->value = $value; $this->value = $value;
$this->value = $this->_setValue(); $this->value = $this->_setValue();

2
classes/xml/xmlquery/tags/column/InsertColumnTag.class.php
View file

@ -12,7 +12,7 @@
function InsertColumnTag($column) { function InsertColumnTag($column) {
parent::ColumnTag($column->attrs->name); parent::ColumnTag($column->attrs->name);
$dbParser = XmlQueryParser::getDBParser(); $dbParser = DB::getParser();
$this->name = $dbParser->parseColumnName($this->name); $this->name = $dbParser->parseColumnName($this->name);
$this->argument = new QueryArgument($column); $this->argument = new QueryArgument($column);
} }

4
classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
View file

@ -15,7 +15,7 @@
parent::ColumnTag($column->attrs->name); parent::ColumnTag($column->attrs->name);
if(!$this->name) $this->name = "*"; if(!$this->name) $this->name = "*";
if($this->name != "*") { if($this->name != "*") {
$dbParser = XmlQueryParser::getDBParser(); $dbParser = DB::getParser();
$this->name = $dbParser->parseExpression($this->name); $this->name = $dbParser->parseExpression($this->name);
} }
@ -27,7 +27,7 @@
if($this->name == '*') return "new StarExpression()"; if($this->name == '*') return "new StarExpression()";
if($this->click_count) if($this->click_count)
return sprintf('new ClickCountExpression(%s, %s, $args->%s)', $this->name, $this->alias,$this->click_count); return sprintf('new ClickCountExpression(%s, %s, $args->%s)', $this->name, $this->alias,$this->click_count);
$dbParser = XmlQueryParser::getDBParser(); $dbParser = DB::getParser();
return sprintf('new SelectExpression(\'%s\'%s)', $this->name, $this->alias ? ', \''.$dbParser->escape($this->alias) .'\'': ''); return sprintf('new SelectExpression(\'%s\'%s)', $this->name, $this->alias ? ', \''.$dbParser->escape($this->alias) .'\'': '');
} }
} }

2
classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php
View file

@ -14,7 +14,7 @@
function UpdateColumnTag($column) { function UpdateColumnTag($column) {
parent::ColumnTag($column->attrs->name); parent::ColumnTag($column->attrs->name);
$dbParser = XmlQueryParser::getDBParser(); $dbParser = DB::getParser();
$this->name = $dbParser->parseColumnName($this->name); $this->name = $dbParser->parseColumnName($this->name);
$this->argument = new QueryArgument($column); $this->argument = new QueryArgument($column);
} }

2
classes/xml/xmlquery/tags/condition/ConditionTag.class.php
View file

@ -20,7 +20,7 @@
function ConditionTag($condition){ function ConditionTag($condition){
$this->operation = $condition->attrs->operation; $this->operation = $condition->attrs->operation;
$this->pipe = $condition->attrs->pipe; $this->pipe = $condition->attrs->pipe;
$dbParser = XmlQueryParser::getDBParser(); $dbParser = DB::getParser();
$this->column_name = $dbParser->parseColumnName($condition->attrs->column); $this->column_name = $dbParser->parseColumnName($condition->attrs->column);
$isColumnName = strpos($condition->attrs->default, '.'); $isColumnName = strpos($condition->attrs->default, '.');

2
classes/xml/xmlquery/tags/group/GroupsTag.class.php
View file

@ -9,7 +9,7 @@
if($xml_groups) { if($xml_groups) {
if(!is_array($xml_groups)) $xml_groups = array($xml_groups); if(!is_array($xml_groups)) $xml_groups = array($xml_groups);
$dbParser = XmlQueryParser::getDBParser(); $dbParser = DB::getParser();
for($i=0;$i<count($xml_groups);$i++) { for($i=0;$i<count($xml_groups);$i++) {
$group = $xml_groups[$i]; $group = $xml_groups[$i];
$column = trim($group->attrs->column); $column = trim($group->attrs->column);

2
classes/xml/xmlquery/tags/navigation/IndexTag.class.php
View file

@ -11,7 +11,7 @@
$this->argument_name = $index->attrs->var; $this->argument_name = $index->attrs->var;
// Sort index - column by which to sort // Sort index - column by which to sort
//$dbParser = XmlQueryParser::getDBParser(); //$dbParser = DB::getParser();
//$index->attrs->default = $dbParser->parseExpression($index->attrs->default); //$index->attrs->default = $dbParser->parseExpression($index->attrs->default);
$this->default = $index->attrs->default; $this->default = $index->attrs->default;
$this->argument = new QueryArgument($index); $this->argument = new QueryArgument($index);

4
classes/xml/xmlquery/tags/table/TableTag.class.php
View file

@ -30,7 +30,7 @@
* @param XML <table> tag $table * @param XML <table> tag $table
*/ */
function TableTag($table){ function TableTag($table){
$dbParser = XmlQueryParser::getDBParser(); $dbParser = DB::getParser();
$this->unescaped_name = $table->attrs->name; $this->unescaped_name = $table->attrs->name;
$this->name = $dbParser->parseTableName($table->attrs->name); $this->name = $dbParser->parseTableName($table->attrs->name);
@ -67,7 +67,7 @@
* @return string * @return string
*/ */
function getTableString(){ function getTableString(){
$dbParser = XmlQueryParser::getDBParser(); $dbParser = DB::getParser();
if($this->isJoinTable()){ if($this->isJoinTable()){
return sprintf('new JoinTable(\'%s\', \'%s\', "%s", %s)' return sprintf('new JoinTable(\'%s\', \'%s\', "%s", %s)'
, $dbParser->escape($this->name) , $dbParser->escape($this->name)

2
test-phpUnit/db/CubridOnlineTest.php
View file

@ -35,7 +35,7 @@
// remove cache dir // remove cache dir
FileHandler::removeDir( _XE_PATH_ . 'files/cache'); FileHandler::removeDir( _XE_PATH_ . 'files/cache');
XmlQueryParser::getDBParser(true); DB::getParser(true);
} }
/** /**

2
test-phpUnit/db/CubridTest.php
View file

@ -16,7 +16,7 @@
$db_info->slave_db = array(array('db_type' => 'cubrid','db_table_prefix' => 'xe_')); $db_info->slave_db = array(array('db_type' => 'cubrid','db_table_prefix' => 'xe_'));
$oContext->setDbInfo($db_info); $oContext->setDbInfo($db_info);
XmlQueryParser::getDBParser(true); DB::getParser(true);
} }
/** /**

2
test-phpUnit/db/MssqlOnlineTest.php
View file

@ -35,7 +35,7 @@
// remove cache dir // remove cache dir
FileHandler::removeDir( _XE_PATH_ . 'files/cache'); FileHandler::removeDir( _XE_PATH_ . 'files/cache');
XmlQueryParser::getDBParser(true); DB::getParser(true);
} }
/** /**

2
test-phpUnit/db/MssqlTest.php
View file

@ -15,7 +15,7 @@
$oContext->setDbInfo($db_info); $oContext->setDbInfo($db_info);
XmlQueryParser::getDBParser(true); DB::getParser(true);
} }
protected function tearDown() { protected function tearDown() {