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

git-svn-id: http://xe-core.googlecode.com/svn/trunk@1120 201d5d3c-b55e-5fd7-737f-ddc643e51545

Browse source
This commit is contained in:
zero 2007-04-12 11:01:40 +00:00
parent c2497596a1
commit 6d6d6c5b8b
5 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
classes/db/DBMysql.class.php
View file

@ -288,7 +288,8 @@
$type = $output->column_type[$name]; $type = $output->column_type[$name];
$pipe = $v['pipe']; $pipe = $v['pipe'];
if(strpos($value,'.')===false) $value = $this->getConditionValue($name, $value, $operation, $type); $value = $this->getConditionValue($name, $value, $operation, $type);
if(!$value) $value = $v['value'];
$str = $this->getConditionPart($name, $value, $operation); $str = $this->getConditionPart($name, $value, $operation);
if($sub_condition) $sub_condition .= ' '.$pipe.' '; if($sub_condition) $sub_condition .= ' '.$pipe.' ';
$sub_condition .= $str; $sub_condition .= $str;
@ -319,9 +320,7 @@
if($output->column_type[$name]!='number') { if($output->column_type[$name]!='number') {
$value = "'".$this->addQuotes($value)."'"; $value = "'".$this->addQuotes($value)."'";
if(!$value) $value = 'null'; if(!$value) $value = 'null';
} else { } elseif(!$value || is_numeric($value)) $value = (int)$value;
if(!$value) $value = 0;
}
$column_list[] = '`'.$name.'`'; $column_list[] = '`'.$name.'`';
$value_list[] = $value; $value_list[] = $value;
@ -346,7 +345,7 @@
$name = $val['name']; $name = $val['name'];
$value = $val['value']; $value = $val['value'];
if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'"; if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
else $value = (int)$value; elseif(!$value || is_numeric($value)) $value = (int)$value;
$column_list[] = sprintf("`%s` = %s", $name, $value); $column_list[] = sprintf("`%s` = %s", $name, $value);
} }

9
classes/db/DBMysql_innodb.class.php
View file

@ -297,7 +297,8 @@
$type = $output->column_type[$name]; $type = $output->column_type[$name];
$pipe = $v['pipe']; $pipe = $v['pipe'];
if(strpos($value,'.')===false) $value = $this->getConditionValue($name, $value, $operation, $type); $value = $this->getConditionValue($name, $value, $operation, $type);
if(!$value) $value = $v['value'];
$str = $this->getConditionPart($name, $value, $operation); $str = $this->getConditionPart($name, $value, $operation);
if($sub_condition) $sub_condition .= ' '.$pipe.' '; if($sub_condition) $sub_condition .= ' '.$pipe.' ';
$sub_condition .= $str; $sub_condition .= $str;
@ -328,9 +329,7 @@
if($output->column_type[$name]!='number') { if($output->column_type[$name]!='number') {
$value = "'".$this->addQuotes($value)."'"; $value = "'".$this->addQuotes($value)."'";
if(!$value) $value = 'null'; if(!$value) $value = 'null';
} else { } elseif(!$value || is_numeric($value)) $value = (int)$value;
if(!$value) $value = 0;
}
$column_list[] = '`'.$name.'`'; $column_list[] = '`'.$name.'`';
$value_list[] = $value; $value_list[] = $value;
@ -355,7 +354,7 @@
$name = $val['name']; $name = $val['name'];
$value = $val['value']; $value = $val['value'];
if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'"; if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
else $value = (int)$value; elseif(!$value || is_numeric($value)) $value = (int)$value;
$column_list[] = sprintf("`%s` = %s", $name, $value); $column_list[] = sprintf("`%s` = %s", $name, $value);
} }

9
classes/db/DBSqlite2.class.php
View file

@ -292,7 +292,8 @@
$type = $output->column_type[$name]; $type = $output->column_type[$name];
$pipe = $v['pipe']; $pipe = $v['pipe'];
if(strpos($value,'.')===false) $value = $this->getConditionValue($name, $value, $operation, $type); $value = $this->getConditionValue($name, $value, $operation, $type);
if(!$value) $value = $v['value'];
$str = $this->getConditionPart($name, $value, $operation); $str = $this->getConditionPart($name, $value, $operation);
if($sub_condition) $sub_condition .= ' '.$pipe.' '; if($sub_condition) $sub_condition .= ' '.$pipe.' ';
$sub_condition .= $str; $sub_condition .= $str;
@ -323,9 +324,7 @@
if($output->column_type[$name]!='number') { if($output->column_type[$name]!='number') {
$value = "'".$this->addQuotes($value)."'"; $value = "'".$this->addQuotes($value)."'";
if(!$value) $value = 'null'; if(!$value) $value = 'null';
} else { } elseif(!$value || is_numeric($value)) $value = (int)$value;
if(!$value) $value = 0;
}
$column_list[] = $name; $column_list[] = $name;
$value_list[] = $value; $value_list[] = $value;
@ -350,7 +349,7 @@
$name = $val['name']; $name = $val['name'];
$value = $val['value']; $value = $val['value'];
if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'"; if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
else $value = (int)$value; elseif(!$value || is_numeric($value)) $value = (int)$value;
$column_list[] = sprintf("%s = %s", $name, $value); $column_list[] = sprintf("%s = %s", $name, $value);
} }

14
classes/db/DBSqlite3_pdo.class.php
View file

@ -319,7 +319,9 @@
$type = $output->column_type[$name]; $type = $output->column_type[$name];
$pipe = $v['pipe']; $pipe = $v['pipe'];
if(strpos($value,'.')===false) $value = $this->getConditionValue($name, $value, $operation, $type); $value = $this->getConditionValue($name, $value, $operation, $type);
if(!$value) $value = $v['value'];
$str = $this->getConditionPart($name, $value, $operation); $str = $this->getConditionPart($name, $value, $operation);
if($sub_condition) $sub_condition .= ' '.$pipe.' '; if($sub_condition) $sub_condition .= ' '.$pipe.' ';
$sub_condition .= $str; $sub_condition .= $str;
@ -351,7 +353,10 @@
$key_list[] = $name; $key_list[] = $name;
if($output->column_type[$name]!='number') $val_list[] = $this->addQuotes($value); if($output->column_type[$name]!='number') $val_list[] = $this->addQuotes($value);
else $val_list[] = (int)$value; else {
if(!$value || is_numeric($value)) $value = (int)$value;
$val_list[] = $value;
}
$prepare_list[] = '?'; $prepare_list[] = '?';
} }
@ -381,7 +386,10 @@
$name = $val['name']; $name = $val['name'];
$value = $val['value']; $value = $val['value'];
if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'"; if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
else $value = (int)$value; else {
if(!$value || is_numeric($value)) $value = (int)$value;
$val_list[] = $value;
}
$column_list[] = sprintf("%s = %s", $name, $value); $column_list[] = sprintf("%s = %s", $name, $value);

2
modules/file/file.controller.php
View file

@ -255,7 +255,7 @@
Context::set('buff', $buff); Context::set('buff', $buff);
$this->setTemplatePath($this->module_path.'tpl'); $this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile('print_uploaded_file_list.html'); $this->setTemplateFile('print_uploaded_file_list');
} }
/** /**