* Merging all changes from TYPO3_4-0 branch back into HEAD
authorMichael Stucki <michael.stucki@typo3.org>
Mon, 10 Apr 2006 09:27:15 +0000 (09:27 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Mon, 10 Apr 2006 09:27:15 +0000 (09:27 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/dbal/trunk@23840 735d13b6-9817-0410-8766-e36946ffe9aa

typo3/sysext/dbal/ChangeLog
typo3/sysext/dbal/class.ux_t3lib_db.php
typo3/sysext/dbal/class.ux_t3lib_sqlengine.php
typo3/sysext/dbal/class.ux_t3lib_sqlparser.php
typo3/sysext/dbal/doc/manual.sxw
typo3/sysext/dbal/ext_emconf.php
typo3/sysext/dbal/ext_php_api.dat [deleted file]
typo3/sysext/dbal/ext_tables.sql
typo3/sysext/dbal/mod1/index.php
typo3/sysext/dbal/mod1/locallang.xml
typo3/sysext/dbal/mod1/locallang_mod.xml

index ac266cf..a85c5a0 100644 (file)
@@ -1,3 +1,18 @@
+2006-01-19  Karsten Dambekalns <karsten@typo3.org>
+
+       * Changes to connection handling, detecting failed connections.
+       * Added support for $no_quote_fields in UPDATE and INSERT methods.
+
+2006-01-04  Karsten Dambekalns <karsten@typo3.org>
+
+       * Changed the way a connection is established with ADOdb. The new
+       way allows ODBC connections (rather, connections to drivers having
+       an underscore in their name).
+       * Changes to ext_tables.sql to make it more portable.
+       * When printing errors, output the offending SQL as well.
+       * Some small fixes, enhancements to code documentation.
+       * Some additions to the manual.
+
 2005-12-27  Karsten Dambekalns <karsten@typo3.org>
 
        * Converted locallang to XML, small adaptions to syext location.
index 2dfe9e6..f029b76 100644 (file)
@@ -126,158 +126,151 @@ require_once(PATH_t3lib.'class.t3lib_install.php');
  */
 class ux_t3lib_DB extends t3lib_DB {
 
-  // Internal, static:
-  var $printErrors = FALSE;                    // Enable output of SQL errors after query executions. Set through TYPO3_CONF_VARS, see init()
-  var $debug = FALSE;                                  // Enable debug mode. Set through TYPO3_CONF_VARS, see init()
-  var $conf = array();                         // Configuration array, copied from TYPO3_CONF_VARS in constructor.
+       // Internal, static:
+       var $printErrors = FALSE;                       // Enable output of SQL errors after query executions. Set through TYPO3_CONF_VARS, see init()
+       var $debug = FALSE;                                     // Enable debug mode. Set through TYPO3_CONF_VARS, see init()
+       var $conf = array();                            // Configuration array, copied from TYPO3_CONF_VARS in constructor.
 
-  var $mapping = array();                              // See manual.
-  var $table2handlerKeys = array();    // See manual.
-  var $handlerCfg = array (                    // See manual.
-  '_DEFAULT' => array (
-  'type' => 'native',
-  'config' => array(
-  'username' => '',            // Set by default (overridden)
-  'password' => '',            // Set by default (overridden)
-  'host' => '',                        // Set by default (overridden)
-  'database' => '',            // Set by default (overridden)
-  'driver' => '',                      // ONLY "adodb" type; eg. "mysql"
-  )
-  ),
-  );
+       var $mapping = array();                         // See manual.
+       var $table2handlerKeys = array();       // See manual.
+       var $handlerCfg = array (                       // See manual.
+       '_DEFAULT' => array (
+       'type' => 'native',
+       'config' => array(
+       'username' => '',               // Set by default (overridden)
+       'password' => '',               // Set by default (overridden)
+       'host' => '',                   // Set by default (overridden)
+       'database' => '',               // Set by default (overridden)
+       'driver' => '',                 // ONLY "adodb" type; eg. "mysql"
+       )
+       ),
+       );
 
 
-  // Internal, dynamic:
-  var $handlerInstance = array();                              // Contains instance of the handler objects as they are created. Exception is the native mySQL calls which are registered as an array with keys "handlerType" = "native" and "link" pointing to the link resource for the connection.
-  var $lastHandlerKey = '';                                    // Storage of the handler key of last ( SELECT) query - used for subsequent fetch-row calls etc.
-  var $lastQuery = '';                                         // Storage of last SELECT query
-  var $lastParsedAndMappedQueryArray=array();  // Query array, the last one parsed
+       // Internal, dynamic:
+       var $handlerInstance = array();                         // Contains instance of the handler objects as they are created. Exception is the native mySQL calls which are registered as an array with keys "handlerType" = "native" and "link" pointing to the link resource for the connection.
+       var $lastHandlerKey = '';                                       // Storage of the handler key of last ( SELECT) query - used for subsequent fetch-row calls etc.
+       var $lastQuery = '';                                            // Storage of last SELECT query
+       var $lastParsedAndMappedQueryArray=array();     // Query array, the last one parsed
 
-  var $resourceIdToTableNameMap = array();     // Mapping of resource ids to table names.
+       var $resourceIdToTableNameMap = array();        // Mapping of resource ids to table names.
 
-  // Internal, caching:
-  var $cache_handlerKeyFromTableList = array();                        // Caching handlerKeys for table lists
-  var $cache_mappingFromTableList = array();                   // Caching mapping information for table lists
-  var $cache_autoIncFields = array(); // parsed SQL from standard DB dump file
-  var $cache_fieldType = array(); // field types for tables/fields
-  var $cache_primaryKeys = array(); // primary keys
+       // Internal, caching:
+       var $cache_handlerKeyFromTableList = array();                   // Caching handlerKeys for table lists
+       var $cache_mappingFromTableList = array();                      // Caching mapping information for table lists
+       var $cache_autoIncFields = array(); // parsed SQL from standard DB dump file
+       var $cache_fieldType = array(); // field types for tables/fields
+       var $cache_primaryKeys = array(); // primary keys
 
 
 
 
 
-  /**
+       /**
         * Constructor.
         * Creates SQL parser object and imports configuration from $TYPO3_CONF_VARS['EXTCONF']['dbal']
         *
         * @return      void
         */
-  function ux_t3lib_DB()       {
+       function ux_t3lib_DB()  {
 
-    // Set SQL parser object for internal use:
-    $this->SQLparser = t3lib_div::makeInstance('t3lib_sqlengine');
-    $this->Installer = t3lib_div::makeInstance('t3lib_install');
+               // Set SQL parser object for internal use:
+               $this->SQLparser = t3lib_div::makeInstance('t3lib_sqlengine');
+               $this->Installer = t3lib_div::makeInstance('t3lib_install');
 
-    // Set internal variables with configuration:
-    $this->conf = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['dbal'];
-    $this->initInternalVariables();
-  }
+               // Set internal variables with configuration:
+               $this->conf = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['dbal'];
+               $this->initInternalVariables();
+       }
 
-  /**
+       /**
         * Setting internal variables from $this->conf
         *
         * @return      void
         */
-  function initInternalVariables()     {
-
-    // Set outside configuration:
-    if (isset($this->conf['mapping']))                         $this->mapping = $this->conf['mapping'];
-    if (isset($this->conf['table2handlerKeys']))       $this->table2handlerKeys = $this->conf['table2handlerKeys'];
-    if (isset($this->conf['handlerCfg']))                      $this->handlerCfg = $this->conf['handlerCfg'];
-
-    $this->cacheFieldInfo();
-    // Debugging settings:
-    $this->printErrors = $this->conf['debugOptions']['printErrors'] ? TRUE : FALSE;
-    $this->debug = $this->conf['debugOptions']['enabled'] ? TRUE : FALSE;
-  }
-
-  function clearCachedFieldInfo() {
-    if(file_exists(PATH_typo3conf.'temp_fieldInfo.php'))
-    unlink(PATH_typo3conf.'temp_fieldInfo.php');
-  }
-
-  function cacheFieldInfo() {
-    global $TYPO3_LOADED_EXT;
-    $extSQL = '';
-    $parsedExtSQL = array();
-
-    // try to fetch cached file first
-    // file is removed when admin_query() is called
-    if(file_exists(PATH_typo3conf.'temp_fieldInfo.php')) {
-      $fdata = unserialize(t3lib_div::getUrl(PATH_typo3conf.'temp_fieldInfo.php'));
-      $this->cache_autoIncFields = $fdata['incFields'];
-      $this->cache_fieldType = $fdata['fieldTypes'];
-      $this->cache_primaryKeys = $fdata['primaryKeys'];
-    }
-    else {
-      // handle stddb.sql
-      $extSQL = t3lib_div::getUrl(PATH_site.'t3lib/stddb/tables.sql');
-      $parsedExtSQL = $this->Installer->getFieldDefinitions_sqlContent($extSQL);
-
-      // extract auto_inc field (if any)
-      foreach($parsedExtSQL as $table => $tdef) {
-        foreach($tdef['fields'] as $field => $fdef) {
-          $fdef = $this->SQLparser->parseFieldDef($fdef);
-          $this->cache_fieldType[$table][$field]['type'] = $fdef['fieldType'];
-          $this->cache_fieldType[$table][$field]['metaType'] = $this->MySQLMetaType($fdef['fieldType']);
-          $this->cache_fieldType[$table][$field]['notnull'] = (isset($fdef['featureIndex']['NOTNULL']) && !$this->SQLparser->checkEmptyDefaultValue($fdef['featureIndex'])) ? 1 : 0;
-          if(isset($fdef['featureIndex']['AUTO_INCREMENT'])) {
-            // store in array
-            $this->cache_autoIncFields[$table] = $field;
-          }
-          if(isset($tdef['keys']['PRIMARY'])) {
-                                               $this->cache_primaryKeys[$table] = substr($tdef['keys']['PRIMARY'], 13, -1);
-          }
-        }
-      }
-
-      // loop over all installed extensions
-      foreach($TYPO3_LOADED_EXT as $ext => $v) {
-        if(!is_array($v) || !isset($v['ext_tables.sql']))
-        continue;
-
-        // fetch db dump (if any) and parse it
-        $extSQL = t3lib_div::getUrl($v['ext_tables.sql']);
-        $parsedExtSQL = $this->Installer->getFieldDefinitions_sqlContent($extSQL);
-
-        // extract auto_inc field (if any)
-        foreach($parsedExtSQL as $table => $tdef) {
-          foreach($tdef['fields'] as $field => $fdef) {
-            $fdef = $this->SQLparser->parseFieldDef($fdef);
-            $this->cache_fieldType[$table][$field]['type'] = $fdef['fieldType'];
-            $this->cache_fieldType[$table][$field]['metaType'] = $this->MySQLMetaType($fdef['fieldType']);
-            $this->cache_fieldType[$table][$field]['notnull'] = (isset($fdef['featureIndex']['NOTNULL']) && !$this->SQLparser->checkEmptyDefaultValue($fdef['featureIndex'])) ? 1 : 0;
-            if(isset($fdef['featureIndex']['AUTO_INCREMENT'])) {
-              $this->cache_autoIncFields[$table] = $field;
-            }
-            if(isset($tdef['keys']['PRIMARY'])) {
-                                                       $this->cache_primaryKeys[$table] = substr($tdef['keys']['PRIMARY'], 13, -1);
-            }
-          }
-        }
-      }
+       function initInternalVariables()        {
+
+               // Set outside configuration:
+               if (isset($this->conf['mapping']))                              $this->mapping = $this->conf['mapping'];
+               if (isset($this->conf['table2handlerKeys']))    $this->table2handlerKeys = $this->conf['table2handlerKeys'];
+               if (isset($this->conf['handlerCfg']))                   $this->handlerCfg = $this->conf['handlerCfg'];
+
+               $this->cacheFieldInfo();
+               // Debugging settings:
+               $this->printErrors = $this->conf['debugOptions']['printErrors'] ? TRUE : FALSE;
+               $this->debug = $this->conf['debugOptions']['enabled'] ? TRUE : FALSE;
+       }
+
+       function clearCachedFieldInfo() {
+               if(file_exists(PATH_typo3conf.'temp_fieldInfo.php'))
+               unlink(PATH_typo3conf.'temp_fieldInfo.php');
+       }
+
+       function cacheFieldInfo() {
+               global $TYPO3_LOADED_EXT;
+               $extSQL = '';
+               $parsedExtSQL = array();
+
+               // try to fetch cached file first
+               // file is removed when admin_query() is called
+               if(file_exists(PATH_typo3conf.'temp_fieldInfo.php')) {
+                       $fdata = unserialize(t3lib_div::getUrl(PATH_typo3conf.'temp_fieldInfo.php'));
+                       $this->cache_autoIncFields = $fdata['incFields'];
+                       $this->cache_fieldType = $fdata['fieldTypes'];
+                       $this->cache_primaryKeys = $fdata['primaryKeys'];
+               }
+               else {
+                               // handle stddb.sql, parse and analyze
+                       $extSQL = t3lib_div::getUrl(PATH_site.'t3lib/stddb/tables.sql');
+                       $parsedExtSQL = $this->Installer->getFieldDefinitions_sqlContent($extSQL);
+                       $this->analyzeFields($parsedExtSQL);
+
+                               // loop over all installed extensions
+                       foreach($TYPO3_LOADED_EXT as $ext => $v)        {
+                               if(!is_array($v) || !isset($v['ext_tables.sql']))
+                               continue;
+
+                                       // fetch db dump (if any) and parse it, then analyze
+                               $extSQL = t3lib_div::getUrl($v['ext_tables.sql']);
+                               $parsedExtSQL = $this->Installer->getFieldDefinitions_sqlContent($extSQL);
+                               $this->analyzeFields($parsedExtSQL);
+                       }
 
                        $cachedFieldInfo = array('incFields' => $this->cache_autoIncFields, 'fieldTypes' => $this->cache_fieldType, 'primaryKeys' => $this->cache_primaryKeys);
                        $cachedFieldInfo = serialize($this->mapCachedFieldInfo($cachedFieldInfo));
 
-      // write serialized content to file
+                               // write serialized content to file
                        t3lib_div::writeFile(PATH_typo3conf."temp_fieldInfo.php", $cachedFieldInfo);
 
                        if (strcmp(t3lib_div::getUrl(PATH_typo3conf."temp_fieldInfo.php"), $cachedFieldInfo))   {
-        die('typo3temp/temp_incfields.php was NOT updated properly (written content didn\'t match file content) - maybe write access problem?');
-      }
-    }
-  }
+                               die('typo3temp/temp_incfields.php was NOT updated properly (written content didn\'t match file content) - maybe write access problem?');
+                       }
+               }
+       }
+
+       /**
+        * Analyzes fields and adds the extracted information to the field type, auto increment and primary key info caches.
+        *
+        * @param array $parsedExtSQL The output produced by t3lib_install::getFieldDefinitions_sqlContent()
+        * @return void
+        * @see t3lib_install::getFieldDefinitions_sqlContent()
+        */
+       function analyzeFields($parsedExtSQL) {
+               foreach($parsedExtSQL as $table => $tdef) {
+                       foreach($tdef['fields'] as $field => $fdef) {
+                               $fdef = $this->SQLparser->parseFieldDef($fdef);
+                               $this->cache_fieldType[$table][$field]['type'] = $fdef['fieldType'];
+                               $this->cache_fieldType[$table][$field]['metaType'] = $this->MySQLMetaType($fdef['fieldType']);
+                               $this->cache_fieldType[$table][$field]['notnull'] = (isset($fdef['featureIndex']['NOTNULL']) && !$this->SQLparser->checkEmptyDefaultValue($fdef['featureIndex'])) ? 1 : 0;
+                               if(isset($fdef['featureIndex']['AUTO_INCREMENT'])) {
+                                       $this->cache_autoIncFields[$table] = $field;
+                               }
+                               if(isset($tdef['keys']['PRIMARY'])) {
+                                       $this->cache_primaryKeys[$table] = substr($tdef['keys']['PRIMARY'], 13, -1);
+                               }
+                       }
+               }
+       }
 
        /**
        * This function builds all definitions for mapped tables and fields
@@ -286,308 +279,308 @@ class ux_t3lib_DB extends t3lib_DB {
        function mapCachedFieldInfo($fieldInfo){
                global $TYPO3_CONF_VARS;
 
-               foreach($TYPO3_CONF_VARS['EXTCONF']['dbal']['mapping'] as $mappedTable => $mappedConf){
-                       if(array_key_exists($mappedTable, $fieldInfo['incFields'])) {
-                               $mappedTableAlias = $mappedConf['mapTableName'];
-                               $fieldInfo['incFields'][$mappedTableAlias] = isset($mappedConf['mapFieldNames'][$fieldInfo['incFields'][$mappedTable]]) ? $mappedConf['mapFieldNames'][$fieldInfo['incFields'][$mappedTable]] : $fieldInfo['incFields'][$mappedTable];
-                       }
+               if(is_array($TYPO3_CONF_VARS['EXTCONF']['dbal']['mapping'])) {
+                       foreach($TYPO3_CONF_VARS['EXTCONF']['dbal']['mapping'] as $mappedTable => $mappedConf){
+                               if(array_key_exists($mappedTable, $fieldInfo['incFields'])) {
+                                       $mappedTableAlias = $mappedConf['mapTableName'];
+                                       $fieldInfo['incFields'][$mappedTableAlias] = isset($mappedConf['mapFieldNames'][$fieldInfo['incFields'][$mappedTable]]) ? $mappedConf['mapFieldNames'][$fieldInfo['incFields'][$mappedTable]] : $fieldInfo['incFields'][$mappedTable];
+                               }
+
+                               if(array_key_exists($mappedTable, $fieldInfo['fieldTypes'])) {
+                                       foreach($fieldInfo['fieldTypes'][$mappedTable] as $field => $fieldConf){
+                                               $tempMappedFieldConf[$mappedConf['mapFieldNames'][$field]] = $fieldConf;
+                                       }
 
-                       if(array_key_exists($mappedTable, $fieldInfo['fieldTypes'])) {
-                               foreach($fieldInfo['fieldTypes'][$mappedTable] as $field => $fieldConf){
-                                       $tempMappedFieldConf[$mappedConf['mapFieldNames'][$field]] = $fieldConf;
+                                       $fieldInfo['fieldTypes'][$mappedConf['mapTableName']] = $tempMappedFieldConf;
                                }
 
-                               $fieldInfo['fieldTypes'][$mappedConf['mapTableName']] = $tempMappedFieldConf;
-                       }
+                               if(array_key_exists($mappedTable, $fieldInfo['primaryKeys'])) {
+                                       $mappedTableAlias = $mappedConf['mapTableName'];
+                                       $fieldInfo['primaryKeys'][$mappedTableAlias] = isset($mappedConf['mapFieldNames'][$fieldInfo['primaryKeys'][$mappedTable]]) ? $mappedConf['mapFieldNames'][$fieldInfo['primaryKeys'][$mappedTable]] : $fieldInfo['primaryKeys'][$mappedTable];
+                               }
 
-                       if(array_key_exists($mappedTable, $fieldInfo['primaryKeys'])) {
-                               $mappedTableAlias = $mappedConf['mapTableName'];
-                               $fieldInfo['primaryKeys'][$mappedTableAlias] = isset($mappedConf['mapFieldNames'][$fieldInfo['primaryKeys'][$mappedTable]]) ? $mappedConf['mapFieldNames'][$fieldInfo['primaryKeys'][$mappedTable]] : $fieldInfo['primaryKeys'][$mappedTable];
                        }
-
                }
 
                return $fieldInfo;
        }
 
 
-  /************************************
-  *
-  * Query Building (Overriding parent methods)
-  * These functions are extending counterparts in the parent class.
-  *
-  **************************************/
+       /************************************
+       *
+       * Query Building (Overriding parent methods)
+       * These functions are extending counterparts in the parent class.
+       *
+       **************************************/
 
-  /* From the ADOdb documentation, this is what we do (_Execute for SELECT, _query for the other actions)
+       /* From the ADOdb documentation, this is what we do (_Execute for SELECT, _query for the other actions)
 
-  Execute() is the default way to run queries. You can use the low-level functions _Execute() and _query() to reduce query overhead.
-  Both these functions share the same parameters as Execute().
+       Execute() is the default way to run queries. You can use the low-level functions _Execute() and _query() to reduce query overhead.
+       Both these functions share the same parameters as Execute().
 
-  If you do not have any bind parameters or your database supports binding (without emulation), then you can call _Execute() directly.
-  Calling this function bypasses bind emulation. Debugging is still supported in _Execute().
+       If you do not have any bind parameters or your database supports binding (without emulation), then you can call _Execute() directly.
+       Calling this function bypasses bind emulation. Debugging is still supported in _Execute().
 
-  If you do not require debugging facilities nor emulated binding, and do not require a recordset to be returned, then you can call _query.
-  This is great for inserts, updates and deletes. Calling this function bypasses emulated binding, debugging, and recordset handling. Either
-  the resultid, true or false are returned by _query().
-  */
+       If you do not require debugging facilities nor emulated binding, and do not require a recordset to be returned, then you can call _query.
+       This is great for inserts, updates and deletes. Calling this function bypasses emulated binding, debugging, and recordset handling. Either
+       the resultid, true or false are returned by _query().
+       */
 
-  /**
+       /**
         * Inserts a record for $table from the array with field/value pairs $fields_values.
         *
         * @param       string          Table name
         * @param       array           Field values as key=>value pairs. Values will be escaped internally. Typically you would fill an array like "$insertFields" with 'fieldname'=>'value' and pass it to this function as argument.
+        * @param mixed    List/array of keys NOT to quote (eg. SQL functions)
         * @return      mixed           Result from handler, usually TRUE when success and FALSE on failure
         */
-  function exec_INSERTquery($table,$fields_values)     {
-
-    if ($this->debug)  $pt = t3lib_div::milliseconds();
-
-    // Do field mapping if needed:
-    $ORIG_tableName = $table;
-    if ($tableArray = $this->map_needMapping($table))  {
-
-      // Field mapping of array:
-      $fields_values = $this->map_assocArray($fields_values,$tableArray);
-
-      // Table name:
-      if ($this->mapping[$table]['mapTableName'])      {
-        $table = $this->mapping[$table]['mapTableName'];
-      }
-    }
-    // Select API:
-    $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
-    switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])   {
-      case 'native':
-      $this->lastQuery = $this->INSERTquery($table,$fields_values);
-      if(is_string($this->lastQuery)) {
-        $sqlResult = mysql_query($this->lastQuery, $this->handlerInstance[$this->lastHandlerKey]['link']);
-      }
-      else {
-        $sqlResult = mysql_query($this->lastQuery[0], $this->handlerInstance[$this->lastHandlerKey]['link']);
-        foreach($this->lastQuery[1] as $field => $content) {
-          mysql_query('UPDATE '.$this->quoteFromTables($table).' SET '.$this->quoteFromTables($field).'='.$this->fullQuoteStr($content,$table).' WHERE '.$this->quoteWhereClause($where), $this->handlerInstance[$this->lastHandlerKey]['link']);
-        }
-      }
-      break;
-      case 'adodb':
-      // auto generate ID for auto_increment fields if not present (static import needs this!)
-      // should we check the table name here (static_*)?
-      if(isset($this->cache_autoIncFields[$table])) {
-        if(isset($fields_values[$this->cache_autoIncFields[$table]])) {
-          $new_id = $fields_values[$this->cache_autoIncFields[$table]];
-          if($table !== 'tx_dbal_debuglog') {
-            $this->handlerInstance[$this->lastHandlerKey]->last_insert_id = $new_id;
-          }
-        }
-        else {
-          $new_id = $this->handlerInstance[$this->lastHandlerKey]->GenID($table.'_'.$this->cache_autoIncFields[$table]);
-          $fields_values[$this->cache_autoIncFields[$table]] = $new_id;
-          if($table !== 'tx_dbal_debuglog') {
-            $this->handlerInstance[$this->lastHandlerKey]->last_insert_id = $new_id;
-          }
-        }
-      }
-
-      $this->lastQuery = $this->INSERTquery($table,$fields_values);
-      if(is_string($this->lastQuery)) {
-        $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->_query($this->lastQuery,false);
-      }
-      else {
-       $this->handlerInstance[$this->lastHandlerKey]->StartTrans();
-        $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->_query($this->lastQuery[0],false);
-        foreach($this->lastQuery[1] as $field => $content) {
-          if(empty($content)) continue;
-
-          if(isset($this->cache_autoIncFields[$table]) && isset($new_id)) {
-            $this->handlerInstance[$this->lastHandlerKey]->UpdateBlob($this->quoteFromTables($table),$field,$content,$this->quoteWhereClause($this->cache_autoIncFields[$table].'='.$new_id));
-          }
-          elseif(isset($this->cache_primaryKeys[$table])) {
-            $pks = explode(',', $this->cache_primaryKeys[$table]);
-            foreach ($pks as $pk) {
-              if(isset($fields_values[$pk]))
-              $where .= $pk.'='.$this->fullQuoteStr($fields_values[$pk], $table).' AND ';
-            }
-            $where = $this->quoteWhereClause($where.'1=1');
-            $this->handlerInstance[$this->lastHandlerKey]->UpdateBlob($this->quoteFromTables($table),$field,$content,$where);
-          }
-          else {
-                       $this->handlerInstance[$this->lastHandlerKey]->CompleteTrans(false);
-            die('Could not update BLOB >>>> no WHERE clause found!'); // should never ever happen
-          }
-        }
-               $this->handlerInstance[$this->lastHandlerKey]->CompleteTrans();
-      }
-      break;
-      case 'userdefined':
-      $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->exec_INSERTquery($table,$fields_values);
-      break;
-    }
-
-    // Print errors:
-    if ($this->printErrors && $this->sql_error())      { debug(array($this->sql_error()));     }
-
-    # DEBUG:
-    if ($this->debug)  {
-      $this->debugHandler(
-      'exec_INSERTquery',
-      t3lib_div::milliseconds()-$pt,
-      array(
-      'handlerType' => $hType,
-      'args' => array($table,$fields_values),
-      'ORIG_tablename' => $ORIG_tableName
-      )
-      );
-    }
-    // Return output:
-    return $sqlResult;
-  }
-
-  /**
+       function exec_INSERTquery($table,$fields_values,$no_quote_fields='')    {
+
+               if ($this->debug)       $pt = t3lib_div::milliseconds();
+
+               // Do field mapping if needed:
+               $ORIG_tableName = $table;
+               if ($tableArray = $this->map_needMapping($table))       {
+
+                       // Field mapping of array:
+                       $fields_values = $this->map_assocArray($fields_values,$tableArray);
+
+                       // Table name:
+                       if ($this->mapping[$table]['mapTableName'])     {
+                               $table = $this->mapping[$table]['mapTableName'];
+                       }
+               }
+               // Select API:
+               $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
+               switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])        {
+                       case 'native':
+                               $this->lastQuery = $this->INSERTquery($table,$fields_values,$no_quote_fields);
+                               if(is_string($this->lastQuery)) {
+                                       $sqlResult = mysql_query($this->lastQuery, $this->handlerInstance[$this->lastHandlerKey]['link']);
+                               }
+                               else {
+                                       $sqlResult = mysql_query($this->lastQuery[0], $this->handlerInstance[$this->lastHandlerKey]['link']);
+                                       foreach($this->lastQuery[1] as $field => $content) {
+                                               mysql_query('UPDATE '.$this->quoteFromTables($table).' SET '.$this->quoteFromTables($field).'='.$this->fullQuoteStr($content,$table).' WHERE '.$this->quoteWhereClause($where), $this->handlerInstance[$this->lastHandlerKey]['link']);
+                                       }
+                               }
+                               break;
+                       case 'adodb':
+                               // auto generate ID for auto_increment fields if not present (static import needs this!)
+                               // should we check the table name here (static_*)?
+                               if(isset($this->cache_autoIncFields[$table])) {
+                                       if(isset($fields_values[$this->cache_autoIncFields[$table]])) {
+                                               $new_id = $fields_values[$this->cache_autoIncFields[$table]];
+                                               if($table !== 'tx_dbal_debuglog') {
+                                                       $this->handlerInstance[$this->lastHandlerKey]->last_insert_id = $new_id;
+                                               }
+                                       } else {
+                                               $new_id = $this->handlerInstance[$this->lastHandlerKey]->GenID($table.'_'.$this->cache_autoIncFields[$table]);
+                                               $fields_values[$this->cache_autoIncFields[$table]] = $new_id;
+                                               if($table !== 'tx_dbal_debuglog') {
+                                                       $this->handlerInstance[$this->lastHandlerKey]->last_insert_id = $new_id;
+                                               }
+                                       }
+                               }
+
+                               $this->lastQuery = $this->INSERTquery($table,$fields_values,$no_quote_fields);
+                               if(is_string($this->lastQuery)) {
+                                       $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->_query($this->lastQuery,false);
+                               } else {
+                                       $this->handlerInstance[$this->lastHandlerKey]->StartTrans();
+                                       $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->_query($this->lastQuery[0],false);
+                                       foreach($this->lastQuery[1] as $field => $content) {
+                                               if(empty($content)) continue;
+
+                                               if(isset($this->cache_autoIncFields[$table]) && isset($new_id)) {
+                                                       $this->handlerInstance[$this->lastHandlerKey]->UpdateBlob($this->quoteFromTables($table),$field,$content,$this->quoteWhereClause($this->cache_autoIncFields[$table].'='.$new_id));
+                                               } elseif(isset($this->cache_primaryKeys[$table])) {
+                                                       $pks = explode(',', $this->cache_primaryKeys[$table]);
+                                                       foreach ($pks as $pk) {
+                                                               if(isset($fields_values[$pk]))
+                                                               $where .= $pk.'='.$this->fullQuoteStr($fields_values[$pk], $table).' AND ';
+                                                       }
+                                                       $where = $this->quoteWhereClause($where.'1=1');
+                                                       $this->handlerInstance[$this->lastHandlerKey]->UpdateBlob($this->quoteFromTables($table),$field,$content,$where);
+                                               } else {
+                                                       $this->handlerInstance[$this->lastHandlerKey]->CompleteTrans(false);
+                                                       die('Could not update BLOB >>>> no WHERE clause found!'); // should never ever happen
+                                               }
+                                       }
+                                       $this->handlerInstance[$this->lastHandlerKey]->CompleteTrans();
+                               }
+                               break;
+                       case 'userdefined':
+                               $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->exec_INSERTquery($table,$fields_values,$no_quote_fields);
+                               break;
+               }
+
+               if ($this->printErrors && $this->sql_error())   {
+                       debug(array($this->lastQuery, $this->sql_error()));
+               }
+
+               if ($this->debug)       {
+                       $this->debugHandler(
+                       'exec_INSERTquery',
+                       t3lib_div::milliseconds()-$pt,
+                       array(
+                       'handlerType' => $hType,
+                       'args' => array($table,$fields_values),
+                       'ORIG_tablename' => $ORIG_tableName
+                       )
+                       );
+               }
+               // Return output:
+               return $sqlResult;
+       }
+
+       /**
         * Updates a record from $table
         *
         * @param       string          Database tablename
         * @param       string          WHERE clause, eg. "uid=1". NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself!
         * @param       array           Field values as key=>value pairs. Values will be escaped internally. Typically you would fill an array like "$updateFields" with 'fieldname'=>'value' and pass it to this function as argument.
+        * @param mixed    List/array of keys NOT to quote (eg. SQL functions)
         * @return      mixed           Result from handler, usually TRUE when success and FALSE on failure
         */
