Fixed bug #14005: Moving a page with IRRE records misplaces IRRE records
[Packages/TYPO3.CMS.git] / t3lib / class.t3lib_install.php
old mode 100755 (executable)
new mode 100644 (file)
index 68d0024..933f9bc
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2006 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 1999-2010 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -71,7 +71,6 @@
 
 
 
 
 
 
-require_once(PATH_t3lib.'class.t3lib_sqlparser.php');
 
 /**
  * Class to setup values in localconf.php and verify the TYPO3 DB tables/fields
 
 /**
  * Class to setup values in localconf.php and verify the TYPO3 DB tables/fields
@@ -93,6 +92,7 @@ class t3lib_install {
        var $backPath = '../';                          // Backpath (used for icons etc.)
 
        var $multiplySize = 1;                          // Multiplier of SQL field size (for char, varchar and text fields)
        var $backPath = '../';                          // Backpath (used for icons etc.)
 
        var $multiplySize = 1;                          // Multiplier of SQL field size (for char, varchar and text fields)
+       var $character_sets = array();                  // Caching output of $GLOBALS['TYPO3_DB']->admin_get_charsets()
 
                // Internal, dynamic:
        var $setLocalconf = 0;                          // Used to indicate that a value is change in the line-array of localconf and that it should be written.
 
                // Internal, dynamic:
        var $setLocalconf = 0;                          // Used to indicate that a value is change in the line-array of localconf and that it should be written.
@@ -140,6 +140,9 @@ class t3lib_install {
                $tokenSet = ($this->localconf_editPointToken && !$inArray);             // Flag is set if the token should be set but is not yet...
                $stopAtToken = ($this->localconf_editPointToken && $inArray);
                $comment = ' Modified or inserted by '.$this->updateIdentity.'.';
                $tokenSet = ($this->localconf_editPointToken && !$inArray);             // Flag is set if the token should be set but is not yet...
                $stopAtToken = ($this->localconf_editPointToken && $inArray);
                $comment = ' Modified or inserted by '.$this->updateIdentity.'.';
+               $replace = array('["', '"]');
+               $search = array('[\'', '\']');
+               $varDoubleQuotes = str_replace($search, $replace, $variable);
 
                        // Search for variable name:
                if (!$this->localconf_addLinesOnly && !$tokenSet)       {
 
                        // Search for variable name:
                if (!$this->localconf_addLinesOnly && !$tokenSet)       {
@@ -156,7 +159,21 @@ class t3lib_install {
                                                $found = 1;
                                                break;
                                        }
                                                $found = 1;
                                                break;
                                        }
-                               }
+                               } elseif (!strcmp(substr($v2, 0, strlen($varDoubleQuotes . ' ')), $varDoubleQuotes . ' ')) {
+                                               // Due to a bug in the update wizard (fixed in TYPO3 4.1.7) it is possible
+                                               // that $TYPO3_CONF_VARS['SYS']['compat_version'] was enclosed by "" (double
+                                               // quotes) instead of the expected '' (single quotes) when is was written to
+                                               // localconf.php. The following code was added to make sure that values with
+                                               // double quotes are updated, too.
+                                       $mainparts = explode($varDoubleQuotes, $v, 2);
+                                       if (count($mainparts) == 2) { // should ALWAYS be....
+                                               $subparts = explode('//', $mainparts[1], 2);
+                                               $line_array[$k] = $mainparts[0] . $variable . " = '" . $this->slashValueForSingleDashes($value) . "';   " . ('//' . $comment . str_replace($comment, '', $subparts[1]));
+                                               $this->touchedLine = count($line_array) - $k - 1;
+                                               $found = 1;
+                                               break;
+                                       }
+                               }
                        }
                        $line_array = array_reverse($line_array);
                }
                        }
                        $line_array = array_reverse($line_array);
                }
@@ -168,7 +185,11 @@ class t3lib_install {
                        $line_array[] = $variable." = '".$this->slashValueForSingleDashes($value)."';   // ".$comment;
                        $this->touchedLine = -1;
                }
                        $line_array[] = $variable." = '".$this->slashValueForSingleDashes($value)."';   // ".$comment;
                        $this->touchedLine = -1;
                }
-               $this->messages[] = $variable." = '".htmlspecialchars($value)."'";
+               if ($variable == '$typo_db_password') {
+                       $this->messages[] = 'Updated ' . $variable;
+               } else {
+                       $this->messages[] = $variable . " = '" . htmlspecialchars($value) . "'";
+               }
                $this->setLocalconf = 1;
        }
 
                $this->setLocalconf = 1;
        }
 
@@ -182,6 +203,7 @@ class t3lib_install {
         */
        function writeToLocalconf_control($inlines='',$absFullPath='')  {
                $tmpExt = '.TMP.php';
         */
        function writeToLocalconf_control($inlines='',$absFullPath='')  {
                $tmpExt = '.TMP.php';
+               $writeToLocalconf_dat = array();
                $writeToLocalconf_dat['file'] = $absFullPath ? $absFullPath : PATH_typo3conf.'localconf.php';
                $writeToLocalconf_dat['tmpfile'] = $writeToLocalconf_dat['file'].$tmpExt;
 
                $writeToLocalconf_dat['file'] = $absFullPath ? $absFullPath : PATH_typo3conf.'localconf.php';
                $writeToLocalconf_dat['tmpfile'] = $writeToLocalconf_dat['file'].$tmpExt;
 
@@ -286,61 +308,92 @@ class t3lib_install {
         *************************************/
 
        /**
         *************************************/
 
        /**
-        * Reads the field definitions for the input sql-file string
+        * Reads the field definitions for the input SQL-file string
         *
         *
-        * @param       string          $sqlContent: Should be a string read from an sql-file made with 'mysqldump [database_name] -d'
+        * @param       string          Should be a string read from an SQL-file made with 'mysqldump [database_name] -d'
         * @return      array           Array with information about table.
         */
        function getFieldDefinitions_fileContent($fileContent)  {
                $lines = t3lib_div::trimExplode(chr(10), $fileContent, 1);
         * @return      array           Array with information about table.
         */
        function getFieldDefinitions_fileContent($fileContent)  {
                $lines = t3lib_div::trimExplode(chr(10), $fileContent, 1);
-               $isTable = '';
-               $total = Array();
-
-               foreach($lines as $value)       {
-                       if ($value[0]!='#')     {
-                               if (!$isTable)  {
-                                       $parts = explode(' ',$value);
-                                       if ($parts[0]=='CREATE' && $parts[1]=='TABLE')  {
-                                               $isTable = str_replace( '`', '', $parts[2]);
-                                               if (TYPO3_OS=='WIN') {  // tablenames are always lowercase on windows!
-                                                       $isTable = strtolower($isTable);
+               $table = '';
+               $total = array();
+
+               foreach ($lines as $value) {
+                       if (substr($value,0,1)=='#') {
+                               continue;       // Ignore comments
+                       }
+
+                       if (!strlen($table)) {
+                               $parts = t3lib_div::trimExplode(' ', $value, TRUE);
+                               if (strtoupper($parts[0]) === 'CREATE' && strtoupper($parts[1]) === 'TABLE') {
+                                       $table = str_replace( '`', '', $parts[2]);
+                                       if (TYPO3_OS=='WIN') {  // tablenames are always lowercase on windows!
+                                               $table = strtolower($table);
+                                       }
+                               }
+                       } else {
+                               if (substr($value,0,1)==')' && substr($value,-1)==';')  {
+                                       $ttype = array();
+                                       if (preg_match('/(ENGINE|TYPE)[ ]*=[ ]*([a-zA-Z]*)/',$value,$ttype)) {
+                                               $total[$table]['extra']['ENGINE'] = $ttype[2];
+                                       } // Otherwise, just do nothing: If table engine is not defined, just accept the system default.
+
+                                               // Set the collation, if specified
+                                       if (preg_match('/(COLLATE)[ ]*=[ ]*([a-zA-z0-9_-]+)/', $value, $tcollation)) {
+                                               $total[$table]['extra']['COLLATE'] = $tcollation[2];
+                                       } else {
+                                                       // Otherwise, get the CHARACTER SET and try to find the default collation for it as returned by "SHOW CHARACTER SET" query (for details, see http://dev.mysql.com/doc/refman/5.1/en/charset-table.html)
+                                               if (preg_match('/(CHARSET|CHARACTER SET)[ ]*=[ ]*([a-zA-z0-9_-]+)/', $value, $tcharset)) {      // Note: Keywords "DEFAULT CHARSET" and "CHARSET" are the same, so "DEFAULT" can just be ignored
+                                                       $charset = $tcharset[2];
+                                               } else {
+                                                       $charset = $GLOBALS['TYPO3_DB']->default_charset;       // Fallback to default charset
                                                }
                                                }
+                                               $total[$table]['extra']['COLLATE'] = $this->getCollationForCharset($charset);
                                        }
                                        }
+
+                                       $table = '';    // Remove table marker and start looking for the next "CREATE TABLE" statement
                                } else {
                                } else {
-                                       if (substr($value,0,1)==')' && substr($value,-1)==';')  {
-                                               $ttype = array();
-                                               preg_match('/(ENGINE|TYPE)=([a-zA-Z]*)/',$value,$ttype);
-                                               $total[$isTable]['extra']['ttype'] = $ttype[2];
-                                               $isTable = '';
-                                       } else {
-                                               $lineV = preg_replace('/,$/','',$value);
-                                               $lineV = str_replace('UNIQUE KEY', 'UNIQUE', $lineV);
-                                               $parts = explode(' ',$lineV,2);
+                                       $lineV = preg_replace('/,$/','',$value);        // Strip trailing commas
+                                       $lineV = str_replace('`', '', $lineV);
+                                       $lineV = str_replace('  ', ' ', $lineV);        // Remove double blanks
+
+                                       $parts = explode(' ', $lineV, 2);
+                                       if (!preg_match('/(PRIMARY|UNIQUE|FULLTEXT|INDEX|KEY)/',$parts[0])) {   // Field definition
 
                                                        // Make sure there is no default value when auto_increment is set
 
                                                        // Make sure there is no default value when auto_increment is set
-                                               if(stristr($parts[1],'auto_increment')) {
+                                               if (stristr($parts[1],'auto_increment')) {
                                                        $parts[1] = preg_replace('/ default \'0\'/i','',$parts[1]);
                                                }
                                                        // "default" is always lower-case
                                                        $parts[1] = preg_replace('/ default \'0\'/i','',$parts[1]);
                                                }
                                                        // "default" is always lower-case
-                                               if(strstr($parts[1], ' DEFAULT '))      {
-                                                       $parts[1] = str_replace(' DEFAULT ', ' default ', $parts[1]);
+                                               if (stristr($parts[1], ' DEFAULT '))    {
+                                                       $parts[1] = str_ireplace(' DEFAULT ', ' default ', $parts[1]);
                                                }
 
                                                        // Change order of "default" and "null" statements
                                                $parts[1] = preg_replace('/(.*) (default .*) (NOT NULL)/', '$1 $3 $2', $parts[1]);
                                                $parts[1] = preg_replace('/(.*) (default .*) (NULL)/', '$1 $3 $2', $parts[1]);
 
                                                }
 
                                                        // Change order of "default" and "null" statements
                                                $parts[1] = preg_replace('/(.*) (default .*) (NOT NULL)/', '$1 $3 $2', $parts[1]);
                                                $parts[1] = preg_replace('/(.*) (default .*) (NULL)/', '$1 $3 $2', $parts[1]);
 
-                                                       // Remove double blanks
-                                               $parts[1] = preg_replace('/([^ ]+)[ ]+([^ ]+)/', '$1 $2', $parts[1]);
-
-                                               if ($parts[0]!='PRIMARY' && $parts[0]!='KEY' && $parts[0]!='UNIQUE')    {
-                                                       $key = str_replace('`', '', $parts[0]);
-                                                       $total[$isTable]['fields'][$key] = $parts[1];
-                                               } else {        // Process keys
-                                                       $newParts = explode(' ',$parts[1],2);
-                                                       $key = str_replace('`', '', ($parts[0]=='PRIMARY'?$parts[0]:$newParts[0]));
-                                                       $lineV = str_replace('`', '', $lineV);
-                                                       $total[$isTable]['keys'][$key] = $lineV;
+                                               $key = $parts[0];
+                                               $total[$table]['fields'][$key] = $parts[1];
+
+                                       } else {        // Key definition
+                                               $search = array('/UNIQUE (INDEX|KEY)/', '/FULLTEXT (INDEX|KEY)/', '/INDEX/');
+                                               $replace = array('UNIQUE', 'FULLTEXT', 'KEY');
+                                               $lineV = preg_replace($search, $replace, $lineV);
+
+                                               if (preg_match('/PRIMARY|UNIQUE|FULLTEXT/', $parts[0])) {
+                                                       $parts[1] = preg_replace('/^(KEY|INDEX) /', '', $parts[1]);
+                                               }
+
+                                               $newParts = explode(' ',$parts[1],2);
+                                               $key = $parts[0]=='PRIMARY' ? $parts[0] : $newParts[0];
+
+                                               $total[$table]['keys'][$key] = $lineV;
+
+                                                       // This is a protection against doing something stupid: Only allow clearing of cache_* and index_* tables.
+                                               if (preg_match('/^(cache|index)_/',$table)) {
+                                                               // Suggest to truncate (clear) this table
+                                                       $total[$table]['extra']['CLEAR'] = 1;
                                                }
                                        }
                                }
                                                }
                                        }
                                }
@@ -401,7 +454,7 @@ class t3lib_install {
                                                                                                }
                                                                                                $keys[] = $kfN;
                                                                                        }
                                                                                                }
                                                                                                $keys[] = $kfN;
                                                                                        }
-                                                                                       $total[$table]['keys'][$kN] = $match[1].'('.join(',',$keys).')'.$match[3];
+                                                                                       $total[$table]['keys'][$kN] = $match[1].'('.implode(',',$keys).')'.$match[3];
                                                                                }
                                                                        }
                                                                }
                                                                                }
                                                                        }
                                                                }
