|
@@ -482,7 +482,7 @@ class Core_Database_Mysql extends Core_Database {
|
|
|
$changed = false;
|
|
$changed = false;
|
|
|
foreach (get_object_vars($sql_obj) as $k => $v) {
|
|
foreach (get_object_vars($sql_obj) as $k => $v) {
|
|
|
if (strtolower($k) == strtolower($primary)) continue;
|
|
if (strtolower($k) == strtolower($primary)) continue;
|
|
|
- if ($v == $curr_obj->$k) {// === ?
|
|
|
|
|
|
|
+ if ((string)$v === (string)$curr_obj->$k) {// TODO: NULL !== ''
|
|
|
unset($sql_obj->$k);
|
|
unset($sql_obj->$k);
|
|
|
} else {
|
|
} else {
|
|
|
$changed = true;
|
|
$changed = true;
|
|
@@ -913,7 +913,7 @@ class Core_Database_Mysql extends Core_Database {
|
|
|
if(in_array('SKIP-PRIMARY-KEY', $options) && ($PRIMARY_FIELD==$INDEX_OF_CONFIG_TABLE)) {
|
|
if(in_array('SKIP-PRIMARY-KEY', $options) && ($PRIMARY_FIELD==$INDEX_OF_CONFIG_TABLE)) {
|
|
|
$sql.=" null ";
|
|
$sql.=" null ";
|
|
|
} else {
|
|
} else {
|
|
|
- if($ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Null=='NO') $sql.=" not null "; else
|
|
|
|
|
|
|
+ if($ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Null=='NO') $sql.=" not null "; else
|
|
|
if($ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Null=='YES') $sql.=" null "; // else die('917 unknown NULL??? '.$ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Null.' . Should be or YES or NO');
|
|
if($ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Null=='YES') $sql.=" null "; // else die('917 unknown NULL??? '.$ARR_TABLE['FIELDS'][$INDEX_OF_CONFIG_TABLE]->Null.' . Should be or YES or NO');
|
|
|
}
|
|
}
|
|
|
$sql.=" ;";
|
|
$sql.=" ;";
|
|
@@ -1178,7 +1178,7 @@ class Core_Database_Mysql extends Core_Database {
|
|
|
} else if($FOUND_INDEX_ARR->Non_unique==1) {
|
|
} else if($FOUND_INDEX_ARR->Non_unique==1) {
|
|
|
if($FOUND_INDEX_ARR->Sub_part > 0)
|
|
if($FOUND_INDEX_ARR->Sub_part > 0)
|
|
|
$sql="ALTER TABLE `".$TABLE."` ADD KEY `".$FOUND_INDEX_ARR->Key_name."` ( ".$FOUND_INDEX_ARR->Column_name." (".$FOUND_INDEX_ARR->Sub_part.") ) ;" ;
|
|
$sql="ALTER TABLE `".$TABLE."` ADD KEY `".$FOUND_INDEX_ARR->Key_name."` ( ".$FOUND_INDEX_ARR->Column_name." (".$FOUND_INDEX_ARR->Sub_part.") ) ;" ;
|
|
|
- else
|
|
|
|
|
|
|
+ else
|
|
|
$sql="ALTER TABLE `".$TABLE."` ADD KEY `".$FOUND_INDEX_ARR->Key_name."` ( ".$FOUND_INDEX_ARR->Column_name." ) ;" ;
|
|
$sql="ALTER TABLE `".$TABLE."` ADD KEY `".$FOUND_INDEX_ARR->Key_name."` ( ".$FOUND_INDEX_ARR->Column_name." ) ;" ;
|
|
|
echo "\n ".$sql;
|
|
echo "\n ".$sql;
|
|
|
$result=$this->query($sql) or DEBUG_S(-3,'Problem ze SQL:',$sql,__FILE__, __FUNCTION__, __LINE__) or die1();
|
|
$result=$this->query($sql) or DEBUG_S(-3,'Problem ze SQL:',$sql,__FILE__, __FUNCTION__, __LINE__) or die1();
|