-  function exec_UPDATEquery($table,$where,$fields_values)      {
-
-    if ($this->debug)  $pt = t3lib_div::milliseconds();
-
-    // Do table/field mapping:
-    $ORIG_tableName = $table;
-    if ($tableArray = $this->map_needMapping($table))  {
-
-      // Field mapping of array:
-      $fields_values = $this->map_assocArray($fields_values,$tableArray);
-
-      // Where clause table and field mapping:
-      $whereParts = $this->SQLparser->parseWhereClause($where);
-      $this->map_sqlParts($whereParts,$tableArray[0]['table']);
-      $where = $this->SQLparser->compileWhereClause($whereParts);
-
-      // Table name:
-      if ($this->mapping[$table]['mapTableName'])      {
-        $table = $this->mapping[$table]['mapTableName'];
-      }
-    }
-
-    // Select API
-    $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
-    switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])   {
-      case 'native':
-      $this->lastQuery = $this->UPDATEquery($table,$where,$fields_values);
-      if(is_string($this->lastQuery)) {
-        $sqlResult = mysql_query($this->lastQuery, $this->handlerInstance[$this->lastHandlerKey]['link']);
-      }
-      else {
-        $sqlResult = mysql_query($this->lastQuery[0], $this->handlerInstance[$this->lastHandlerKey]['link']);
-        foreach($this->lastQuery[1] as $field => $content) {
-          mysql_query('UPDATE '.$this->quoteFromTables($table).' SET '.$this->quoteFromTables($field).'='.$this->fullQuoteStr($content,$table).' WHERE '.$this->quoteWhereClause($where), $this->handlerInstance[$this->lastHandlerKey]['link']);
-        }
-      }
-      break;
-      case 'adodb':
-      $this->lastQuery = $this->UPDATEquery($table,$where,$fields_values);
-      if(is_string($this->lastQuery)) {
-             $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->_query($this->lastQuery,false);
-      } else {
-               $this->handlerInstance[$this->lastHandlerKey]->StartTrans();
-        $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->_query($this->lastQuery[0],false);
-        foreach($this->lastQuery[1] as $field => $content) {
-          $this->handlerInstance[$this->lastHandlerKey]->UpdateBlob($this->quoteFromTables($table),$field,$content,$this->quoteWhereClause($where));
-        }
-               $this->handlerInstance[$this->lastHandlerKey]->CompleteTrans();
-      }
-      break;
-      case 'userdefined':
-      $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->exec_UPDATEquery($table,$where,$fields_values);
-      break;
-    }
-
-    // Print errors:
-    if ($this->printErrors && $this->sql_error())      { debug(array($this->sql_error()));     }
-
-    # DEBUG:
-    if ($this->debug)  {
-      $this->debugHandler(
-      'exec_UPDATEquery',
-      t3lib_div::milliseconds()-$pt,
-      array(
-      'handlerType' => $hType,
-      'args' => array($table,$where, $fields_values),
-      'ORIG_from_table' => $ORIG_tableName
-      )
-      );
-    }
-
-    // Return result:
-    return $sqlResult;
-  }
-
-  /**
+       function exec_UPDATEquery($table,$where,$fields_values,$no_quote_fields='')     {
+
+               if ($this->debug)       $pt = t3lib_div::milliseconds();
+
+               // Do table/field mapping:
+               $ORIG_tableName = $table;
+               if ($tableArray = $this->map_needMapping($table))       {
+
+                       // Field mapping of array:
+                       $fields_values = $this->map_assocArray($fields_values,$tableArray);
+
+                       // Where clause table and field mapping:
+                       $whereParts = $this->SQLparser->parseWhereClause($where);
+                       $this->map_sqlParts($whereParts,$tableArray[0]['table']);
+                       $where = $this->SQLparser->compileWhereClause($whereParts);
+
+                       // Table name:
+                       if ($this->mapping[$table]['mapTableName'])     {
+                               $table = $this->mapping[$table]['mapTableName'];
+                       }
+               }
+
+               // Select API
+               $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
+               switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])        {
+                       case 'native':
+                               $this->lastQuery = $this->UPDATEquery($table,$where,$fields_values,$no_quote_fields);
+                               if(is_string($this->lastQuery)) {
+                                       $sqlResult = mysql_query($this->lastQuery, $this->handlerInstance[$this->lastHandlerKey]['link']);
+                               }
+                               else {
+                                       $sqlResult = mysql_query($this->lastQuery[0], $this->handlerInstance[$this->lastHandlerKey]['link']);
+                                       foreach($this->lastQuery[1] as $field => $content) {
+                                               mysql_query('UPDATE '.$this->quoteFromTables($table).' SET '.$this->quoteFromTables($field).'='.$this->fullQuoteStr($content,$table).' WHERE '.$this->quoteWhereClause($where), $this->handlerInstance[$this->lastHandlerKey]['link']);
+                                       }
+                               }
+                       break;
+                       case 'adodb':
+                               $this->lastQuery = $this->UPDATEquery($table,$where,$fields_values,$no_quote_fields);
+                               if(is_string($this->lastQuery)) {
+                                       $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->_query($this->lastQuery,false);
+                               } else {
+                                       $this->handlerInstance[$this->lastHandlerKey]->StartTrans();
+                                       $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->_query($this->lastQuery[0],false);
+                                       foreach($this->lastQuery[1] as $field => $content) {
+                                               $this->handlerInstance[$this->lastHandlerKey]->UpdateBlob($this->quoteFromTables($table),$field,$content,$this->quoteWhereClause($where));
+                                       }
+                                       $this->handlerInstance[$this->lastHandlerKey]->CompleteTrans();
+                               }
+                               break;
+                       case 'userdefined':
+                               $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->exec_UPDATEquery($table,$where,$fields_values,$no_quote_fields);
+                               break;
+               }
+
+               if ($this->printErrors && $this->sql_error())   {
+                       debug(array($this->lastQuery, $this->sql_error()));
+               }
+
+               if ($this->debug)       {
+                       $this->debugHandler(
+                       'exec_UPDATEquery',
+                       t3lib_div::milliseconds()-$pt,
+                       array(
+                       'handlerType' => $hType,
+                       'args' => array($table,$where, $fields_values),
+                       'ORIG_from_table' => $ORIG_tableName
+                       )
+                       );
+               }
+
+               // Return result:
+               return $sqlResult;
+       }
+
+       /**
         * Deletes records from table
         *
         * @param       string          Database tablename
         * @param       string          WHERE clause, eg. "uid=1". NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself!
         * @return      mixed           Result from handler
         */
-  function exec_DELETEquery($table,$where)     {
-
-    if ($this->debug)  $pt = t3lib_div::milliseconds();
-
-    // Do table/field mapping:
-    $ORIG_tableName = $table;
-    if ($tableArray = $this->map_needMapping($table))  {
-
-      // Where clause:
-      $whereParts = $this->SQLparser->parseWhereClause($where);
-      $this->map_sqlParts($whereParts,$tableArray[0]['table']);
-      $where = $this->SQLparser->compileWhereClause($whereParts);
-
-      // Table name:
-      if ($this->mapping[$table]['mapTableName'])      {
-        $table = $this->mapping[$table]['mapTableName'];
-      }
-    }
-
-    // Select API
-    $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
-    switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])   {
-      case 'native':
-      $this->lastQuery = $this->DELETEquery($table,$where);
-      $sqlResult = mysql_query($this->lastQuery, $this->handlerInstance[$this->lastHandlerKey]['link']);
-      break;
-      case 'adodb':
-      $this->lastQuery = $this->DELETEquery($table,$where);
-      $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->_query($this->lastQuery,false);
-      break;
-      case 'userdefined':
-      $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->exec_DELETEquery($table,$where);
-      break;
-    }
-
-    // Print errors:
-    if ($this->printErrors && $this->sql_error())      { debug(array($this->sql_error()));     }
-
-    # DEBUG:
-    if ($this->debug)  {
-      $this->debugHandler(
-      'exec_DELETEquery',
-      t3lib_div::milliseconds()-$pt,
-      array(
-      'handlerType' => $hType,
-      'args' => array($table,$where),
-      'ORIG_from_table' => $ORIG_tableName
-      )
-      );
-    }
-
-    // Return result:
-    return $sqlResult;
-  }
-
-  /**
+       function exec_DELETEquery($table,$where)        {
+
+               if ($this->debug)       $pt = t3lib_div::milliseconds();
+
+               // Do table/field mapping:
+               $ORIG_tableName = $table;
+               if ($tableArray = $this->map_needMapping($table))       {
+
+                       // Where clause:
+                       $whereParts = $this->SQLparser->parseWhereClause($where);
+                       $this->map_sqlParts($whereParts,$tableArray[0]['table']);
+                       $where = $this->SQLparser->compileWhereClause($whereParts);
+
+                       // Table name:
+                       if ($this->mapping[$table]['mapTableName'])     {
+                               $table = $this->mapping[$table]['mapTableName'];
+                       }
+               }
+
+               // Select API
+               $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
+               switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])        {
+                       case 'native':
+                               $this->lastQuery = $this->DELETEquery($table,$where);
+                               $sqlResult = mysql_query($this->lastQuery, $this->handlerInstance[$this->lastHandlerKey]['link']);
+                               break;
+                       case 'adodb':
+                               $this->lastQuery = $this->DELETEquery($table,$where);
+                               $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->_query($this->lastQuery,false);
+                               break;
+                       case 'userdefined':
+                               $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->exec_DELETEquery($table,$where);
+                               break;
+               }
+
+               if ($this->printErrors && $this->sql_error())   {
+                       debug(array($this->lastQuery, $this->sql_error()));
+               }
+
+               if ($this->debug)       {
+                       $this->debugHandler(
+                       'exec_DELETEquery',
+                       t3lib_div::milliseconds()-$pt,
+                       array(
+                       'handlerType' => $hType,
+                       'args' => array($table,$where),
+                       'ORIG_from_table' => $ORIG_tableName
+                       )
+                       );
+               }
+
+               // Return result:
+               return $sqlResult;
+       }
+
+       /**
         * Selects records from Data Source
         *
         * @param       string $select_fields List of fields to select from the table. This is what comes right after "SELECT ...". Required value.
@@ -598,118 +591,126 @@ class ux_t3lib_DB extends t3lib_DB {
         * @param       string $limit Optional LIMIT value ([begin,]max), if none, supply blank string.
         * @return      mixed           Result from handler. Typically object from DBAL layers.
         */
-  function exec_SELECTquery($select_fields,$from_table,$where_clause,$groupBy='',$orderBy='',$limit='')        {
-
-    if ($this->debug)  $pt = t3lib_div::milliseconds();
-
-    // Map table / field names if needed:
-    $ORIG_tableName = $from_table;     // Saving table names in $ORIG_from_table since $from_table is transformed beneath:
-    if ($tableArray = $this->map_needMapping($ORIG_tableName)) {
-      $this->map_remapSELECTQueryParts($select_fields,$from_table,$where_clause,$groupBy,$orderBy);    // Variables passed by reference!
-    }
-
-    // Get handler key and select API:
-    $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
-    $hType = (string)$this->handlerCfg[$this->lastHandlerKey]['type'];
-    switch($hType)     {
-      case 'native':
-      $this->lastQuery = $this->SELECTquery($select_fields,$from_table,$where_clause,$groupBy,$orderBy,$limit);
-      $sqlResult = mysql_query($this->lastQuery, $this->handlerInstance[$this->lastHandlerKey]['link']);
-      $this->resourceIdToTableNameMap[(string)$sqlResult] = $ORIG_tableName;
-      break;
-      case 'adodb':
-      if ($limit)      {
-        $splitLimit = t3lib_div::intExplode(',',$limit);               // Splitting the limit values:
-        if ($splitLimit[1])    {       // If there are two parameters, do mapping differently than otherwise:
-        $numrows = $splitLimit[1];
-        $offset = $splitLimit[0];
-        } else {
-          $numrows = $splitLimit[0];
-          $offset = 0;
-        }
-
-                               $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->SelectLimit($this->SELECTquery($select_fields,$from_table,$where_clause,$groupBy,$orderBy), $numrows, $offset);
-        $this->lastQuery = $sqlResult->sql;
-      } else {
-        $this->lastQuery = $this->SELECTquery($select_fields,$from_table,$where_clause,$groupBy,$orderBy,$limit);
-        $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->_Execute($this->lastQuery);
-      }
-      $sqlResult->TYPO3_DBAL_handlerType = 'adodb';    // Setting handler type in result object (for later recognition!)
-      $sqlResult->TYPO3_DBAL_tableList = $ORIG_tableName;
-      break;
-      case 'userdefined':
-      $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->exec_SELECTquery($select_fields,$from_table,$where_clause,$groupBy,$orderBy,$limit);
-      if (is_object($sqlResult))       {
-        $sqlResult->TYPO3_DBAL_handlerType = 'userdefined';    // Setting handler type in result object (for later recognition!)
-        $sqlResult->TYPO3_DBAL_tableList = $ORIG_tableName;
-      }
-      break;
-    }
-
-    // Print errors:
-    if ($this->printErrors && $this->sql_error())      { debug(array($this->sql_error()));     }
-
-    # DEBUG:
-    if ($this->debug)  {
-      $this->debugHandler(
-      'exec_SELECTquery',
-      t3lib_div::milliseconds()-$pt,
-      array(
-      'handlerType' => $hType,
-      'args' => array($from_table,$select_fields,$where_clause,$groupBy,$orderBy,$limit),
-      'ORIG_from_table' => $ORIG_tableName
-      )
-      );
-    }
-
-    // Return result handler.
-    return $sqlResult;
-  }
-
-
-
-  /**************************************
-  *
-  * Query building
-  *
-  **************************************/
-
-  /**
+       function exec_SELECTquery($select_fields,$from_table,$where_clause,$groupBy='',$orderBy='',$limit='')   {
+
+               if ($this->debug)       $pt = t3lib_div::milliseconds();
+
+               // Map table / field names if needed:
+               $ORIG_tableName = $from_table;  // Saving table names in $ORIG_from_table since $from_table is transformed beneath:
+               if ($tableArray = $this->map_needMapping($ORIG_tableName))      {
+                       $this->map_remapSELECTQueryParts($select_fields,$from_table,$where_clause,$groupBy,$orderBy);   // Variables passed by reference!
+               }
+
+               // Get handler key and select API:
+               $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
+               $hType = (string)$this->handlerCfg[$this->lastHandlerKey]['type'];
+               switch($hType)  {
+                       case 'native':
+                               $this->lastQuery = $this->SELECTquery($select_fields,$from_table,$where_clause,$groupBy,$orderBy,$limit);
+                               $sqlResult = mysql_query($this->lastQuery, $this->handlerInstance[$this->lastHandlerKey]['link']);
+                               $this->resourceIdToTableNameMap[(string)$sqlResult] = $ORIG_tableName;
+                               break;
+                       case 'adodb':
+                               if ($limit!='') {
+                                       $splitLimit = t3lib_div::intExplode(',',$limit);                // Splitting the limit values:
+                                       if ($splitLimit[1])     {       // If there are two parameters, do mapping differently than otherwise:
+                                               $numrows = $splitLimit[1];
+                                               $offset = $splitLimit[0];
+                                       } else {
+                                               $numrows = $splitLimit[0];
+                                               $offset = 0;
+                                       }
+
+                                       $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->SelectLimit($this->SELECTquery($select_fields,$from_table,$where_clause,$groupBy,$orderBy), $numrows, $offset);
+                                       $this->lastQuery = $sqlResult->sql;
+                               } else {
+                                       $this->lastQuery = $this->SELECTquery($select_fields,$from_table,$where_clause,$groupBy,$orderBy);
+                                       $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->_Execute($this->lastQuery);
+                               }
+                               $sqlResult->TYPO3_DBAL_handlerType = 'adodb';   // Setting handler type in result object (for later recognition!)
+                               $sqlResult->TYPO3_DBAL_tableList = $ORIG_tableName;
+                               break;
+                       case 'userdefined':
+                               $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->exec_SELECTquery($select_fields,$from_table,$where_clause,$groupBy,$orderBy,$limit);
+                               if (is_object($sqlResult))      {
+                                       $sqlResult->TYPO3_DBAL_handlerType = 'userdefined';     // Setting handler type in result object (for later recognition!)
+                                       $sqlResult->TYPO3_DBAL_tableList = $ORIG_tableName;
+                               }
+                               break;
+               }
+
+               if ($this->printErrors && $this->sql_error())   {
+                       debug(array($this->lastQuery, $this->sql_error()));
+               }
+
+               if ($this->debug)       {
+                       $this->debugHandler(
+                       'exec_SELECTquery',
+                       t3lib_div::milliseconds()-$pt,
+                       array(
+                       'handlerType' => $hType,
+                       'args' => array($from_table,$select_fields,$where_clause,$groupBy,$orderBy,$limit),
+                       'ORIG_from_table' => $ORIG_tableName
+                       )
+                       );
+               }
+
+               // Return result handler.
+               return $sqlResult;
+       }
+
+
+
+       /**************************************
+       *
+       * Query building
+       *
+       **************************************/
+
+       /**
         * Creates an INSERT SQL-statement for $table from the array with field/value pairs $fields_values.
         * Usage count/core: 4
         *
         * @param       string          See exec_INSERTquery()
         * @param       array           See exec_INSERTquery()
+        * @param mixed         See exec_INSERTquery()
         * @return      string          Full SQL query for INSERT (unless $fields_values does not contain any elements in which case it will be false)
         * @depreciated                 use exec_INSERTquery() instead if possible!
         */
-  function INSERTquery($table,$fields_values)  {
-    // Table and fieldnames should be "SQL-injection-safe" when supplied to this function (contrary to values in the arrays which may be insecure).
-    if (is_array($fields_values) && count($fields_values))     {
-      $blobfields = array();
-      $nArr = array();
-      foreach($fields_values as $k => $v)      {
-        if($this->sql_field_metatype($table,$k) == 'B') {
-          /* // is this really needed for Oracle?
-          if($this->handlerInstance[$this->lastHandlerKey]->databaseType == 'oci8')
+       function INSERTquery($table,$fields_values,$no_quote_fields='') {
+               // Table and fieldnames should be "SQL-injection-safe" when supplied to this function (contrary to values in the arrays which may be insecure).
+               if (is_array($fields_values) && count($fields_values))  {
+
+                       if (is_string($no_quote_fields))        {
+                               $no_quote_fields = explode(',',$no_quote_fields);
+                       } elseif (!is_array($no_quote_fields))  {
+                               $no_quote_fields = array();
+                       }
+
+                       $blobfields = array();
+                       $nArr = array();
+                       foreach($fields_values as $k => $v)     {
+                               if($this->sql_field_metatype($table,$k) == 'B') {
+                                       /* // is this really needed for Oracle?
+                                       if($this->handlerInstance[$this->lastHandlerKey]->databaseType == 'oci8')
                                        $nArr[$this->quoteFieldNames($k)] = 'empty_blob()';
-          else
+                                       else
                                        $nArr[$this->quoteFieldNames($k)] = 'null';
-          */
+                                       */
                                        $nArr[$this->quoteFieldNames($k)] = 'null';
                                        $blobfields[$this->quoteFieldNames($k)] = $v;
-        }
-        else {
-          // Add slashes old-school:
-          // cast numerical values
-          $mt = $this->sql_field_metatype($table,$k);
-          $v = (($mt{0}=='I')||($mt{0}=='F')) ? (int)$v : $v;
-
-                                       $nArr[$this->quoteFieldNames($k)] = $this->fullQuoteStr($v, $table);
-        }
-      }
-      if(((string)$this->handlerCfg[$this->lastHandlerKey]['type']!=='native') && count($blobfields)) {
-        $query[0] = 'INSERT INTO '.$this->quoteFromTables($table).'
+                               }
+                               else {
+                                       // Add slashes old-school:
+                                       // cast numerical values
+                                       $mt = $this->sql_field_metatype($table,$k);
+                                       $v = (($mt{0}=='I')||($mt{0}=='F')) ? (int)$v : $v;
+
+                                       $nArr[$this->quoteFieldNames($k)] = (!in_array($k,$no_quote_fields)) ? $this->fullQuoteStr($v, $table) : $v;
+                               }
+                       }
+                       if(((string)$this->handlerCfg[$this->lastHandlerKey]['type']!=='native') && count($blobfields)) {
+                               $query[0] = 'INSERT INTO '.$this->quoteFromTables($table).'
                                (
                                        '.implode(',
                                        ',array_keys($nArr)).'
@@ -717,11 +718,11 @@ class ux_t3lib_DB extends t3lib_DB {
                                        '.implode(',
                                        ',$nArr).'
                                )';
-        $query[1] = $blobfields;
-        if ($this->debugOutput) $this->debug_lastBuiltQuery = $query[0];
-      }
-      else {
-        $query = 'INSERT INTO '.$this->quoteFromTables($table).'
+                               $query[1] = $blobfields;
+                               if ($this->debugOutput) $this->debug_lastBuiltQuery = $query[0];
+                       }
+                       else {
+                               $query = 'INSERT INTO '.$this->quoteFromTables($table).'
                                (
                                        '.implode(',
                                        ',array_keys($nArr)).'
@@ -730,76 +731,84 @@ class ux_t3lib_DB extends t3lib_DB {
                                        ',$nArr).'
                                )';
 
-        if ($this->debugOutput) $this->debug_lastBuiltQuery = $query;
-      }
+                               if ($this->debugOutput) $this->debug_lastBuiltQuery = $query;
+                       }
 
-      return $query;
-    }
-  }
+                       return $query;
+               }
+       }
 
-  /**
+       /**
         * Creates an UPDATE SQL-statement for $table where $where-clause (typ. 'uid=...') from the array with field/value pairs $fields_values.
         * Usage count/core: 6
         *
         * @param       string          See exec_UPDATEquery()
         * @param       string          See exec_UPDATEquery()
         * @param       array           See exec_UPDATEquery()
+        * @param mixed         See exec_UPDATEquery()
         * @return      string          Full SQL query for UPDATE (unless $fields_values does not contain any elements in which case it will be false)
         * @depreciated                 use exec_UPDATEquery() instead if possible!
         */
