Fixed a few MSSQL bugs - related to array query arguments and increment columns.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0-DB@8632 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ucorina 2011-07-25 15:35:43 +00:00
parent 6edd5f03a7
commit b3c75ac4db
15 changed files with 411 additions and 276 deletions

View file

@ -1,52 +1,62 @@
<?php
<?php
class Argument {
var $value;
var $name;
var $type;
var $isValid;
var $errorMessage;
var $column_operation;
function Argument($name, $value){
$this->value = $value;
$this->name = $name;
$this->name = $name;
$this->isValid = true;
}
function getType(){
if(isset($this->type)) return $this->type;
if(is_string($this->value)) return 'column_name';
return 'number';
}
function setColumnType($value){
$this->type = $value;
}
function setColumnOperation($operation){
$this->column_operation = $operation;
}
function getName(){
return $this->name;
}
function getValue(){
$value = $this->escapeValue($this->value);
return $this->toString($value);
}
function getColumnOperation(){
return $this->column_operation;
}
function getUnescapedValue(){
return $this->toString($this->value);
return $this->value;
}
function toString($value){
if(is_array($value)) return '('.implode(',', $value).')';
return $value;
return $value;
}
function escapeValue($value){
if($this->getType() == 'column_name'){
$dbParser = XmlQueryParser::getDBParser();
return $dbParser->parseExpression($value);
}
return $dbParser->parseExpression($value);
}
if(!isset($value)) return null;
if(in_array($this->type, array('date', 'varchar', 'char','text', 'bigtext'))){
if(!is_array($value))
@ -57,32 +67,32 @@
$value[$i] = $this->_escapeStringValue($value[$i]);
//$value[$i] = '\''.$value[$i].'\'';
}
}
return $value;
}
}
return $value;
}
function _escapeStringValue($value){
$db = &DB::getInstance();
$value = $db->addQuotes($value);
$value = $db->addQuotes($value);
return '\''.$value.'\'';
}
function isValid(){
return $this->isValid;
}
function getErrorMessage(){
return $this->errorMessage;
}
function ensureDefaultValue($default_value){
if(!isset($this->value) || $this->value == '')
if(!isset($this->value) || $this->value == '')
$this->value = $default_value;
}
function checkFilter($filter_type){
if(isset($this->value) && $this->value != ''){
$val = $this->value;
@ -90,7 +100,7 @@
switch($filter_type) {
case 'email' :
case 'email_address' :
if(!preg_match('/^[_0-9a-z-]+(\.[_0-9a-z-]+)*@[0-9a-z-]+(\.[0-9a-z-]+)*$/is', $val)) {
if(!preg_match('/^[_0-9a-z-]+(\.[_0-9a-z-]+)*@[0-9a-z-]+(\.[0-9a-z-]+)*$/is', $val)) {
$this->isValid = false;
$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_email, $lang->{$key} ? $lang->{$key} : $key));
}
@ -111,7 +121,7 @@
case 'number' :
case 'numbers' :
if(is_array($val)) $val = join(',', $val);
if(!preg_match('/^(-?)[0-9]+(,\-?[0-9]+)*$/is', $val)){
if(!preg_match('/^(-?)[0-9]+(,\-?[0-9]+)*$/is', $val)){
$this->isValid = false;
$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_number, $lang->{$key} ? $lang->{$key} : $key));
}
@ -128,10 +138,10 @@
$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_alpha_number, $lang->{$key} ? $lang->{$key} : $key));
}
break;
}
}
}
}
function checkMaxLength($length){
if($this->value && (strlen($this->value) > $length)){
$this->isValid = false;
@ -139,15 +149,15 @@
$this->errorMessage = new Object(-1, $lang->filter->outofrange, $lang->{$key} ? $lang->{$key} : $key);
}
}
function checkMinLength($length){
if($this->value && (strlen($this->value) > $length)){
$this->isValid = false;
$key = $this->name;
$this->errorMessage = new Object(-1, $lang->filter->outofrange, $lang->{$key} ? $lang->{$key} : $key);
}
}
}
function checkNotNull(){
if(!isset($this->value)){
$this->isValid = false;