Changeset 2333 for trunk/admin/include/functions.php

Timestamp:

May 6, 2008, 3:04:58 AM (16 years ago)

Author:

rvelices

Message:

• remove some unnecessary db columns (#history_summary.id, #history.year, month, day and hour)

File:

• trunk/admin/include/functions.php (modified) (11 diffs)

trunk/admin/include/functions.php

@@ -278 +278 @@
     $where_cats = '%s IN('.wordwrap(implode(', ', $ids), 120, "\n").')';
   }
-  
+
   // find all categories where the setted representative is not possible :
   // the picture does not exist
@@ -395 +395 @@
       {
         $query = '
-  INSERT INTO '.$table_name.'
-    ('.implode(',', $dbfields).')
-     VALUES';
+INSERT INTO '.$table_name.'
+  ('.implode(',', $dbfields).')
+  VALUES';
         $first = false;
       }
@@ -403 +403 @@
       {
         $query .= '
-    , ';
+  , ';
       }
 
@@ -453 +453 @@
       {
         $query = '
-  UPDATE '.$tablename.'
-    SET ';
+UPDATE '.$tablename.'
+  SET ';
         $is_first = true;
         foreach ($dbfields['update'] as $key)
@@ -474 +474 @@
         }
         $query.= '
-    WHERE ';
+  WHERE ';
 
         $is_first = true;
@@ -483 +483 @@
             $query.= ' AND ';
           }
-          $query.= $key.' = \''.$data[$key].'\'';
+          if ( isset($data[$key]) )
+          {
+            $query.= $key.' = \''.$data[$key].'\'';
+          }
+          else
+          {
+            $query.= $key.' IS NULL';
+          }
           $is_first = false;
         }
         $query.= '
-  ;';
+;';
         pwg_query($query);
       }
@@ -495 +502 @@
       // creation of the temporary table
       $query = '
-  SHOW FULL COLUMNS FROM '.$tablename.'
+SHOW FULL COLUMNS FROM '.$tablename.'
 ;';
       $result = pwg_query($query);
@@ -506 +513 @@
           $column = $row['Field'];
           $column.= ' '.$row['Type'];
-          if (!isset($row['Null']) or $row['Null'] == '')
+
+          $nullable = true;
+          if (!isset($row['Null']) or $row['Null'] == '' or $row['Null']=='NO')
           {
             $column.= ' NOT NULL';
+            $nullable = false;
           }
           if (isset($row['Default']))
           {
             $column.= " default '".$row['Default']."'";
+          }
+          elseif ($nullable)
+          {
+            $column.= " default NULL";
           }
           if (isset($row['Collation']) and $row['Collation'] != 'NULL')
@@ -528 +542 @@
   (
   '.implode(",\n", $columns).',
-  PRIMARY KEY ('.implode(',', $dbfields['primary']).')
+  UNIQUE KEY the_key ('.implode(',', $dbfields['primary']).')
   )
 ;';
+
       pwg_query($query);
       mass_inserts($temporary_tablename, $all_fields, $datas);
       // update of images table by joining with temporary table
       $query = '
-  UPDATE '.$tablename.' AS t1, '.$temporary_tablename.' AS t2
-    SET '.
+UPDATE '.$tablename.' AS t1, '.$temporary_tablename.' AS t2
+  SET '.
         implode(
           "\n    , ",
@@ -544 +559 @@
             )
           ).'
-    WHERE '.
+  WHERE '.
         implode(
           "\n    AND ",
@@ -555 +570 @@
       pwg_query($query);
       $query = '
-  DROP TABLE '.$temporary_tablename.'
+DROP TABLE '.$temporary_tablename.'
 ;';
       pwg_query($query);