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

Query cache file - added condition to skip null arguments that do not need validation and are not mandatory.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9066 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2011-09-06 15:50:30 +00:00
parent 34246aa267
commit 33df36e715
12 changed files with 148 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

1
classes/db/queryparts/condition/Condition.class.php
View file

@ -11,7 +11,6 @@
var $_show;
var $_value_to_string;
function Condition($column_name, $argument, $operation, $pipe){
$this->column_name = $column_name;
$this->argument = $argument;

33
classes/db/queryparts/condition/ConditionWithArgument.class.php
View file

@ -3,31 +3,38 @@
class ConditionWithArgument extends Condition {
function ConditionWithArgument($column_name, $argument, $operation, $pipe = ""){
if($argument === null) { $this->_show = false; return; }
parent::Condition($column_name, $argument, $operation, $pipe);
$this->_value = $argument->getValue();
}
function getArgument(){
return $this->argument;
if(!$this->show()) return;
return $this->argument;
}
function toStringWithoutValue(){
$value = $this->argument->getUnescapedValue();
$value = $this->argument->getUnescapedValue();
if(is_array($value)){
$q = '';
foreach ($value as $v) $q .= '?,';
if($q !== '') $q = substr($q, 0, -1);
$q = '(' . $q . ')';
}
else $q = '?';
return $this->pipe . ' ' . $this->getConditionPart($q);
if(is_array($value)){
$q = '';
foreach ($value as $v) $q .= '?,';
if($q !== '') $q = substr($q, 0, -1);
$q = '(' . $q . ')';
}
else $q = '?';
return $this->pipe . ' ' . $this->getConditionPart($q);
}
function show(){
if(!$this->argument->isValid()) return false;
if($this->_value === '\'\'') return false;
return parent::show();
if(!isset($this->_show)){
if(!$this->argument->isValid()) $this->_show = false;
if($this->_value === '\'\'') $this->_show = false;
if(!isset($this->_show)){
return parent::show();
}
}
return $this->_show;
}
}

45
classes/xml/XmlQueryParser.class.php
View file

@ -31,7 +31,7 @@
require(_XE_PATH_.'classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/group/GroupsTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/navigation/NavigationTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/navigation/IndexTag.class.php');
require(_XE_PATH_.'classes/xml/xmlquery/tags/navigation/LimitTag.class.php');
@ -44,50 +44,41 @@
class XmlQueryParser extends XmlParser {
static $dbParser = null;
var $db_type;
function XmlQueryParser($db_type = NULL){
$this->db_type = $db_type;
function XmlQueryParser(){
}
function &getInstance($db_type = NULL){
static $theInstance = null;
if(!isset($theInstance)){
$theInstance = new XmlQueryParser($db_type);
}
return $theInstance;
function &getInstance(){
static $theInstance = null;
if(!isset($theInstance)){
$theInstance = new XmlQueryParser();
}
return $theInstance;
}
function parse($query_id, $xml_file, $cache_file) {
// Read xml file
$xml_obj = $this->getXmlFileContent($xml_file);
// Read xml file
$xml_obj = $this->getXmlFileContent($xml_file);
// insert, update, delete, select action
$action = strtolower($xml_obj->query->attrs->action);
if(!$action) return;
$parser = new QueryParser($xml_obj->query);
$parser = new QueryParser($xml_obj->query);
FileHandler::writeFile($cache_file, $parser->toString());
}
// singleton
function &getDBParser(){
if(!$self->dbParser){
is_a($this,'XmlQueryParser')?$self=&$this:$self=&XmlQueryParser::getInstance();
if(isset($self->db_type))
$oDB = &DB::getInstance($self->db_type);
else
$oDB = &DB::getInstance();
$self->dbParser = $oDB->getParser();
}
return $self->dbParser;
}
function &getDBParser($force = false){
static $dbParser = null;
if(!$dbParser || $force) {
$oDB = &DB::getInstance();
$dbParser = $oDB->getParser();
}
function setDBParser($value){
$self->dbParser = $value;
return $dbParser;
}
function getXmlFileContent($xml_file){

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

@ -51,35 +51,58 @@
}
function toString(){
if($this->isConditionArgument())
$arg = sprintf("\n$%s_argument = new ConditionArgument('%s', %s, '%s');\n"
if($this->argument_validator->hasOnlyDefaultValue()){
return sprintf("\n$%s_argument = %s;\n"
, $this->argument_name
, $this->argument_name
, '$args->'.$this->variable_name
, $this->operation
, $this->argument_validator->getDefaultValueString()
);
}
else
$arg = sprintf("\n$%s_argument = new Argument('%s', %s);\n"
, $this->argument_name
, $this->argument_name
, '$args->'.$this->variable_name);
if($this->isConditionArgument()){
// Instantiation
$arg = sprintf("\n$%s_argument = new ConditionArgument('%s', %s, '%s');\n"
, $this->argument_name
, $this->argument_name
, '$args->'.$this->variable_name
, $this->operation
);
// Call methods to validate argument and ensure default value
$arg .= $this->argument_validator->toString();
// Prepare condition string
$arg .= sprintf("$%s_argument->createConditionValue();\n"
, $this->argument_name
);
$arg .= $this->argument_validator->toString();
// Check that argument passed validation, else return
$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"
, $this->argument_name
, $this->argument_name
, '$args->'.$this->variable_name);
if($this->isConditionArgument()){
$arg .= sprintf("$%s_argument->createConditionValue();\n"
, $this->argument_name
);
}
$arg .= $this->argument_validator->toString();
$arg .= sprintf("if(!$%s_argument->isValid()) return $%s_argument->getErrorMessage();\n"
, $this->argument_name
, $this->argument_name
);
return $arg;
}
$arg .= sprintf("if(!$%s_argument->isValid()) return $%s_argument->getErrorMessage();\n"
, $this->argument_name
, $this->argument_name
);
}
// If the argument is null, skip it
if($this->argument_validator->isIgnorable()){
$arg = sprintf("if(isset(%s)) {", '$args->'.$this->variable_name)
. $arg
. sprintf("} else \n$%s_argument = null;", $this->argument_name);
}
return $arg;
}
}

15
classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php
View file

@ -22,10 +22,15 @@
$this->max_length = $tag->attrs->max_length;
}
function isIgnorable(){
if(isset($this->default_value) || isset($this->notnull)) return false;
return true;
}
function toString(){
$validator = '';
if(isset($this->default_value)){
$this->default_value = new DefaultValue($this->argument_name, $this->default_value);
$this->default_value = new DefaultValue($this->argument_name, $this->default_value);
if($this->default_value->isSequence())
$validator .= '$db = &DB::getInstance(); $sequence = $db->getNextSequence(); ';
if($this->default_value->isOperation())
@ -33,10 +38,10 @@
, $this->argument_name
, $this->default_value->getOperation()
);
$validator .= sprintf("$%s_argument->ensureDefaultValue(%s);\n"
, $this->argument_name
, $this->default_value->toString()
);
$validator .= sprintf("$%s_argument->ensureDefaultValue(%s);\n"
, $this->argument_name
, $this->default_value->toString()
);
}
if($this->notnull){
$validator .= sprintf("$%s_argument->checkNotNull();\n"

88
classes/xml/xmlquery/tags/query/QueryTag.class.php
View file

@ -5,7 +5,7 @@ class QueryTag {
var $query_id;
var $column_type;
var $query;
//xml tags
var $columns;
var $tables;
@ -19,7 +19,7 @@ class QueryTag {
var $join_type;
var $alias;
function QueryTag($query, $isSubQuery = false){
$this->action = $query->attrs->action;
$this->query_id = $query->attrs->id;
@ -28,11 +28,11 @@ class QueryTag {
if($this->isSubQuery) $this->action = 'select';
$this->alias = $query->attrs->alias;
$this->join_type = $query->attrs->join_type;
$this->getColumns();
$tables = $this->getTables();
$this->setTableColumnTypes($tables);
$this->getConditions();
$this->getConditions();
$this->getGroups();
$this->getNavigation();
$this->getPrebuff();
@ -42,15 +42,15 @@ class QueryTag {
function show(){
return true;
}
function getQueryId(){
return $this->query->attrs->query_id ? $this->query->attrs->query_id : $this->query->attrs->id;
}
function getAction(){
return $this->query->attrs->action;
}
function setTableColumnTypes($tables){
$query_id = $this->getQueryId();
if(!isset($this->column_type[$query_id])){
@ -65,39 +65,43 @@ class QueryTag {
$this->column_type[$query_id] = $column_type;
}
}
function getColumns(){
if($this->action == 'select'){
if($this->action == 'select'){
return $this->columns = new SelectColumnsTag($this->query->columns);
}else if($this->action == 'insert'){
return $this->columns = new InsertColumnsTag($this->query->columns->column);
}else if($this->action == 'update') {
}else if($this->action == 'update') {
return $this->columns = new UpdateColumnsTag($this->query->columns->column);
}else if($this->action == 'delete') {
}else if($this->action == 'delete') {
return $this->columns = null;
}
}
function getPrebuff(){
// TODO Check if this work with arguments in join clause
$arguments = $this->getArguments();
$prebuff = '';
foreach($arguments as $argument){
if(isset($argument) && $argument->getArgumentName()){
$prebuff .= $argument->toString();
$column_type = $this->column_type[$this->getQueryId()][$argument->getColumnName()];
if(isset($column_type))
$prebuff .= sprintf("$%s_argument->setColumnType('%s');\n"
, $argument->getArgumentName()
, $column_type );
}
if(isset($argument)){
$arg_name = $argument->getArgumentName();
if($arg_name){
$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"
, $arg_name
, $arg_name
, $column_type );
}
}
}
$prebuff .= "\n";
return $this->preBuff = $prebuff;
}
function getBuff(){
$buff = '';
if($this->isSubQuery){
@ -106,67 +110,67 @@ class QueryTag {
$buff .= ($this->columns ? $this->columns->toString() : 'null' ). ', '.PHP_EOL;
$buff .= $this->tables->toString() .','.PHP_EOL;
$buff .= $this->conditions->toString() .',' .PHP_EOL;
$buff .= $this->groups->toString() . ',' .PHP_EOL;
$buff .= $this->groups->toString() . ',' .PHP_EOL;
$buff .= $this->navigation->getOrderByString() .','.PHP_EOL;
$limit = $this->navigation->getLimitString() ;
$buff .= $limit ? $limit : 'null' . PHP_EOL;
$buff .= $this->join_type ? "'" . $this->join_type . "'" : '';
$buff .= ')';
$this->buff = $buff;
return $this->buff;
}
$buff .= '$query = new Query();'.PHP_EOL;
$buff .= sprintf('$query->setQueryId("%s");%s', $this->query_id, "\n");
$buff .= sprintf('$query->setAction("%s");%s', $this->action, "\n");
$buff .= $this->preBuff;
if($this->columns)
$buff .= '$query->setColumns(' . $this->columns->toString() . ');'.PHP_EOL;
$buff .= '$query->setTables(' . $this->tables->toString() .');'.PHP_EOL;
$buff .= '$query->setConditions('.$this->conditions->toString() .');'.PHP_EOL;
$buff .= '$query->setGroups(' . $this->groups->toString() . ');'.PHP_EOL;
$buff .= '$query->setGroups(' . $this->groups->toString() . ');'.PHP_EOL;
$buff .= '$query->setOrder(' . $this->navigation->getOrderByString() .');'.PHP_EOL;
$buff .= '$query->setLimit(' . $this->navigation->getLimitString() .');'.PHP_EOL;
$this->buff = $buff;
return $this->buff;
}
}
function getTables(){
return $this->tables = new TablesTag($this->query->tables);
}
function getConditions(){
return $this->conditions = new ConditionsTag($this->query->conditions);
}
function getGroups(){
return $this->groups = new GroupsTag($this->query->groups->group);
}
function getNavigation(){
return $this->navigation = new NavigationTag($this->query->navigation);
}
function toString(){
return $this->buff;
}
function getTableString(){
return $this->buff;
}
function getConditionString(){
return $this->buff;
}
function getExpressionString(){
return $this->buff;
}
function getArguments(){
$arguments = array();
if($this->columns)
@ -174,8 +178,8 @@ class QueryTag {
$arguments = array_merge($arguments, $this->tables->getArguments());
$arguments = array_merge($arguments, $this->conditions->getArguments());
$arguments = array_merge($arguments, $this->navigation->getArguments());
return $arguments;
return $arguments;
}
}
?>

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

@ -34,6 +34,8 @@
// remove cache dir
FileHandler::removeDir( _XE_PATH_ . 'files/cache');
XmlQueryParser::getDBParser(true);
}
/**
@ -41,7 +43,6 @@
*/
protected function tearDown() {
unset($GLOBALS['__DB__']);
XmlQueryParser::setDBParser(null);
}
}
?>

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

@ -16,6 +16,7 @@
$db_info->slave_db = array(array('db_type' => 'cubrid','db_table_prefix' => 'xe_'));
$oContext->setDbInfo($db_info);
XmlQueryParser::getDBParser(true);
}
/**
@ -23,7 +24,6 @@
*/
protected function tearDown() {
unset($GLOBALS['__DB__']);
XmlQueryParser::setDBParser(null);
}
}
?>

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

@ -34,6 +34,8 @@
// remove cache dir
FileHandler::removeDir( _XE_PATH_ . 'files/cache');
XmlQueryParser::getDBParser(true);
}
/**
@ -41,7 +43,6 @@
*/
protected function tearDown() {
unset($GLOBALS['__DB__']);
XmlQueryParser::setDBParser(null);
}
}
?>

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

@ -14,11 +14,12 @@
$db_info->slave_db = array(array('db_type' => 'mssql','db_table_prefix' => 'xe_'));
$oContext->setDbInfo($db_info);
XmlQueryParser::getDBParser(true);
}
protected function tearDown() {
unset($GLOBALS['__DB__']);
XmlQueryParser::setDBParser(null);
}
}
?>

2
test-phpUnit/db/xml_query/cubrid/CubridSelectTest.php
View file

@ -14,7 +14,7 @@
$this->_test($xml_file, $argsString, $expected);
}
function testRquiredParameter(){
function testRequiredParameter(){
$xml_file = _XE_PATH_ . "modules/module/queries/getAdminId.xml";
$argsString = '';
$expected = 'Date incorecte! Query-ul nu a putut fi executat.';

2
test-phpUnit/db/xml_query/mssql/MssqlSelectTest.php
View file

@ -14,7 +14,7 @@
$this->_test($xml_file, $argsString, $expected, array(10));
}
function testRquiredParameter(){
function testRequiredParameter(){
$xml_file = _XE_PATH_ . "modules/module/queries/getAdminId.xml";
$argsString = '';
$expected = 'Date incorecte! Query-ul nu a putut fi executat.';