@@ -420,46 +473,93 @@ class t3lib_install {
        }
 
        /**
        }
 
        /**
+        * Look up the default collation for specified character set based on "SHOW CHARACTER SET" output
+        *
+        * @param       string          Character set
+        * @return      string          Corresponding default collation
+        */
+       function getCollationForCharset($charset)       {
+                       // Load character sets, if not cached already
+               if (!count($this->character_sets)) {
+                       if (method_exists($GLOBALS['TYPO3_DB'],'admin_get_charsets')) {
+                               $this->character_sets = $GLOBALS['TYPO3_DB']->admin_get_charsets();
+                       } else {
+                               $this->character_sets[$charset] = array();      // Add empty element to avoid that the check will be repeated
+                       }
+               }
+
+               $collation = '';
+               if (isset($this->character_sets[$charset]['Default collation'])) {
+                       $collation = $this->character_sets[$charset]['Default collation'];
+               }
+
+               return $collation;
+       }
+
+       /**
         * Reads the field definitions for the current database
         *
         * @return      array           Array with information about table.
         */
        function getFieldDefinitions_database() {
                $total = array();
         * Reads the field definitions for the current database
         *
         * @return      array           Array with information about table.
         */
        function getFieldDefinitions_database() {
                $total = array();
+               $tempKeys = array();
+               $tempKeysPrefix = array();
+
                $GLOBALS['TYPO3_DB']->sql_select_db(TYPO3_db);
                echo $GLOBALS['TYPO3_DB']->sql_error();
 
                $tables = $GLOBALS['TYPO3_DB']->admin_get_tables(TYPO3_db);
                $GLOBALS['TYPO3_DB']->sql_select_db(TYPO3_db);
                echo $GLOBALS['TYPO3_DB']->sql_error();
 
                $tables = $GLOBALS['TYPO3_DB']->admin_get_tables(TYPO3_db);
-               foreach ($tables as $tableName) {
+               foreach ($tables as $tableName => $tableStatus) {
 
                                // Fields:
                        $fieldInformation = $GLOBALS['TYPO3_DB']->admin_get_fields($tableName);
 
                                // Fields:
                        $fieldInformation = $GLOBALS['TYPO3_DB']->admin_get_fields($tableName);
-                       foreach($fieldInformation as $fN => $fieldRow)  {
+                       foreach ($fieldInformation as $fN => $fieldRow) {
                                $total[$tableName]['fields'][$fN] = $this->assembleFieldDefinition($fieldRow);
                        }
 
                                // Keys:
                        $keyInformation = $GLOBALS['TYPO3_DB']->admin_get_keys($tableName);
                                $total[$tableName]['fields'][$fN] = $this->assembleFieldDefinition($fieldRow);
                        }
 
                                // Keys:
                        $keyInformation = $GLOBALS['TYPO3_DB']->admin_get_keys($tableName);
-                       foreach($keyInformation as $kN => $keyRow)      {
-                               $tempKeys[$tableName][$keyRow['Key_name']][$keyRow['Seq_in_index']] = $keyRow['Column_name'];
-                               if ($keyRow['Sub_part'])        {
-                                       $tempKeys[$tableName][$keyRow['Key_name']][$keyRow['Seq_in_index']].= '('.$keyRow['Sub_part'].')';
+
+                       foreach ($keyInformation as $keyRow) {
+                               $keyName = $keyRow['Key_name'];
+                               $colName = $keyRow['Column_name'];
+                               if ($keyRow['Sub_part']) {
+                                       $colName.= '('.$keyRow['Sub_part'].')';
                                }
                                }
-                               if ($keyRow['Key_name']=='PRIMARY')     {
-                                       $tempKeysPrefix[$tableName][$keyRow['Key_name']] = 'PRIMARY KEY';
+                               $tempKeys[$tableName][$keyName][$keyRow['Seq_in_index']] = $colName;
+                               if ($keyName=='PRIMARY') {
+                                       $prefix = 'PRIMARY KEY';
                                } else {
                                } else {
-                                       if ($keyRow['Non_unique'])      {
-                                               $tempKeysPrefix[$tableName][$keyRow['Key_name']] = 'KEY';
+                                       if ($keyRow['Index_type']=='FULLTEXT') {
+                                               $prefix = 'FULLTEXT';
+                                       } elseif ($keyRow['Non_unique']) {
+                                               $prefix = 'KEY';
                                        } else {
                                        } else {
-                                               $tempKeysPrefix[$tableName][$keyRow['Key_name']] = 'UNIQUE';
+                                               $prefix = 'UNIQUE';
+                                       }
+                                       $prefix.= ' '.$keyName;
+                               }
+                               $tempKeysPrefix[$tableName][$keyName] = $prefix;
+                       }
+
+                               // Table status (storage engine, collaction, etc.)
+                       if (is_array($tableStatus)) {
+                               $tableExtraFields = array(
+                                       'Engine' => 'ENGINE',
+                                       'Collation' => 'COLLATE',
+                               );
+
+                               foreach ($tableExtraFields as $mysqlKey=>$internalKey) {
+                                       if (isset($tableStatus[$mysqlKey])) {
+                                               $total[$tableName]['extra'][$internalKey] = $tableStatus[$mysqlKey];
                                        }
                                        }
-                                       $tempKeysPrefix[$tableName][$keyRow['Key_name']].= ' '.$keyRow['Key_name'];
                                }
                        }
                }
 
                        // Compile key information:
                                }
                        }
                }
 
                        // Compile key information:
-               if (is_array($tempKeys)) {
+               if (count($tempKeys)) {
                        foreach ($tempKeys as $table => $keyInf) {
                                foreach ($keyInf as $kName => $index) {
                                        ksort($index);
                        foreach ($tempKeys as $table => $keyInf) {
                                foreach ($keyInf as $kName => $index) {
                                        ksort($index);
@@ -478,8 +578,8 @@ class t3lib_install {
         * @param       array           Field definitions, source (from getFieldDefinitions_fileContent())
         * @param       array           Field definitions, comparison. (from getFieldDefinitions_database())
         * @param       string          Table names (in list) which is the ONLY one observed.
         * @param       array           Field definitions, source (from getFieldDefinitions_fileContent())
         * @param       array           Field definitions, comparison. (from getFieldDefinitions_database())
         * @param       string          Table names (in list) which is the ONLY one observed.
-        * @param       boolean         If set, this function ignores NOT NULL statements of the sql file field definition when comparing current field definition from database with field definition from sql file. This way, NOT NULL statements will be executed when the field is initially created, but the sql parser will never complain about missing NOT NULL statements afterwards.
-        * @return      array           Returns an array with 1) all elements from $FSsrc that is not in $FDcomp (in key 'extra') and 2) all elements from $FSsrc that is difference from the ones in $FDcomp
+        * @param       boolean         If set, this function ignores NOT NULL statements of the SQL file field definition when comparing current field definition from database with field definition from SQL file. This way, NOT NULL statements will be executed when the field is initially created, but the SQL parser will never complain about missing NOT NULL statements afterwards.
+        * @return      array           Returns an array with 1) all elements from $FDsrc that is not in $FDcomp (in key 'extra') and 2) all elements from $FDsrc that is different from the ones in $FDcomp
         */
        function getDatabaseExtra($FDsrc, $FDcomp, $onlyTableList='',$ignoreNotNullWhenComparing=true)  {
                $extraArr = array();
         */
        function getDatabaseExtra($FDsrc, $FDcomp, $onlyTableList='',$ignoreNotNullWhenComparing=true)  {
                $extraArr = array();
@@ -492,16 +592,27 @@ class t3lib_install {
                                                $extraArr[$table] = $info;              // If the table was not in the FDcomp-array, the result array is loaded with that table.
                                                $extraArr[$table]['whole_table']=1;
                                        } else {
                                                $extraArr[$table] = $info;              // If the table was not in the FDcomp-array, the result array is loaded with that table.
                                                $extraArr[$table]['whole_table']=1;
                                        } else {
-                                               $keyTypes = explode(',','fields,keys');
+                                               $keyTypes = explode(',','extra,fields,keys');
                                                foreach ($keyTypes as $theKey) {
                                                        if (is_array($info[$theKey])) {
                                                                foreach ($info[$theKey] as $fieldN => $fieldC) {
                                                                        $fieldN = str_replace('`','',$fieldN);
                                                foreach ($keyTypes as $theKey) {
                                                        if (is_array($info[$theKey])) {
                                                                foreach ($info[$theKey] as $fieldN => $fieldC) {
                                                                        $fieldN = str_replace('`','',$fieldN);
-                                                                       if (!isset($FDcomp[$table][$theKey][$fieldN]))  {
+                                                                       if ($fieldN=='COLLATE') {
+                                                                               continue;       // TODO: collation support is currently disabled (needs more testing)
+                                                                       }
+
+                                                                       if (!isset($FDcomp[$table][$theKey][$fieldN])) {
                                                                                $extraArr[$table][$theKey][$fieldN] = $fieldC;
                                                                                $extraArr[$table][$theKey][$fieldN] = $fieldC;
-                                                                       } elseif (strcmp($FDcomp[$table][$theKey][$fieldN], $ignoreNotNullWhenComparing?str_replace(' NOT NULL', '', trim($fieldC)):trim($fieldC)))     {
-                                                                               $diffArr[$table][$theKey][$fieldN] = $fieldC;
-                                                                               $diffArr_cur[$table][$theKey][$fieldN] = $FDcomp[$table][$theKey][$fieldN];
+                                                                       } else {
+                                                                               $fieldC = trim($fieldC);
+                                                                               if ($ignoreNotNullWhenComparing) {
+                                                                                       $fieldC = str_replace(' NOT NULL', '', $fieldC);
+                                                                                       $FDcomp[$table][$theKey][$fieldN] = str_replace(' NOT NULL', '', $FDcomp[$table][$theKey][$fieldN]);
+                                                                               }
+                                                                               if ($fieldC !== $FDcomp[$table][$theKey][$fieldN]) {
+                                                                                       $diffArr[$table][$theKey][$fieldN] = $fieldC;
+                                                                                       $diffArr_cur[$table][$theKey][$fieldN] = $FDcomp[$table][$theKey][$fieldN];
+                                                                               }
                                                                        }
                                                                }
                                                        }
                                                                        }
                                                                }
                                                        }
@@ -545,6 +656,18 @@ class t3lib_install {
                                                        if ($info['whole_table']) {
                                                                $whole_table[]=$fN.' '.$fV;
                                                        } else {
                                                        if ($info['whole_table']) {
                                                                $whole_table[]=$fN.' '.$fV;
                                                        } else {
+                                                                       // Special case to work around MySQL problems when adding auto_increment fields:
+                                                               if (stristr($fV, 'auto_increment')) {
+                                                                               // The field can only be set "auto_increment" if there exists a PRIMARY key of that field already.
+                                                                               // The check does not look up which field is primary but just assumes it must be the field with the auto_increment value...
+                                                                       if (isset($diffArr['extra'][$table]['keys']['PRIMARY'])) {
+                                                                                       // Remove "auto_increment" from the statement - it will be suggested in a 2nd step after the primary key was created
+                                                                               $fV = str_replace(' auto_increment', '', $fV);
+                                                                       } else {
+                                                                                       // In the next step, attempt to clear the table once again (2 = force)
+                                                                               $info['extra']['CLEAR'] = 2;
+                                                                       }
+                                                               }
                                                                if ($theKey=='extra') {
                                                                        if ($remove) {
                                                                                if (substr($fN,0,strlen($deletedPrefixKey))!=$deletedPrefixKey) {
                                                                if ($theKey=='extra') {
                                                                        if ($remove) {
                                                                                if (substr($fN,0,strlen($deletedPrefixKey))!=$deletedPrefixKey) {
@@ -588,6 +711,40 @@ class t3lib_install {
                                                        }
                                                }
                                        }
                                                        }
                                                }
                                        }
+                                       if (is_array($info['extra'])) {
+                                               $extras = array();
+                                               $extras_currentValue = array();
+                                               $clear_table = false;
+
+                                               foreach ($info['extra'] as $fN => $fV) {
+
+                                                               // Only consider statements which are missing in the database but don't remove existing properties
+                                                       if (!$remove) {
+                                                               if (!$info['whole_table']) {    // If the whole table is created at once, we take care of this later by imploding all elements of $info['extra']
+                                                                       if ($fN=='CLEAR') {
+                                                                                       // Truncate table must happen later, not now
+                                                                                       // Valid values for CLEAR: 1=only clear if keys are missing, 2=clear anyway (force)
+                                                                               if (count($info['keys']) || $fV==2) {
+                                                                                       $clear_table = true;
+                                                                               }
+                                                                               continue;
+                                                                       } else {
+                                                                               $extras[] = $fN.'='.$fV;
+                                                                               $extras_currentValue[] = $fN.'='.$diffArr['diff_currentValues'][$table]['extra'][$fN];
+                                                                       }
+                                                               }
+                                                       }
+                                               }
+                                               if ($clear_table) {
+                                                       $statement = 'TRUNCATE TABLE '.$table.';';
+                                                       $statements['clear_table'][md5($statement)] = $statement;
+                                               }
+                                               if (count($extras)) {
+                                                       $statement = 'ALTER TABLE '.$table.' '.implode(' ',$extras).';';
+                                                       $statements['change'][md5($statement)] = $statement;
+                                                       $statements['change_currentValue'][md5($statement)] = implode(' ',$extras_currentValue);
+                                               }
+                                       }
                                        if ($info['whole_table']) {
                                                if ($remove) {
                                                        if (substr($table,0,strlen($deletedPrefixKey))!=$deletedPrefixKey) {
                                        if ($info['whole_table']) {
                                                if ($remove) {
                                                        if (substr($table,0,strlen($deletedPrefixKey))!=$deletedPrefixKey) {
@@ -598,12 +755,19 @@ class t3lib_install {
                                                                $statements['drop_table'][md5($statement)] = $statement;
                                                        }
                                                                // count:
                                                                $statements['drop_table'][md5($statement)] = $statement;
                                                        }
                                                                // count:
-                                                       $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('count(*)', $table, '');
-                                                       list($count) = $GLOBALS['TYPO3_DB']->sql_fetch_row($res);
+                                                       $count = $GLOBALS['TYPO3_DB']->exec_SELECTcountRows('*', $table);
                                                        $statements['tables_count'][md5($statement)] = $count?'Records in table: '.$count:'';
                                                } else {
                                                        $statement = 'CREATE TABLE '.$table." (\n".implode(",\n",$whole_table)."\n)";
                                                        $statements['tables_count'][md5($statement)] = $count?'Records in table: '.$count:'';
                                                } else {
                                                        $statement = 'CREATE TABLE '.$table." (\n".implode(",\n",$whole_table)."\n)";
-                                                       $statement .= ($info['extra']['ttype']) ? ' TYPE='.$info['extra']['ttype'].';' : ';';
+                                                       if ($info['extra']) {
+                                                               foreach ($info['extra'] as $k=>$v) {
+                                                                       if ($k=='COLLATE' || $k=='CLEAR') {
+                                                                               continue;       // Skip these special statements. TODO: collation support is currently disabled (needs more testing)
+                                                                       }
+                                                                       $statement.= ' '.$k.'='.$v;     // Add extra attributes like ENGINE, CHARSET, etc.
+                                                               }
+                                                       }
+                                                       $statement.= ';';
                                                        $statements['create_table'][md5($statement)] = $statement;
                                                }
                                        }
                                                        $statements['create_table'][md5($statement)] = $statement;
                                                }
                                        }
@@ -617,30 +781,35 @@ class t3lib_install {
        /**
         * Converts a result row with field information into the SQL field definition string
         *
        /**
         * Converts a result row with field information into the SQL field definition string
         *
-        * @param       array           MySQL result row.
+        * @param       array           MySQL result row
         * @return      string          Field definition
         */
        function assembleFieldDefinition($row)  {
         * @return      string          Field definition
         */
        function assembleFieldDefinition($row)  {
-               $field[] = $row['Type'];
-               // if (!$row['Null'])   { $field[] = 'NOT NULL'; }
+               $field = array($row['Type']);
+
+               if ($row['Null']=='NO') {
+                       $field[] = 'NOT NULL';
+               }
                if (!strstr($row['Type'],'blob') && !strstr($row['Type'],'text')) {
                if (!strstr($row['Type'],'blob') && !strstr($row['Type'],'text')) {
-                               // Add a default value if the field is not auto-incremented (these fields never have a default definition).
+                               // Add a default value if the field is not auto-incremented (these fields never have a default definition)
                        if (!stristr($row['Extra'],'auto_increment')) {
                        if (!stristr($row['Extra'],'auto_increment')) {
-                               $field[] = 'default '."'".(addslashes($row['Default']))."'";
+                               $field[] = 'default \''.addslashes($row['Default']).'\'';
                        }
                }
                        }
                }
-               if ($row['Extra'])      { $field[] = $row['Extra']; }
+               if ($row['Extra']) {
+                       $field[] = $row['Extra'];
+               }
 
                return implode(' ',$field);
        }
 
        /**
 
                return implode(' ',$field);
        }
 
        /**
-        * Returns an array where every entry is a single sql-statement. Input must be formatted like an ordinary MySQL-dump files
+        * Returns an array where every entry is a single SQL-statement. Input must be formatted like an ordinary MySQL-dump files.
         *
         *
-        * @param       string          $sqlcode        The sql-file content. Provided that 1) every query in the input is ended with ';' and that a line in the file contains only one query or a part of a query.
-        * @param       boolean         If set, non-sql (like comments and blank lines) are not included in the final product)
-        * @param       string          Regex to filter SQL lines to include.
-        * @return      array           Array of SQL statements.
+        * @param       string          The SQL-file content. Provided that 1) every query in the input is ended with ';' and that a line in the file contains only one query or a part of a query.
+        * @param       boolean         If set, non-SQL content (like comments and blank lines) is not included in the final output
+        * @param       string          Regex to filter SQL lines to include
+        * @return      array           Array of SQL statements
         */
        function getStatementArray($sqlcode,$removeNonSQL=0,$query_regex='')    {
                $sqlcodeArr = explode(chr(10), $sqlcode);
         */
        function getStatementArray($sqlcode,$removeNonSQL=0,$query_regex='')    {
                $sqlcodeArr = explode(chr(10), $sqlcode);
@@ -649,27 +818,31 @@ class t3lib_install {
                $statementArray = array();
                $statementArrayPointer = 0;
 
                $statementArray = array();
                $statementArrayPointer = 0;
 
-               foreach ($sqlcodeArr as $line => $linecontent) {
+               foreach ($sqlcodeArr as $line => $lineContent) {
                        $is_set = 0;
                        $is_set = 0;
-                       if(stristr($linecontent,'auto_increment')) {
-                               $linecontent = eregi_replace(' default \'0\'','',$linecontent);
+
+                               // auto_increment fields cannot have a default value!
+                       if (stristr($lineContent,'auto_increment')) {
+                               $lineContent = preg_replace('/ default \'0\'/i', '', $lineContent);
                        }
 
                        }
 
-                       if (!$removeNonSQL || (strcmp(trim($linecontent),'') && substr(trim($linecontent),0,1)!='#' && substr(trim($linecontent),0,2)!='--')) {         // '--' is seen as mysqldump comments from server version 3.23.49
-                               $statementArray[$statementArrayPointer].= $linecontent;
+                       if (!$removeNonSQL || (strcmp(trim($lineContent),'') && substr(trim($lineContent),0,1)!='#' && substr(trim($lineContent),0,2)!='--')) {         // '--' is seen as mysqldump comments from server version 3.23.49
+                               $statementArray[$statementArrayPointer].= $lineContent;
                                $is_set = 1;
                        }
                                $is_set = 1;
                        }
-                       if (substr(trim($linecontent),-1)==';') {
+                       if (substr(trim($lineContent),-1)==';') {
                                if (isset($statementArray[$statementArrayPointer])) {
                                if (isset($statementArray[$statementArrayPointer])) {
-                                       if (!trim($statementArray[$statementArrayPointer]) || ($query_regex && !eregi($query_regex,trim($statementArray[$statementArrayPointer])))) {
+                                       if (!trim($statementArray[$statementArrayPointer]) || ($query_regex && !preg_match('/'.$query_regex.'/i',trim($statementArray[$statementArrayPointer])))) {
                                                unset($statementArray[$statementArrayPointer]);
                                        }
                                }
                                $statementArrayPointer++;
                                                unset($statementArray[$statementArrayPointer]);
                                        }
                                }
                                $statementArrayPointer++;
+
                        } elseif ($is_set) {
                                $statementArray[$statementArrayPointer].= chr(10);
                        }
                }
                        } elseif ($is_set) {
                                $statementArray[$statementArrayPointer].= chr(10);
                        }
                }
+
                return $statementArray;
        }
 
                return $statementArray;
        }
 
@@ -680,25 +853,28 @@ class t3lib_install {
         * @param       boolean         If set, will count number of INSERT INTO statements following that table definition
         * @return      array           Array with table definitions in index 0 and count in index 1
         */
         * @param       boolean         If set, will count number of INSERT INTO statements following that table definition
         * @return      array           Array with table definitions in index 0 and count in index 1
         */
-       function getCreateTables($statements, $insertCountFlag=0)       {
+       function getCreateTables($statements, $insertCountFlag=0) {
                $crTables = array();
                $insertCount = array();
                $crTables = array();
                $insertCount = array();
-               foreach ($statements as $line => $linecontent) {
+               foreach ($statements as $line => $lineContent) {
                        $reg = array();
                        $reg = array();
-                       if (eregi('^create[[:space:]]*table[[:space:]]*[`]?([[:alnum:]_]*)[`]?',substr($linecontent,0,100),$reg)) {
+                       if (preg_match('/^create[[:space:]]*table[[:space:]]*[`]?([[:alnum:]_]*)[`]?/i',substr($lineContent,0,100),$reg)) {
                                $table = trim($reg[1]);
                                if ($table)     {
                                $table = trim($reg[1]);
                                if ($table)     {
-                                       if (TYPO3_OS=='WIN')    { $table=strtolower($table); }  // table names are always lowercase on Windows!
-                                       $sqlLines = explode(chr(10), $linecontent);
+                                               // table names are always lowercase on Windows!
+                                       if (TYPO3_OS == 'WIN') {
+                                               $table = strtolower($table);
+                                       }
+                                       $sqlLines = explode(chr(10), $lineContent);
                                        foreach ($sqlLines as $k=>$v) {
                                                if (stristr($v,'auto_increment')) {
                                        foreach ($sqlLines as $k=>$v) {
                                                if (stristr($v,'auto_increment')) {
-                                                       $sqlLines[$k] = eregi_replace(' default \'0\'','',$v);
+                                                       $sqlLines[$k] = preg_replace('/ default \'0\'/i', '', $v);
                                                }
                                        }
                                                }
                                        }
-                                       $linecontent = implode(chr(10), $sqlLines);
-                                       $crTables[$table] = $linecontent;
+                                       $lineContent = implode(chr(10), $sqlLines);
+                                       $crTables[$table] = $lineContent;
                                }
                                }
-                       } elseif ($insertCountFlag && eregi('^insert[[:space:]]*into[[:space:]]*[`]?([[:alnum:]_]*)[`]?',substr($linecontent,0,100),$reg)) {
+                       } elseif ($insertCountFlag && preg_match('/^insert[[:space:]]*into[[:space:]]*[`]?([[:alnum:]_]*)[`]?/i',substr($lineContent,0,100),$reg)) {
                                $nTable = trim($reg[1]);
                                $insertCount[$nTable]++;
                        }
                                $nTable = trim($reg[1]);
                                $insertCount[$nTable]++;
                        }
@@ -716,12 +892,12 @@ class t3lib_install {
         */
        function getTableInsertStatements($statements, $table)  {
                $outStatements=array();
         */
        function getTableInsertStatements($statements, $table)  {
                $outStatements=array();
-               foreach($statements as $line => $linecontent)   {
+               foreach($statements as $line => $lineContent) {
                        $reg = array();
                        $reg = array();
-                       if (preg_match('/^insert[[:space:]]*into[[:space:]]*[`]?([[:alnum:]_]*)[`]?/i',substr($linecontent,0,100),$reg))        {
+                       if (preg_match('/^insert[[:space:]]*into[[:space:]]*[`]?([[:alnum:]_]*)[`]?/i',substr($lineContent,0,100),$reg)) {
                                $nTable = trim($reg[1]);
                                if ($nTable && !strcmp($table,$nTable)) {
                                $nTable = trim($reg[1]);
                                if ($nTable && !strcmp($table,$nTable)) {
-                                       $outStatements[]=$linecontent;
+                                       $outStatements[] = $lineContent;
                                }
                        }
                }
                                }
                        }
                }
@@ -764,6 +940,9 @@ class t3lib_install {
         */
        function getListOfTables()      {
                $whichTables = $GLOBALS['TYPO3_DB']->admin_get_tables(TYPO3_db);
         */
        function getListOfTables()      {
                $whichTables = $GLOBALS['TYPO3_DB']->admin_get_tables(TYPO3_db);
+               foreach ($whichTables as $key=>&$value) {
+                       $value = $key;
+               }
                return $whichTables;
        }
 
                return $whichTables;
        }
 
@@ -781,16 +960,30 @@ class t3lib_install {
        function generateUpdateDatabaseForm_checkboxes($arr,$label,$checked=1,$iconDis=0,$currentValue=array(),$cVfullMsg=0)    {
                $out = array();
                if (is_array($arr))     {
        function generateUpdateDatabaseForm_checkboxes($arr,$label,$checked=1,$iconDis=0,$currentValue=array(),$cVfullMsg=0)    {
                $out = array();
                if (is_array($arr))     {
+                       $tableId = uniqid('table');
+                       if (count($arr) > 1) {
+                               $out[] = '
+                                       <tr class="update-db-fields-batch">
+                                               <td valign="top">
+                                                       <input type="checkbox" id="' . $tableId . '-checkbox"' . ($checked ? ' checked="checked"' : '') . '
+                                                        onclick="$(\'' . $tableId . '\').select(\'input[type=checkbox]\').invoke(\'setValue\', $(this).checked);" />
+                                               </td>
+                                               <td nowrap="nowrap"><label for="' . $tableId . '-checkbox" style="cursor:pointer"><strong>select/deselect all</strong></label></td>
+                                       </tr>';
+                       }
                        foreach($arr as $key => $string)        {
                                $ico = '';
                        foreach($arr as $key => $string)        {
                                $ico = '';
+                               $warnings = array();
+
                                if ($iconDis)   {
                                if ($iconDis)   {
-                                       if (stristr($string,' user_'))  {
+                                       if (preg_match('/^TRUNCATE/i',$string)) {
+                                               $ico.= '<img src="'.$this->backPath.'gfx/icon_warning.gif" width="18" height="16" align="top" alt="" /><strong> </strong>';
+                                               $warnings['clear_table_info'] = 'Clearing the table is sometimes neccessary when adding new keys. In case of cache_* tables this should not hurt at all. However, use it with care.';
+                                       } elseif (stristr($string,' user_'))    {
                                                $ico.= '<img src="'.$this->backPath.'gfx/icon_warning.gif" width="18" height="16" align="top" alt="" /><strong>(USER) </strong>';
                                                $ico.= '<img src="'.$this->backPath.'gfx/icon_warning.gif" width="18" height="16" align="top" alt="" /><strong>(USER) </strong>';
-                                       }
-                                       if (stristr($string,' app_'))   {
+                                       } elseif (stristr($string,' app_'))     {
                                                $ico.= '<img src="'.$this->backPath.'gfx/icon_warning.gif" width="18" height="16" align="top" alt="" /><strong>(APP) </strong>';
                                                $ico.= '<img src="'.$this->backPath.'gfx/icon_warning.gif" width="18" height="16" align="top" alt="" /><strong>(APP) </strong>';
-                                       }
-                                       if (stristr($string,' ttx_') || stristr($string,' tx_'))        {
+                                       } elseif (stristr($string,' ttx_') || stristr($string,' tx_'))  {
                                                $ico.= '<img src="'.$this->backPath.'gfx/icon_warning.gif" width="18" height="16" align="top" alt="" /><strong>(EXT) </strong>';
                                        }
                                }
                                                $ico.= '<img src="'.$this->backPath.'gfx/icon_warning.gif" width="18" height="16" align="top" alt="" /><strong>(EXT) </strong>';
                                        }
                                }
@@ -803,16 +996,23 @@ class t3lib_install {
                                        $out[]='
                                        <tr>
                                                <td valign="top"></td>
                                        $out[]='
                                        <tr>
                                                <td valign="top"></td>
-                                               <td nowrap="nowrap" style="color : #666666;">'.nl2br((!$cVfullMsg?"Current value: ":"").'<em>'.$currentValue[$key].'</em>').'</td>
+                                               <td nowrap="nowrap" style="color:#666666;">'.nl2br((!$cVfullMsg?"Current value: ":"").'<em>'.$currentValue[$key].'</em>').'</td>
                                        </tr>';
                                }
                        }
                                        </tr>';
                                }
                        }
+                       if (count($warnings)) {
+                               $out[] = '
+                                       <tr>
+                                               <td valign="top"></td>
+                                               <td style="color:#666666;"><em>' . implode('<br />',$warnings) . '</em></td>
+                                       </tr>';
+                       }
 
                        // Compile rows:
                        $content = '
                                <!-- Update database fields / tables -->
                                <h3>'.$label.'</h3>
 
                        // Compile rows:
                        $content = '
                                <!-- Update database fields / tables -->
                                <h3>'.$label.'</h3>
-                               <table border="0" cellpadding="2" cellspacing="2" class="update-db-fields">'.implode('',$out).'
+                               <table border="0" cellpadding="2" cellspacing="2" id="' . $tableId . '" class="update-db-fields">' . implode('', $out) . '
                                </table>';
                }
 
                                </table>';
                }
 
@@ -820,18 +1020,21 @@ class t3lib_install {
        }
 
        /**
        }
 
        /**
-        * Reads the field definitions for the input sql-file string
+        * Reads the field definitions for the input SQL-file string
         *
         *
-        * @param       string          $sqlContent: Should be a string read from an sql-file made with 'mysqldump [database_name] -d'
+        * @param       string          Should be a string read from an SQL-file made with 'mysqldump [database_name] -d'
         * @return      array           Array with information about table.
         * @return      array           Array with information about table.
-        * @deprecated
+        * @deprecated  since TYPO3 4.2, this function will be removed in TYPO3 4.5, use ->getFieldDefinitions_fileContent() instead!
         */
         */
-       function getFieldDefinitions_sqlContent($sqlContent)    {
-               return $this->getFieldDefinitions_fileContent($sqlContent);
+       function getFieldDefinitions_sqlContent($fileContent)   {
+               t3lib_div::logDeprecatedFunction();
+
+               return $this->getFieldDefinitions_fileContent($fileContent);
        }
 }
 
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_install.php'])  {
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_install.php']);
 }
        }
 }
 
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_install.php'])  {
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_install.php']);
 }
-?>
+
+?>
\ No newline at end of file