-  function UPDATEquery($table,$where,$fields_values)   {
-    // Table and fieldnames should be "SQL-injection-safe" when supplied to this function (contrary to values in the arrays which may be insecure).
-    if (is_string($where))     {
-      if (is_array($fields_values) && count($fields_values))   {
-        $blobfields = array();
-        $nArr = array();
-        foreach($fields_values as $k => $v)    {
-          if($this->sql_field_metatype($table,$k) == 'B') {
-            // do we need empty_blob() for Oracle? see also INSERTquery()
+       function UPDATEquery($table,$where,$fields_values,$no_quote_fields='')  {
+               // Table and fieldnames should be "SQL-injection-safe" when supplied to this function (contrary to values in the arrays which may be insecure).
+               if (is_string($where))  {
+                       if (is_array($fields_values) && count($fields_values))  {
+
+                               if (is_string($no_quote_fields))        {
+                                       $no_quote_fields = explode(',',$no_quote_fields);
+                               } elseif (!is_array($no_quote_fields))  {
+                                       $no_quote_fields = array();
+                               }
+
+                               $blobfields = array();
+                               $nArr = array();
+                               foreach($fields_values as $k => $v)     {
+                                       if($this->sql_field_metatype($table,$k) == 'B') {
+                                               // do we need empty_blob() for Oracle? see also INSERTquery()
                                                $nArr[] = $this->quoteFieldNames($k).'=NULL';
                                                $blobfields[$this->quoteFieldNames($k)] = $v;
-          }
-          else {
-            // Add slashes old-school:
-            // cast numeric values
-            $mt = $this->sql_field_metatype($table,$k);
-            $v = (($mt{0}=='I')||($mt{0}=='F')) ? (int)$v : $v;
-                                               $nArr[] = $this->quoteFieldNames($k).'='.$this->fullQuoteStr($v, $table);
-          }
-        }
-      }
-
-      if(count($blobfields)) {
-        $query[0] = 'UPDATE '.$this->quoteFromTables($table).'
+                                       }
+                                       else {
+                                               // Add slashes old-school:
+                                               // cast numeric values
+                                               $mt = $this->sql_field_metatype($table,$k);
+                                               $v = (($mt{0}=='I')||($mt{0}=='F')) ? (int)$v : $v;
+                                               $nArr[] = $this->quoteFieldNames($k).'='.((!in_array($k,$no_quote_fields)) ? $this->fullQuoteStr($v, $table) : $v);
+                                       }
+                               }
+
+                               if(count($blobfields)) {
+                                       $query[0] = 'UPDATE '.$this->quoteFromTables($table).'
                                        SET
                                                '.implode(',
                                                ',$nArr).
-        (strlen($where)>0 ? '
+                                               (strlen($where)>0 ? '
                                        WHERE
                                                '.$this->quoteWhereClause($where) : '');
-        $query[1] = $blobfields;
-        if ($this->debugOutput) $this->debug_lastBuiltQuery = $query[0];
-      }
-      else {
-        $query = 'UPDATE '.$this->quoteFromTables($table).'
+                                               $query[1] = $blobfields;
+                                               if ($this->debugOutput) $this->debug_lastBuiltQuery = $query[0];
+                               }
+                               else {
+                                       $query = 'UPDATE '.$this->quoteFromTables($table).'
                                        SET
                                                '.implode(',
                                                ',$nArr).
-        (strlen($where)>0 ? '
+                                               (strlen($where)>0 ? '
                                        WHERE
                                                '.$this->quoteWhereClause($where) : '');
 
-        if ($this->debugOutput) $this->debug_lastBuiltQuery = $query;
-      }
+                                               if ($this->debugOutput) $this->debug_lastBuiltQuery = $query;
+                               }
 
-      return $query;
-    }
-    else {
-      die('<strong>TYPO3 Fatal Error:</strong> "Where" clause argument for UPDATE query was not a string in $this->UPDATEquery() !');
-    }
-  }
+                               return $query;
+                       }
+               }
+               else {
+                       die('<strong>TYPO3 Fatal Error:</strong> "Where" clause argument for UPDATE query was not a string in $this->UPDATEquery() !');
+               }
+       }
 
-  /**
+       /**
         * Creates a DELETE SQL-statement for $table where $where-clause
         * Usage count/core: 3
         *
@@ -808,21 +817,21 @@ class ux_t3lib_DB extends t3lib_DB {
         * @return      string          Full SQL query for DELETE
         * @depreciated                 use exec_DELETEquery() instead if possible!
         */
-  function DELETEquery($table,$where)  {
-    if (is_string($where))     {
-      $table = $this->quoteFromTables($table);
-      $where = $this->quoteWhereClause($where);
+       function DELETEquery($table,$where)     {
+               if (is_string($where))  {
+                       $table = $this->quoteFromTables($table);
+                       $where = $this->quoteWhereClause($where);
 
-      $query = parent::DELETEquery($table, $where);
+                       $query = parent::DELETEquery($table, $where);
 
-      if ($this->debugOutput) $this->debug_lastBuiltQuery = $query;
-      return $query;
-    } else {
-      die('<strong>TYPO3 Fatal Error:</strong> "Where" clause argument for DELETE query was not a string in $this->DELETEquery() !');
-    }
-  }
+                       if ($this->debugOutput) $this->debug_lastBuiltQuery = $query;
+                       return $query;
+               } else {
+                       die('<strong>TYPO3 Fatal Error:</strong> "Where" clause argument for DELETE query was not a string in $this->DELETEquery() !');
+               }
+       }
 
-  /**
+       /**
         * Creates a SELECT SQL-statement
         * Usage count/core: 11
         *
@@ -835,30 +844,30 @@ class ux_t3lib_DB extends t3lib_DB {
         * @return      string          Full SQL query for SELECT
         * @depreciated                 use exec_SELECTquery() instead if possible!
         */
-  function SELECTquery($select_fields,$from_table,$where_clause,$groupBy='',$orderBy='',$limit='')     {
+       function SELECTquery($select_fields,$from_table,$where_clause,$groupBy='',$orderBy='',$limit='')        {
 
                $select_fields = $this->quoteFieldNames($select_fields);
-    $from_table = $this->quoteFromTables($from_table);
-    $where_clause = $this->quoteWhereClause($where_clause);
-    $groupBy = $this->quoteGroupBy($groupBy);
-    $orderBy = $this->quoteOrderBy($orderBy);
+               $from_table = $this->quoteFromTables($from_table);
+               $where_clause = $this->quoteWhereClause($where_clause);
+               $groupBy = $this->quoteGroupBy($groupBy);
+               $orderBy = $this->quoteOrderBy($orderBy);
 
-    // call parent method to build actual query
-    $query = parent::SELECTquery($select_fields,$from_table,$where_clause,$groupBy,$orderBy,$limit);
+               // call parent method to build actual query
+               $query = parent::SELECTquery($select_fields,$from_table,$where_clause,$groupBy,$orderBy,$limit);
 
-    if ($this->debugOutput) $this->debug_lastBuiltQuery = $query;
+               if ($this->debugOutput) $this->debug_lastBuiltQuery = $query;
 
-    return $query;
-  }
+               return $query;
+       }
 
 
-  /**************************************
-  *
-  * Functions for quoting table/field names
-  *
-  **************************************/
+       /**************************************
+       *
+       * Functions for quoting table/field names
+       *
+       **************************************/
 
-  /**
+       /**
         * Quotes field (and table) names with the quote character suitable for the DB being used
         * Use quoteFieldNames instead!
         *
@@ -866,7 +875,7 @@ class ux_t3lib_DB extends t3lib_DB {
         * @return      string          Quoted list of fields to be selected from DB
         * @deprecated
         */
-  function quoteSelectFields($select_fields) {
+       function quoteSelectFields($select_fields) {
                $this->quoteFieldNames($select_fields);
        }
 
@@ -877,151 +886,151 @@ class ux_t3lib_DB extends t3lib_DB {
         * @return      string          Quoted list of fields to be in query to DB
         */
        function quoteFieldNames($select_fields) {
-    if($select_fields == '') return '';
-
-    $select_fields = $this->SQLparser->parseFieldList($select_fields);
-    foreach($select_fields as $k => $v)        {
-      if($select_fields[$k]['field'] != '' && $select_fields[$k]['field'] != '*') {
-        $select_fields[$k]['field'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$select_fields[$k]['field'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-      }
-      if($select_fields[$k]['table'] != '') {
-        $select_fields[$k]['table'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$select_fields[$k]['table'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-      }
-      if($select_fields[$k]['as'] != '') {
-        $select_fields[$k]['as'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$select_fields[$k]['as'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-      }
-      if(isset($select_fields[$k]['func_content.']) && $select_fields[$k]['func_content.'][0]['func_content'] != '*'){
-        if(strstr($select_fields[$k]['func_content.'][0]['func_content'],'.')) {
+               if($select_fields == '') return '';
+
+               $select_fields = $this->SQLparser->parseFieldList($select_fields);
+               foreach($select_fields as $k => $v)     {
+                       if($select_fields[$k]['field'] != '' && $select_fields[$k]['field'] != '*') {
+                               $select_fields[$k]['field'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$select_fields[$k]['field'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                       }
+                       if($select_fields[$k]['table'] != '') {
+                               $select_fields[$k]['table'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$select_fields[$k]['table'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                       }
+                       if($select_fields[$k]['as'] != '') {
+                               $select_fields[$k]['as'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$select_fields[$k]['as'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                       }
+                       if(isset($select_fields[$k]['func_content.']) && $select_fields[$k]['func_content.'][0]['func_content'] != '*'){
+                               if(strstr($select_fields[$k]['func_content.'][0]['func_content'],'.')) {
                                        $select_fields[$k]['func_content.'][0]['func_content'] = $this->quoteFieldNames($select_fields[$k]['func_content.'][0]['func_content']);
                                        $select_fields[$k]['func_content'] = $this->quoteFieldNames($select_fields[$k]['func_content']);
-        }
-        else {
-          $select_fields[$k]['func_content.'][0]['func_content'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$select_fields[$k]['func_content.'][0]['func_content'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-          $select_fields[$k]['func_content'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$select_fields[$k]['func_content'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-        }
-      }
-    }
-
-    return $this->SQLparser->compileFieldList($select_fields);
-  }
-
-  /**
+                               }
+                               else {
+                                       $select_fields[$k]['func_content.'][0]['func_content'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$select_fields[$k]['func_content.'][0]['func_content'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                                       $select_fields[$k]['func_content'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$select_fields[$k]['func_content'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                               }
+                       }
+               }
+
+               return $this->SQLparser->compileFieldList($select_fields);
+       }
+
+       /**
         * Quotes table names with the quote character suitable for the DB being used
         *
         * @param       string          List of tables to be selected from DB
         * @return      string          Quoted list of tables to be selected from DB
         */
-  function quoteFromTables($from_table) {
-    if($from_table == '') return '';
-
-    $from_table = $this->SQLparser->parseFromTables($from_table);
-    foreach($from_table as $k => $v)   {
-      $from_table[$k]['table'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$from_table[$k]['table'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-      if($from_table[$k]['as'] != '') {
-        $from_table[$k]['as'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$from_table[$k]['as'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-      }
-      if (is_array($v['JOIN']))        {
-        $from_table[$k]['JOIN']['withTable'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$from_table[$k]['JOIN']['withTable'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-        $from_table[$k]['JOIN']['ON'][0]['table'] = ($from_table[$k]['JOIN']['ON'][0]['table']) ? $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$from_table[$k]['JOIN']['ON'][0]['table'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote : '';
-        $from_table[$k]['JOIN']['ON'][0]['field'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$from_table[$k]['JOIN']['ON'][0]['field'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-        $from_table[$k]['JOIN']['ON'][1]['table'] = ($from_table[$k]['JOIN']['ON'][1]['table']) ? $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$from_table[$k]['JOIN']['ON'][1]['table'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote : '';
-        $from_table[$k]['JOIN']['ON'][1]['field'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$from_table[$k]['JOIN']['ON'][1]['field'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-      }
-    }
-    return $this->SQLparser->compileFromTables($from_table);
-  }
-
-  /**
+       function quoteFromTables($from_table) {
+               if($from_table == '') return '';
+
+               $from_table = $this->SQLparser->parseFromTables($from_table);
+               foreach($from_table as $k => $v)        {
+                       $from_table[$k]['table'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$from_table[$k]['table'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                       if($from_table[$k]['as'] != '') {
+                               $from_table[$k]['as'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$from_table[$k]['as'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                       }
+                       if (is_array($v['JOIN']))       {
+                               $from_table[$k]['JOIN']['withTable'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$from_table[$k]['JOIN']['withTable'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                               $from_table[$k]['JOIN']['ON'][0]['table'] = ($from_table[$k]['JOIN']['ON'][0]['table']) ? $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$from_table[$k]['JOIN']['ON'][0]['table'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote : '';
+                               $from_table[$k]['JOIN']['ON'][0]['field'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$from_table[$k]['JOIN']['ON'][0]['field'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                               $from_table[$k]['JOIN']['ON'][1]['table'] = ($from_table[$k]['JOIN']['ON'][1]['table']) ? $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$from_table[$k]['JOIN']['ON'][1]['table'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote : '';
+                               $from_table[$k]['JOIN']['ON'][1]['field'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$from_table[$k]['JOIN']['ON'][1]['field'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                       }
+               }
+               return $this->SQLparser->compileFromTables($from_table);
+       }
+
+       /**
         * Quotes the field (and table) names within a where clause with the quote character suitable for the DB being used
         *
         * @param       string          A where clause that can e parsed by parseWhereClause
         * @return      string          Usable where clause with quoted field/table names
         */
-  function quoteWhereClause($where_clause) {
-    if($where_clause == '') return '';
+       function quoteWhereClause($where_clause) {
+               if($where_clause == '') return '';
 
-    $where_clause = $this->SQLparser->parseWhereClause($where_clause);
-    $where_clause = $this->_quoteWhereClause($where_clause);
-    $where_clause = $this->SQLparser->compileWhereClause($where_clause);
+               $where_clause = $this->SQLparser->parseWhereClause($where_clause);
+               $where_clause = $this->_quoteWhereClause($where_clause);
+               $where_clause = $this->SQLparser->compileWhereClause($where_clause);
 
-    return $where_clause;
-  }
+               return $where_clause;
+       }
 
-  /**
+       /**
         * [Describe function...]
         *
         * @param       [type]          $$groupBy: ...
         * @return      [type]          ...
         */
-  function _quoteWhereClause($where_clause) {
-    foreach($where_clause as $k => $v) {
-      // Look for sublevel:
-      if (is_array($where_clause[$k]['sub']))  {
-        $where_clause[$k]['sub'] = $this->_quoteWhereClause($where_clause[$k]['sub']);
-      } else {
-        if($where_clause[$k]['table'] != '') {
-          $where_clause[$k]['table'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$where_clause[$k]['table'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-        }
-        if(!is_numeric($where_clause[$k]['field'])) {
-          $where_clause[$k]['field'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$where_clause[$k]['field'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-        }
-      }
-      if ($where_clause[$k]['comparator'])     {
-        // Detecting value type; list or plain:
-        if ((!isset($where_clause[$k]['value'][1]) || $where_clause[$k]['value'][1] == '') && is_string($where_clause[$k]['value'][0]) && strstr($where_clause[$k]['value'][0], '.') && !t3lib_div::inList('NOTIN,IN',strtoupper(str_replace(array(" ","\n","\r","\t"),'',$where_clause[$k]['comparator']))))  {
+       function _quoteWhereClause($where_clause) {
+               foreach($where_clause as $k => $v)      {
+                       // Look for sublevel:
+                       if (is_array($where_clause[$k]['sub'])) {
+                               $where_clause[$k]['sub'] = $this->_quoteWhereClause($where_clause[$k]['sub']);
+                       } else {
+                               if($where_clause[$k]['table'] != '') {
+                                       $where_clause[$k]['table'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$where_clause[$k]['table'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                               }
+                               if(!is_numeric($where_clause[$k]['field'])) {
+                                       $where_clause[$k]['field'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$where_clause[$k]['field'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                               }
+                       }
+                       if ($where_clause[$k]['comparator'])    {
+                               // Detecting value type; list or plain:
+                               if ((!isset($where_clause[$k]['value'][1]) || $where_clause[$k]['value'][1] == '') && is_string($where_clause[$k]['value'][0]) && strstr($where_clause[$k]['value'][0], '.') && !t3lib_div::inList('NOTIN,IN',strtoupper(str_replace(array(" ","\n","\r","\t"),'',$where_clause[$k]['comparator']))))   {
                                        $where_clause[$k]['value'][0] = $this->quoteFieldNames($where_clause[$k]['value'][0]);
-        }
-      }
-    }
+                               }
+                       }
+               }
 
-    return $where_clause;
-  }
+               return $where_clause;
+       }
 
-  /**
+       /**
         * [Describe function...]
         *
         * @param       [type]          $$groupBy: ...
         * @return      [type]          ...
         */
-  function quoteGroupBy($groupBy) {
-    if($groupBy == '') return '';
-
-    $groupBy = $this->SQLparser->parseFieldList($groupBy);
-    foreach($groupBy as $k => $v)      {
-      $groupBy[$k]['field'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$groupBy[$k]['field'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-      if($groupBy[$k]['table'] != '') {
-        $groupBy[$k]['table'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$groupBy[$k]['table'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-      }
-    }
-    return $this->SQLparser->compileFieldList($groupBy);
-  }
-
-  /**
+       function quoteGroupBy($groupBy) {
+               if($groupBy == '') return '';
+
+               $groupBy = $this->SQLparser->parseFieldList($groupBy);
+               foreach($groupBy as $k => $v)   {
+                       $groupBy[$k]['field'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$groupBy[$k]['field'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                       if($groupBy[$k]['table'] != '') {
+                               $groupBy[$k]['table'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$groupBy[$k]['table'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                       }
+               }
+               return $this->SQLparser->compileFieldList($groupBy);
+       }
+
+       /**
         * [Describe function...]
         *
         * @param       [type]          $$orderBy: ...
         * @return      [type]          ...
         */
-  function quoteOrderBy($orderBy) {
-    if($orderBy == '') return '';
-
-    $orderBy = $this->SQLparser->parseFieldList($orderBy);
-    foreach($orderBy as $k => $v)      {
-      $orderBy[$k]['field'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$orderBy[$k]['field'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-      if($orderBy[$k]['table'] != '') {
-        $orderBy[$k]['table'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$orderBy[$k]['table'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
-      }
-    }
-    return $this->SQLparser->compileFieldList($orderBy);
-  }
+       function quoteOrderBy($orderBy) {
+               if($orderBy == '') return '';
+
+               $orderBy = $this->SQLparser->parseFieldList($orderBy);
+               foreach($orderBy as $k => $v)   {
+                       $orderBy[$k]['field'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$orderBy[$k]['field'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                       if($orderBy[$k]['table'] != '') {
+                               $orderBy[$k]['table'] = $this->handlerInstance[$this->lastHandlerKey]->nameQuote.$orderBy[$k]['table'].$this->handlerInstance[$this->lastHandlerKey]->nameQuote;
+                       }
+               }
+               return $this->SQLparser->compileFieldList($orderBy);
+       }
 
 
 
-  /**************************************
-  *
-  * Various helper functions
-  *
-  **************************************/
+       /**************************************
+       *
+       * Various helper functions
+       *
+       **************************************/
 
        /**
         * Escaping and quoting values for SQL statements.
@@ -1031,9 +1040,9 @@ class ux_t3lib_DB extends t3lib_DB {
         * @return      string          Output string; Wrapped in single quotes and quotes in the string (" / ') and \ will be backslashed (or otherwise based on DBAL handler)
         * @see quoteStr()
         */
-  function fullQuoteStr($str,$table) {
-       return '\''.$this->quoteStr($str, $table).'\'';
-  }
+       function fullQuoteStr($str,$table) {
+               return '\''.$this->quoteStr($str, $table).'\'';
+       }
 
        /**
         * Substitution for PHP function "addslashes()"
@@ -1044,375 +1053,374 @@ class ux_t3lib_DB extends t3lib_DB {
         * @return      string          Output string; Quotes (" / ') and \ will be backslashed (or otherwise based on DBAL handler)
         * @see quoteStr()
         */
-  function quoteStr($str, $table)      {
-    $this->lastHandlerKey = $this->handler_getFromTableList($table);
-    switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])   {
-      case 'native':
-      $str = mysql_real_escape_string($str, $this->handlerInstance[$this->lastHandlerKey]['link']);
-      break;
-      case 'adodb':
-      $str = substr($this->handlerInstance[$this->lastHandlerKey]->qstr($str),1,-1);
-      break;
-      case 'userdefined':
-      $str = $this->handlerInstance[$this->lastHandlerKey]->quoteStr($str);
-      break;
-      default:
-      die('No handler found!!!');
-      break;
-    }
-
-    return $str;
-  }
-
-
-  /**
+       function quoteStr($str, $table) {
+               $this->lastHandlerKey = $this->handler_getFromTableList($table);
+               switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])        {
+                       case 'native':
+                               $str = mysql_real_escape_string($str, $this->handlerInstance[$this->lastHandlerKey]['link']);
+                               break;
+                       case 'adodb':
+                               $str = substr($this->handlerInstance[$this->lastHandlerKey]->qstr($str),1,-1);
+                               break;
+                       case 'userdefined':
+                               $str = $this->handlerInstance[$this->lastHandlerKey]->quoteStr($str);
+                               break;
+                       default:
+                               die('No handler found!!!');
+                               break;
+               }
+
+               return $str;
+       }
+
+
+       /**
         * Return MetaType for native field type (ADOdb only!)
         *
         * @param       string          native type as reported by admin_get_fields()
         * @param       string          Table name for which query type string. Important for detection of DBMS handler of the query!
         * @return      string          Meta type (currenly ADOdb syntax only, http://phplens.com/lens/adodb/docs-adodb.htm#metatype)
         */
-  function MetaType($type,$table,$max_length=-1)       {
-    $this->lastHandlerKey = $this->handler_getFromTableList($table);
-    switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])   {
-      case 'adodb':
-      $rs = $this->handlerInstance[$this->lastHandlerKey]->SelectLimit('SELECT * FROM '.$this->quoteFromTables($table),1);
-      $str = $rs->MetaType($type, $max_length);
-      break;
-      default:
-      die('No handler found!!!');
-      break;
-    }
-
-    return $str;
-  }
-
-
-  /**
+       function MetaType($type,$table,$max_length=-1)  {
+               $this->lastHandlerKey = $this->handler_getFromTableList($table);
+               switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])        {
+                       case 'adodb':
+                       $rs = $this->handlerInstance[$this->lastHandlerKey]->SelectLimit('SELECT * FROM '.$this->quoteFromTables($table),1);
+                       $str = $rs->MetaType($type, $max_length);
+                       break;
+                       default:
+                       die('No handler found!!!');
+                       break;
+               }
+
+               return $str;
+       }
+
+
+       /**
         * Return MetaType for native MySQL field type
         *
         * @param       string          native type as reported as in mysqldump files
         * @return      string          Meta type (currenly ADOdb syntax only, http://phplens.com/lens/adodb/docs-adodb.htm#metatype)
         */
-  function MySQLMetaType($t) {
-
-    switch (strtoupper($t)) {
-      case 'STRING':
-      case 'CHAR':
-      case 'VARCHAR':
-      //               case 'TINYBLOB': // moved below, see there for the reason
-      //               case 'TINYTEXT': // moved below, see there for the reason
-      case 'ENUM':
-      case 'SET':
-      return 'C';
-
-      case 'TINYTEXT': // basically the same as with TINYBLOB
-      case 'TEXT':
-      case 'LONGTEXT':
-      case 'MEDIUMTEXT':
-      return 'X';
-
-      // php_mysql extension always returns 'blob' even if 'text'
-      // so we have to check whether binary...
-      case 'IMAGE':
-      case 'TINYBLOB': // this got moved here from above.
-      // otherwise tinyblob fields become varchar without length.
-      // this fails on Oracle and results in char(1) on PostgreSQL
-      case 'LONGBLOB':
-      case 'BLOB':
-      case 'MEDIUMBLOB':
-      return 'B';
-
-      case 'YEAR':
-      case 'DATE': return 'D';
-
-      case 'TIME':
-      case 'DATETIME':
-      case 'TIMESTAMP': return 'T';
-
-      case 'FLOAT':
-      case 'DOUBLE':
-      return 'F';
-
-      case 'INT':
-      case 'INTEGER': return 'I';
-      case 'TINYINT': return 'I1';
-      case 'SMALLINT': return 'I2';
-      case 'MEDIUMINT': return 'I4';
-      case 'BIGINT': return 'I8';
-
-      default: return 'N';
-    }
-  }
-
-  /**
+       function MySQLMetaType($t) {
+
+               switch (strtoupper($t)) {
+                       case 'STRING':
+                       case 'CHAR':
+                       case 'VARCHAR':
+                       case 'TINYBLOB':
+                       case 'TINYTEXT':
+                       case 'ENUM':
+                       case 'SET':
+                       return 'C';
+
+                       case 'TEXT':
+                       case 'LONGTEXT':
+                       case 'MEDIUMTEXT':
+                       return 'X';
+
+                       // php_mysql extension always returns 'blob' even if 'text'
+                       // so we have to check whether binary...
+                       case 'IMAGE':
+                       case 'LONGBLOB':
+                       case 'BLOB':
+                       case 'MEDIUMBLOB':
+                       return 'B';
+
+                       case 'YEAR':
+                       case 'DATE': return 'D';
+
+                       case 'TIME':
+                       case 'DATETIME':
+                       case 'TIMESTAMP': return 'T';
+
+                       case 'FLOAT':
+                       case 'DOUBLE':
+                       return 'F';
+
+                       case 'INT':
+                       case 'INTEGER': return 'I';
+                       case 'TINYINT': // MS SQL Server allows only 0..255 for tinyint, so we do not map to I1
+                       case 'SMALLINT': return 'I2';
+                       case 'MEDIUMINT': return 'I4';
+                       case 'BIGINT': return 'I8';
+
+                       default: return 'N';
+               }
+       }
+
+       /**
         * Return actual MySQL type for meta field type
         *
         * @param       string          Meta type (currenly ADOdb syntax only, http://phplens.com/lens/adodb/docs-adodb.htm#metatype)
         * @return      string          native type as reported as in mysqldump files, uppercase
         */
-  function MySQLActualType($meta) {
-    switch(strtoupper($meta)) {
-      case 'C': return 'VARCHAR';
-      case 'XL':
-      case 'X': return 'LONGTEXT';
-
-      case 'C2': return 'VARCHAR';
-      case 'X2': return 'LONGTEXT';
-
-      case 'B': return 'LONGBLOB';
-
-      case 'D': return 'DATE';
-      case 'T': return 'DATETIME';
-      case 'L': return 'TINYINT';
-
-      case 'I': return 'INT';
-      case 'I1': return 'TINYINT';
-      case 'I2': return 'SMALLINT';
-      case 'I4': return 'MEDIUMINT';
-      case 'I8': return 'BIGINT';
-
-      case 'F': return 'DOUBLE';
-      case 'N': return 'NUMERIC';
-      default:
-      return $meta;
-    }
-  }
+       function MySQLActualType($meta) {
+               switch(strtoupper($meta)) {
+                       case 'C': return 'VARCHAR';
+                       case 'XL':
+                       case 'X': return 'LONGTEXT';
+
+                       case 'C2': return 'VARCHAR';
+                       case 'X2': return 'LONGTEXT';
+
+                       case 'B': return 'LONGBLOB';
+
+                       case 'D': return 'DATE';
+                       case 'T': return 'DATETIME';
+                       case 'L': return 'TINYINT';
+
+                       case 'I': return 'INT';
+                       case 'I1': // MS SQL Server allows only 0..255 for tinyint, so we do not map to TINYINT
+                       case 'I2': return 'SMALLINT';
+                       case 'I4': return 'MEDIUMINT';
+                       case 'I8': return 'BIGINT';
+
+                       case 'F': return 'DOUBLE';
+                       case 'N': return 'NUMERIC';
+                       default:
+                       return $meta;
+               }
+       }
 
 
 
 
-  /**************************************
-  *
-  * SQL wrapper functions (Overriding parent methods)
-  * (For use in your applications)
-  *
-  **************************************/
+       /**************************************
+       *
+       * SQL wrapper functions (Overriding parent methods)
+       * (For use in your applications)
+       *
+       **************************************/
 
-  /**
+       /**
         * Returns the error status on the most recent sql() execution (based on $this->lastHandlerKey)
         *
         * @return      string          Handler error strings
         */
-  function sql_error() {
-
-    switch($this->handlerCfg[$this->lastHandlerKey]['type'])   {
-      case 'native':
-      $output = mysql_error($this->handlerInstance[$this->lastHandlerKey]['link']);
-      break;
-      case 'adodb':
-      $output = $this->handlerInstance[$this->lastHandlerKey]->ErrorMsg();
-      break;
-      case 'userdefined':
-      $output = $this->handlerInstance[$this->lastHandlerKey]->sql_error();
-      break;
-    }
-    return $output;
-  }
-
-  /**
+       function sql_error()    {
+
+               switch($this->handlerCfg[$this->lastHandlerKey]['type'])        {
+                       case 'native':
+                               $output = mysql_error($this->handlerInstance[$this->lastHandlerKey]['link']);
+                               break;
+                       case 'adodb':
+                               $output = $this->handlerInstance[$this->lastHandlerKey]->ErrorMsg();
+                               break;
+                       case 'userdefined':
+                               $output = $this->handlerInstance[$this->lastHandlerKey]->sql_error();
+                               break;
+               }
+               return $output;
+       }
+
+       /**
         * Returns the number of selected rows.
         *
         * @param       pointer         Result pointer / DBAL object
         * @return      integer         Number of resulting rows.
         */
-  function sql_num_rows(&$res) {
-
-    $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType : 'native';
-    switch($handlerType)       {
-      case 'native':
-      $output = mysql_num_rows($res);
-      break;
-      case 'adodb':
-                       $output = method_exists($res, 'RecordCount') ? $res->RecordCount() : 0;
-      break;
-      case 'userdefined':
-      $output = $res->sql_num_rows();
-      break;
-    }
-    return $output;
-  }
-
-  /**
+       function sql_num_rows(&$res)    {
+
+               $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType : 'native';
+               switch($handlerType)    {
+                       case 'native':
+                               $output = mysql_num_rows($res);
+                               break;
+                       case 'adodb':
+                               $output = method_exists($res, 'RecordCount') ? $res->RecordCount() : 0;
+                               break;
+                       case 'userdefined':
+                               $output = $res->sql_num_rows();
+                               break;
+               }
+               return $output;
+       }
+
+       /**
         * Returns an associative array that corresponds to the fetched row, or FALSE if there are no more rows.
         *
         * @param       pointer         MySQL result pointer (of SELECT query) / DBAL object
         * @return      array           Associative array of result row.
         */
-  function sql_fetch_assoc(&$res)      {
-
-    $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType :  'native';
-    switch($handlerType)       {
-      case 'native':
-      $output = mysql_fetch_assoc($res);
-      $tableList = $this->resourceIdToTableNameMap[(string)$res];      // Reading list of tables from SELECT query:
-      break;
-      case 'adodb':
-                       // Check if method exists for the current $res object.
-                       // If a table exists in TCA but not in the db, a error
-                       // occured because $res is not a valid object.
-                       if(method_exists($res, 'FetchRow')) {
-      $output = $res->FetchRow();
-      $tableList = $res->TYPO3_DBAL_tableList; // Reading list of tables from SELECT query:
-
-      // Removing all numeric/integer keys.
-      // Just a temporary workaround till I know how to make ADOdb return this by default... Most likely this will not work with other databases than MySQL
-      if (is_array($output))   {
-        foreach($output as $key => $value)     {
-          if (is_integer($key))        unset($output[$key]);
-        }
-      }
+       function sql_fetch_assoc(&$res) {
+               $output = array();
+
+               $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType : (is_resource($res) ? 'native' : false);
+               switch($handlerType)    {
+                       case 'native':
+                               $output = mysql_fetch_assoc($res);
+                               $tableList = $this->resourceIdToTableNameMap[(string)$res];     // Reading list of tables from SELECT query:
+                               break;
+                       case 'adodb':
+                                       // Check if method exists for the current $res object.
+                                       // If a table exists in TCA but not in the db, a error
+                                       // occured because $res is not a valid object.
+                               if(method_exists($res, 'FetchRow')) {
+                                       $output = $res->FetchRow();
+                                       $tableList = $res->TYPO3_DBAL_tableList;        // Reading list of tables from SELECT query:
+
+                                               // Removing all numeric/integer keys.
+                                               // A workaround because in ADOdb we would need to know what we want before executing the query...
+                                       if (is_array($output))  {
+                                               foreach($output as $key => $value)      {
+                                                       if (is_integer($key))   unset($output[$key]);
+                                                       elseif($value===' ' && strstr($GLOBALS['TYPO3_DB']->handlerCfg[$GLOBALS['TYPO3_DB']->lastHandlerKey]['config']['driver'],'mssql')) $output[$key]=''; // MSSQL does not know such thing as an empty string. So it returns one space instead, which we must fix.
+                                               }
+                                       }
+                               }
+                               break;
+                       case 'userdefined':
+                               $output = $res->sql_fetch_assoc();
+                               $tableList = $res->TYPO3_DBAL_tableList;        // Reading list of tables from SELECT query:
+                               break;
+               }
+
+               // Table/Fieldname mapping:
+               if (is_array($output))  {
+                       if ($tables = $this->map_needMapping($tableList,TRUE))  {
+                               $output = $this->map_assocArray($output,$tables,1);
                        }
-      break;
-      case 'userdefined':
-      $output = $res->sql_fetch_assoc();
-      $tableList = $res->TYPO3_DBAL_tableList; // Reading list of tables from SELECT query:
-      break;
-    }
-
-    // Table/Fieldname mapping:
-    if (is_array($output))     {
-      if ($tables = $this->map_needMapping($tableList,TRUE))   {
-        $output = $this->map_assocArray($output,$tables,1);
-      }
-    }
-
-    // Return result:
-    return $output;
-  }
-
-  /**
+               }
+
+               // Return result:
+               return $output;
+       }
+
+       /**
         * Returns an array that corresponds to the fetched row, or FALSE if there are no more rows.
         * The array contains the values in numerical indices.
         *
         * @param       pointer         MySQL result pointer (of SELECT query) / DBAL object
         * @return      array           Array with result rows.
         */
-  function sql_fetch_row(&$res)        {
-    $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType :  'native';
-    switch($handlerType)       {
-      case 'native':
-      $output = mysql_fetch_row($res);
-      break;
-      case 'adodb':
-                       // Check if method exists for the current $res object.
-                       // If a table exists in TCA but not in the db, a error
-                       // occured because $res is not a valid object.
-                       if(method_exists($res, 'FetchRow')) {
-      $output = $res->FetchRow();
-
-      // Removing all assoc. keys.
-      // Just a temporary workaround till I know how to make ADOdb return this by default... Most likely this will not work with other databases than MySQL
-      if (is_array($output))   {
-        foreach($output as $key => $value)     {
-          if (!is_integer($key))       unset($output[$key]);
-        }
-      }
-                       }
-      break;
-      case 'userdefined':
-      $output = $res->sql_fetch_row();
-      break;
-    }
-    return $output;
-  }
-
-  /**
+       function sql_fetch_row(&$res)   {
+               $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType :  'native';
+               switch($handlerType)    {
+                       case 'native':
+                               $output = mysql_fetch_row($res);
+                               break;
+                       case 'adodb':
+                                       // Check if method exists for the current $res object.
+                                       // If a table exists in TCA but not in the db, a error
+                                       // occured because $res is not a valid object.
+                               if(method_exists($res, 'FetchRow')) {
+                                       $output = $res->FetchRow();
+
+                                               // Removing all assoc. keys.
+                                               // A workaround because in ADOdb we would need to know what we want before executing the query...
+                                       if (is_array($output))  {
+                                               foreach($output as $key => $value)      {
+                                                       if (!is_integer($key))  unset($output[$key]);
+                                                       elseif($value===' ' && strstr($GLOBALS['TYPO3_DB']->handlerCfg[$GLOBALS['TYPO3_DB']->lastHandlerKey]['config']['driver'],'mssql')) $output[$key]=''; // MSSQL does not know such thing as an empty string. So it returns one space instead, which we must fix.
+                                               }
+                                       }
+                               }
+                               break;
+                       case 'userdefined':
+                               $output = $res->sql_fetch_row();
+                               break;
+               }
+               return $output;
+       }
+
+       /**
         * Free result memory / unset result object
         *
         * @param       pointer         MySQL result pointer to free / DBAL object
         * @return      boolean         Returns TRUE on success or FALSE on failure.
         */
-  function sql_free_result(&$res)      {
-
-    $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType :  'native';
-    switch($handlerType)       {
-      case 'native':
-      $output = mysql_free_result($res);
-      break;
-      case 'adodb':
-                       if(method_exists($res, 'Close')) {
-      $res->Close();
-      unset($res);
-      $output = true;
-                       } else {
-                               $output = false;
-                       }
-      break;
-      case 'userdefined':
-      unset($res);
-      break;
-    }
-    return $output;
-  }
-
-  /**
+       function sql_free_result(&$res) {
+
+               $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType :  'native';
+               switch($handlerType)    {
+                       case 'native':
+                               $output = mysql_free_result($res);
+                               break;
+                       case 'adodb':
+                               if(method_exists($res, 'Close')) {
+                                       $res->Close();
+                                       unset($res);
+                                       $output = true;
+                               } else {
+                                       $output = false;
+                               }
+                               break;
+                       case 'userdefined':
+                               unset($res);
+                               break;
+               }
+               return $output;
+       }
+
+       /**
         * Get the ID generated from the previous INSERT operation
         *
         * @return      integer         The uid of the last inserted record.
         */
-  function sql_insert_id()     {
-
-    switch($this->handlerCfg[$this->lastHandlerKey]['type'])   {
-      case 'native':
-      $output = mysql_insert_id($this->handlerInstance[$this->lastHandlerKey]['link']);
-      break;
-      case 'adodb':
-      $output = $this->handlerInstance[$this->lastHandlerKey]->last_insert_id;
-      break;
-      case 'userdefined':
-      $output = $this->handlerInstance[$this->lastHandlerKey]->sql_insert_id();
-      break;
-    }
-    return $output;
-  }
-
-  /**
+       function sql_insert_id()        {
+
+               switch($this->handlerCfg[$this->lastHandlerKey]['type'])        {
+                       case 'native':
+                               $output = mysql_insert_id($this->handlerInstance[$this->lastHandlerKey]['link']);
+                               break;
+                       case 'adodb':
+                               $output = $this->handlerInstance[$this->lastHandlerKey]->last_insert_id;
+                               break;
+                       case 'userdefined':
+                               $output = $this->handlerInstance[$this->lastHandlerKey]->sql_insert_id();
+                               break;
+               }
+               return $output;
+       }
+
+       /**
         * Returns the number of rows affected by the last INSERT, UPDATE or DELETE query
         *
         * @return      integer         Number of rows affected by last query
         */
-  function sql_affected_rows() {
-
-    switch($this->handlerCfg[$this->lastHandlerKey]['type'])   {
-      case 'native':
-      $output = mysql_affected_rows();
-      break;
-      case 'adodb':
-      $output = $this->handlerInstance[$this->lastHandlerKey]->Affected_Rows();
-      break;
-      case 'userdefined':
-      $output = $this->handlerInstance[$this->lastHandlerKey]->sql_affected_rows();
-      break;
-    }
-    return $output;
-  }
-
-  /**
+       function sql_affected_rows()    {
+
+               switch($this->handlerCfg[$this->lastHandlerKey]['type'])        {
+                       case 'native':
+                               $output = mysql_affected_rows();
+                               break;
+                       case 'adodb':
+                               $output = $this->handlerInstance[$this->lastHandlerKey]->Affected_Rows();
+                               break;
+                       case 'userdefined':
+                               $output = $this->handlerInstance[$this->lastHandlerKey]->sql_affected_rows();
+                               break;
+               }
+               return $output;
+       }
+
+       /**
         * Move internal result pointer
         *
         * @param       pointer         MySQL result pointer (of SELECT query) / DBAL object
         * @param       integer         Seek result number.
         * @return      boolean         Returns TRUE on success or FALSE on failure.
         */
-  function sql_data_seek(&$res,$seek)  {
-
-    $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType :  'native';
-    switch($handlerType)       {
-      case 'native':
-      $output = mysql_data_seek($res,$seek);
-      break;
-      case 'adodb':
-      $output = $res->Move($seek);
-      break;
-      case 'userdefined':
-      $output = $res->sql_data_seek($seek);
-      break;
-    }
-    return $output;
-  }
-
-  /**
+       function sql_data_seek(&$res,$seek)     {
+
+               $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType :  'native';
+               switch($handlerType)    {
+                       case 'native':
+                               $output = mysql_data_seek($res,$seek);
+                               break;
+                       case 'adodb':
+                               $output = $res->Move($seek);
+                               break;
+                       case 'userdefined':
+                               $output = $res->sql_data_seek($seek);
+                               break;
+               }
+               return $output;
+       }
+
+       /**
         * Get the type of the specified field in a result
         *
         * If the first parameter is a string, it is used as table name for the lookup.
@@ -1421,11 +1429,11 @@ class ux_t3lib_DB extends t3lib_DB {
         * @param       integer         Field index. In case of ADOdb a string (field name!) FIXME
         * @return      string          Returns the type of the specified field index
         */
-  function sql_field_metatype($table,$field)   {
-    return $this->cache_fieldType[$table][$field]['metaType'];
-  }
+       function sql_field_metatype($table,$field)      {
+               return $this->cache_fieldType[$table][$field]['metaType'];
+       }
 
-  /**
+       /**
         * Get the type of the specified field in a result
         *
         * If the first parameter is a string, it is used as table name for the lookup.
@@ -1434,37 +1442,36 @@ class ux_t3lib_DB extends t3lib_DB {
         * @param       integer         Field index. In case of ADOdb a string (field name!) FIXME
         * @return      string          Returns the type of the specified field index
         */
-  function sql_field_type(&$res,$pointer)      {
-    if($res === null) {
-      debug(array('no res in sql_field_type!'));
-      return 'text';
-    }
-    else if(is_string($res)){
-      if($res == 'tx_dbal_debuglog') return 'text';
-      $handlerType = 'adodb';
-    }
-    else {
-      $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType :  'native';
-    }
-
-    switch($handlerType)       {
-      case 'native':
-      $output = mysql_field_type($res,$pointer);
-      break;
-      case 'adodb':
-                       if(is_string($pointer)){
-      $output = $this->cache_fieldType[$res][$pointer]['type'];
-                       }
+       function sql_field_type(&$res,$pointer) {
+               if($res === null) {
+                       debug(array('no res in sql_field_type!'));
+                       return 'text';
+               }
+               else if(is_string($res)){
+                       if($res == 'tx_dbal_debuglog') return 'text';
+                       $handlerType = 'adodb';
+               }
+               else {
+                       $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType :  'native';
+               }
 
-      break;
-      case 'userdefined':
-      $output = $res->sql_field_type($pointer);
-      break;
-    }
+               switch($handlerType)    {
+                       case 'native':
+                               $output = mysql_field_type($res,$pointer);
+                               break;
+                       case 'adodb':
+                               if(is_string($pointer)){
+                                       $output = $this->cache_fieldType[$res][$pointer]['type'];
+                               }
 
-    return $output;
-  }
+                               break;
+                       case 'userdefined':
+                               $output = $res->sql_field_type($pointer);
+                               break;
+               }
 
+               return $output;
+       }
 
 
 
@@ -1472,14 +1479,15 @@ class ux_t3lib_DB extends t3lib_DB {
 
 
 
-  /**********
-  *
-  * Legacy functions, bound to _DEFAULT handler. (Overriding parent methods)
-  * Depreciated.
-  *
-  **********/
 
-  /**
+       /**********
+       *
+       * Legacy functions, bound to _DEFAULT handler. (Overriding parent methods)
+       * Depreciated.
+       *
+       **********/
+
+       /**
         * Executes query (on DEFAULT handler!)
         * DEPRECIATED - use exec_* functions from this class instead!
         *
@@ -1488,11 +1496,11 @@ class ux_t3lib_DB extends t3lib_DB {
         * @return      pointer         Result pointer
         * @depreciated
         */
-  function sql($db,$query)     {
-    return $this->sql_query($query);
-  }
+       function sql($db,$query)        {
+               return $this->sql_query($query);
+       }
 
-  /**
+       /**
         * Executes query (on DEFAULT handler!)
         * DEPRECIATED - use exec_* functions from this class instead!
         *
@@ -1500,27 +1508,30 @@ class ux_t3lib_DB extends t3lib_DB {
         * @return      pointer         Result pointer / DBAL object
         * @depreciated
         */
-  function sql_query($query)   {
-
-    switch($this->handlerCfg['_DEFAULT']['type'])      {
-      case 'native':
-      $sqlResult = mysql_query($query, $this->handlerInstance['_DEFAULT']['link']);
-      break;
-      case 'adodb':
-      $sqlResult = $this->handlerInstance['_DEFAULT']->Execute($query);
-      break;
-      case 'userdefined':
-      $sqlResult = $this->handlerInstance['_DEFAULT']->sql_query($query);
-      break;
-    }
-
-    // Print errors:
-    if ($this->printErrors && $this->sql_error())      { debug(array($this->sql_error()));     }
-
-    return $sqlResult;
-  }
-
-  /**
+       function sql_query($query)      {
+
+               switch($this->handlerCfg['_DEFAULT']['type'])   {
+                       case 'native':
+                               $sqlResult = mysql_query($query, $this->handlerInstance['_DEFAULT']['link']);
+                               break;
+                       case 'adodb':
+                               $sqlResult = $this->handlerInstance['_DEFAULT']->Execute($query);
+                               $sqlResult->TYPO3_DBAL_handlerType = 'adodb';
+                               break;
+                       case 'userdefined':
+                               $sqlResult = $this->handlerInstance['_DEFAULT']->sql_query($query);
+                               $sqlResult->TYPO3_DBAL_handlerType = 'userdefined';
+                               break;
+               }
+
+               if ($this->printErrors && $this->sql_error())   {
+                       debug(array($this->lastQuery, $this->sql_error()));
+               }
+
+               return $sqlResult;
+       }
+
+       /**
         * Opening the _DEFAULT connection handler to the database.
         * This is typically done by the scripts "init.php" in the backend or "index_ts.php" in the frontend (tslib_fe->connectToMySQL())
         * You wouldn't need to use this at any time - let TYPO3 core handle this.
@@ -1532,28 +1543,28 @@ class ux_t3lib_DB extends t3lib_DB {
         * @depreciated
         * @see handler_init()
         */
-  function sql_pconnect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password)        {
-    // Overriding the _DEFAULT handler configuration of username, password, localhost and database name:
-    $this->handlerCfg['_DEFAULT']['config']['username'] = $TYPO3_db_username;
-    $this->handlerCfg['_DEFAULT']['config']['password'] = $TYPO3_db_password;
-    $this->handlerCfg['_DEFAULT']['config']['host'] = $TYPO3_db_host;
-    $this->handlerCfg['_DEFAULT']['config']['database'] = TYPO3_db;
-
-    // Initializing and output value:
-    $sqlResult = $this->handler_init('_DEFAULT');
-    return $sqlResult;
-  }
-
-  /**
+       function sql_pconnect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password)   {
+               // Overriding the _DEFAULT handler configuration of username, password, localhost and database name:
+               $this->handlerCfg['_DEFAULT']['config']['username'] = $TYPO3_db_username;
+               $this->handlerCfg['_DEFAULT']['config']['password'] = $TYPO3_db_password;
+               $this->handlerCfg['_DEFAULT']['config']['host'] = $TYPO3_db_host;
+               $this->handlerCfg['_DEFAULT']['config']['database'] = TYPO3_db;
+
+               // Initializing and output value:
+               $sqlResult = $this->handler_init('_DEFAULT');
+               return $sqlResult;
+       }
+
+       /**
         * Select database for _DEFAULT handler.
         *
         * @param       string          Database to connect to.
         * @return      boolean         Always returns true; function is obsolete, database selection is made in handler_init() function!
         * @depreciated
         */
-  function sql_select_db($TYPO3_db)    {
-    return TRUE;
-  }
+       function sql_select_db($TYPO3_db)       {
+               return TRUE;
+       }
 
 
 
@@ -1569,109 +1580,111 @@ class ux_t3lib_DB extends t3lib_DB {
 
 
 
-  /**************************************
-  *
-  * SQL admin functions
-  * (For use in the Install Tool and Extension Manager)
-  *
-  **************************************/
+       /**************************************
+       *
+       * SQL admin functions
+       * (For use in the Install Tool and Extension Manager)
+       *
+       **************************************/
 
-  /**
+       /**
         * Listing databases from current MySQL connection. NOTICE: It WILL try to select those databases and thus break selection of current database.
         * Use in Install Tool only!
         * Usage count/core: 1
         *
         * @return      array           Each entry represents a database name
         */
-  function admin_get_dbs()     {
-    $dbArr = array();
-    switch($this->handlerCfg['_DEFAULT']['type'])      {
-      case 'native':
-      $db_list = mysql_list_dbs($this->link);
-      while ($row = mysql_fetch_object($db_list)) {
-        if ($this->sql_select_db($row->Database))      {
-          $dbArr[] = $row->Database;
-        }
-      }
-      break;
-      case 'adodb':
-       // check needed for install tool - otherwise it will just die because the call to
-       // MetaDatabases is done on a stdClass instance
-      if(method_exists($this->handlerInstance['_DEFAULT'],'MetaDatabases')) {
-             $sqlDBs = $this->handlerInstance['_DEFAULT']->MetaDatabases();
-           foreach( $sqlDBs as $k => $theDB) {
-           $dbArr[] = $theDB;
-       }
-      }
-      break;
-      case 'userdefined':
-      $dbArr = $this->handlerInstance['_DEFAULT']->admin_get_tables();
-      break;
-    }
-
-    return $dbArr;
-  }
-
-  /**
+       function admin_get_dbs()        {
+               $dbArr = array();
+               switch($this->handlerCfg['_DEFAULT']['type'])   {
+                       case 'native':
+                               $db_list = mysql_list_dbs($this->link);
+                               while ($row = mysql_fetch_object($db_list)) {
+                                       if ($this->sql_select_db($row->Database))       {
+                                               $dbArr[] = $row->Database;
+                                       }
+                               }
+                               break;
+                       case 'adodb':
+                                       // check needed for install tool - otherwise it will just die because the call to
+                                       // MetaDatabases is done on a stdClass instance
+                               if(method_exists($this->handlerInstance['_DEFAULT'],'MetaDatabases')) {
+                                       $sqlDBs = $this->handlerInstance['_DEFAULT']->MetaDatabases();
+                                       if(is_array($sqlDBs)) {
+                                               foreach($sqlDBs as $k => $theDB) {
+                                                       $dbArr[] = $theDB;
+                                               }
+                                       }
+                               }
+                               break;
+                       case 'userdefined':
+                               $dbArr = $this->handlerInstance['_DEFAULT']->admin_get_tables();
+                               break;
+               }
+
+               return $dbArr;
+       }
+
+       /**
         * Returns the list of tables from the system (quering the DBMSs)
         * It looks up all tables from the DBMS of the _DEFAULT handler and then add all tables *configured* to be managed by other handlers
         *
         * @return      array           Tables in an array (tablename is in both key and value)
         */
-  function admin_get_tables()  {
-    $whichTables = array();
-
-    // Getting real list of tables:
-    switch($this->handlerCfg['_DEFAULT']['type'])      {
-      case 'native':
-      $tables_result = mysql_list_tables(TYPO3_db, $this->handlerInstance['_DEFAULT']['link']);
-      if (!$this->sql_error()) {
-        while ($theTable = $this->sql_fetch_assoc($tables_result)) {
-          $whichTables[current($theTable)] = current($theTable);
-        }
-      }
-      break;
-      case 'adodb':
-      $sqlTables = $this->handlerInstance['_DEFAULT']->MetaTables('TABLES');
-      while (list($k, $theTable) = each($sqlTables)) {
-        $whichTables[$theTable] = $theTable;
-      }
-      break;
-      case 'userdefined':
-      $whichTables = $this->handlerInstance['_DEFAULT']->admin_get_tables();
-      break;
-    }
-
-    // Check mapping:
-    if (is_array($this->mapping))      {
-
-      // Mapping table names in reverse, first getting list of real table names:
-      $tMap = array();
-      foreach($this->mapping as $tN => $tMapInfo)      {
-        if (isset($tMapInfo['mapTableName']))  $tMap[$tMapInfo['mapTableName']]=$tN;
-      }
-
-      // Do mapping:
-      $newList=array();
-      foreach($whichTables as $tN)     {
-        if (isset($tMap[$tN])) $tN = $tMap[$tN];
-        $newList[$tN] = $tN;
-      }
-
-      $whichTables = $newList;
-    }
-
-    // Adding tables configured to reside in other DBMS (handler by other handlers than the default):
-    if (is_array($this->table2handlerKeys))    {
-      foreach($this->table2handlerKeys as $key => $handlerKey) {
-        $whichTables[$key] = $key;
-      }
-    }
-
-    return $whichTables;
-  }
-
-  /**
+       function admin_get_tables()     {
+               $whichTables = array();
+
+               // Getting real list of tables:
+               switch($this->handlerCfg['_DEFAULT']['type'])   {
+                       case 'native':
+                               $tables_result = mysql_list_tables(TYPO3_db, $this->handlerInstance['_DEFAULT']['link']);
+                               if (!$this->sql_error())        {
+                                       while ($theTable = $this->sql_fetch_assoc($tables_result)) {
+                                               $whichTables[current($theTable)] = current($theTable);
+                                       }
+                               }
+                               break;
+                       case 'adodb':
+                               $sqlTables = $this->handlerInstance['_DEFAULT']->MetaTables('TABLES');
+                               while (list($k, $theTable) = each($sqlTables)) {
+                                       $whichTables[$theTable] = $theTable;
+                               }
+                               break;
+                       case 'userdefined':
+                               $whichTables = $this->handlerInstance['_DEFAULT']->admin_get_tables();
+                               break;
+               }
+
+               // Check mapping:
+               if (is_array($this->mapping))   {
+
+                       // Mapping table names in reverse, first getting list of real table names:
+                       $tMap = array();
+                       foreach($this->mapping as $tN => $tMapInfo)     {
+                               if (isset($tMapInfo['mapTableName']))   $tMap[$tMapInfo['mapTableName']]=$tN;
+                       }
+
+                       // Do mapping:
+                       $newList=array();
+                       foreach($whichTables as $tN)    {
+                               if (isset($tMap[$tN]))  $tN = $tMap[$tN];
+                               $newList[$tN] = $tN;
+                       }
+
+                       $whichTables = $newList;
+               }
+
+               // Adding tables configured to reside in other DBMS (handler by other handlers than the default):
+               if (is_array($this->table2handlerKeys)) {
+                       foreach($this->table2handlerKeys as $key => $handlerKey)        {
+                               $whichTables[$key] = $key;
+                       }
+               }
+
+               return $whichTables;
+       }
+
+       /**
         * Returns information about each field in the $table (quering the DBMS)
         * In a DBAL this should look up the right handler for the table and return compatible information
         * This function is important not only for the Install Tool but probably for DBALs as well since they might need to look up table specific information in order to construct correct queries. In such cases this information should probably be cached for quick delivery
@@ -1679,231 +1692,233 @@ class ux_t3lib_DB extends t3lib_DB {
         * @param       string          Table name
         * @return      array           Field information in an associative array with fieldname => field row
         */
-  function admin_get_fields($tableName)        {
-    $output = array();
-
-    // Do field mapping if needed:
-    $ORIG_tableName = $tableName;
-    if ($tableArray = $this->map_needMapping($tableName))      {
-
-      // Table name:
-      if ($this->mapping[$tableName]['mapTableName'])  {
-        $tableName = $this->mapping[$tableName]['mapTableName'];
-      }
-    }
-
-    // Find columns
-    $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
-    switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])   {
-      case 'native':
-      $columns_res = mysql_query('SHOW columns FROM '.$tableName, $this->handlerInstance[$this->lastHandlerKey]['link']);
-      while($fieldRow = mysql_fetch_assoc($columns_res))       {
-        $output[$fieldRow['Field']] = $fieldRow;
-      }
-      break;
-      case 'adodb':
-      $fieldRows = $this->handlerInstance[$this->lastHandlerKey]->MetaColumns($tableName, false);
-      foreach($fieldRows as $k => $fieldRow) {
-        settype($fieldRow, 'array');
-        $fieldRow['Field'] = $fieldRow['name'];
-        $ntype = $this->MySQLActualType($this->MetaType($fieldRow['type'],$tableName));
-        $ntype .= (($fieldRow['max_length'] != -1) ? (($ntype == 'INT') ? '(11)' :'('.$fieldRow['max_length'].')') : '');
-        $fieldRow['Type'] = strtolower($ntype);
-        $fieldRow['Null'] = '';
-        $fieldRow['Key'] = '';
-        $fieldRow['Default'] = $fieldRow['default_value'];
-        $fieldRow['Extra'] = '';
-        $output[$fieldRow['name']] = $fieldRow;
-      }
-      break;
-      case 'userdefined':
-      $output = $this->handlerInstance[$this->lastHandlerKey]->admin_get_fields($tableName);
-      break;
-    }
-
-    // mapping should be done:
-    if (is_array($tableArray) && is_array($this->mapping[$ORIG_tableName]['mapFieldNames']))   {
-      $revFields = array_flip($this->mapping[$ORIG_tableName]['mapFieldNames']);
-
-      $newOutput = array();
-      foreach($output as $fN => $fInfo)        {
-        if (isset($revFields[$fN]))    {
-          $fN = $revFields[$fN];
-          $fInfo['Field'] = $fN;
-        }
-        $newOutput[$fN] = $fInfo;
-      }
-      $output = $newOutput;
-    }
-
-    return $output;
-  }
-
-  /**
+       function admin_get_fields($tableName)   {
+               $output = array();
+
+               // Do field mapping if needed:
+               $ORIG_tableName = $tableName;
+               if ($tableArray = $this->map_needMapping($tableName))   {
+
+                       // Table name:
+                       if ($this->mapping[$tableName]['mapTableName']) {
+                               $tableName = $this->mapping[$tableName]['mapTableName'];
+                       }
+               }
+
+               // Find columns
+               $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
+               switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])        {
+                       case 'native':
+                               $columns_res = mysql_query('SHOW columns FROM '.$tableName, $this->handlerInstance[$this->lastHandlerKey]['link']);
+                               while($fieldRow = mysql_fetch_assoc($columns_res))      {
+                                       $output[$fieldRow['Field']] = $fieldRow;
+                               }
+                               break;
+                       case 'adodb':
+                               $fieldRows = $this->handlerInstance[$this->lastHandlerKey]->MetaColumns($tableName, false);
+                               foreach($fieldRows as $k => $fieldRow) {
+                                       settype($fieldRow, 'array');
+                                       $fieldRow['Field'] = $fieldRow['name'];
+                                       $ntype = $this->MySQLActualType($this->MetaType($fieldRow['type'],$tableName));
+                                       $ntype .= (($fieldRow['max_length'] != -1) ? (($ntype == 'INT') ? '(11)' :'('.$fieldRow['max_length'].')') : '');
+                                       $fieldRow['Type'] = strtolower($ntype);
+                                       $fieldRow['Null'] = '';
+                                       $fieldRow['Key'] = '';
+                                       $fieldRow['Default'] = $fieldRow['default_value'];
+                                       $fieldRow['Extra'] = '';
+                                       $output[$fieldRow['name']] = $fieldRow;
+                               }
+                               break;
+                       case 'userdefined':
+                               $output = $this->handlerInstance[$this->lastHandlerKey]->admin_get_fields($tableName);
+                               break;
+               }
+
+               // mapping should be done:
+               if (is_array($tableArray) && is_array($this->mapping[$ORIG_tableName]['mapFieldNames']))        {
+                       $revFields = array_flip($this->mapping[$ORIG_tableName]['mapFieldNames']);
+
+                       $newOutput = array();
+                       foreach($output as $fN => $fInfo)       {
+                               if (isset($revFields[$fN]))     {
+                                       $fN = $revFields[$fN];
+                                       $fInfo['Field'] = $fN;
+                               }
+                               $newOutput[$fN] = $fInfo;
+                       }
+                       $output = $newOutput;
+               }
+
+               return $output;
+       }
+
+       /**
         * Returns information about each index key in the $table (quering the DBMS)
         * In a DBAL this should look up the right handler for the table and return compatible information
         *
         * @param       string          Table name
         * @return      array           Key information in a numeric array
         */
-  function admin_get_keys($tableName)  {
-    $output = array();
-
-    // Do field mapping if needed:
-    $ORIG_tableName = $tableName;
-    if ($tableArray = $this->map_needMapping($tableName))      {
-
-      // Table name:
-      if ($this->mapping[$tableName]['mapTableName'])  {
-        $tableName = $this->mapping[$tableName]['mapTableName'];
-      }
-    }
-
-    // Find columns
-    $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
-    switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])   {
-      case 'native':
-      $keyRes = mysql_query('SHOW keys FROM '.$tableName, $this->handlerInstance[$this->lastHandlerKey]['link']);
-      while($keyRow = mysql_fetch_assoc($keyRes))      {
-        $output[] = $keyRow;
-      }
-      break;
-      case 'adodb':
-      $keyRows = $this->handlerInstance[$this->lastHandlerKey]->MetaIndexes($tableName);
-      if($keyRows !== false) {
-        while (list($k, $theKey) = each($keyRows)) {
-          $theKey['Table'] = $tableName;
-          $theKey['Non_unique'] = (int) !$theKey['unique'];
-          $theKey['Key_name'] = str_replace($tableName.'_','',$k);
-
-          // the following are probably not needed anyway...
-          $theKey['Collation'] = '';
-          $theKey['Cardinality'] = '';
-          $theKey['Sub_part'] = '';
-          $theKey['Packed'] = '';
-          $theKey['Null'] = '';
-          $theKey['Index_type'] = '';
-          $theKey['Comment'] = '';
-
-          // now map multiple fields into multiple rows (we mimic MySQL, remember...)
-          $keycols = $theKey['columns'];
-          while (list($c, $theCol) = each($keycols)) {
-            $theKey['Seq_in_index'] = $c+1;
-            $theKey['Column_name'] = $theCol;
-            $output[] = $theKey;
-          }
-        }
-      }
-      $priKeyRow = $this->handlerInstance[$this->lastHandlerKey]->MetaPrimaryKeys($tableName);
-      $theKey = array();
-      $theKey['Table'] = $tableName;
-      $theKey['Non_unique'] = 0;
-      $theKey['Key_name'] = 'PRIMARY';
-
-      // the following are probably not needed anyway...
-      $theKey['Collation'] = '';
-      $theKey['Cardinality'] = '';
-      $theKey['Sub_part'] = '';
-      $theKey['Packed'] = '';
-      $theKey['Null'] = '';
-      $theKey['Index_type'] = '';
-      $theKey['Comment'] = '';
-
-      // now map multiple fields into multiple rows (we mimic MySQL, remember...)
-      if($priKeyRow !== false) {
-        while (list($c, $theCol) = each($priKeyRow)) {
-          $theKey['Seq_in_index'] = $c+1;
-          $theKey['Column_name'] = $theCol;
-          $output[] = $theKey;
-        }
-      }
-      break;
-      case 'userdefined':
-      $output = $this->handlerInstance[$this->lastHandlerKey]->admin_get_keys($tableName);
-      break;
-    }
-
-    // mapping should be done:
-    if (is_array($tableArray) && is_array($this->mapping[$ORIG_tableName]['mapFieldNames']))   {
-      $revFields = array_flip($this->mapping[$ORIG_tableName]['mapFieldNames']);
-
-      $newOutput = array();
-      foreach($output as $kN => $kInfo)        {
-        // Table:
-        $kInfo['Table'] = $ORIG_tableName;
-
-        // Column
-        if (isset($revFields[$kInfo['Column_name']]))  {
-          $kInfo['Column_name'] = $revFields[$kInfo['Column_name']];
-        }
-
-        // Write it back:
-        $newOutput[$kN] = $kInfo;
-      }
-      $output = $newOutput;
-    }
-
-    return $output;
-  }
-
-  /**
-        * mysql() wrapper function, used by the Install Tool and EM for all queries regarding management of the database!
-        *
-        * @param       string          Query to execute
-        * @return      pointer         Result pointer
-        */
-  function admin_query($query) {
-    $parsedQuery = $this->SQLparser->parseSQL($query);
-    $ORIG_table = $parsedQuery['TABLE'];
+       function admin_get_keys($tableName)     {
+               $output = array();
 
-    if (is_array($parsedQuery))        {
+               // Do field mapping if needed:
+               $ORIG_tableName = $tableName;
+               if ($tableArray = $this->map_needMapping($tableName))   {
 
-      // Process query based on type:
-      switch($parsedQuery['type'])     {
-        case 'CREATETABLE':
-        case 'ALTERTABLE':
-        case 'DROPTABLE':
-        if(file_exists(PATH_typo3conf.'temp_fieldInfo.php'))
-        unlink(PATH_typo3conf.'temp_fieldInfo.php');
-        $this->map_genericQueryParsed($parsedQuery);
-        break;
-        case 'INSERT':
-        $this->map_genericQueryParsed($parsedQuery);
-        break;
-        default:
-        die('ERROR: Invalid Query type ('.$parsedQuery['type'].') for ->admin_query() function!: "'.htmlspecialchars($query).'"');
-        break;
-      }
+                       // Table name:
+                       if ($this->mapping[$tableName]['mapTableName']) {
+                               $tableName = $this->mapping[$tableName]['mapTableName'];
+                       }
+               }
 
-      // Setting query array (for other applications to access if needed)
-      $this->lastParsedAndMappedQueryArray = $parsedQuery;
+               // Find columns
+               $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
+               switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])        {
+                       case 'native':
+                       $keyRes = mysql_query('SHOW keys FROM '.$tableName, $this->handlerInstance[$this->lastHandlerKey]['link']);
+                       while($keyRow = mysql_fetch_assoc($keyRes))     {
+                               $output[] = $keyRow;
+                       }
+                       break;
+                       case 'adodb':
+                       $keyRows = $this->handlerInstance[$this->lastHandlerKey]->MetaIndexes($tableName);
+                       if($keyRows !== false) {
+                               while (list($k, $theKey) = each($keyRows)) {
+                                       $theKey['Table'] = $tableName;
+                                       $theKey['Non_unique'] = (int) !$theKey['unique'];
+                                       $theKey['Key_name'] = str_replace($tableName.'_','',$k);
+
+                                       // the following are probably not needed anyway...
+                                       $theKey['Collation'] = '';
+                                       $theKey['Cardinality'] = '';
+                                       $theKey['Sub_part'] = '';
+                                       $theKey['Packed'] = '';
+                                       $theKey['Null'] = '';
+                                       $theKey['Index_type'] = '';
+                                       $theKey['Comment'] = '';
+
+                                       // now map multiple fields into multiple rows (we mimic MySQL, remember...)
+                                       $keycols = $theKey['columns'];
+                                       while (list($c, $theCol) = each($keycols)) {
+                                               $theKey['Seq_in_index'] = $c+1;
+                                               $theKey['Column_name'] = $theCol;
+                                               $output[] = $theKey;
+                                       }
+                               }
+                       }
+                       $priKeyRow = $this->handlerInstance[$this->lastHandlerKey]->MetaPrimaryKeys($tableName);
+                       $theKey = array();
+                       $theKey['Table'] = $tableName;
+                       $theKey['Non_unique'] = 0;
+                       $theKey['Key_name'] = 'PRIMARY';
+
+                       // the following are probably not needed anyway...
+                       $theKey['Collation'] = '';
+                       $theKey['Cardinality'] = '';
+                       $theKey['Sub_part'] = '';
+                       $theKey['Packed'] = '';
+                       $theKey['Null'] = '';
+                       $theKey['Index_type'] = '';
+                       $theKey['Comment'] = '';
+
+                       // now map multiple fields into multiple rows (we mimic MySQL, remember...)
+                       if($priKeyRow !== false) {
+                               while (list($c, $theCol) = each($priKeyRow)) {
+                                       $theKey['Seq_in_index'] = $c+1;
+                                       $theKey['Column_name'] = $theCol;
+                                       $output[] = $theKey;
+                               }
+                       }
+                       break;
+                       case 'userdefined':
+                       $output = $this->handlerInstance[$this->lastHandlerKey]->admin_get_keys($tableName);
+                       break;
+               }
 
-      // Execute query (based on handler derived from the TABLE name which we actually know for once!)
-      $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_table);
-      switch((string)$this->handlerCfg[$this->lastHandlerKey]['type']) {
-        case 'native':
-        // Compiling query:
-        $compiledQuery =  $this->SQLparser->compileSQL($this->lastParsedAndMappedQueryArray);
+               // mapping should be done:
+               if (is_array($tableArray) && is_array($this->mapping[$ORIG_tableName]['mapFieldNames']))        {
+                       $revFields = array_flip($this->mapping[$ORIG_tableName]['mapFieldNames']);
 
-        return mysql_query($compiledQuery[0], $this->link);
-        break;
-        case 'adodb':
-        // Compiling query:
-        $compiledQuery =  $this->SQLparser->compileSQL($this->lastParsedAndMappedQueryArray);
-        if($this->lastParsedAndMappedQueryArray['type']=='INSERT') {
-          return $this->exec_INSERTquery($this->lastParsedAndMappedQueryArray['TABLE'],$compiledQuery);
-        }
-        return $this->handlerInstance[$this->lastHandlerKey]->DataDictionary->ExecuteSQLArray($compiledQuery);
-        break;
-        case 'userdefined':
-        // Compiling query:
-        $compiledQuery =  $this->SQLparser->compileSQL($this->lastParsedAndMappedQueryArray);
+                       $newOutput = array();
+                       foreach($output as $kN => $kInfo)       {
+                               // Table:
+                               $kInfo['Table'] = $ORIG_tableName;
 
-        return $this->handlerInstance[$this->lastHandlerKey]->admin_query($compiledQuery);
-        break;
-      }
-    } else die('ERROR: Query could not be parsed: "'.htmlspecialchars($parsedQuery).'". Query: "'.htmlspecialchars($query).'"');
-  }
+                               // Column
+                               if (isset($revFields[$kInfo['Column_name']]))   {
+                                       $kInfo['Column_name'] = $revFields[$kInfo['Column_name']];
+                               }
+
+                               // Write it back:
+                               $newOutput[$kN] = $kInfo;
+                       }
+                       $output = $newOutput;
+               }
+
+               return $output;
+       }
+
+       /**
+        * mysql() wrapper function, used by the Install Tool and EM for all queries regarding management of the database!
+        *
+        * @param       string          Query to execute
+        * @return      pointer         Result pointer
+        */
+       function admin_query($query)    {
+               $parsedQuery = $this->SQLparser->parseSQL($query);
+               $ORIG_table = $parsedQuery['TABLE'];
+
+               if (is_array($parsedQuery))     {
+
+                       // Process query based on type:
+                       switch($parsedQuery['type'])    {
+                               case 'CREATETABLE':
+                               case 'ALTERTABLE':
+                               case 'DROPTABLE':
+                                       if(file_exists(PATH_typo3conf.'temp_fieldInfo.php')) unlink(PATH_typo3conf.'temp_fieldInfo.php');
+                                       $this->map_genericQueryParsed($parsedQuery);
+                                       break;
+                               case 'INSERT':
+                                       $this->map_genericQueryParsed($parsedQuery);
+                                       break;
+                               case 'CREATEDATABASE':
+                                       die('Creating a database with DBAL is not supported. Did you really read the manual?');
+                                       break;
+                               default:
+                                       die('ERROR: Invalid Query type ('.$parsedQuery['type'].') for ->admin_query() function!: "'.htmlspecialchars($query).'"');
+                                       break;
+                       }
+
+                       // Setting query array (for other applications to access if needed)
+                       $this->lastParsedAndMappedQueryArray = $parsedQuery;
+
+                       // Execute query (based on handler derived from the TABLE name which we actually know for once!)
+                       $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_table);
+                       switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])        {
+                               case 'native':
+                                       // Compiling query:
+                                       $compiledQuery =  $this->SQLparser->compileSQL($this->lastParsedAndMappedQueryArray);
+
+                                       return mysql_query($compiledQuery[0], $this->link);
+                                       break;
+                               case 'adodb':
+                                       // Compiling query:
+                                       $compiledQuery =  $this->SQLparser->compileSQL($this->lastParsedAndMappedQueryArray);
+                                       if($this->lastParsedAndMappedQueryArray['type']=='INSERT') {
+                                               return $this->exec_INSERTquery($this->lastParsedAndMappedQueryArray['TABLE'],$compiledQuery);
+                                       }
+                                       return $this->handlerInstance[$this->lastHandlerKey]->DataDictionary->ExecuteSQLArray($compiledQuery);
+                                       break;
+                               case 'userdefined':
+                                       // Compiling query:
+                                       $compiledQuery =  $this->SQLparser->compileSQL($this->lastParsedAndMappedQueryArray);
+
+                                       return $this->handlerInstance[$this->lastHandlerKey]->admin_query($compiledQuery);
+                                       break;
+                       }
+               } else die('ERROR: Query could not be parsed: "'.htmlspecialchars($parsedQuery).'". Query: "'.htmlspecialchars($query).'"');
+       }
 
 
 
@@ -1914,146 +1929,148 @@ class ux_t3lib_DB extends t3lib_DB {
 
 
 
-  /************************************
-  *
-  * Handler management
-  *
-  **************************************/
+       /************************************
+       *
+       * Handler management
+       *
+       **************************************/
 
-  /**
+       /**
         * Return the handler key pointing to an appropriate database handler as found in $this->handlerCfg array
         * Notice: TWO or more tables in the table list MUST use the SAME handler key - otherwise a fatal error is thrown! (Logically, no database can possibly join two tables from separate sources!)
         *
         * @param       string          Table list, eg. "pages" or "pages, tt_content" or "pages AS A, tt_content AS B"
         * @return      string          Handler key (see $this->handlerCfg array) for table
         */
-  function handler_getFromTableList($tableList)        {
+       function handler_getFromTableList($tableList)   {
 
-    $key = $tableList;
+               $key = $tableList;
 
-    if (!isset($this->cache_handlerKeyFromTableList[$key]))    {
+               if (!isset($this->cache_handlerKeyFromTableList[$key])) {
 
-      // Get tables separated:
-      $_tableList = $tableList;
-      $tableArray = $this->SQLparser->parseFromTables($_tableList);
+                       // Get tables separated:
+                       $_tableList = $tableList;
+                       $tableArray = $this->SQLparser->parseFromTables($_tableList);
 
-      // If success, traverse the tables:
-      if (is_array($tableArray) && count($tableArray)) {
-        foreach($tableArray as $vArray)        {
+                       // If success, traverse the tables:
+                       if (is_array($tableArray) && count($tableArray))        {
+                               foreach($tableArray as $vArray) {
 
-          // Find handler key, select "_DEFAULT" if none is specifically configured:
-          $handlerKey = $this->table2handlerKeys[$vArray['table']] ? $this->table2handlerKeys[$vArray['table']] : '_DEFAULT';
+                                       // Find handler key, select "_DEFAULT" if none is specifically configured:
+                                       $handlerKey = $this->table2handlerKeys[$vArray['table']] ? $this->table2handlerKeys[$vArray['table']] : '_DEFAULT';
 
-          // In case of separate handler keys for joined tables:
-          if ($outputHandlerKey && $handlerKey != $outputHandlerKey)   {
-            die('DBAL fatal error: Tables in this list "'.$tableList.'" didn\'t use the same DB handler!');
-          }
+                                       // In case of separate handler keys for joined tables:
+                                       if ($outputHandlerKey && $handlerKey != $outputHandlerKey)      {
+                                               die('DBAL fatal error: Tables in this list "'.$tableList.'" didn\'t use the same DB handler!');
+                                       }
 
-          $outputHandlerKey = $handlerKey;
-        }
+                                       $outputHandlerKey = $handlerKey;
+                               }
 
-        // Check initialized state; if handler is NOT initialized (connected) then we will connect it!
-        if (!isset($this->handlerInstance[$outputHandlerKey])) {
-          $this->handler_init($outputHandlerKey);
-        }
+                               // Check initialized state; if handler is NOT initialized (connected) then we will connect it!
+                               if (!isset($this->handlerInstance[$outputHandlerKey]))  {
+                                       $this->handler_init($outputHandlerKey);
+                               }
 
-        // Return handler key:
-        $this->cache_handlerKeyFromTableList[$key] = $outputHandlerKey;
-      } else {
-        die('DBAL fatal error: No tables found: "'.$tableList.'"');
-      }
-    }
+                               // Return handler key:
+                               $this->cache_handlerKeyFromTableList[$key] = $outputHandlerKey;
+                       } else {
+                               die('DBAL fatal error: No tables found: "'.$tableList.'"');
+                       }
+               }
 
-    return $this->cache_handlerKeyFromTableList[$key];
-  }
+               return $this->cache_handlerKeyFromTableList[$key];
+       }
 
-  /**
+       /**
         * Initialize handler (connecting to database)
         *
         * @param       string          Handler key
         * @return      boolean         If connection went well, return true
         * @see handler_getFromTableList()
         */
-  function handler_init($handlerKey)   {
-
-    // Find handler configuration:
-    $cfgArray = $this->handlerCfg[$handlerKey];
-    $handlerType = (string)$cfgArray['type'];
-    $output = FALSE;
-
-    if (is_array($cfgArray))   {
-      switch($handlerType)     {
-        case 'native':
-        $link = mysql_pconnect(
-        $cfgArray['config']['host'],
-        $cfgArray['config']['username'],
-        $cfgArray['config']['password']
-        );
-
-        // Set handler instance:
-        $this->handlerInstance[$handlerKey] = array(
-        'handlerType' => 'native',
-        'link' => $link
-        );
-
-        // If link succeeded:
-        if ($link)     {
-
-          // For default, set ->link (see t3lib_DB)
-          if ($handlerKey == '_DEFAULT') {
-            $this->link = $link;
-          }
-
-          // Select database as well:
-          if (mysql_select_db($cfgArray['config']['database'], $link)) {
-            $output = TRUE;
-          }
-        }
-        break;
-        case 'adodb':
-        $output = true;
-        require_once (t3lib_extMgm::extPath('adodb').'adodb/adodb.inc.php');
-        if(!defined('ADODB_FORCE_NULLS')) define('ADODB_FORCE_NULLS',1);
-        $ADODB_FORCE_TYPE = ADODB_FORCE_VALUE;
-
-        $dsn = $cfgArray['config']['driver'].'://'.
-        rawurlencode($cfgArray['config']['username']).':'.
-        rawurlencode($cfgArray['config']['password']).'@'.
-        rawurlencode($cfgArray['config']['host']).'/'.
-        rawurlencode($cfgArray['config']['database']).
-        '?persistent=1&fetchmode='.ADODB_FETCH_BOTH;
-        $this->handlerInstance[$handlerKey] = &ADONewConnection($dsn);
-        if($this->handlerInstance[$handlerKey] === false) {
-          error_log('DBAL error: Connection to '.$dsn.' failed. Maybe PHP doesn\'t support the database?');
-               $output = false;
-        }
-
-        $this->handlerInstance[$handlerKey]->DataDictionary  = NewDataDictionary($this->handlerInstance[$handlerKey]);
-        $this->handlerInstance[$handlerKey]->last_insert_id = 0;
-        break;
-        case 'userdefined':
-        // Find class file:
-        $fileName = t3lib_div::getFileAbsFileName($cfgArray['config']['classFile']);
-        if (@is_file($fileName))       {
-          require_once($fileName);
-        } else die('DBAL error: "'.$fileName.'" was not a file to include.');
-
-        // Initialize:
-        $this->handlerInstance[$handlerKey] = t3lib_div::makeInstance($cfgArray['config']['class']);
-        $this->handlerInstance[$handlerKey]->init($cfgArray,$this);
-
-        if (is_object($this->handlerInstance[$handlerKey]))            {
-          $output = TRUE;
-        }
-        break;
-        default:
-        die('ERROR: Invalid handler type: "'.$cfgArray['type'].'"');
-        break;
-      }
+       function handler_init($handlerKey)      {
+
+               // Find handler configuration:
+               $cfgArray = $this->handlerCfg[$handlerKey];
+               $handlerType = (string)$cfgArray['type'];
+               $output = FALSE;
+
+               if (is_array($cfgArray))        {
+                       switch($handlerType)    {
+                               case 'native':
+                               $link = mysql_pconnect($cfgArray['config']['host'].(isset($cfgArray['config']['port']) ? ':'.$cfgArray['config']['port'] : ''), $cfgArray['config']['username'], $cfgArray['config']['password']);
+
+                               // Set handler instance:
+                               $this->handlerInstance[$handlerKey] = array('handlerType' => 'native', 'link' => $link);
+
+                               // If link succeeded:
+                               if ($link)      {
+                                       // For default, set ->link (see t3lib_DB)
+                                       if ($handlerKey == '_DEFAULT') {
+                                               $this->link = $link;
+                                       }
+
+                                       // Select database as well:
+                                       if (mysql_select_db($cfgArray['config']['database'], $link))    {
+                                               $output = TRUE;
+                                       }
+                                       $setDBinit = t3lib_div::trimExplode(chr(10), $GLOBALS['TYPO3_CONF_VARS']['SYS']['setDBinit']);
+                                       foreach ($setDBinit as $v)      {
+                                               if (mysql_query($v, $this->link) === FALSE)     {
+                                                       t3lib_div::sysLog('Could not initialize DB connection with query "'.$v.'".','Core',3);
+                                               }
+                                       }
+                               }
+                               break;
+                               case 'adodb':
+                               $output = true;
+                               require_once(t3lib_extMgm::extPath('adodb').'adodb/adodb.inc.php');
+                               if(!defined('ADODB_FORCE_NULLS')) define('ADODB_FORCE_NULLS', 1);
+                               $GLOBALS['ADODB_FORCE_TYPE'] = ADODB_FORCE_VALUE;
+                               $GLOBALS['ADODB_FETCH_MODE'] = ADODB_FETCH_BOTH;
+
+                               $this->handlerInstance[$handlerKey] = &ADONewConnection($cfgArray['config']['driver']);
+                               if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['no_pconnect'])  {
+                                       $this->handlerInstance[$handlerKey]->Connect($cfgArray['config']['host'].(isset($cfgArray['config']['port']) ? ':'.$cfgArray['config']['port'] : ''),$cfgArray['config']['username'],$cfgArray['config']['password'],$cfgArray['config']['database']);
+                               } else {
+                                       $this->handlerInstance[$handlerKey]->PConnect($cfgArray['config']['host'].(isset($cfgArray['config']['port']) ? ':'.$cfgArray['config']['port'] : ''),$cfgArray['config']['username'],$cfgArray['config']['password'],$cfgArray['config']['database']);
+                               }
+                               if(!$this->handlerInstance[$handlerKey]->isConnected()) {
+                                       $dsn = $cfgArray['config']['driver'].'://'.$cfgArray['config']['username'].
+                                               (strlen($cfgArray['config']['password']) ? ':XXXX@' : '').
+                                               $cfgArray['config']['host'].(isset($cfgArray['config']['port']) ? ':'.$cfgArray['config']['port'] : '').'/'.$cfgArray['config']['database'].
+                                               ($GLOBALS['TYPO3_CONF_VARS']['SYS']['no_pconnect'] ? '' : '?persistent=1');
+                                       error_log('DBAL error: Connection to '.$dsn.' failed. Maybe PHP doesn\'t support the database?');
+                                       $output = false;
+                               } else {
+                                       $this->handlerInstance[$handlerKey]->DataDictionary  = NewDataDictionary($this->handlerInstance[$handlerKey]);
+                                       $this->handlerInstance[$handlerKey]->last_insert_id = 0;
+                               }
+                               break;
+                               case 'userdefined':
+                               // Find class file:
+                               $fileName = t3lib_div::getFileAbsFileName($cfgArray['config']['classFile']);
+                               if (@is_file($fileName))        {
+                                       require_once($fileName);
+                               } else die('DBAL error: "'.$fileName.'" was not a file to include.');
+
+                               // Initialize:
+                               $this->handlerInstance[$handlerKey] = t3lib_div::makeInstance($cfgArray['config']['class']);
+                               $this->handlerInstance[$handlerKey]->init($cfgArray,$this);
+
+                               if (is_object($this->handlerInstance[$handlerKey]))             {
+                                       $output = TRUE;
+                               }
+                               break;
+                               default:
+                               die('ERROR: Invalid handler type: "'.$cfgArray['type'].'"');
+                               break;
+                       }
 
-      return $output;
-    } else die('ERROR: No handler for key "'.$handlerKey.'"');
-  }
+                       return $output;
+               } else die('ERROR: No handler for key "'.$handlerKey.'"');
+       }
 
 
 
@@ -2068,45 +2085,45 @@ class ux_t3lib_DB extends t3lib_DB {
 
 
 
-  /************************************
-  *
-  * Table/Field mapping
-  *
-  **************************************/
+       /************************************
+       *
+       * Table/Field mapping
+       *
+       **************************************/
 
-  /**
+       /**
         * Checks if mapping is needed for a table(list)
         *
         * @param       string          List of tables in query
         * @param       boolean         If true, it will check only if FIELDs are configured and ignore the mapped table name if any.
         * @return      mixed           Returns an array of table names (parsed version of input table) if mapping is needed, otherwise just false.
         */
-  function map_needMapping($tableList,$fieldMappingOnly=FALSE) {
-
-    $key = $tableList.'|'.$fieldMappingOnly;
-    if (!isset($this->cache_mappingFromTableList[$key]))       {
-      $this->cache_mappingFromTableList[$key] = FALSE; // Default:
-
-      $tables = $this->SQLparser->parseFromTables($tableList);
-      if (is_array($tables))   {
-        foreach($tables as $tableCfg)  {
-          if ($fieldMappingOnly)       {
-            if (is_array($this->mapping[$tableCfg['table']]['mapFieldNames'])) {
-              $this->cache_mappingFromTableList[$key] = $tables;
-            }
-          } else {
-            if (is_array($this->mapping[$tableCfg['table']]))  {
-              $this->cache_mappingFromTableList[$key] = $tables;
-            }
-          }
-        }
-      }
-    }
-
-    return $this->cache_mappingFromTableList[$key];
-  }
-
-  /**
+       function map_needMapping($tableList,$fieldMappingOnly=FALSE)    {
+
+               $key = $tableList.'|'.$fieldMappingOnly;
+               if (!isset($this->cache_mappingFromTableList[$key]))    {
+                       $this->cache_mappingFromTableList[$key] = FALSE;        // Default:
+
+                       $tables = $this->SQLparser->parseFromTables($tableList);
+                       if (is_array($tables))  {
+                               foreach($tables as $tableCfg)   {
+                                       if ($fieldMappingOnly)  {
+                                               if (is_array($this->mapping[$tableCfg['table']]['mapFieldNames']))      {
+                                                       $this->cache_mappingFromTableList[$key] = $tables;
+                                               }
+                                       } else {
+                                               if (is_array($this->mapping[$tableCfg['table']]))       {
+                                                       $this->cache_mappingFromTableList[$key] = $tables;
+                                               }
+                                       }
+                               }
+                       }
+               }
+
+               return $this->cache_mappingFromTableList[$key];
+       }
+
+       /**
         * Takes an associated array with field => value pairs and remaps the field names if configured for this table in $this->mapping array.
         * Be careful not to map a field name to another existing fields name (although you can use this to swap fieldnames of course...:-)
         * Observe mapping problems with join-results (more than one table): Joined queries should always prefix the table name to avoid problems with this.
@@ -2117,44 +2134,44 @@ class ux_t3lib_DB extends t3lib_DB {
         * @param       boolean         If true, reverse direction. Default direction is to map an array going INTO the database (thus mapping TYPO3 fieldnames to PHYSICAL field names!)
         * @return      array           Output array, with mapped associative keys.
         */
-  function map_assocArray($input,$tables,$rev=FALSE)   {
-
-    // Traverse tables from query (hopefully only one table):
-    foreach($tables as $tableCfg)      {
-      if (is_array($this->mapping[$tableCfg['table']]['mapFieldNames']))       {
-
-        // Get the map (reversed if needed):
-        if ($rev)      {
-          $theMap = array_flip($this->mapping[$tableCfg['table']]['mapFieldNames']);
-        } else {
-          $theMap = $this->mapping[$tableCfg['table']]['mapFieldNames'];
-        }
-
-        // Traverse selected record, map fieldnames:
-        $output = array();
-        foreach($input as $fN => $value)       {
-
-          // Set the field name, change it if found in mapping array:
-          if ($theMap[$fN])    {
-            $newKey = $theMap[$fN];
-          } else {
-            $newKey = $fN;
-          }
-
-          // Set value to fieldname:
-          $output[$newKey] = $value;
-        }
-
-        // When done, override the $input array with the result:
-        $input = $output;
-      }
-    }
-
-    // Return input array (which might have been altered in the mean time)
-    return $input;
-  }
-
-  /**
+       function map_assocArray($input,$tables,$rev=FALSE)      {
+
+               // Traverse tables from query (hopefully only one table):
+               foreach($tables as $tableCfg)   {
+                       if (is_array($this->mapping[$tableCfg['table']]['mapFieldNames']))      {
+
+                               // Get the map (reversed if needed):
+                               if ($rev)       {
+                                       $theMap = array_flip($this->mapping[$tableCfg['table']]['mapFieldNames']);
+                               } else {
+                                       $theMap = $this->mapping[$tableCfg['table']]['mapFieldNames'];
+                               }
+
+                               // Traverse selected record, map fieldnames:
+                               $output = array();
+                               foreach($input as $fN => $value)        {
+
+                                       // Set the field name, change it if found in mapping array:
+                                       if ($theMap[$fN])       {
+                                               $newKey = $theMap[$fN];
+                                       } else {
+                                               $newKey = $fN;
+                                       }
+
+                                       // Set value to fieldname:
+                                       $output[$newKey] = $value;
+                               }
+
+                               // When done, override the $input array with the result:
+                               $input = $output;
+                       }
+               }
+
+               // Return input array (which might have been altered in the mean time)
+               return $input;
+       }
+
+       /**
         * Remaps table/field names in a SELECT query's parts
         * Notice: All arguments are passed by reference!
         *
@@ -2166,40 +2183,40 @@ class ux_t3lib_DB extends t3lib_DB {
         * @return      void
         * @see exec_SELECTquery()
         */
-  function map_remapSELECTQueryParts(&$select_fields,&$from_table,&$where_clause,&$groupBy,&$orderBy)  {
-
-    // Tables:
-    $tables = $this->SQLparser->parseFromTables($from_table);
-    $defaultTable = $tables[0]['table'];
-    foreach($tables as $k => $v)       {
-      if ($this->mapping[$v['table']]['mapTableName']) {
-        $tables[$k]['table'] = $this->mapping[$v['table']]['mapTableName'];
-      }
-    }
-    $from_table = $this->SQLparser->compileFromTables($tables);
-
-    // Where clause:
-    $whereParts = $this->SQLparser->parseWhereClause($where_clause);
-    $this->map_sqlParts($whereParts,$defaultTable);
-    $where_clause = $this->SQLparser->compileWhereClause($whereParts);
-
-    // Select fields:
-    $expFields = $this->SQLparser->parseFieldList($select_fields);
-    $this->map_sqlParts($expFields,$defaultTable);
-    $select_fields = $this->SQLparser->compileFieldList($expFields);
-
-    // Group By fields
-    $expFields = $this->SQLparser->parseFieldList($groupBy);
-    $this->map_sqlParts($expFields,$defaultTable);
-    $groupBy = $this->SQLparser->compileFieldList($expFields);
-
-    // Order By fields
-    $expFields = $this->SQLparser->parseFieldList($orderBy);
-    $this->map_sqlParts($expFields,$defaultTable);
-    $orderBy = $this->SQLparser->compileFieldList($expFields);
-  }
-
-  /**
+       function map_remapSELECTQueryParts(&$select_fields,&$from_table,&$where_clause,&$groupBy,&$orderBy)     {
+
+               // Tables:
+               $tables = $this->SQLparser->parseFromTables($from_table);
+               $defaultTable = $tables[0]['table'];
+               foreach($tables as $k => $v)    {
+                       if ($this->mapping[$v['table']]['mapTableName'])        {
+                               $tables[$k]['table'] = $this->mapping[$v['table']]['mapTableName'];
+                       }
+               }
+               $from_table = $this->SQLparser->compileFromTables($tables);
+
+               // Where clause:
+               $whereParts = $this->SQLparser->parseWhereClause($where_clause);
+               $this->map_sqlParts($whereParts,$defaultTable);
+               $where_clause = $this->SQLparser->compileWhereClause($whereParts);
+
+               // Select fields:
+               $expFields = $this->SQLparser->parseFieldList($select_fields);
+               $this->map_sqlParts($expFields,$defaultTable);
+               $select_fields = $this->SQLparser->compileFieldList($expFields);
+
+               // Group By fields
+               $expFields = $this->SQLparser->parseFieldList($groupBy);
+               $this->map_sqlParts($expFields,$defaultTable);
+               $groupBy = $this->SQLparser->compileFieldList($expFields);
+
+               // Order By fields
+               $expFields = $this->SQLparser->parseFieldList($orderBy);
+               $this->map_sqlParts($expFields,$defaultTable);
+               $orderBy = $this->SQLparser->compileFieldList($expFields);
+       }
+
+       /**
         * Generic mapping of table/field names arrays (as parsed by t3lib_sqlengine)
         *
         * @param       array           Array with parsed SQL parts; Takes both fields, tables, where-parts, group and order-by. Passed by reference.
@@ -2208,34 +2225,34 @@ class ux_t3lib_DB extends t3lib_DB {
         * @access private
         * @see map_remapSELECTQueryParts()
         */
-  function map_sqlParts(&$sqlPartArray, $defaultTable) {
-
-    // Traverse sql Part array:
-    if (is_array($sqlPartArray))       {
-      foreach($sqlPartArray as $k => $v)       {
-
-        // Look for sublevel (WHERE parts only)
-        if (is_array($sqlPartArray[$k]['sub']))        {
-          $this->map_sqlParts($sqlPartArray[$k]['sub'], $defaultTable);        // Call recursively!
-        } else {
-          // For the field, look for table mapping (generic):
-          $t = $sqlPartArray[$k]['table'] ? $sqlPartArray[$k]['table'] : $defaultTable;
-
-          // Mapping field name, if set:
-          if (is_array($this->mapping[$t]['mapFieldNames']) && $this->mapping[$t]['mapFieldNames'][$sqlPartArray[$k]['field']])        {
-            $sqlPartArray[$k]['field'] = $this->mapping[$t]['mapFieldNames'][$sqlPartArray[$k]['field']];
-          }
-
-          // Map table?
-          if ($sqlPartArray[$k]['table'] && $this->mapping[$sqlPartArray[$k]['table']]['mapTableName'])        {
-            $sqlPartArray[$k]['table'] = $this->mapping[$sqlPartArray[$k]['table']]['mapTableName'];
-          }
-        }
-      }
-    }
-  }
-
-  /**
+       function map_sqlParts(&$sqlPartArray, $defaultTable)    {
+
+               // Traverse sql Part array:
+               if (is_array($sqlPartArray))    {
+                       foreach($sqlPartArray as $k => $v)      {
+
+                               // Look for sublevel (WHERE parts only)
+                               if (is_array($sqlPartArray[$k]['sub'])) {
+                                       $this->map_sqlParts($sqlPartArray[$k]['sub'], $defaultTable);   // Call recursively!
+                               } else {
+                                       // For the field, look for table mapping (generic):
+                                       $t = $sqlPartArray[$k]['table'] ? $sqlPartArray[$k]['table'] : $defaultTable;
+
+                                       // Mapping field name, if set:
+                                       if (is_array($this->mapping[$t]['mapFieldNames']) && $this->mapping[$t]['mapFieldNames'][$sqlPartArray[$k]['field']])   {
+                                               $sqlPartArray[$k]['field'] = $this->mapping[$t]['mapFieldNames'][$sqlPartArray[$k]['field']];
+                                       }
+
+                                       // Map table?
+                                       if ($sqlPartArray[$k]['table'] && $this->mapping[$sqlPartArray[$k]['table']]['mapTableName'])   {
+                                               $sqlPartArray[$k]['table'] = $this->mapping[$sqlPartArray[$k]['table']]['mapTableName'];
+                                       }
+                               }
+                       }
+               }
+       }
+
+       /**
         * Will do table/field mapping on a general t3lib_sqlengine-compliant SQL query
         * (May still not support all query types...)
         *
@@ -2243,82 +2260,82 @@ class ux_t3lib_DB extends t3lib_DB {
         * @return      void
         * @see t3lib_sqlengine::parseSQL()
         */
-  function map_genericQueryParsed(&$parsedQuery)       {
-
-    // Getting table - same for all:
-    $table = $parsedQuery['TABLE'];
-    if ($table)        {
-      // Do field mapping if needed:
-      if ($tableArray = $this->map_needMapping($table))        {
-
-        // Table name:
-        if ($this->mapping[$table]['mapTableName'])    {
-          $parsedQuery['TABLE'] = $this->mapping[$table]['mapTableName'];
-        }
-
-        // Based on type, do additional changes:
-        switch($parsedQuery['type'])   {
-          case 'ALTERTABLE':
-
-          // Changing field name:
-          $newFieldName = $this->mapping[$table]['mapFieldNames'][$parsedQuery['FIELD']];
-          if ($newFieldName)   {
-            if ($parsedQuery['FIELD'] == $parsedQuery['newField'])     {
-              $parsedQuery['FIELD'] = $parsedQuery['newField'] = $newFieldName;
-            } else $parsedQuery['FIELD'] = $newFieldName;
-          }
-
-          // Changing key field names:
-          if (is_array($parsedQuery['fields']))        {
-            $this->map_fieldNamesInArray($table,$parsedQuery['fields']);
-          }
-          break;
-          case 'CREATETABLE':
-          // Remapping fields:
-          if (is_array($parsedQuery['FIELDS']))        {
-            $newFieldsArray = array();
-            foreach($parsedQuery['FIELDS'] as $fN => $fInfo)   {
-              if ($this->mapping[$table]['mapFieldNames'][$fN])        {
-                $fN = $this->mapping[$table]['mapFieldNames'][$fN];
-              }
-              $newFieldsArray[$fN] = $fInfo;
-            }
-            $parsedQuery['FIELDS'] = $newFieldsArray;
-          }
-
-          // Remapping keys:
-          if (is_array($parsedQuery['KEYS']))  {
-            foreach($parsedQuery['KEYS'] as $kN => $kInfo)     {
-              $this->map_fieldNamesInArray($table,$parsedQuery['KEYS'][$kN]);
-            }
-          }
-          break;
-
-
-          /// ... and here support for all other query types should be!
-
-
-        }
-      }
-    } else die('ERROR, mapping: No table found in parsed Query array...');
-  }
-
-  /**
+       function map_genericQueryParsed(&$parsedQuery)  {
+
+               // Getting table - same for all:
+               $table = $parsedQuery['TABLE'];
+               if ($table)     {
+                       // Do field mapping if needed:
+                       if ($tableArray = $this->map_needMapping($table))       {
+
+                               // Table name:
+                               if ($this->mapping[$table]['mapTableName'])     {
+                                       $parsedQuery['TABLE'] = $this->mapping[$table]['mapTableName'];
+                               }
+
+                               // Based on type, do additional changes:
+                               switch($parsedQuery['type'])    {
+                                       case 'ALTERTABLE':
+
+                                       // Changing field name:
+                                       $newFieldName = $this->mapping[$table]['mapFieldNames'][$parsedQuery['FIELD']];
+                                       if ($newFieldName)      {
+                                               if ($parsedQuery['FIELD'] == $parsedQuery['newField'])  {
+                                                       $parsedQuery['FIELD'] = $parsedQuery['newField'] = $newFieldName;
+                                               } else $parsedQuery['FIELD'] = $newFieldName;
+                                       }
+
+                                       // Changing key field names:
+                                       if (is_array($parsedQuery['fields']))   {
+                                               $this->map_fieldNamesInArray($table,$parsedQuery['fields']);
+                                       }
+                                       break;
+                                       case 'CREATETABLE':
+                                       // Remapping fields:
+                                       if (is_array($parsedQuery['FIELDS']))   {
+                                               $newFieldsArray = array();
+                                               foreach($parsedQuery['FIELDS'] as $fN => $fInfo)        {
+                                                       if ($this->mapping[$table]['mapFieldNames'][$fN])       {
+                                                               $fN = $this->mapping[$table]['mapFieldNames'][$fN];
+                                                       }
+                                                       $newFieldsArray[$fN] = $fInfo;
+                                               }
+                                               $parsedQuery['FIELDS'] = $newFieldsArray;
+                                       }
+
+                                       // Remapping keys:
+                                       if (is_array($parsedQuery['KEYS']))     {
+                                               foreach($parsedQuery['KEYS'] as $kN => $kInfo)  {
+                                                       $this->map_fieldNamesInArray($table,$parsedQuery['KEYS'][$kN]);
+                                               }
+                                       }
+                                       break;
+
+
+                                       /// ... and here support for all other query types should be!
+
+
+                               }
+                       }
+               } else die('ERROR, mapping: No table found in parsed Query array...');
+       }
+
+       /**
         * Re-mapping field names in array
         *
         * @param       string          (TYPO3) Table name for fields.
         * @param       array           Array of fieldnames to remap. Notice: Passed by reference!
         * @return      void
         */
-  function map_fieldNamesInArray($table,&$fieldArray)  {
-    if (is_array($this->mapping[$table]['mapFieldNames']))     {
-      foreach($fieldArray as $k => $v) {
-        if ($this->mapping[$table]['mapFieldNames'][$v])       {
-          $fieldArray[$k] = $this->mapping[$table]['mapFieldNames'][$v];
-        }
-      }
-    }
-  }
+       function map_fieldNamesInArray($table,&$fieldArray)     {
+               if (is_array($this->mapping[$table]['mapFieldNames']))  {
+                       foreach($fieldArray as $k => $v)        {
+                               if ($this->mapping[$table]['mapFieldNames'][$v])        {
+                                       $fieldArray[$k] = $this->mapping[$table]['mapFieldNames'][$v];
+                               }
+                       }
+               }
+       }
 
 
 
@@ -2336,13 +2353,13 @@ class ux_t3lib_DB extends t3lib_DB {
 
 
 
-  /**************************************
-  *
-  * Debugging
-  *
-  **************************************/
+       /**************************************
+       *
+       * Debugging
+       *
+       **************************************/
 
-  /**
+       /**
         * Debug handler for query execution
         *
         * @param       string          Function name from which this function is called.
@@ -2351,92 +2368,93 @@ class ux_t3lib_DB extends t3lib_DB {
         * @return      void
         * @access private
         */
-  function debugHandler($function,$execTime,$inData)   {
-    // we don't want to log our own log/debug SQL
-    $script = substr(PATH_thisScript,strlen(PATH_site));
-    if (substr($script,-strlen('dbal/mod1/index.php'))!='dbal/mod1/index.php' &&
-    !strstr($inData['args'][0], 'tx_dbal_debuglog'))   {
-      $data = array();
-      $errorFlag = 0;
-      $joinTable = '';
-
-      if ($this->sql_error())  {
-        $data['sqlError'] = $this->sql_error();
-        $errorFlag|=1;
-      }
-
-      // if lastQuery is empty (for whatever reason) at least log inData.args
-      if(empty($this->lastQuery))
-      $query = implode(' ',$inData['args']);
-      else
-      $query = $this->lastQuery;
-
-      switch($function)        {
-        case 'exec_INSERTquery':
-        case 'exec_UPDATEquery':
-        case 'exec_DELETEquery':
-        $this->debug_log($query,$execTime,$data,$joinTable,$errorFlag, $script);
-        break;
-
-        case 'exec_SELECTquery':
-        // Get explain data:
-        if ($this->conf['debugOptions']['EXPLAIN'] && t3lib_div::inList('adodb,native',$inData['handlerType']))        {
-          $data['EXPLAIN'] = $this->debug_explain($this->lastQuery);
-        }
-
-        // Check parsing of Query:
-        if ($this->conf['debugOptions']['parseQuery']) {
-          $parseResults = array();
-          $parseResults['SELECT'] = $this->SQLparser->debug_parseSQLpart('SELECT',$inData['args'][1]);
-          $parseResults['FROM'] = $this->SQLparser->debug_parseSQLpart('FROM',$inData['args'][0]);
-          $parseResults['WHERE'] = $this->SQLparser->debug_parseSQLpart('WHERE',$inData['args'][2]);
-          $parseResults['GROUPBY'] = $this->SQLparser->debug_parseSQLpart('SELECT',$inData['args'][3]);        // Using select field list syntax
-          $parseResults['ORDERBY'] = $this->SQLparser->debug_parseSQLpart('SELECT',$inData['args'][4]);        // Using select field list syntax
-
-          foreach($parseResults as $k => $v)   {
-            if (!strlen($parseResults[$k]))    unset($parseResults[$k]);
-          }
-          if (count($parseResults))    {
-            $data['parseError'] = $parseResults;
-            $errorFlag|=2;
-          }
-        }
-
-        // Checking joinTables:
-        if ($this->conf['debugOptions']['joinTables']) {
-          if (count(explode(',', $inData['ORIG_from_table']))>1)               {
-            $joinTable = $inData['args'][0];
-          }
-        }
-
-        // Logging it:
-        $this->debug_log($query,$execTime,$data,$joinTable,$errorFlag, $script);
-        if(!empty($inData['args'][2]))
-        $this->debug_WHERE($inData['args'][0], $inData['args'][2], $script);
-        break;
-      }
-    }
-  }
-
-  /**
+       function debugHandler($function,$execTime,$inData)      {
+               // we don't want to log our own log/debug SQL
+               $script = substr(PATH_thisScript,strlen(PATH_site));
+
+               if (substr($script,-strlen('dbal/mod1/index.php'))!='dbal/mod1/index.php' &&
+               !strstr($inData['args'][0], 'tx_dbal_debuglog'))        {
+                       $data = array();
+                       $errorFlag = 0;
+                       $joinTable = '';
+
+                       if ($this->sql_error()) {
+                               $data['sqlError'] = $this->sql_error();
+                               $errorFlag|=1;
+                       }
+
+                       // if lastQuery is empty (for whatever reason) at least log inData.args
+                       if(empty($this->lastQuery))
+                       $query = implode(' ',$inData['args']);
+                       else
+                       $query = $this->lastQuery;
+
+                       switch($function)       {
+                               case 'exec_INSERTquery':
+                               case 'exec_UPDATEquery':
+                               case 'exec_DELETEquery':
+                               $this->debug_log($query,$execTime,$data,$joinTable,$errorFlag, $script);
+                               break;
+
+                               case 'exec_SELECTquery':
+                               // Get explain data:
+                               if ($this->conf['debugOptions']['EXPLAIN'] && t3lib_div::inList('adodb,native',$inData['handlerType'])) {
+                                       $data['EXPLAIN'] = $this->debug_explain($this->lastQuery);
+                               }
+
+                               // Check parsing of Query:
+                               if ($this->conf['debugOptions']['parseQuery'])  {
+                                       $parseResults = array();
+                                       $parseResults['SELECT'] = $this->SQLparser->debug_parseSQLpart('SELECT',$inData['args'][1]);
+                                       $parseResults['FROM'] = $this->SQLparser->debug_parseSQLpart('FROM',$inData['args'][0]);
+                                       $parseResults['WHERE'] = $this->SQLparser->debug_parseSQLpart('WHERE',$inData['args'][2]);
+                                       $parseResults['GROUPBY'] = $this->SQLparser->debug_parseSQLpart('SELECT',$inData['args'][3]);   // Using select field list syntax
+                                       $parseResults['ORDERBY'] = $this->SQLparser->debug_parseSQLpart('SELECT',$inData['args'][4]);   // Using select field list syntax
+
+                                       foreach($parseResults as $k => $v)      {
+                                               if (!strlen($parseResults[$k])) unset($parseResults[$k]);
+                                       }
+                                       if (count($parseResults))       {
+                                               $data['parseError'] = $parseResults;
+                                               $errorFlag|=2;
+                                       }
+                               }
+
+                               // Checking joinTables:
+                               if ($this->conf['debugOptions']['joinTables'])  {
+                                       if (count(explode(',', $inData['ORIG_from_table']))>1)          {
+                                               $joinTable = $inData['args'][0];
+                                       }
+                               }
+
+                               // Logging it:
+                               $this->debug_log($query,$execTime,$data,$joinTable,$errorFlag, $script);
+                               if(!empty($inData['args'][2]))
+                               $this->debug_WHERE($inData['args'][0], $inData['args'][2], $script);
+                               break;
+                       }
+               }
+       }
+
+       /**
    * Log the where clause for debugging purposes.
    *
    * @param string $table
    * @param string $where
    */
-  function debug_WHERE($table,$where, $script='')      {
-    $insertArray = array (
-    'tstamp' => $GLOBALS['EXEC_TIME'],
-    'beuser_id' => intval($GLOBALS['BE_USER']->user['uid']),
-    'script' => $script,
-    'tablename' => $table,
-    'whereclause' => $where
-    );
-
-    $this->exec_INSERTquery('tx_dbal_debuglog_where', $insertArray);
-  }
-
-  /**
+       function debug_WHERE($table,$where, $script='') {
+               $insertArray = array (
+               'tstamp' => $GLOBALS['EXEC_TIME'],
+               'beuser_id' => intval($GLOBALS['BE_USER']->user['uid']),
+               'script' => $script,
+               'tablename' => $table,
+               'whereclause' => $where
+               );
+
+               $this->exec_INSERTquery('tx_dbal_debuglog_where', $insertArray);
+       }
+
+       /**
         * Insert row in the log table
         *
         * @param       string          The current query
@@ -2446,41 +2464,41 @@ class ux_t3lib_DB extends t3lib_DB {
         * @param       integer         Error status.
         * @return      void
         */
-  function debug_log($query,$ms,$data,$join,$errorFlag, $script='')    {
-    $insertArray = array (
-    'tstamp' => $GLOBALS['EXEC_TIME'],
-    'beuser_id' => intval($GLOBALS['BE_USER']->user['uid']),
-    'script' => $script,
-    'exec_time' => $ms,
-    'table_join' => $join,
-    'serdata' => serialize($data),
-    'query' => (is_array($query) ? $query[0].' WITH '.count($query[1]).' BLOB FIELDS: '.implode(', ',array_keys($query[1])) : $query),
-    'errorFlag' => $errorFlag
-    );
-
-    $this->exec_INSERTquery('tx_dbal_debuglog', $insertArray);
-  }
-
-  /**
+       function debug_log($query,$ms,$data,$join,$errorFlag, $script='')       {
+               $insertArray = array (
+               'tstamp' => $GLOBALS['EXEC_TIME'],
+               'beuser_id' => intval($GLOBALS['BE_USER']->user['uid']),
+               'script' => $script,
+               'exec_time' => $ms,
+               'table_join' => $join,
+               'serdata' => serialize($data),
+               'query' => (is_array($query) ? $query[0].' WITH '.count($query[1]).' BLOB FIELDS: '.implode(', ',array_keys($query[1])) : $query),
+               'errorFlag' => $errorFlag
+               );
+
+               $this->exec_INSERTquery('tx_dbal_debuglog', $insertArray);
+       }
+
+       /**
         * Perform EXPLAIN query on DEFAULT handler!
         *
         * @param       string          SELECT Query
         * @return      array           The Explain result rows in an array
         * @todo        Not supporting other than the default handler? And what about DBMS of other kinds than MySQL - support for EXPLAIN?
         */
-  function debug_explain($query)       {
-    $res = $this->sql_query('EXPLAIN '.$query);
-
-    $output = array();
-    while($row = $this->sql_fetch_assoc($res)) {
-      $output[] = $row;
-    }
-    return $output;
-  }
+       function debug_explain($query)  {
+               $res = $this->sql_query('EXPLAIN '.$query);
+
+               $output = array();
+               while($row = $this->sql_fetch_assoc($res))      {
+                       $output[] = $row;
+               }
+               return $output;
+       }
 }
 
 
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dbal/class.ux_t3lib_db.php']) {
-  include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dbal/class.ux_t3lib_db.php']);
+       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dbal/class.ux_t3lib_db.php']);
 }
 ?>
index 0da3035..a015833 100644 (file)
@@ -2,7 +2,8 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 2004 Kasper Skaarhoj (kasper@typo3.com)
+*  (c) 2004 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 2004-2006 Karsten Dambekalns <karsten@typo3.org>
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -29,6 +30,7 @@
  *
  * $Id$
  *
+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
  * @author     Karsten Dambekalns <k.dambekalns@fishfarm.de>
  */
 
@@ -42,6 +44,7 @@
  * @subpackage t3lib
  */
 class ux_t3lib_sqlengine extends t3lib_sqlengine {
+
        /*************************
         *
         * Compiling queries
@@ -60,28 +63,28 @@ class ux_t3lib_sqlengine extends t3lib_sqlengine {
                switch($components['type'])     {
                        case 'SELECT':
                                $query = $this->compileSELECT($components);
-                       break;
+                               break;
                        case 'UPDATE':
                                $query = $this->compileUPDATE($components);
-                       break;
+                               break;
                        case 'INSERT':
                                $query = $this->compileINSERT($components);
-                       break;
+                               break;
                        case 'DELETE':
                                $query = $this->compileDELETE($components);
-                       break;
+                               break;
                        case 'EXPLAIN':
                                $query = 'EXPLAIN '.$this->compileSELECT($components);
-                       break;
+                               break;
                        case 'DROPTABLE':
                                $query = $this->compileDROPTABLE($components);
-                       break;
+                               break;
                        case 'CREATETABLE':
                                $query = $this->compileCREATETABLE($components);
-                       break;
+                               break;
                        case 'ALTERTABLE':
                                $query = $this->compileALTERTABLE($components);
-                       break;
+                               break;
                }
 
                return $query;
@@ -91,17 +94,17 @@ class ux_t3lib_sqlengine extends t3lib_sqlengine {
        function compileINSERT($components)     {
                switch((string)$GLOBALS['TYPO3_DB']->handlerCfg[$GLOBALS['TYPO3_DB']->lastHandlerKey]['type'])  {
                        case 'native':
-                           parent::compileINSERT($components);
-                       break;
+                               parent::compileINSERT($components);
+                               break;
                        case 'adodb':
-                           if(isset($components['VALUES_ONLY']) && is_array($components['VALUES_ONLY'])) {
-                               $fields = $GLOBALS['TYPO3_DB']->cache_fieldType[$components['TABLE']];
-                               $fc = 0;
-                               foreach($fields as $fn => $fd) {
-                                   $query[$fn] = $components['VALUES_ONLY'][$fc++][0];
+                               if(isset($components['VALUES_ONLY']) && is_array($components['VALUES_ONLY'])) {
+                                       $fields = $GLOBALS['TYPO3_DB']->cache_fieldType[$components['TABLE']];
+                                       $fc = 0;
+                                       foreach($fields as $fn => $fd) {
+                                               $query[$fn] = $components['VALUES_ONLY'][$fc++][0];
+                                       }
                                }
-                           }
-                       break;
+                               break;
                }
 
                return $query;
@@ -111,12 +114,11 @@ class ux_t3lib_sqlengine extends t3lib_sqlengine {
                switch((string)$GLOBALS['TYPO3_DB']->handlerCfg[$GLOBALS['TYPO3_DB']->lastHandlerKey]['type'])  {
                        case 'native':
                                $query = 'DROP TABLE'.($components['ifExists']?' IF EXISTS':'').' '.$components['TABLE'];
-                       break;
+                               break;
                        case 'adodb':
                                $query = $GLOBALS['TYPO3_DB']->handlerInstance[$GLOBALS['TYPO3_DB']->handler_getFromTableList($components['TABLE'])]->DataDictionary->DropTableSQL('`'.$components['TABLE'].'`');
-                       break;
+                               break;
                }
-               echo '<!-- ';var_dump($query);echo ' -->'.chr(10);
 
                return $query;
        }
@@ -129,67 +131,69 @@ class ux_t3lib_sqlengine extends t3lib_sqlengine {
         * @see parseCREATETABLE()
         */
        function compileCREATETABLE($components)        {
-               // Execute query (based on handler derived from the TABLE name which we actually know for once!)
-               //$this->lastHandlerKey = $this->handler_getFromTableList($ORIG_table);
+                       // Execute query (based on handler derived from the TABLE name which we actually know for once!)
                switch((string)$GLOBALS['TYPO3_DB']->handlerCfg[$GLOBALS['TYPO3_DB']->handler_getFromTableList($components['TABLE'])]['type'])  {
                        case 'native':
                                $query[] = parent::compileCREATETABLE($components);
-                       break;
+                               break;
                        case 'adodb':
-                               // Create fields and keys:
+                                       // Create fields and keys:
                                $fieldsKeys = array();
                                $indexKeys = array();
 
                                foreach($components['FIELDS'] as $fN => $fCfg)  {
-                                       // the backticks get converted to the correct quote char automatically
+                                               // the backticks get converted to the correct quote char automatically
                                        $fieldsKeys[$fN] = '`'.$fN.'` '.$this->compileFieldCfg($fCfg['definition'],$fN);
                                }
 
-                               foreach($components['KEYS'] as $kN => $kCfg)    {
-                                       if ($kN == 'PRIMARYKEY')        {
-                                               foreach($kCfg as $n => $field)  {
-                                                       $fieldsKeys[$field] .= ' PRIMARY';
-                                               }
+                               if(isset($components['KEYS']) && is_array($components['KEYS'])) {
+                                       foreach($components['KEYS'] as $kN => $kCfg)    {
+                                               if ($kN == 'PRIMARYKEY')        {
+                                                       foreach($kCfg as $n => $field)  {
+                                                               $fieldsKeys[$field] .= ' PRIMARY';
+                                                       }
+                                               } elseif ($kN == 'UNIQUE')      {
+                                                       foreach($kCfg as $n => $field)  {
+                                                               $indexKeys = array_merge($indexKeys, $GLOBALS['TYPO3_DB']->handlerInstance[$GLOBALS['TYPO3_DB']->handler_getFromTableList($components['TABLE'])]->DataDictionary->CreateIndexSQL($n, $components['TABLE'], $field, array('UNIQUE')));
+                                                       }
                                                } else {
-                                               $indexKeys = array_merge($indexKeys, $GLOBALS['TYPO3_DB']->handlerInstance[$GLOBALS['TYPO3_DB']->handler_getFromTableList($components['TABLE'])]->DataDictionary->CreateIndexSQL($components['TABLE'].'_'.$kN, $components['TABLE'], $kCfg));
+                                                       $indexKeys = array_merge($indexKeys, $GLOBALS['TYPO3_DB']->handlerInstance[$GLOBALS['TYPO3_DB']->handler_getFromTableList($components['TABLE'])]->DataDictionary->CreateIndexSQL($components['TABLE'].'_'.$kN, $components['TABLE'], $kCfg));
+                                               }
                                        }
                                }
 
-                               // Fetch table/index generation query:
+                                       // Fetch table/index generation query:
                                $query = array_merge($GLOBALS['TYPO3_DB']->handlerInstance[$GLOBALS['TYPO3_DB']->lastHandlerKey]->DataDictionary->CreateTableSQL('`'.$components['TABLE'].'`',implode(','.chr(10), $fieldsKeys)), $indexKeys);
-                       break;
+                               break;
                }
 
                return $query;
        }
 
        function compileALTERTABLE($components) {
-
-               // Execute query (based on handler derived from the TABLE name which we actually know for once!)
-               //$this->lastHandlerKey = $this->handler_getFromTableList($ORIG_table);
+                       // Execute query (based on handler derived from the TABLE name which we actually know for once!)
                switch((string)$GLOBALS['TYPO3_DB']->handlerCfg[$GLOBALS['TYPO3_DB']->lastHandlerKey]['type'])  {
                        case 'native':
                                $query[] = parent::compileALTERTABLE($components);
-                       break;
+                               break;
                        case 'adodb':
                                switch(strtoupper(str_replace(array(" ","\n","\r","\t"),'',$components['action'])))     {
                                        case 'ADD':
                                                $query = $GLOBALS['TYPO3_DB']->handlerInstance[$GLOBALS['TYPO3_DB']->lastHandlerKey]->DataDictionary->AddColumnSQL('`'.$components['TABLE'].'`','`'.$components['FIELD'].'` '.$this->compileFieldCfg($components['definition']));
-                                       break;
+                                               break;
                                        case 'CHANGE':
                                                $query = $GLOBALS['TYPO3_DB']->handlerInstance[$GLOBALS['TYPO3_DB']->lastHandlerKey]->DataDictionary->AlterColumnSQL('`'.$components['TABLE'].'`','`'.$components['FIELD'].'` '.$this->compileFieldCfg($components['definition']));
-                                       break;
+                                               break;
                                        case 'DROP':
                                        case 'DROPKEY':
-                                       break;
+                                               break;
                                        case 'ADDKEY':
                                        case 'ADDPRIMARYKEY':
                                                $query.=' ('.implode(',',$components['fields']).')';
-                                       break;
+                                               break;
                                }
-                       break;
+                               break;
                }
-               echo '<!-- ';var_dump($query);echo ' -->'.chr(10);
 
                return $query;
        }
@@ -204,59 +208,58 @@ class ux_t3lib_sqlengine extends t3lib_sqlengine {
                switch((string)$GLOBALS['TYPO3_DB']->handlerCfg[$GLOBALS['TYPO3_DB']->lastHandlerKey]['type'])  {
                        case 'native':
                                $cfg = parent::compileFieldCfg($fieldCfg,$fN);
-                       break;
+                               break;
                        case 'adodb':
-                       // Set type:
-                       $cfg = $GLOBALS['TYPO3_DB']->MySQLMetaType($fieldCfg['fieldType']);
+                                       // Set type:
+                               $cfg = $GLOBALS['TYPO3_DB']->MySQLMetaType($fieldCfg['fieldType']);
 
-                       // Add value, if any:
-                       if (strlen($fieldCfg['value']) && (in_array($cfg, array('C','C2'))))    {
-                               $cfg.=' '.$fieldCfg['value'];
-                       }
-
-                       // Add additional features:
-                       if (is_array($fieldCfg['featureIndex']))        {
-
-                               // MySQL assigns DEFAULT value automatically if NOT NULL, fake this here
-                               //if(array_key_exists('NOTNULL',$fieldCfg['featureIndex']) && !array_key_exists('DEFAULT',$fieldCfg['featureIndex']) && !array_key_exists('AUTO_INCREMENT',$fieldCfg['featureIndex'])) {
-                               if(isset($fieldCfg['featureIndex']['NOTNULL']) && !isset($fieldCfg['featureIndex']['DEFAULT']) && !isset($fieldCfg['featureIndex']['AUTO_INCREMENT'])) {
-                                       $fieldCfg['featureIndex']['DEFAULT'] = array('keyword' => 'DEFAULT', 'value' => array('','\''));
+                                       // Add value, if any:
+                               if (strlen($fieldCfg['value']) && (in_array($cfg, array('C','C2'))))    {
+                                       $cfg.=' '.$fieldCfg['value'];
+                               } elseif (!isset($fieldCfg['value']) && (in_array($cfg, array('C','C2')))) {
+                                       $cfg .= ' 255'; // add 255 as length for varchar without specified length (e.g. coming from tinytext, tinyblob)
                                }
 
-                               foreach($fieldCfg['featureIndex'] as $featureDef)       {
-                                               // unsigned only for mysql, as it is mysql specific
-                                       if($featureDef['keyword'] == 'unsigned' && !strstr($GLOBALS['TYPO3_DB']->handlerCfg[$GLOBALS['TYPO3_DB']->lastHandlerKey]['config']['driver'],'mysql')) {
-                                               continue;
-                                       }
-                                               // auto_increment is removed, it is handled by (emulated) sequences
-                                       if($featureDef['keyword'] == 'auto_increment') {
-                                               continue;
+                                       // Add additional features:
+                               if (is_array($fieldCfg['featureIndex']))        {
+
+                                               // MySQL assigns DEFAULT value automatically if NOT NULL, fake this here
+                                       if(isset($fieldCfg['featureIndex']['NOTNULL']) && !isset($fieldCfg['featureIndex']['DEFAULT']) && !isset($fieldCfg['featureIndex']['AUTO_INCREMENT'])) {
+                                               $fieldCfg['featureIndex']['DEFAULT'] = array('keyword' => 'DEFAULT', 'value' => array('','\''));
                                        }
-                                               // NOT NULL only if there is no default value, as this conflicts
-                                       if($featureDef['keyword'] == 'NOT NULL') {
-                                               if($this->checkEmptyDefaultValue($fieldCfg['featureIndex'])) // we do not have a default value or it is an empty string
+
+                                       foreach($fieldCfg['featureIndex'] as $featureDef)       {
+                                                       // unsigned only for mysql, as it is mysql specific
+                                               if($featureDef['keyword'] == 'unsigned' && !strstr($GLOBALS['TYPO3_DB']->handlerCfg[$GLOBALS['TYPO3_DB']->lastHandlerKey]['config']['driver'],'mysql')) {
                                                        continue;
-                                               else
-                                                       $cfg.=' NOTNULL';
-                                       }
+                                               }
+                                                       // auto_increment is removed, it is handled by (emulated) sequences
+                                               if($featureDef['keyword'] == 'auto_increment') {
+                                                       continue;
+                                               }
+                                                       // NOT NULL only if there is no default value, as this conflicts
+                                               if($featureDef['keyword'] == 'NOT NULL') {
+                                                       if($this->checkEmptyDefaultValue($fieldCfg['featureIndex'])) continue; // we do not have a default value or it is an empty string
+                                                       else $cfg.=' NOTNULL';
+                                               }
 
-                                       $cfg.=' '.$featureDef['keyword'];
+                                               $cfg.=' '.$featureDef['keyword'];
 
-                                       // Add value if found:
-                                       if (is_array($featureDef['value']))     {
-                                               if(!is_numeric($featureDef['value'][0]) && empty($featureDef['value'][0])) {
-                                                       $cfg .= '" \'\' "';
-                                               } else{
-                                                       $cfg.=' '.$featureDef['value'][1].$this->compileAddslashes($featureDef['value'][0]).$featureDef['value'][1];
+                                                       // Add value if found:
+                                               if (is_array($featureDef['value']))     {
+                                                       if(!is_numeric($featureDef['value'][0]) && empty($featureDef['value'][0])) {
+                                                               $cfg .= ' "\'\'"';
+                                                       } else {
+                                                               $cfg.=' '.$featureDef['value'][1].$this->compileAddslashes($featureDef['value'][0]).$featureDef['value'][1];
+                                                       }
                                                }
                                        }
                                }
-                       }
-                       $cfg .= ' NOQUOTE';
-               break;
+                               $cfg .= ' NOQUOTE';
+                               break;
                }
 
-               // Return field definition string:
+                       // Return field definition string:
                return $cfg;
        }
 
@@ -264,8 +267,7 @@ class ux_t3lib_sqlengine extends t3lib_sqlengine {
                if (is_array($featureIndex['DEFAULT']['value']))        {
                        if(!is_numeric($featureIndex['DEFAULT']['value'][0]) && empty($featureIndex['DEFAULT']['value'][0])) {
                                return true;
-                       }
-                       else {
+                       } else {
                                return false;
                        }
                }
index 453010c..a38c008 100644 (file)
@@ -2,7 +2,8 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 2004 Kasper Skaarhoj (kasper@typo3.com)
+*  (c) 2004 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 2004-2006 Karsten Dambekalns <karsten@typo3.org>
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -29,6 +30,7 @@
  *
  * $Id$
  *
+ * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
  * @author     Karsten Dambekalns <k.dambekalns@fishfarm.de>
  */
 
@@ -61,28 +63,28 @@ class ux_t3lib_sqlparser extends t3lib_sqlparser {
                switch($components['type'])     {
                        case 'SELECT':
                                $query = $this->compileSELECT($components);
-                       break;
+                               break;
                        case 'UPDATE':
                                $query = $this->compileUPDATE($components);
-                       break;
+                               break;
                        case 'INSERT':
                                $query = $this->compileINSERT($components);
-                       break;
+                               break;
                        case 'DELETE':
                                $query = $this->compileDELETE($components);
-                       break;
+                               break;
                        case 'EXPLAIN':
                                $query = 'EXPLAIN '.$this->compileSELECT($components);
-                       break;
+                               break;
                        case 'DROPTABLE':
                                $query = $this->compileDROPTABLE($components);
-                       break;
+                               break;
                        case 'CREATETABLE':
                                $query = $this->compileCREATETABLE($components);
-                       break;
+                               break;
                        case 'ALTERTABLE':
                                $query = $this->compileALTERTABLE($components);
-                       break;
+                               break;
                }
 
                return $query;
@@ -92,17 +94,17 @@ class ux_t3lib_sqlparser extends t3lib_sqlparser {
        function compileINSERT($components)     {
                switch((string)$GLOBALS['TYPO3_DB']->handlerCfg[$GLOBALS['TYPO3_DB']->lastHandlerKey]['type'])  {
                        case 'native':
-                           parent::compileINSERT($components);
-                       break;
+                               parent::compileINSERT($components);
+                               break;
                        case 'adodb':
-                                       if(isset($components['VALUES_ONLY']) && is_array($components['VALUES_ONLY'])) {
-                                               $fields = $GLOBALS['TYPO3_DB']->cache_fieldType[$components['TABLE']];
-                                               $fc = 0;
-                                               foreach($fields as $fn => $fd) {
-                                                       $query[$fn] = $components['VALUES_ONLY'][$fc++][0];
-                                               }
+                               if(isset($components['VALUES_ONLY']) && is_array($components['VALUES_ONLY'])) {
+                                       $fields = $GLOBALS['TYPO3_DB']->cache_fieldType[$components['TABLE']];
+                                       $fc = 0;
+                                       foreach($fields as $fn => $fd) {
+                                               $query[$fn] = $components['VALUES_ONLY'][$fc++][0];
                                        }
-                       break;
+                               }
+                               break;
                }
 
                return $query;
@@ -112,10 +114,10 @@ class ux_t3lib_sqlparser extends t3lib_sqlparser {
                switch((string)$GLOBALS['TYPO3_DB']->handlerCfg[$GLOBALS['TYPO3_DB']->lastHandlerKey]['type'])  {
                        case 'native':
                                $query = 'DROP TABLE'.($components['ifExists']?' IF EXISTS':'').' '.$components['TABLE'];
-                       break;
+                               break;
                        case 'adodb':
                                $query = $GLOBALS['TYPO3_DB']->handlerInstance[$GLOBALS['TYPO3_DB']->handler_getFromTableList($components['TABLE'])]->DataDictionary->DropTableSQL('`'.$components['TABLE'].'`');
-                       break;
+                               break;
                }
 
                return $query;
@@ -129,67 +131,69 @@ class ux_t3lib_sqlparser extends t3lib_sqlparser {
         * @see parseCREATETABLE()
         */
        function compileCREATETABLE($components)        {
-               // Execute query (based on handler derived from the TABLE name which we actually know for once!)
-               //$this->lastHandlerKey = $this->handler_getFromTableList($ORIG_table);
+                       // Execute query (based on handler derived from the TABLE name which we actually know for once!)
                switch((string)$GLOBALS['TYPO3_DB']->handlerCfg[$GLOBALS['TYPO3_DB']->handler_getFromTableList($components['TABLE'])]['type'])  {
                        case 'native':
                                $query[] = parent::compileCREATETABLE($components);
-                       break;
+                               break;
                        case 'adodb':
-                               // Create fields and keys:
+                                       // Create fields and keys:
                                $fieldsKeys = array();
                                $indexKeys = array();
 
                                foreach($components['FIELDS'] as $fN => $fCfg)  {
-                                       // the backticks get converted to the correct quote char automatically
+                                               // the backticks get converted to the correct quote char automatically
                                        $fieldsKeys[$fN] = '`'.$fN.'` '.$this->compileFieldCfg($fCfg['definition'],$fN);
                                }
 
-                               foreach($components['KEYS'] as $kN => $kCfg)    {
-                                       if ($kN == 'PRIMARYKEY')        {
-                                               foreach($kCfg as $n => $field)  {
-                                                       $fieldsKeys[$field] .= ' PRIMARY';
-                                               }
+                               if(isset($components['KEYS']) && is_array($components['KEYS'])) {
+                                       foreach($components['KEYS'] as $kN => $kCfg)    {
+                                               if ($kN == 'PRIMARYKEY')        {
+                                                       foreach($kCfg as $n => $field)  {
+                                                               $fieldsKeys[$field] .= ' PRIMARY';
+                                                       }
+                                               } elseif ($kN == 'UNIQUE')      {
+                                                       foreach($kCfg as $n => $field)  {
+                                                               $indexKeys = array_merge($indexKeys, $GLOBALS['TYPO3_DB']->handlerInstance[$GLOBALS['TYPO3_DB']->handler_getFromTableList($components['TABLE'])]->DataDictionary->CreateIndexSQL($n, $components['TABLE'], $field, array('UNIQUE')));
+                                                       }
                                                } else {
-                                               $indexKeys = array_merge($indexKeys, $GLOBALS['TYPO3_DB']->handlerInstance[$GLOBALS['TYPO3_DB']->handler_getFromTableList($components['TABLE'])]->DataDictionary->CreateIndexSQL($components['TABLE'].'_'.$kN, $components['TABLE'], $kCfg));
+                                                       $indexKeys = array_merge($indexKeys, $GLOBALS['TYPO3_DB']->handlerInstance[$GLOBALS['TYPO3_DB']->handler_getFromTableList($components['TABLE'])]->DataDictionary->CreateIndexSQL($components['TABLE'].'_'.$kN, $components['TABLE'], $kCfg));
+                                               }
                                        }
                                }
 
-                               // Fetch table/index generation query:
+                                       // Fetch table/index generation query:
                                $query = array_merge($GLOBALS['TYPO3_DB']->handlerInstance[$GLOBALS['TYPO3_DB']->lastHandlerKey]->DataDictionary->CreateTableSQL('`'.$components['TABLE'].'`',implode(','.chr(10), $fieldsKeys)), $indexKeys);
-                       break;
+                               break;
                }
 
                return $query;
        }
 
        function compileALTERTABLE($components) {
-
-               // Execute query (based on handler derived from the TABLE name which we actually know for once!)
-               //$this->lastHandlerKey = $this->handler_getFromTableList($ORIG_table);
+                       // Execute query (based on handler derived from the TABLE name which we actually know for once!)
                switch((string)$GLOBALS['TYPO3_DB']->handlerCfg[$GLOBALS['TYPO3_DB']->lastHandlerKey]['type'])  {
                        case 'native':
                                $query[] = parent::compileALTERTABLE($components);
-                       break;
+                               break;
                        case 'adodb':
                                switch(strtoupper(str_replace(array(" ","\n","\r","\t"),'',$components['action'])))     {
                                        case 'ADD':
                                                $query = $GLOBALS['TYPO3_DB']->handlerInstance[$GLOBALS['TYPO3_DB']->lastHandlerKey]->DataDictionary->AddColumnSQL('`'.$components['TABLE'].'`','`'.$components['FIELD'].'` '.$this->compileFieldCfg($components['definition']));
-                                       break;
+                                               break;
                                        case 'CHANGE':
                                                $query = $GLOBALS['TYPO3_DB']->handlerInstance[$GLOBALS['TYPO3_DB']->lastHandlerKey]->DataDictionary->AlterColumnSQL('`'.$components['TABLE'].'`','`'.$components['FIELD'].'` '.$this->compileFieldCfg($components['definition']));
-                                       break;
+                                               break;
                                        case 'DROP':
                                        case 'DROPKEY':
-                                       break;
+                                               break;
                                        case 'ADDKEY':
                                        case 'ADDPRIMARYKEY':
                                                $query.=' ('.implode(',',$components['fields']).')';
-                                       break;
+                                               break;
                                }
-                       break;
+                               break;
                }
-               echo '<!-- ';var_dump($query);echo ' -->'.chr(10);
 
                return $query;
        }
@@ -204,58 +208,58 @@ class ux_t3lib_sqlparser extends t3lib_sqlparser {
                switch((string)$GLOBALS['TYPO3_DB']->handlerCfg[$GLOBALS['TYPO3_DB']->lastHandlerKey]['type'])  {
                        case 'native':
                                $cfg = parent::compileFieldCfg($fieldCfg,$fN);
-                       break;
+                               break;
                        case 'adodb':
-                       // Set type:
-                       $cfg = $GLOBALS['TYPO3_DB']->MySQLMetaType($fieldCfg['fieldType']);
+                               // Set type:
+                               $cfg = $GLOBALS['TYPO3_DB']->MySQLMetaType($fieldCfg['fieldType']);
 
-                       // Add value, if any:
-                       if (strlen($fieldCfg['value']) && (in_array($cfg, array('C','C2'))))    {
-                               $cfg.=' '.$fieldCfg['value'];
-                       }
-
-                       // Add additional features:
-                       if (is_array($fieldCfg['featureIndex']))        {
-
-                               // MySQL assigns DEFAULT value automatically if NOT NULL, fake this here
-                               //if(array_key_exists('NOTNULL',$fieldCfg['featureIndex']) && !array_key_exists('DEFAULT',$fieldCfg['featureIndex']) && !array_key_exists('AUTO_INCREMENT',$fieldCfg['featureIndex'])) {
-                               if(isset($fieldCfg['featureIndex']['NOTNULL']) && !isset($fieldCfg['featureIndex']['DEFAULT']) && !isset($fieldCfg['featureIndex']['AUTO_INCREMENT'])) {
-                                       $fieldCfg['featureIndex']['DEFAULT'] = array('keyword' => 'DEFAULT', 'value' => array('','\''));
+                                       // Add value, if any:
+                               if (strlen($fieldCfg['value']) && (in_array($cfg, array('C','C2'))))    {
+                                       $cfg.=' '.$fieldCfg['value'];
+                               } elseif (!isset($fieldCfg['value']) && (in_array($cfg, array('C','C2')))) {
+                                       $cfg .= ' 255'; // add 255 as length for varchar without specified length (e.g. coming from tinytext, tinyblob)
                                }
 
-                               // we handle unsigned, auto_increment and NOT NULL
-                               foreach($fieldCfg['featureIndex'] as $featureDef)       {
-                                       if($featureDef['keyword'] == 'unsigned') {
-                                               continue;
-                                       }
-                                       if($featureDef['keyword'] == 'auto_increment') {
-                                               //$cfg.=' AUTO'; removed as we handle auto_increment different now
-                                               continue;
+                                       // Add additional features:
+                               if (is_array($fieldCfg['featureIndex']))        {
+
+                                               // MySQL assigns DEFAULT value automatically if NOT NULL, fake this here
+                                       if(isset($fieldCfg['featureIndex']['NOTNULL']) && !isset($fieldCfg['featureIndex']['DEFAULT']) && !isset($fieldCfg['featureIndex']['AUTO_INCREMENT'])) {
+                                               $fieldCfg['featureIndex']['DEFAULT'] = array('keyword' => 'DEFAULT', 'value' => array('','\''));
                                        }
-                                       if($featureDef['keyword'] == 'NOT NULL') {
-                                               if($this->checkEmptyDefaultValue($fieldCfg['featureIndex'])) // we do not have a default value or it is an empty string
+
+                                       foreach($fieldCfg['featureIndex'] as $featureDef)       {
+                                                       // unsigned only for mysql, as it is mysql specific
+                                               if($featureDef['keyword'] == 'unsigned' && !strstr($GLOBALS['TYPO3_DB']->handlerCfg[$GLOBALS['TYPO3_DB']->lastHandlerKey]['config']['driver'],'mysql')) {
                                                        continue;
-                                               else
-                                                       $cfg.=' NOTNULL';
-                                       }
+                                               }
+                                                       // auto_increment is removed, it is handled by (emulated) sequences
+                                               if($featureDef['keyword'] == 'auto_increment') {
+                                                       continue;
+                                               }
+                                                       // NOT NULL only if there is no default value, as this conflicts
+                                               if($featureDef['keyword'] == 'NOT NULL') {
+                                                       if($this->checkEmptyDefaultValue($fieldCfg['featureIndex'])) continue; // we do not have a default value or it is an empty string
+                                                       else $cfg.=' NOTNULL';
+                                               }
 
-                                       $cfg.=' '.$featureDef['keyword'];
+                                               $cfg.=' '.$featureDef['keyword'];
 
-                                       // Add value if found:
-                                       if (is_array($featureDef['value']))     {
-                                               if(!is_numeric($featureDef['value'][0]) && empty($featureDef['value'][0])) {
-                                                       $cfg .= '" \'\' "';
-                                               } else{
-                                                       $cfg.=' '.$featureDef['value'][1].$this->compileAddslashes($featureDef['value'][0]).$featureDef['value'][1];
+                                                       // Add value if found:
+                                               if (is_array($featureDef['value']))     {
+                                                       if(!is_numeric($featureDef['value'][0]) && empty($featureDef['value'][0])) {
+                                                               $cfg .= ' "\'\'"';
+                                                       } else {
+                                                               $cfg.=' '.$featureDef['value'][1].$this->compileAddslashes($featureDef['value'][0]).$featureDef['value'][1];
+                                                       }
                                                }
                                        }
                                }
-                       }
-                       $cfg .= ' NOQUOTE';
-               break;
+                               $cfg .= ' NOQUOTE';
+                               break;
                }
 
-               // Return field definition string:
+                       // Return field definition string:
                return $cfg;
        }
 
@@ -263,8 +267,7 @@ class ux_t3lib_sqlparser extends t3lib_sqlparser {
                if (is_array($featureIndex['DEFAULT']['value']))        {
                        if(!is_numeric($featureIndex['DEFAULT']['value'][0]) && empty($featureIndex['DEFAULT']['value'][0])) {
                                return true;
-                       }
-                       else {
+                       } else {
                                return false;
                        }
                }
index ae14328..700f0cc 100644 (file)
Binary files a/typo3/sysext/dbal/doc/manual.sxw and b/typo3/sysext/dbal/doc/manual.sxw differ
index ea687b4..0ab3dd5 100644 (file)
@@ -3,36 +3,50 @@
 ########################################################################
 # Extension Manager/Repository config file for ext: "dbal"
 #
-# Auto generated 27-12-2005 16:16
+# Auto generated 25-03-2006 23:26
 #
 # Manual updates:
-# Only the data in the array - anything else is removed by next write
+# Only the data in the array - anything else is removed by next write.
+# "version" and "dependencies" must not be touched!
 ########################################################################
 
-$EM_CONF[$_EXTKEY] = Array (
+$EM_CONF[$_EXTKEY] = array(
        'title' => 'Database Abstraction Layer',
-       'description' => '',
+       'description' => 'A database abstraction layer implementation for TYPO3 4.0 based on ADOdb and offering a lot of other features...',
        'category' => 'be',
-       'author' => 'Karsten Dambekalns',
-       'author_email' => 'k.dambekalns@fishfarm.de',
-       'shy' => '',
+       'shy' => 0,
        'dependencies' => 'adodb',
-       'TYPO3_version' => '3.9.0-',
        'conflicts' => '',
        'priority' => '',
+       'loadOrder' => '',
        'module' => 'mod1',
        'state' => 'beta',
-       'internal' => '',
+       'internal' => 0,
        'uploadfolder' => 0,
        'createDirs' => '',
        'modify_tables' => '',
        'clearCacheOnLoad' => 0,
        'lockType' => '',
-       'author_company' => '',
-       'private' => '',
-       'download_password' => '',
-       'version' => '0.5.0',   // Don't modify this! Managed automatically during upload to repository.
-       '_md5_values_when_last_written' => 'a:32:{s:9:"ChangeLog";s:4:"2614";s:21:"class.ux_t3lib_db.php";s:4:"033d";s:28:"class.ux_t3lib_sqlengine.php";s:4:"4f41";s:28:"class.ux_t3lib_sqlparser.php";s:4:"796d";s:12:"ext_icon.gif";s:4:"1bdc";s:17:"ext_localconf.php";s:4:"4c9c";s:15:"ext_php_api.dat";s:4:"56e0";s:14:"ext_tables.php";s:4:"427e";s:14:"ext_tables.sql";s:4:"1d3e";s:11:"CVS/Entries";s:4:"abb2";s:14:"CVS/Repository";s:4:"2282";s:8:"CVS/Root";s:4:"b923";s:12:"doc/TODO.txt";s:4:"8ff6";s:14:"doc/manual.sxw";s:4:"d418";s:15:"doc/CVS/Entries";s:4:"f7ec";s:18:"doc/CVS/Repository";s:4:"351a";s:12:"doc/CVS/Root";s:4:"b923";s:45:"handlers/class.tx_dbal_handler_openoffice.php";s:4:"84f3";s:43:"handlers/class.tx_dbal_handler_rawmysql.php";s:4:"160b";s:40:"handlers/class.tx_dbal_handler_xmldb.php";s:4:"6651";s:20:"handlers/CVS/Entries";s:4:"71c8";s:23:"handlers/CVS/Repository";s:4:"77d9";s:17:"handlers/CVS/Root";s:4:"b923";s:14:"mod1/clear.gif";s:4:"cc11";s:13:"mod1/conf.php";s:4:"cf19";s:14:"mod1/index.php";s:4:"d895";s:18:"mod1/locallang.xml";s:4:"af22";s:22:"mod1/locallang_mod.xml";s:4:"d1c6";s:19:"mod1/moduleicon.gif";s:4:"8074";s:16:"mod1/CVS/Entries";s:4:"dbdc";s:19:"mod1/CVS/Repository";s:4:"16e3";s:13:"mod1/CVS/Root";s:4:"b923";}',
+       'author' => 'Karsten Dambekalns',
+       'author_email' => 'k.dambekalns@fishfarm.de',
+       'author_company' => 'TYPO3 Association',
+       'CGLcompliance' => '',
+       'CGLcompliance_note' => '',
+       'version' => '0.9.0',
+       '_md5_values_when_last_written' => 'a:36:{s:9:"ChangeLog";s:4:"8f10";s:21:"class.ux_t3lib_db.php";s:4:"a71a";s:28:"class.ux_t3lib_sqlengine.php";s:4:"41b4";s:28:"class.ux_t3lib_sqlparser.php";s:4:"96ac";s:12:"ext_icon.gif";s:4:"1bdc";s:17:"ext_localconf.php";s:4:"4c9c";s:15:"ext_php_api.dat";s:4:"56e0";s:14:"ext_tables.php";s:4:"427e";s:14:"ext_tables.sql";s:4:"9a69";s:11:"CVS/Entries";s:4:"ca91";s:14:"CVS/Repository";s:4:"2282";s:8:"CVS/Root";s:4:"b923";s:7:"CVS/Tag";s:4:"c437";s:12:"doc/TODO.txt";s:4:"8ff6";s:14:"doc/manual.sxw";s:4:"ffe7";s:15:"doc/CVS/Entries";s:4:"14bb";s:18:"doc/CVS/Repository";s:4:"351a";s:12:"doc/CVS/Root";s:4:"b923";s:11:"doc/CVS/Tag";s:4:"c437";s:45:"handlers/class.tx_dbal_handler_openoffice.php";s:4:"84f3";s:43:"handlers/class.tx_dbal_handler_rawmysql.php";s:4:"160b";s:40:"handlers/class.tx_dbal_handler_xmldb.php";s:4:"6651";s:20:"handlers/CVS/Entries";s:4:"b59b";s:23:"handlers/CVS/Repository";s:4:"77d9";s:17:"handlers/CVS/Root";s:4:"b923";s:16:"handlers/CVS/Tag";s:4:"c437";s:14:"mod1/clear.gif";s:4:"cc11";s:13:"mod1/conf.php";s:4:"cf19";s:14:"mod1/index.php";s:4:"240c";s:18:"mod1/locallang.xml";s:4:"0b57";s:22:"mod1/locallang_mod.xml";s:4:"86ef";s:19:"mod1/moduleicon.gif";s:4:"8074";s:16:"mod1/CVS/Entries";s:4:"9074";s:19:"mod1/CVS/Repository";s:4:"16e3";s:13:"mod1/CVS/Root";s:4:"b923";s:12:"mod1/CVS/Tag";s:4:"c437";}',
+       'constraints' => array(
+               'depends' => array(
+                       'adodb' => '4.70.0-',
+                       'php' => '4.1.0-',
+                       'typo3' => '3.8.1-',
+               ),
+               'conflicts' => array(
+               ),
+               'suggests' => array(
+               ),
+       ),
+       'suggests' => array(
+       ),
 );
 
 ?>
\ No newline at end of file
diff --git a/typo3/sysext/dbal/ext_php_api.dat b/typo3/sysext/dbal/ext_php_api.dat
deleted file mode 100644 (file)
index 8fa9d2e..0000000
+++ /dev/null
@@ -1,864 +0,0 @@
-a:2:{s:4:"meta";a:3:{s:5:"title";s:12:"DBAL package";s:5:"descr";s:0:"";s:7:"options";a:2:{s:10:"usageCount";s:1:"1";s:19:"includeCodeAbstract";s:1:"1";}}s:5:"files";a:4:{s:14:"MD5_9a0025a766";a:5:{s:8:"filename";s:21:"class.ux_t3lib_db.php";s:8:"filesize";i:43452;s:6:"header";a:5:{s:4:"text";s:35:"
-
-TYPO3 database abstraction layer
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}s:5:"other";a:3:{i:0;s:42:"@author       Kasper Skaarhoj <kasper@typo3.com>";i:1;s:14:"@package TYPO3";i:2;s:19:"@subpackage tx_dbal";}s:11:"other_index";a:3:{s:7:"@author";a:1:{i:0;s:34:"Kasper Skaarhoj <kasper@typo3.com>";}s:8:"@package";a:1:{i:0;s:6:"TYPO3 ";}s:11:"@subpackage";a:1:{i:0;s:8:"tx_dbal ";}}}s:3:"DAT";a:29:{i:1;a:8:{s:6:"header";s:36:"class ux_t3lib_DB extends t3lib_DB {";s:5:"class";i:1;s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:5:{s:4:"text";s:35:"
-
-TYPO3 database abstraction layer
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}s:5:"other";a:3:{i:0;s:42:"@author       Kasper Skaarhoj <kasper@typo3.com>";i:1;s:14:"@package TYPO3";i:2;s:19:"@subpackage tx_dbal";}s:11:"other_index";a:3:{s:7:"@author";a:1:{i:0;s:34:"Kasper Skaarhoj <kasper@typo3.com>";}s:8:"@package";a:1:{i:0;s:6:"TYPO3 ";}s:11:"@subpackage";a:1:{i:0;s:8:"tx_dbal ";}}}s:7:"content";a:2:{i:0;s:1311:"
-               // Internal, static:
-       var $printErrors = FALSE;                       // Enable output of SQL errors after query executions. Set through TYPO3_CONF_VARS, see init()
-       var $debug = FALSE;                                     // Enable debug mode. Set through TYPO3_CONF_VARS, see init()
-
-       var $mapping = array();                         // See manual.
-       var $table2handlerKeys = array();       // See manual.  
-       var $handlerCfg = array (                       // See manual.
-               '_DEFAULT' => array (
-                       'type' => 'native',
-                       'config' => array(
-                               'username' => '',               // Set by default (overridden)
-                               'password' => '',               // Set by default (overridden)
-                               'host' => '',                   // Set by default (overridden)
-                               'database' => '',               // Set by default (overridden)
-                               'driver' => '',                 // ONLY "adodb" / "pear" type; eg. "mysql"
-                       )
-               ),
-       );
-
-
-               // Internal, dynamic:
-       var $handlerInstance = array();                         // Contains instance of the handler objects as they are created. Exception is the native mySQL calls which are registered as an array with keys "handlerType" = "native" and "link" pointing to the link resource for the connection.
-       var $lastHandlerKey = '';                                       // Storage of the handler key of last ( SELECT) query - used for subsequent fetch-row calls etc.
-       var $lastQuery = '';                                            // Storage of last SELECT query
-
-       var $resourceIdToTableNameMap = array();        // Mapping of resource ids to table names.
-
-
-       
-       
-       
-       
-       ";i:1;i:-1;}s:12:"content_size";i:1311;s:13:"content_lines";i:33;s:6:"atLine";i:104;}i:3;a:7:{s:6:"header";s:24:"function ux_t3lib_DB() {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:3:{s:4:"text";s:109:"
-
-Constructor. 
-Creates SQL parser object and imports configuration from $TYPO3_CONF_VARS['EXTCONF']['dbal']
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:4:"void";i:1;s:0:"";}}s:7:"content";a:2:{i:0;s:507:"               global $TYPO3_CONF_VARS;
-
-                       // Set outside configuration:
-               if (isset($TYPO3_CONF_VARS['EXTCONF']['dbal']['mapping']))                              $this->mapping = $TYPO3_CONF_VARS['EXTCONF']['dbal']['mapping'];
-               if (isset($TYPO3_CONF_VARS['EXTCONF']['dbal']['table2handlerKeys']))    $this->table2handlerKeys = $TYPO3_CONF_VARS['EXTCONF']['dbal']['table2handlerKeys'];
-               if (isset($TYPO3_CONF_VARS[
-[...]
-ethods)
-        * These functions are extending counterparts in the parent class.
-        * 
-        **************************************/
-
-       ";i:1;i:1;}s:12:"content_size";i:1046;s:13:"content_lines";i:30;s:6:"atLine";i:144;}i:5;a:8:{s:6:"header";s:50:"function exec_INSERTquery($table,$fields_values)        {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:11:"sectionText";a:2:{i:0;s:42:"Query Building (Overriding parent methods)";i:1;s:63:"These functions are extending counterparts in the parent class.";}s:4:"cDat";a:3:{s:4:"text";s:84:"
-
-Inserts a record for $table from the array with field/value pairs $fields_values.
-";s:5:"param";a:2:{i:0;a:2:{i:0;s:6:"string";i:1;s:10:"Table name";}i:1;a:2:{i:0;s:5:"array";i:1;s:191:"Field values as key=>value pairs. Values will be escaped internally. Typically you would fill an array like "$insertFields" with 'fieldname'=>'value' and pass it to this function as argument.";}}s:6:"return";a:2:{i:0;s:5:"mixed";i:1;s:67:"Result from handler, usually TRUE when success and FALSE on failure";}}s:7:"content";a:2:{i:0;s:507:"
-                       // Do field mapping if needed:
-               if ($tableArray = $this->map_needMapping($table))       {
-               
-                               // Field mapping of array:
-                       $fields_values = $this->map_assocArray($fields_values,$tableArray);
-
-                               // Table name:
-                       if ($this->mapping[$table]['mapTableName'])     {
-                               $table = $this->mapping[$table]['mapTableName'];
-                       }
-               }
-
-                       // Select API:
-               $this->lastHandlerKey = $this
-[...]
-->printErrors && $this->sql_error())   { debug(array($this->sql_error()));     }
-               
-                       // Return output:
-               return $sqlResult;
-       }
-
-       ";i:1;i:1;}s:12:"content_size";i:1697;s:13:"content_lines";i:43;s:6:"atLine";i:182;}i:7;a:7:{s:6:"header";s:57:"function exec_UPDATEquery($table,$where,$fields_values) {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:3:{s:4:"text";s:31:"
-
-Updates a record from $table
-";s:5:"param";a:3:{i:0;a:2:{i:0;s:6:"string";i:1;s:18:"Database tablename";}i:1;a:2:{i:0;s:6:"string";i:1;s:107:"WHERE clause, eg. "uid=1". NOTICE: You must escape values in this argument with $this->quoteStr() yourself!";}i:2;a:2:{i:0;s:5:"array";i:1;s:191:"Field values as key=>value pairs. Values will be escaped internally. Typically you would fill an array like "$updateFields" with 'fieldname'=>'value' and pass it to this function as argument.";}}s:6:"return";a:2:{i:0;s:5:"mixed";i:1;s:67:"Result from handler, usually TRUE when success and FALSE on failure";}}s:7:"content";a:2:{i:0;s:507:"
-                       // Do table/field mapping:
-               if ($tableArray = $this->map_needMapping($table))       {
-               
-                               // Field mapping of array:
-                       $fields_values = $this->map_assocArray($fields_values,$tableArray);
-                       
-                               // Where clause table and field mapping:
-                       $whereParts = $this->SQLparser->parseWhereClause($where);
-                       $this->map_sqlParts($whereParts,$tableArray[0]['table']);
-                       $where = $t
-[...]
-->printErrors && $this->sql_error())   { debug(array($this->sql_error()));     }
-               
-                       // Return result:
-               return $sqlResult;
-       }
-
-       ";i:1;i:1;}s:12:"content_size";i:1804;s:13:"content_lines";i:45;s:6:"atLine";i:234;}i:9;a:7:{s:6:"header";s:42:"function exec_DELETEquery($table,$where)        {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:3:{s:4:"text";s:29:"
-
-Deletes records from table
-";s:5:"param";a:2:{i:0;a:2:{i:0;s:6:"string";i:1;s:18:"Database tablename";}i:1;a:2:{i:0;s:6:"string";i:1;s:107:"WHERE clause, eg. "uid=1". NOTICE: You must escape values in this argument with $this->quoteStr() yourself!";}}s:6:"return";a:2:{i:0;s:5:"mixed";i:1;s:19:"Result from handler";}}s:7:"content";a:2:{i:0;s:507:"
-                       // Do table/field mapping:
-               if ($tableArray = $this->map_needMapping($table))       {
-
-                               // Where clause:
-                       $whereParts = $this->SQLparser->parseWhereClause($where);
-                       $this->map_sqlParts($whereParts,$tableArray[0]['table']);
-                       $where = $this->SQLparser->compileWhereClause($whereParts);
-
-                               // Table name:
-                       if ($this->mapping[$table]['mapTableName'])     {
-                               $table = $
-[...]
-->printErrors && $this->sql_error())   { debug(array($this->sql_error()));     }
-               
-                       // Return result:
-               return $sqlResult;
-       }
-
-       ";i:1;i:1;}s:12:"content_size";i:1419;s:13:"content_lines";i:40;s:6:"atLine";i:287;}i:11;a:7:{s:6:"header";s:103:"function exec_SELECTquery($select_fields,$from_table,$where_clause,$groupBy='',$orderBy='',$limit='') {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:3:{s:4:"text";s:35:"
-
-Selects records from Data Source
-";s:5:"param";a:6:{i:0;a:2:{i:0;s:6:"string";i:1;s:101:"List of fields to select from the table. This is what comes right after "SELECT ...". Required value.";}i:1;a:2:{i:0;s:6:"string";i:1;s:89:"Table(s) from which to select. This is what comes right after "FROM ...". Required value.";}i:2;a:2:{i:0;s:6:"string";i:1;s:186:"Optional additional WHERE clauses put in the end of the query. NOTICE: You must escape values in this argument with $this->quoteStr() yourself! DO NOT PUT IN GROUP BY, ORDER BY or LIMIT!";}i:3;a:2:{i:0;s:6:"string";i:1;s:57:"Optional GROUP BY field(s), if none, supply blank string.";}i:4;a:2:{i:0;s:6:"string";i:1;s:57:"Optional ORDER BY field(s), if none, supply blank string.";}i:5;a:2:{i:0;s:6:"string";i:1;s:65:"Optional LIMIT value ([begin,]max), if none, supply blank string.";}}s:6:"return";a:2:{i:0;s:5:"mixed";i:1;s:55:"Result from handler. Typically object from DBAL layers.";}}s:7:"content";a:2:{i:0;s:507:"
-               if ($this->debug)       $pt = t3lib_div::milliseconds();
-
-                       // Map table / field names if needed:
-               $ORIG_from_table = $from_table; // Saving table names in $ORIG_from_table since $from_table is transformed beneath:
-               if ($tableArray = $this->map_needMapping($ORIG_from_table))     {
-                       $this->map_remapSELECTQueryParts($select_fields,$from_table,$where_clause,$groupBy,$orderBy);   
-[...]
-
-       
-       /**************************************
-        *
-        * Various helper functions
-        *
-        **************************************/
-
-       ";i:1;i:1;}s:12:"content_size";i:4084;s:13:"content_lines";i:115;s:6:"atLine";i:339;}i:13;a:8:{s:6:"header";s:36:"function quoteStr($str, $table='')    {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:11:"sectionText";a:1:{i:0;s:24:"Various helper functions";}s:4:"cDat";a:3:{s:4:"text";s:129:"
-
-Perform context sensitive escaping of strings. This may be "addslashes()" or whatever method fits the current database driver.
-";s:5:"param";a:2:{i:0;a:2:{i:0;s:6:"string";i:1;s:12:"Input string";}i:1;a:2:{i:0;s:6:"string";i:1;s:143:"Table name for which to quote string. Just enter which table(s) that goes into the query. Important for detection of DBMS handler of the query!";}}s:6:"return";a:2:{i:0;s:6:"string";i:1;s:79:"Output string; Quotes (" / ') and \ will be backslashed according to DBMS used.";}}s:7:"content";a:2:{i:0;s:507:"           $this->lastHandlerKey = $this->handler_getFromTableList($table);
-               switch((string)$this->handlerCfg[$this->lastHandlerKey]['type'])        {
-                       case 'native':
-                               $str = addslashes($str);
-                       break;
-                       case 'adodb':
-                               $str = $this->handlerInstance[$this->lastHandlerKey]->qstr($str);
-                       break;
-                       case 'pear':
-                               $str = $this->handlerInstance[$this->lastHandlerKey]->quoteString
-[...]
-per functions (Overriding parent methods)
-        * (For use in your applications)
-        *
-        **************************************/
-
-       ";i:1;i:1;}s:12:"content_size";i:779;s:13:"content_lines";i:38;s:6:"atLine";i:462;}i:15;a:8:{s:6:"header";s:22:"function sql_error()    {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:11:"sectionText";a:2:{i:0;s:49:"SQL wrapper functions (Overriding parent methods)";i:1;s:30:"(For use in your applications)";}s:4:"cDat";a:3:{s:4:"text";s:95:"
-
-Returns the error status on the most recent sql() execution (based on $this->lastHandlerKey)
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:6:"string";i:1;s:21:"Handler error strings";}}s:7:"content";a:2:{i:0;s:507:"
-               switch($this->handlerCfg[$this->lastHandlerKey]['type'])        {
-                       case 'native':
-                               $output = mysql_error($this->handlerInstance[$this->lastHandlerKey]['link']);
-                       break;
-                       case 'adodb':
-                               $output = $this->handlerInstance[$this->lastHandlerKey]->ErrorMsg();
-                       break;
-                       case 'pear':
-                               // PEAR returns an ERROR object if something is wrong. For other APIs the error is 
-[...]
-userdefined':
-                               $output = $this->handlerInstance[$this->lastHandlerKey]->sql_error();
-                       break;
-               }
-               return $output;
-       }
-
-       ";i:1;i:1;}s:12:"content_size";i:777;s:13:"content_lines";i:20;s:6:"atLine";i:506;}i:17;a:7:{s:6:"header";s:30:"function sql_num_rows(&$res)    {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:3:{s:4:"text";s:39:"
-
-Returns the number of selected rows.
-";s:5:"param";a:1:{i:0;a:2:{i:0;s:7:"pointer";i:1;s:28:"Result pointer / DBAL object";}}s:6:"return";a:2:{i:0;s:7:"integer";i:1;s:25:"Number of resulting rows.";}}s:7:"content";a:2:{i:0;s:381:"
-               $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType : 'native';
-               switch($handlerType)    {
-                       case 'native':
-                               $output = mysql_num_rows($res);
-                       break;
-                       case 'adodb':
-                               $output = $res->RecordCount();
-                       break;
-                       case 'pear':
-                               $output = $res->numRows();
-                       break;
-                       case 'userdefined':
-                               $output = $res->sql_num_rows();
-                       break;
-               }
-               return $output;
-       }
-
-       ";i:1;i:0;}s:12:"content_size";i:381;s:13:"content_lines";i:19;s:6:"atLine";i:533;}i:19;a:7:{s:6:"header";s:33:"function sql_fetch_assoc(&$res) {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:3:{s:4:"text";s:104:"
-
-Returns an associative array that corresponds to the fetched row, or FALSE if there are no more rows.
-";s:5:"param";a:1:{i:0;a:2:{i:0;s:7:"pointer";i:1;s:52:"MySQL result pointer (of SELECT query) / DBAL object";}}s:6:"return";a:2:{i:0;s:5:"array";i:1;s:32:"Associative array of result row.";}}s:7:"content";a:2:{i:0;s:507:"
-               $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType :  'native';
-               switch($handlerType)    {
-                       case 'native':
-                               $output = mysql_fetch_assoc($res);
-                               $tableList = $this->resourceIdToTableNameMap[(string)$res];     // Reading list of tables from SELECT query:
-                       break;
-                       case 'adodb':
-                               $output = $res->FetchRow();
-                               $tableList = $res->TYPO3_DBAL_tableList;        //
-[...]
-eList,TRUE))   {
-                               $output = $this->map_assocArray($output,$tables,1);
-                       }
-               }
-
-                       // Return result:
-               return $output;
-       }
-
-       ";i:1;i:1;}s:12:"content_size";i:1324;s:13:"content_lines";i:40;s:6:"atLine";i:559;}i:21;a:7:{s:6:"header";s:31:"function sql_fetch_row(&$res)  {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:3:{s:4:"text";s:144:"
-
-Returns an array that corresponds to the fetched row, or FALSE if there are no more rows.
-The array contains the values in numerical indices.
-";s:5:"param";a:1:{i:0;a:2:{i:0;s:7:"pointer";i:1;s:52:"MySQL result pointer (of SELECT query) / DBAL object";}}s:6:"return";a:2:{i:0;s:5:"array";i:1;s:23:"Array with result rows.";}}s:7:"content";a:2:{i:0;s:507:"
-               $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType :  'native';
-               switch($handlerType)    {
-                       case 'native':
-                               $output = mysql_fetch_row($res);
-                       break;
-                       case 'adodb':
-                               $output = $res->FetchRow();
-                               
-                                       // Removing all assoc. keys. 
-                                       // Just a temporary workaround till I know how to make ADOdb return this by default... Most likely this will not 
-[...]
-TCHMODE_ORDERED);
-                       break;
-                       case 'userdefined':
-                               $output = $res->sql_fetch_row();
-                       break;
-               }
-               return $output;
-       }
-
-       ";i:1;i:1;}s:12:"content_size";i:732;s:13:"content_lines";i:27;s:6:"atLine";i:607;}i:23;a:7:{s:6:"header";s:33:"function sql_free_result(&$res) {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:3:{s:4:"text";s:21:"
-
-Free result memory
-";s:5:"param";a:1:{i:0;a:2:{i:0;s:7:"pointer";i:1;s:42:"MySQL result pointer to free / DBAL object";}}s:6:"return";a:2:{i:0;s:7:"boolean";i:1;s:44:"Returns TRUE on success or FALSE on failure.";}}s:7:"content";a:2:{i:0;s:326:"
-               $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType :  'native';
-               switch($handlerType)    {
-                       case 'native':
-                               $output = mysql_free_result($res);
-                       break;
-                       case 'adodb':
-                               # ?
-                       break;
-                       case 'pear':
-                               $res->free();
-                       break;
-                       case 'userdefined':
-                               unset($res);
-                       break;
-               }
-               return $output;
-       }
-
-       ";i:1;i:0;}s:12:"content_size";i:326;s:13:"content_lines";i:19;s:6:"atLine";i:641;}i:25;a:7:{s:6:"header";s:26:"function sql_insert_id()        {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:3:{s:4:"text";s:58:"
-
-Get the ID generated from the previous INSERT operation
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:7:"integer";i:1;s:36:"The uid of the last inserted record.";}}s:7:"content";a:2:{i:0;s:516:"
-               switch($this->handlerCfg[$this->lastHandlerKey]['type'])        {
-                       case 'native':
-                               $output = mysql_insert_id($this->handlerInstance[$this->lastHandlerKey]['link']);
-                       break;
-                       case 'adodb':
-                               $output = $this->handlerInstance[$this->lastHandlerKey]->Insert_ID();
-                       break;
-                       case 'pear':
-                               $output = mysql_insert_id();    // WILL NOT BE THE FINAL SOLUTION HERE!!!
-                       break;
-                       case 'userdefined':
-                               $output = $this->handlerInstance[$this->lastHandlerKey]->sql_insert_id();
-                       break;
-               }
-               return $output;
-       }
-
-       ";i:1;i:0;}s:12:"content_size";i:516;s:13:"content_lines";i:18;s:6:"atLine";i:666;}i:27;a:7:{s:6:"header";s:30:"function sql_affected_rows()    {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:3:{s:4:"text";s:81:"
-
-Returns the number of rows affected by the last INSERT, UPDATE or DELETE query
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:7:"integer";i:1;s:37:"Number of rows affected by last query";}}s:7:"content";a:2:{i:0;s:477:"
-               switch($this->handlerCfg[$this->lastHandlerKey]['type'])        {
-                       case 'native':
-                               $output = mysql_affected_rows();
-                       break;
-                       case 'adodb':
-                               $output = $this->handlerInstance[$this->lastHandlerKey]->Affected_Rows();
-                       break;
-                       case 'pear':
-                               $output = $this->handlerInstance[$this->lastHandlerKey]->affectedRows();
-                       break;
-                       case 'userdefined':
-                               $output = $this->handlerInstance[$this->lastHandlerKey]->sql_affected_rows();
-                       break;
-               }
-               return $output;
-       }
-
-       ";i:1;i:0;}s:12:"content_size";i:477;s:13:"content_lines";i:18;s:6:"atLine";i:690;}i:29;a:7:{s:6:"header";s:37:"function sql_data_seek(&$res,$seek)     {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:3:{s:4:"text";s:31:"
-
-Move internal result pointer
-";s:5:"param";a:2:{i:0;a:2:{i:0;s:7:"pointer";i:1;s:52:"MySQL result pointer (of SELECT query) / DBAL object";}i:1;a:2:{i:0;s:7:"integer";i:1;s:19:"Seek result number.";}}s:6:"return";a:2:{i:0;s:7:"boolean";i:1;s:44:"Returns TRUE on success or FALSE on failure.";}}s:7:"content";a:2:{i:0;s:383:"
-               $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType :  'native';
-               switch($handlerType)    {
-                       case 'native':
-                               $output = mysql_data_seek($res,$seek);
-                       break;
-                       case 'adodb':
-                               $output = $res->Move($seek);
-                       break;
-                       case 'pear':
-                               # ??? - no idea!
-                       break;
-                       case 'userdefined':
-                               $output = $res->sql_data_seek($seek);
-                       break;
-               }
-               return $output;
-       }
-
-       ";i:1;i:0;}s:12:"content_size";i:383;s:13:"content_lines";i:19;s:6:"atLine";i:716;}i:31;a:7:{s:6:"header";s:41:"function sql_field_type(&$res,$pointer) {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:3:{s:4:"text";s:50:"
-
-Get the type of the specified field in a result
-";s:5:"param";a:2:{i:0;a:2:{i:0;s:7:"pointer";i:1;s:52:"MySQL result pointer (of SELECT query) / DBAL object";}i:1;a:2:{i:0;s:7:"integer";i:1;s:12:"Field index.";}}s:6:"return";a:2:{i:0;s:6:"string";i:1;s:45:"Returns the name of the specified field index";}}s:7:"content";a:2:{i:0;s:476:"
-               $handlerType = is_object($res) ? $res->TYPO3_DBAL_handlerType :  'native';
-               switch($handlerType)    {
-                       case 'native':
-                               $output = mysql_field_type($res,$pointer);
-                       break;
-                       case 'adodb':
-                       break;
-                       case 'pear':
-                       break;
-                       case 'userdefined':
-                               $output = $res->sql_field_type($pointer);
-                       break;
-               }
-               return $output;
-       }
-       
-
-
-
-
-
-
-
-       /**********
-        *
-        * Legacy functions, bound to _DEFAULT handler. (Overriding parent methods)
-        * Depreciated.
-        *
-        **********/
-       
-       ";i:1;i:0;}s:12:"content_size";i:476;s:13:"content_lines";i:31;s:6:"atLine";i:743;}i:33;a:8:{s:6:"header";s:26:"function sql($db,$query)        {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:11:"sectionText";a:2:{i:0;s:72:"Legacy functions, bound to _DEFAULT handler. (Overriding parent methods)";i:1;s:12:"Depreciated.";}s:4:"cDat";a:5:{s:4:"text";s:99:"
-
-Executes query (on DEFAULT handler!)
-DEPRECIATED - use exec_* functions from this class instead!
-";s:5:"param";a:2:{i:0;a:2:{i:0;s:6:"string";i:1;s:13:"Database name";}i:1;a:2:{i:0;s:6:"string";i:1;s:16:"Query to execute";}}s:6:"return";a:2:{i:0;s:7:"pointer";i:1;s:14:"Result pointer";}s:5:"other";a:1:{i:0;s:12:"@depreciated";}s:11:"other_index";a:1:{s:12:"@depreciated";a:1:{i:0;s:1:" ";}}}s:7:"content";a:2:{i:0;s:40:"          return $this->sql_query($query);
-       }
-
-       ";i:1;i:0;}s:12:"content_size";i:40;s:13:"content_lines";i:3;s:6:"atLine";i:784;}i:35;a:7:{s:6:"header";s:28:"function sql_query($query)        {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:5:{s:4:"text";s:99:"
-
-Executes query (on DEFAULT handler!)
-DEPRECIATED - use exec_* functions from this class instead!
-";s:5:"param";a:1:{i:0;a:2:{i:0;s:6:"string";i:1;s:16:"Query to execute";}}s:6:"return";a:2:{i:0;s:7:"pointer";i:1;s:28:"Result pointer / DBAL object";}s:5:"other";a:1:{i:0;s:12:"@depreciated";}s:11:"other_index";a:1:{s:12:"@depreciated";a:1:{i:0;s:1:" ";}}}s:7:"content";a:2:{i:0;s:507:"               
-               switch($this->handlerCfg['_DEFAULT']['type'])   {
-                       case 'native':
-                               $sqlResult = mysql_query($query, $this->handlerInstance['_DEFAULT']['link']);
-                       break;
-                       case 'adodb':
-                               $sqlResult = $this->handlerInstance['_DEFAULT']->Execute($query);
-                       break;
-                       case 'pear':
-                               $sqlResult = $this->handlerInstance['_DEFAULT']->query($query);
-                               $this->handlerInstance['_DE
-[...]
-errors:                
-               if ($this->printErrors && $this->sql_error())   { debug(array($this->sql_error()));     }
-               
-               return $sqlResult;
-       }
-
-       ";i:1;i:1;}s:12:"content_size";i:724;s:13:"content_lines";i:23;s:6:"atLine";i:796;}i:37;a:7:{s:6:"header";s:79:"function sql_pconnect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password)   {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:5:{s:4:"text";s:258:"
-
-Opening the _DEFAULT connection handler to the database.
-This is typically done by the scripts "init.php" in the backend or "index_ts.php" in the frontend (tslib_fe->connectToMySQL())
-You wouldn't need to use this at any time - let TYPO3 core handle this.
-";s:5:"param";a:3:{i:0;a:2:{i:0;s:6:"string";i:1;s:23:"Database host IP/domain";}i:1;a:2:{i:0;s:6:"string";i:1;s:25:"Username to connect with.";}i:2;a:2:{i:0;s:6:"string";i:1;s:25:"Password to connect with.";}}s:6:"return";a:2:{i:0;s:5:"mixed";i:1;s:32:"Returns handler connection value";}s:5:"other";a:2:{i:0;s:12:"@depreciated";i:1;s:19:"@see handler_init()";}s:11:"other_index";a:2:{s:12:"@depreciated";a:1:{i:0;s:1:" ";}s:4:"@see";a:1:{i:0;s:15:"handler_init() ";}}}s:7:"content";a:2:{i:0;s:503:"
-                       // Overriding the _DEFAULT handler configuration of username, password, localhost and database name:
-               $this->handlerCfg['_DEFAULT']['config']['username'] = $TYPO3_db_username;
-               $this->handlerCfg['_DEFAULT']['config']['password'] = $TYPO3_db_password;
-               $this->handlerCfg['_DEFAULT']['config']['host'] = $TYPO3_db_host;
-               $this->handlerCfg['_DEFAULT']['config']['database'] = TYPO3_db;
-
-                       // Initializing and output value:
-               $sqlResult = $this->handler_init('_DEFAULT');
-               return $sqlResult;
-       }
-
-       ";i:1;i:0;}s:12:"content_size";i:503;s:13:"content_lines";i:12;s:6:"atLine";i:832;}i:39;a:7:{s:6:"header";s:35:"function sql_select_db($TYPO3_db)       {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:5:{s:4:"text";s:40:"
-
-Select database for _DEFAULT handler.
-";s:5:"param";a:1:{i:0;a:2:{i:0;s:6:"string";i:1;s:23:"Database to connect to.";}}s:6:"return";a:2:{i:0;s:7:"boolean";i:1;s:97:"Always returns true; function is obsolete, database selection is made in handler_init() function!";}s:5:"other";a:1:{i:0;s:12:"@depreciated";}s:11:"other_index";a:1:{s:12:"@depreciated";a:1:{i:0;s:1:" ";}}}s:7:"content";a:2:{i:0;s:161:"           return TRUE;
-       }
-
-
-
-
-
-
-
-
-
-
-       
-
-
-
-
-
-
-
-
-
-
-
-       
-
-
-       /************************************
-        * 
-        * Handler management
-        * 
-        **************************************/
-
-       ";i:1;i:0;}s:12:"content_size";i:161;s:13:"content_lines";i:33;s:6:"atLine";i:852;}i:41;a:8:{s:6:"header";s:47:"function handler_getFromTableList($tableList)   {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:11:"sectionText";a:1:{i:0;s:18:"Handler management";}s:4:"cDat";a:3:{s:4:"text";s:294:"
-
-Return the handler key pointing to an appropriate database handler as found in $this->handlerCfg array
-Notice: TWO or more tables in the table list MUST use the SAME handler key - otherwise a fatal error is thrown! (Logically, no database can possibly join two tables from separate sources!)
-";s:5:"param";a:1:{i:0;a:2:{i:0;s:6:"string";i:1;s:79:"Table list, eg. "pages" or "pages, tt_content" or "pages AS A, tt_content AS B"";}}s:6:"return";a:2:{i:0;s:6:"string";i:1;s:51:"Handler key (see $this->handlerCfg array) for table";}}s:7:"content";a:2:{i:0;s:507:"
-                       // Get tables separated:
-               $tableArray = $this->SQLparser->parseFromTables($tableList);
-               
-                       // If success, traverse the tables:
-               if (is_array($tableArray) && count($tableArray))        {
-                       foreach($tableArray as $vArray) {
-                       
-                                       // Find handler key, select "_DEFAULT" if none is specifically configured:
-                               $handlerKey = $this->table2handlerKeys[$vArray['table']] ? $thi
-[...]
-handler key:
-                       return $outputHandlerKey;
-               } else {
-                       die('DBAL fatal error: No tables found: "'.$tableList.'"');
-               }
-       }
-
-       ";i:1;i:1;}s:12:"content_size";i:1067;s:13:"content_lines";i:31;s:6:"atLine";i:893;}i:43;a:7:{s:6:"header";s:36:"function handler_init($handlerKey)     {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:5:{s:4:"text";s:46:"
-
-Initialize handler (connecting to database)
-";s:5:"param";a:1:{i:0;a:2:{i:0;s:6:"string";i:1;s:11:"Handler key";}}s:6:"return";a:2:{i:0;s:7:"boolean";i:1;s:36:"If connection went well, return true";}s:5:"other";a:1:{i:0;s:31:"@see handler_getFromTableList()";}s:11:"other_index";a:1:{s:4:"@see";a:1:{i:0;s:27:"handler_getFromTableList() ";}}}s:7:"content";a:2:{i:0;s:507:"
-                       // Find handler configuration:
-               $cfgArray = $this->handlerCfg[$handlerKey];
-               $handlerType = (string)$cfgArray['type'];
-               $output = FALSE;
-               
-               if (is_array($cfgArray))        {
-                       switch($handlerType)    {
-                               case 'native':
-                                       $link = mysql_pconnect(
-                                                                       $cfgArray['config']['host'], 
-                                                                       $cfgArray['config']['username'], 
-                                                                       $cfgArray['config']['password']
-               
-[...]
-
-
-
-
-
-
-
-
-       /************************************
-        * 
-        * Table/Field mapping
-        * 
-        **************************************/
-
-       ";i:1;i:1;}s:12:"content_size";i:2638;s:13:"content_lines";i:101;s:6:"atLine";i:932;}i:45;a:8:{s:6:"header";s:62:"function map_needMapping($tableList,$fieldMappingOnly=FALSE)  {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:11:"sectionText";a:1:{i:0;s:19:"Table/Field mapping";}s:4:"cDat";a:3:{s:4:"text";s:48:"
-
-Checks if mapping is needed for a table(list)
-";s:5:"param";a:2:{i:0;a:2:{i:0;s:6:"string";i:1;s:23:"List of tables in query";}i:1;a:2:{i:0;s:7:"boolean";i:1;s:93:"If true, it will check only if FIELDs are configured and ignore the mapped table name if any.";}}s:6:"return";a:2:{i:0;s:5:"mixed";i:1;s:107:"Returns an array of table names (parsed version of input table) if mapping is needed, otherwise just false.";}}s:7:"content";a:2:{i:0;s:342:"              $tables = $this->SQLparser->parseFromTables($tableList);
-               if (is_array($tables))  {
-                       foreach($tables as $tableCfg)   {
-                               if ($fieldMappingOnly)  {
-                                       if (is_array($this->mapping[$tableCfg['table']]['mapFieldNames']))      return $tables;
-                               } else {
-                                       if (is_array($this->mapping[$tableCfg['table']]))       return $tables;
-                               }
-                       }
-               }
-       }
-
-       ";i:1;i:0;}s:12:"content_size";i:342;s:13:"content_lines";i:12;s:6:"atLine";i:1041;}i:47;a:7:{s:6:"header";s:52:"function map_assocArray($input,$tables,$rev=FALSE)     {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:3:{s:4:"text";s:494:"
-
-Takes an associated array with field => value pairs and remaps the field names if configured for this table in $this->mapping array.
-Be careful not to map a field name to another existing fields name (although you can use this to swap fieldnames of course...:-)
-Observe mapping problems with join-results (more than one table): Joined queries should always prefix the table name to avoid problems with this.
-Observe that alias fields are not mapped of course (should not be a problem though)
-";s:5:"param";a:3:{i:0;a:2:{i:0;s:5:"array";i:1;s:29:"Input array, associative keys";}i:1;a:2:{i:0;s:5:"array";i:1;s:343:"Array of tables from the query. Normally just one table; many tables in case of a join. NOTICE: for multiple tables (with joins) there MIGHT occur trouble with fields of the same name in the two tables: This function traverses the mapping information for BOTH tables and applies mapping without checking from which table the field really came!";}i:2;a:2:{i:0;s:7:"boolean";i:1;s:145:"If true, reverse direction. Default direction is to map an array going INTO the database (thus mapping TYPO3 fieldnames to PHYSICAL field names!)";}}s:6:"return";a:2:{i:0;s:5:"array";i:1;s:43:"Output array, with mapped associative keys.";}}s:7:"content";a:2:{i:0;s:507:"
-                       // Traverse tables from query (hopefully only one table):
-               foreach($tables as $tableCfg)   {
-                       if (is_array($this->mapping[$tableCfg['table']]['mapFieldNames']))      {
-                       
-                                       // Get the map (reversed if needed):
-                               if ($rev)       {
-                                       $theMap = array_flip($this->mapping[$tableCfg['table']]['mapFieldNames']);
-                               } else {
-                                       $theMap = $this->mapping[$tableCfg['table']]['m
-[...]
-       $input = $output;
-                       }
-               }
-
-                       // Return input array (which might have been altered in the mean time)
-               return $input;
-       }
-
-       ";i:1;i:1;}s:12:"content_size";i:950;s:13:"content_lines";i:36;s:6:"atLine";i:1065;}i:49;a:7:{s:6:"header";s:101:"function map_remapSELECTQueryParts(&$select_fields,&$from_table,&$where_clause,&$groupBy,&$orderBy)   {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:5:{s:4:"text";s:100:"
-
-Remaps table/field names in a SELECT query's parts
-Notice: All arguments are passed by reference!
-";s:5:"param";a:5:{i:0;a:2:{i:0;s:6:"string";i:1;s:101:"List of fields to select from the table. This is what comes right after "SELECT ...". Required value.";}i:1;a:2:{i:0;s:6:"string";i:1;s:88:"Table(s) from which to select. This is what comes right after "FROM ...". Require value.";}i:2;a:2:{i:0;s:6:"string";i:1;s:71:"Where clause. This is what comes right after "WHERE ...". Can be blank.";}i:3;a:2:{i:0;s:6:"string";i:1;s:17:"Group by field(s)";}i:4;a:2:{i:0;s:6:"string";i:1;s:17:"Order by field(s)";}}s:6:"return";a:2:{i:0;s:4:"void";i:1;s:0:"";}s:5:"other";a:1:{i:0;s:23:"@see exec_SELECTquery()";}s:11:"other_index";a:1:{s:4:"@see";a:1:{i:0;s:19:"exec_SELECTquery() ";}}}s:7:"content";a:2:{i:0;s:507:"               
-                       // Tables:
-               $tables = $this->SQLparser->parseFromTables($from_table);
-               $defaultTable = $tables[0]['table'];
-               foreach($tables as $k => $v)    {
-                       if ($this->mapping[$v['table']]['mapTableName'])        {
-                               $tables[$k]['table'] = $this->mapping[$v['table']]['mapTableName'];
-                       }
-               }       
-               $from_table = $this->SQLparser->compileFromTables($tables);
-
-                       // Where clause:
-               $wher
-[...]
-erBy);
-               $this->map_sqlParts($expFields,$defaultTable);
-               $orderBy = $this->SQLparser->compileSelectFields($expFields);
-       }
-
-       ";i:1;i:1;}s:12:"content_size";i:1164;s:13:"content_lines";i:32;s:6:"atLine";i:1114;}i:51;a:7:{s:6:"header";s:54:"function map_sqlParts(&$sqlPartArray, $defaultTable)  {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:6:{s:4:"text";s:77:"
-
-Generic mapping of table/field names arrays (as parsed by t3lib_sqlengine)
-";s:5:"param";a:2:{i:0;a:2:{i:0;s:5:"array";i:1;s:109:"Array with parsed SQL parts; Takes both fields, tables, where-parts, group and order-by. Passed by reference.";}i:1;a:2:{i:0;s:6:"string";i:1;s:66:"Default table name to assume if no table is found in $sqlPartArray";}}s:6:"return";a:2:{i:0;s:4:"void";i:1;s:0:"";}s:6:"access";s:7:"private";s:5:"other";a:1:{i:0;s:32:"@see map_remapSELECTQueryParts()";}s:11:"other_index";a:1:{s:4:"@see";a:1:{i:0;s:28:"map_remapSELECTQueryParts() ";}}}s:7:"content";a:2:{i:0;s:507:"
-                       // Traverse sql Part array:
-               if (is_array($sqlPartArray))    {
-                       foreach($sqlPartArray as $k => $v)      {
-
-                                       // Look for sublevel (WHERE parts only)
-                               if (is_array($sqlPartArray[$k]['sub'])) {
-                                       $this->map_sqlParts($sqlPartArray[$k]['sub'], $defaultTable);   // Call recursively!
-                               } else {
-                                               // For the field, look for table mapping (generic):
-                                       $t = $sqlPartA
-[...]
-
-
-
-
-
-
-
-
-
-
-
-
-
-       
-
-
-       /**************************************
-        *
-        * Debugging
-        *
-        **************************************/
-       
-       ";i:1;i:1;}s:12:"content_size";i:1088;s:13:"content_lines";i:49;s:6:"atLine";i:1156;}i:53;a:8:{s:6:"header";s:52:"function debugHandler($function,$execTime,$inData)    {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:11:"sectionText";a:1:{i:0;s:9:"Debugging";}s:4:"cDat";a:4:{s:4:"text";s:16:"
-
-Debug handler
-";s:5:"param";a:3:{i:0;a:2:{i:0;s:6:"string";i:1;s:49:"Function name from which this function is called.";}i:1;a:2:{i:0;s:6:"string";i:1;s:33:"Execution time in ms of the query";}i:2;a:2:{i:0;s:5:"array";i:1;s:25:"In-data of various kinds.";}}s:6:"return";a:2:{i:0;s:4:"void";i:1;s:0:"";}s:6:"access";s:7:"private";}s:7:"content";a:2:{i:0;s:507:"             global $TYPO3_CONF_VARS;
-               
-               switch($function)       {
-                       case 'exec_SELECTquery':
-
-                                       // Initialize:
-                               $data = array();
-                               $errorFlag = 0;
-                               $joinTable = '';
-
-                                       // Check error:
-                               if ($this->sql_error()) {
-                                       $data['sqlError'] = $this->sql_error();
-                                       $errorFlag|=1;
-                               }
-
-                                       // Get explain data:
-                               if ($TYPO3_CONF_VARS['EXTCONF']['dbal']['debugOptions']['E
-[...]
-inTable,$errorFlag);
-                       break;                  
-                       case 'exec_INSERTquery':
-                               // Filter out tx_dbal_debuglog table!!!
-                       break;
-               }
-       }
-
-       ";i:1;i:1;}s:12:"content_size";i:1875;s:13:"content_lines";i:55;s:6:"atLine";i:1215;}i:55;a:4:{s:6:"header";s:55:"function debug_log($query,$ms,$data,$join,$errorFlag) {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:3:{s:4:"text";s:30:"
-
-Insert row in the log table
-";s:5:"param";a:5:{i:0;a:2:{i:0;s:6:"string";i:1;s:17:"The current query";}i:1;a:2:{i:0;s:7:"integer";i:1;s:39:"Execution time of query in milliseconds";}i:2;a:2:{i:0;s:5:"array";i:1;s:29:"Data to be stored serialized.";}i:3;a:2:{i:0;s:6:"string";i:1;s:31:"Join string if there IS a join.";}i:4;a:2:{i:0;s:7:"integer";i:1;s:13:"Error status.";}}s:6:"return";a:2:{i:0;s:4:"void";i:1;s:0:"";}}s:6:"atLine";i:1281;}i:57;a:7:{s:6:"header";s:32:"function debug_explain($query)        {";s:11:"parentClass";s:11:"ux_t3lib_DB";s:4:"cDat";a:5:{s:4:"text";s:44:"
-
-Perform EXPLAIN query on DEFAULT handler!
-";s:5:"param";a:1:{i:0;a:2:{i:0;s:6:"string";i:1;s:12:"SELECT Query";}}s:6:"return";a:2:{i:0;s:5:"array";i:1;s:35:"The Explain result rows in an array";}s:5:"other";a:1:{i:0;s:121:"@todo     Not supporting other than the default handler? And what about DBMS of other kinds than MySQl - support for EXPLAIN?";}s:11:"other_index";a:1:{s:5:"@todo";a:1:{i:0;s:115:"Not supporting other than the default handler? And what about DBMS of other kinds than MySQl - support for EXPLAIN?";}}}s:7:"content";a:2:{i:0;s:365:"                $res = $this->sql_query('EXPLAIN '.$query);
-               
-               $output = array();
-               while($row = $this->sql_fetch_assoc($res))      {
-                       $output[] = $row;
-               }
-               return $output;
-       }
-}
-
-
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dbal/class.ux_t3lib_db.php']) {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/dbal/class.ux_t3lib_db.php']);
-}
-?>";i:1;i:0;}s:12:"content_size";i:365;s:13:"content_lines";i:14;s:6:"atLine";i:1307;}}s:10:"usageCount";a:29:{s:12:"H_8f6fb71e0a";a:2:{s:24:"_searchtime_milliseconds";d:140;s:15:"_functionHeader";s:36:"class ux_t3lib_DB extends t3lib_DB {";}s:12:"H_1ed75ac0ec";a:2:{s:24:"_searchtime_milliseconds";d:27;s:15:"_functionHeader";s:24:"function ux_t3lib_DB()    {";}s:12:"H_9b291e60c2";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:2;s:5:"TOTAL";i:2;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:2;s:5:"TOTAL";i:2;}s:24:"_searchtime_milliseconds";d:41;s:15:"_functionHeader";s:50:"function exec_INSERTquery($table,$fields_values)   {";}s:12:"H_495e478a6a";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:38;s:15:"_functionHeader";s:57:"function exec_UPDATEquery($table,$where,$fields_values)    {";}s:12:"H_7cdface6fe";a:5:{s:3:"ALL";a:2:{s:11:"objectUsage";i:2;s:5:"TOTAL";i:2;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_19aaeae789";a:3:{s:8:"fileName";s:14:"mod1/index.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:31;s:15:"_functionHeader";s:42:"function exec_DELETEquery($table,$where)   {";}s:12:"H_01a2a95614";a:5:{s:3:"ALL";a:2:{s:11:"objectUsage";i:5;s:5:"TOTAL";i:5;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_19aaeae789";a:3:{s:8:"fileName";s:14:"mod1/index.php";s:11:"objectUsage";i:4;s:5:"TOTAL";i:4;}s:24:"_searchtime_milliseconds";d:32;s:15:"_functionHeader";s:103:"function exec_SELECTquery($select_fields,$from_table,$where_clause,$groupBy='',$orderBy='',$limit='')     {";}s:12:"H_4e4ae1f4ef";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:4;s:5:"TOTAL";i:4;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:4;s:5:"TOTAL";i:4;}s:24:"_searchtime_milliseconds";d:36;s:15:"_functionHeader";s:36:"function quoteStr($str, $table='') {";}s:12:"H_892599bebf";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:13;s:5:"TOTAL";i:13;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:13;s:5:"TOTAL";i:13;}s:24:"_searchtime_milliseconds";d:40;s:15:"_functionHeader";s:22:"function sql_error()   {";}s:12:"H_8d43f5d2ae";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:31;s:15:"_functionHeader";s:30:"function sql_num_rows(&$res)       {";}s:12:"H_5181bf7aac";a:5:{s:3:"ALL";a:2:{s:11:"objectUsage";i:6;s:5:"TOTAL";i:6;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:2;s:5:"TOTAL";i:2;}s:14:"MD5_19aaeae789";a:3:{s:8:"fileName";s:14:"mod1/index.php";s:11:"objectUsage";i:4;s:5:"TOTAL";i:4;}s:24:"_searchtime_milliseconds";d:42;s:15:"_functionHeader";s:33:"function sql_fetch_assoc(&$res)    {";}s:12:"H_bccce8f7cd";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:38;s:15:"_functionHeader";s:31:"function sql_fetch_row(&$res)      {";}s:12:"H_6353c9f458";a:2:{s:24:"_searchtime_milliseconds";d:26;s:15:"_functionHeader";s:33:"function sql_free_result(&$res)  {";}s:12:"H_f3e8361680";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:33;s:15:"_functionHeader";s:26:"function sql_insert_id()   {";}s:12:"H_dd660adb4f";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:38;s:15:"_functionHeader";s:30:"function sql_affected_rows()       {";}s:12:"H_1f65efe545";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:40;s:15:"_functionHeader";s:37:"function sql_data_seek(&$res,$seek)        {";}s:12:"H_6500d2e72c";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:39;s:15:"_functionHeader";s:41:"function sql_field_type(&$res,$pointer)    {";}s:12:"H_b1e4dfc159";a:2:{s:24:"_searchtime_milliseconds";d:108;s:15:"_functionHeader";s:26:"function sql($db,$query)        {";}s:12:"H_f19a7d1301";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:3;s:5:"TOTAL";i:3;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:3;s:5:"TOTAL";i:3;}s:24:"_searchtime_milliseconds";d:34;s:15:"_functionHeader";s:28:"function sql_query($query) {";}s:12:"H_bbcdd0ae60";a:2:{s:24:"_searchtime_milliseconds";d:27;s:15:"_functionHeader";s:79:"function sql_pconnect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password)    {";}s:12:"H_ea759c7f5c";a:2:{s:24:"_searchtime_milliseconds";d:28;s:15:"_functionHeader";s:35:"function sql_select_db($TYPO3_db)        {";}s:12:"H_7e9bf23e5c";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:5;s:5:"TOTAL";i:5;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:5;s:5:"TOTAL";i:5;}s:24:"_searchtime_milliseconds";d:34;s:15:"_functionHeader";s:47:"function handler_getFromTableList($tableList)      {";}s:12:"H_786597a06d";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:2;s:5:"TOTAL";i:2;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:2;s:5:"TOTAL";i:2;}s:24:"_searchtime_milliseconds";d:39;s:15:"_functionHeader";s:36:"function handler_init($handlerKey) {";}s:12:"H_6692461e04";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:5;s:5:"TOTAL";i:5;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:5;s:5:"TOTAL";i:5;}s:24:"_searchtime_milliseconds";d:50;s:15:"_functionHeader";s:62:"function map_needMapping($tableList,$fieldMappingOnly=FALSE)       {";}s:12:"H_2c264fccae";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:3;s:5:"TOTAL";i:3;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:3;s:5:"TOTAL";i:3;}s:24:"_searchtime_milliseconds";d:40;s:15:"_functionHeader";s:52:"function map_assocArray($input,$tables,$rev=FALSE) {";}s:12:"H_2d361fc305";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:47;s:15:"_functionHeader";s:101:"function map_remapSELECTQueryParts(&$select_fields,&$from_table,&$where_clause,&$groupBy,&$orderBy)       {";}s:12:"H_c0c608ecd6";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:7;s:5:"TOTAL";i:7;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:7;s:5:"TOTAL";i:7;}s:24:"_searchtime_milliseconds";d:59;s:15:"_functionHeader";s:54:"function map_sqlParts(&$sqlPartArray, $defaultTable)       {";}s:12:"H_f1aaae87bd";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:36;s:15:"_functionHeader";s:52:"function debugHandler($function,$execTime,$inData) {";}s:12:"H_b5c67ebe7b";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:44;s:15:"_functionHeader";s:55:"function debug_log($query,$ms,$data,$join,$errorFlag)      {";}s:12:"H_4425106f29";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_9a0025a766";a:3:{s:8:"fileName";s:21:"class.ux_t3lib_db.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:40;s:15:"_functionHeader";s:32:"function debug_explain($query)     {";}}}s:14:"MD5_19aaeae789";a:5:{s:8:"filename";s:14:"mod1/index.php";s:8:"filesize";i:8372;s:6:"header";a:5:{s:4:"text";s:50:"
-
-Script class; Backend module for DBAL extension
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}s:5:"other";a:3:{i:0;s:42:"@author       Kasper Skaarhoj <kasper@typo3.com>";i:1;s:14:"@package TYPO3";i:2;s:19:"@subpackage tx_dbal";}s:11:"other_index";a:3:{s:7:"@author";a:1:{i:0;s:34:"Kasper Skaarhoj <kasper@typo3.com>";}s:8:"@package";a:1:{i:0;s:6:"TYPO3 ";}s:11:"@subpackage";a:1:{i:0;s:8:"tx_dbal ";}}}s:3:"DAT";a:5:{i:1;a:8:{s:6:"header";s:44:"class tx_dbal_module1 extends t3lib_SCbase {";s:5:"class";i:1;s:11:"parentClass";s:15:"tx_dbal_module1";s:4:"cDat";a:5:{s:4:"text";s:50:"
-
-Script class; Backend module for DBAL extension
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}s:5:"other";a:3:{i:0;s:42:"@author       Kasper Skaarhoj <kasper@typo3.com>";i:1;s:14:"@package TYPO3";i:2;s:19:"@subpackage tx_dbal";}s:11:"other_index";a:3:{s:7:"@author";a:1:{i:0;s:34:"Kasper Skaarhoj <kasper@typo3.com>";}s:8:"@package";a:1:{i:0;s:6:"TYPO3 ";}s:11:"@subpackage";a:1:{i:0;s:8:"tx_dbal ";}}}s:7:"content";a:2:{i:0;s:2:"
-       ";i:1;i:-1;}s:12:"content_size";i:2;s:13:"content_lines";i:1;s:6:"atLine";i:51;}i:3;a:7:{s:6:"header";s:23:"function menuConfig()       {";s:11:"parentClass";s:15:"tx_dbal_module1";s:4:"cDat";a:3:{s:4:"text";s:75:"
-
-Adds items to the ->MOD_MENU array. Used for the function menu selector.
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:4:"void";i:1;s:0:"";}}s:7:"content";a:2:{i:0;s:138:"               $this->MOD_MENU = Array (
-                       'function' => Array (
-                               0 => $GLOBALS['LANG']->getLL('Debug_log')
-                       )
-               );
-               parent::menuConfig();
-       }
-
-       ";i:1;i:0;}s:12:"content_size";i:138;s:13:"content_lines";i:8;s:6:"atLine";i:58;}i:5;a:7:{s:6:"header";s:17:"function main()    {";s:11:"parentClass";s:15:"tx_dbal_module1";s:4:"cDat";a:3:{s:4:"text";s:67:"
-
-Main function of the module. Write the content to $this->content
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:4:"void";i:1;s:0:"";}}s:7:"content";a:2:{i:0;s:507:"               global $BACK_PATH,$BE_USER;
-
-                       // Draw the header.
-               $this->doc = t3lib_div::makeInstance('noDoc');
-               $this->doc->backPath = $BACK_PATH;
-               $this->doc->form='<form action="" method="post">';
-               $this->doc->docType = 'xhtml_trans';
-
-                       // DBAL page title:
-               $this->content.=$this->doc->startPage($GLOBALS['LANG']->getLL('title'));
-               $this->content.=$this->doc->header($GLOBAL
-[...]
-on('id',implode(',',array_keys($this->MOD_MENU)),$this->MCONF['name']));
-               }
-
-               $this->content.=$this->doc->spacer(10);
-       }
-
-       ";i:1;i:1;}s:12:"content_size";i:1006;s:13:"content_lines";i:25;s:6:"atLine";i:72;}i:7;a:4:{s:6:"header";s:25:"function printContent()  {";s:11:"parentClass";s:15:"tx_dbal_module1";s:4:"cDat";a:3:{s:4:"text";s:29:"
-
-Prints out the module HTML
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:4:"void";i:1;s:0:"";}}s:6:"atLine";i:103;}i:9;a:7:{s:6:"header";s:24:"function printLogMgm()       {";s:11:"parentClass";s:15:"tx_dbal_module1";s:4:"cDat";a:3:{s:4:"text";s:121:"
-
-Printing the debug-log from the DBAL extension
-To enabled debugging, you will have to enabled it in the configuration!
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:6:"string";i:1;s:12:"HTML content";}}s:7:"content";a:2:{i:0;s:507:"
-                       // Disable debugging in any case...
-               $GLOBALS['TYPO3_DB']->debug = FALSE;
-
-                       // Get cmd:
-               $cmd = (string)t3lib_div::_GP('cmd');
-               switch($cmd)    {
-                       case 'flush':
-                               $res = $GLOBALS['TYPO3_DB']->exec_DELETEquery('tx_dbal_debuglog','');
-                               $outStr = 'Log FLUSHED!';
-                       break;
-                       case 'joins':
-                       
-                                       // Query:
-                               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('table
-[...]
-/ Make instance:
-$SOBE = t3lib_div::makeInstance('tx_dbal_module1');
-$SOBE->init();
-$SOBE->main();
-$SOBE->printContent();
-
-?>";i:1;i:1;}s:12:"content_size";i:4883;s:13:"content_lines";i:167;s:6:"atLine";i:117;}}s:10:"usageCount";a:5:{s:12:"H_68ca39e043";a:4:{s:3:"ALL";a:2:{s:12:"makeinstance";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_19aaeae789";a:3:{s:8:"fileName";s:14:"mod1/index.php";s:12:"makeinstance";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:74;s:15:"_functionHeader";s:44:"class tx_dbal_module1 extends t3lib_SCbase {";}s:12:"H_759a824b85";a:4:{s:3:"ALL";a:2:{s:14:"nonObjectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_19aaeae789";a:3:{s:8:"fileName";s:14:"mod1/index.php";s:14:"nonObjectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:29;s:15:"_functionHeader";s:23:"function menuConfig()        {";}s:12:"H_9c2550bb82";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_19aaeae789";a:3:{s:8:"fileName";s:14:"mod1/index.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:37;s:15:"_functionHeader";s:17:"function main()   {";}s:12:"H_a337945941";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_19aaeae789";a:3:{s:8:"fileName";s:14:"mod1/index.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:34;s:15:"_functionHeader";s:25:"function printContent()   {";}s:12:"H_dec4fa07f3";a:4:{s:3:"ALL";a:2:{s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:14:"MD5_19aaeae789";a:3:{s:8:"fileName";s:14:"mod1/index.php";s:11:"objectUsage";i:1;s:5:"TOTAL";i:1;}s:24:"_searchtime_milliseconds";d:37;s:15:"_functionHeader";s:24:"function printLogMgm()    {";}}}s:14:"MD5_54e319931e";a:5:{s:8:"filename";s:43:"handlers/class.tx_dbal_handler_rawmysql.php";s:8:"filesize";i:5559;s:6:"header";a:5:{s:4:"text";s:79:"
-
-Example DBAL userdefined handler class
-It simply makes pass-through of MySQL
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}s:5:"other";a:3:{i:0;s:42:"@author       Kasper Skaarhoj <kasper@typo3.com>";i:1;s:14:"@package TYPO3";i:2;s:19:"@subpackage tx_dbal";}s:11:"other_index";a:3:{s:7:"@author";a:1:{i:0;s:34:"Kasper Skaarhoj <kasper@typo3.com>";}s:8:"@package";a:1:{i:0;s:6:"TYPO3 ";}s:11:"@subpackage";a:1:{i:0;s:8:"tx_dbal ";}}}s:3:"DAT";a:16:{i:1;a:8:{s:6:"header";s:56:"class tx_dbal_handler_rawmysql extends t3lib_sqlengine {";s:5:"class";i:1;s:11:"parentClass";s:24:"tx_dbal_handler_rawmysql";s:4:"cDat";a:5:{s:4:"text";s:79:"
-
-Example DBAL userdefined handler class
-It simply makes pass-through of MySQL
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}s:5:"other";a:3:{i:0;s:42:"@author       Kasper Skaarhoj <kasper@typo3.com>";i:1;s:14:"@package TYPO3";i:2;s:19:"@subpackage tx_dbal";}s:11:"other_index";a:3:{s:7:"@author";a:1:{i:0;s:34:"Kasper Skaarhoj <kasper@typo3.com>";}s:8:"@package";a:1:{i:0;s:6:"TYPO3 ";}s:11:"@subpackage";a:1:{i:0;s:8:"tx_dbal ";}}}s:7:"content";a:2:{i:0;s:3:"
-
-       ";i:1;i:-1;}s:12:"content_size";i:3;s:13:"content_lines";i:2;s:6:"atLine";i:78;}i:3;a:7:{s:6:"header";s:24:"function init($config)      {";s:11:"parentClass";s:24:"tx_dbal_handler_rawmysql";s:4:"cDat";a:3:{s:4:"text";s:25:"
-
-[Describe function...]
-";s:5:"param";a:1:{i:0;a:2:{i:0;s:6:"[type]";i:1;s:12:"$config: ...";}}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}}s:7:"content";a:2:{i:0;s:5:" }
-
-       ";i:1;i:0;}s:12:"content_size";i:5;s:13:"content_lines";i:2;s:6:"atLine";i:87;}i:5;a:7:{s:6:"header";s:50:"function exec_INSERTquery($table,$fields_values)     {";s:11:"parentClass";s:24:"tx_dbal_handler_rawmysql";s:4:"cDat";a:3:{s:4:"text";s:25:"
-
-[Describe function...]
-";s:5:"param";a:2:{i:0;a:2:{i:0;s:6:"[type]";i:1;s:11:"$table: ...";}i:1;a:2:{i:0;s:6:"[type]";i:1;s:19:"$fields_values: ...";}}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}}s:7:"content";a:2:{i:0;s:5:"        }
-
-       ";i:1;i:0;}s:12:"content_size";i:5;s:13:"content_lines";i:2;s:6:"atLine";i:97;}i:7;a:7:{s:6:"header";s:57:"function exec_UPDATEquery($table,$where,$fields_values)      {";s:11:"parentClass";s:24:"tx_dbal_handler_rawmysql";s:4:"cDat";a:3:{s:4:"text";s:25:"
-
-[Describe function...]
-";s:5:"param";a:3:{i:0;a:2:{i:0;s:6:"[type]";i:1;s:11:"$table: ...";}i:1;a:2:{i:0;s:6:"[type]";i:1;s:11:"$where: ...";}i:2;a:2:{i:0;s:6:"[type]";i:1;s:19:"$fields_values: ...";}}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}}s:7:"content";a:2:{i:0;s:5:"      }
-
-       ";i:1;i:0;}s:12:"content_size";i:5;s:13:"content_lines";i:2;s:6:"atLine";i:108;}i:9;a:7:{s:6:"header";s:42:"function exec_DELETEquery($table,$where)    {";s:11:"parentClass";s:24:"tx_dbal_handler_rawmysql";s:4:"cDat";a:3:{s:4:"text";s:25:"
-
-[Describe function...]
-";s:5:"param";a:2:{i:0;a:2:{i:0;s:6:"[type]";i:1;s:11:"$table: ...";}i:1;a:2:{i:0;s:6:"[type]";i:1;s:11:"$where: ...";}}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}}s:7:"content";a:2:{i:0;s:5:"        }
-
-       ";i:1;i:0;}s:12:"content_size";i:5;s:13:"content_lines";i:2;s:6:"atLine";i:118;}i:11;a:7:{s:6:"header";s:94:"function exec_SELECTquery($select_fields,$from_table,$where_clause,$groupBy,$orderBy,$limit)       {";s:11:"parentClass";s:24:"tx_dbal_handler_rawmysql";s:4:"cDat";a:3:{s:4:"text";s:25:"
-
-[Describe function...]
-";s:5:"param";a:6:{i:0;a:2:{i:0;s:6:"[type]";i:1;s:19:"$select_fields: ...";}i:1;a:2:{i:0;s:6:"[type]";i:1;s:16:"$from_table: ...";}i:2;a:2:{i:0;s:6:"[type]";i:1;s:18:"$where_clause: ...";}i:3;a:2:{i:0;s:6:"[type]";i:1;s:13:"$groupBy: ...";}i:4;a:2:{i:0;s:6:"[type]";i:1;s:13:"$orderBy: ...";}i:5;a:2:{i:0;s:6:"[type]";i:1;s:11:"$limit: ...";}}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}}s:7:"content";a:2:{i:0;s:210:"              $res = t3lib_div::makeInstance('tx_dbal_handler_rawmysql_sqlObj');
-               $res->result = mysql(TYPO3_db, $this->SELECTquery($select_fields,$from_table,$where_clause,$groupBy,$orderBy,$limit));
-               return $res;
-       }
-
-       ";i:1;i:0;}s:12:"content_size";i:210;s:13:"content_lines";i:5;s:6:"atLine";i:132;}i:13;a:7:{s:6:"header";s:22:"function sql_error()     {";s:11:"parentClass";s:24:"tx_dbal_handler_rawmysql";s:4:"cDat";a:3:{s:4:"text";s:25:"
-
-[Describe function...]
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}}s:7:"content";a:2:{i:0;s:5:"    }
-
-       ";i:1;i:0;}s:12:"content_size";i:5;s:13:"content_lines";i:2;s:6:"atLine";i:143;}i:15;a:7:{s:6:"header";s:26:"function sql_insert_id()   {";s:11:"parentClass";s:24:"tx_dbal_handler_rawmysql";s:4:"cDat";a:3:{s:4:"text";s:25:"
-
-[Describe function...]
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}}s:7:"content";a:2:{i:0;s:5:"    }
-
-       ";i:1;i:0;}s:12:"content_size";i:5;s:13:"content_lines";i:2;s:6:"atLine";i:151;}i:17;a:7:{s:6:"header";s:30:"function sql_affected_rows()       {";s:11:"parentClass";s:24:"tx_dbal_handler_rawmysql";s:4:"cDat";a:3:{s:4:"text";s:25:"
-
-[Describe function...]
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}}s:7:"content";a:2:{i:0;s:5:"    }
-
-       ";i:1;i:0;}s:12:"content_size";i:5;s:13:"content_lines";i:2;s:6:"atLine";i:159;}i:19;a:7:{s:6:"header";s:28:"function sql_query($query) {";s:11:"parentClass";s:24:"tx_dbal_handler_rawmysql";s:4:"cDat";a:3:{s:4:"text";s:25:"
-
-[Describe function...]
-";s:5:"param";a:1:{i:0;a:2:{i:0;s:6:"[type]";i:1;s:11:"$query: ...";}}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}}s:7:"content";a:2:{i:0;s:127:"                $res = t3lib_div::makeInstance('tx_dbal_handler_rawmysql_sqlObj');
-               $res->result = mysql_query($query);
-               return $res;
-       }
-
-       ";i:1;i:0;}s:12:"content_size";i:127;s:13:"content_lines";i:5;s:6:"atLine";i:168;}i:21;a:7:{s:6:"header";s:25:"function quoteStr($str)  {";s:11:"parentClass";s:24:"tx_dbal_handler_rawmysql";s:4:"cDat";a:3:{s:4:"text";s:25:"
-
-[Describe function...]
-";s:5:"param";a:1:{i:0;a:2:{i:0;s:6:"[type]";i:1;s:9:"$str: ...";}}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}}s:7:"content";a:2:{i:0;s:39:"            return addslashes($str);
-       }
-}
-
-
-
-
-
-
-
-";i:1;i:0;}s:12:"content_size";i:39;s:13:"content_lines";i:10;s:6:"atLine";i:180;}i:23;a:8:{s:6:"header";s:73:"class tx_dbal_handler_rawmysql_sqlObj extends t3lib_sqlengine_resultobj {";s:5:"class";i:1;s:11:"parentClass";s:31:"tx_dbal_handler_rawmysql_sqlObj";s:4:"cDat";a:3:{s:4:"text";s:25:"
-
-[Describe function...]
-";s:5:"param";a:0:{}s:6:"return";a:2:{i:0;s:6:"[type]";i:1;s:3:"...";}}s:7:"content";a:2:{i:0;s:59:"
-       $result = '';   // Not array here, but