[TASK] Use external Core Project DBAL as Git submodule
authorOliver Hader <oliver@typo3.org>
Tue, 10 May 2011 21:01:26 +0000 (23:01 +0200)
committerOliver Hader <oliver@typo3.org>
Tue, 10 May 2011 21:02:03 +0000 (23:02 +0200)
Change-Id: Iaae5e6978096de060a1253f14de01b763048645c
Resolves: #26738
Releases: 4.2, 4.3, 4.4, 4.5, 4.6
Reviewed-on: http://review.typo3.org/2016
Reviewed-by: Oliver Hader
Tested-by: Oliver Hader
48 files changed:
.gitmodules
typo3/sysext/dbal [new submodule]
typo3/sysext/dbal/ChangeLog [deleted file]
typo3/sysext/dbal/class.tx_dbal_autoloader.php [deleted file]
typo3/sysext/dbal/class.tx_dbal_em.php [deleted file]
typo3/sysext/dbal/class.tx_dbal_installtool.php [deleted file]
typo3/sysext/dbal/class.ux_db_list_extra.php [deleted file]
typo3/sysext/dbal/class.ux_t3lib_db.php [deleted file]
typo3/sysext/dbal/class.ux_t3lib_sqlparser.php [deleted file]
typo3/sysext/dbal/doc/class.tslib_fe.php.diff [deleted file]
typo3/sysext/dbal/doc/manual.sxw [deleted file]
typo3/sysext/dbal/ext_autoload.php [deleted file]
typo3/sysext/dbal/ext_conf_template.txt [deleted file]
typo3/sysext/dbal/ext_emconf.php [deleted file]
typo3/sysext/dbal/ext_icon.gif [deleted file]
typo3/sysext/dbal/ext_localconf.php [deleted file]
typo3/sysext/dbal/ext_tables.php [deleted file]
typo3/sysext/dbal/ext_tables.sql [deleted file]
typo3/sysext/dbal/handlers/class.tx_dbal_handler_openoffice.php [deleted file]
typo3/sysext/dbal/handlers/class.tx_dbal_handler_rawmysql.php [deleted file]
typo3/sysext/dbal/handlers/class.tx_dbal_handler_xmldb.php [deleted file]
typo3/sysext/dbal/last_synched_target [deleted file]
typo3/sysext/dbal/lib/class.tx_dbal_querycache.php [deleted file]
typo3/sysext/dbal/lib/class.tx_dbal_sqlengine.php [deleted file]
typo3/sysext/dbal/lib/class.tx_dbal_tsparserext.php [deleted file]
typo3/sysext/dbal/mod1/clear.gif [deleted file]
typo3/sysext/dbal/mod1/conf.php [deleted file]
typo3/sysext/dbal/mod1/index.php [deleted file]
typo3/sysext/dbal/mod1/locallang.xml [deleted file]
typo3/sysext/dbal/mod1/locallang_mod.xml [deleted file]
typo3/sysext/dbal/mod1/moduleicon.gif [deleted file]
typo3/sysext/dbal/res/README [deleted file]
typo3/sysext/dbal/res/Templates/install.html [deleted file]
typo3/sysext/dbal/res/oracle/indexed_search.diff [deleted file]
typo3/sysext/dbal/res/oracle/realurl.diff [deleted file]
typo3/sysext/dbal/res/oracle/scheduler.diff [deleted file]
typo3/sysext/dbal/res/oracle/templavoila.diff [deleted file]
typo3/sysext/dbal/res/postgresql/postgresql-compatibility.sql [deleted file]
typo3/sysext/dbal/tests/BaseTestCase.php [deleted file]
typo3/sysext/dbal/tests/FakeDbConnection.php [deleted file]
typo3/sysext/dbal/tests/dbGeneralTest.php [deleted file]
typo3/sysext/dbal/tests/dbMssqlTest.php [deleted file]
typo3/sysext/dbal/tests/dbOracleTest.php [deleted file]
typo3/sysext/dbal/tests/dbPostgresqlTest.php [deleted file]
typo3/sysext/dbal/tests/fixtures/mssql.config.php [deleted file]
typo3/sysext/dbal/tests/fixtures/oci8.config.php [deleted file]
typo3/sysext/dbal/tests/fixtures/postgresql.config.php [deleted file]
typo3/sysext/dbal/tests/sqlParserGeneralTest.php [deleted file]

index 160fa16..f384b77 100644 (file)
@@ -4,3 +4,6 @@
 [submodule "typo3/sysext/workspaces"]
        path = typo3/sysext/workspaces
        url = git://git.typo3.org/TYPO3v4/CoreProjects/workspaces/workspaces.git
+[submodule "typo3/sysext/dbal"]
+       path = typo3/sysext/dbal
+       url = git://git.typo3.org/TYPO3v4/Extensions/dbal.git
diff --git a/typo3/sysext/dbal b/typo3/sysext/dbal
new file mode 160000 (submodule)
index 0000000..96b4ce9
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 96b4ce91b0c2645a498ed586a1c3630db4467462
diff --git a/typo3/sysext/dbal/ChangeLog b/typo3/sysext/dbal/ChangeLog
deleted file mode 100644 (file)
index a3964ca..0000000
+++ /dev/null
@@ -1,569 +0,0 @@
-2011-01-26  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Set version to 1.2.1
-
-2011-01-25  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #17221: Install tool is unable to delete database tables
-
-2011-01-24  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Set version to 1.2.0
-       * Fixed bug #17269: Search with LIKE is case sensitive on Oracle
-
-2010-12-27  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Set version to 1.2.0beta3
-
-2010-12-06  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #16679: Cannot login to backend at the end of 1-2-3 wizard when using Oracle
-
-2010-12-05  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #16677: PHP notices from XCLASS inclusions
-       * Fixed bug #16678: DBAL is active with MySQL at the end of 1-2-3 wizard
-
-2010-12-02  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #16639: Install Tool is unusable since DBAL merge
-
-2010-12-01  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Set version to 1.2.0beta2
-
-2010-12-01  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed use of undefined variable $where in method exec_INSERTquery() with MySQL handler
-       * Fixed use of undefined variable $mapping in method map_subquery()
-       * Follow-up for bug #16392: Native tables could not be retrieved anymore
-       * Code cleanup
-       * Fixed bug #16492: groupBy and orderBy fail on exec_query (thanks to Oguzhan Alan)
-
-2010-11-30  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #16501: DBAL does not support multi-column indexes in create table queries
-       * Added feature #16491: Provide a pass-through flag for sql_exec() which goes directly to the native MySQL engine
-
-2010-11-18  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #16392: Install tool cannot compare "ENGINE" of MySQL Tables when DBAL is active
-
-2010-11-17  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #16444: DBAL installs itself automatically whenever the install tool is called
-
-2010-11-14  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Set version to 1.2.0beta1
-
-2010-11-14  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added feature #15755: Allow DBAL to interact with EM to configure remapping
-
-2010-10-30  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #16179: 1-2-3 install tool wizard does not let DBAL load early enough
-       * Fixed bug #15941: Log deprecated functions (and adjust comments)
-       * Fixed bug #15960: Misleading error message in ux_t3lib_DB->cacheFieldInfo() (thanks to Martin Kuster)
-       * Fixed bug #16120: UPDATE queries fails for $GLOBALS['TYPO3_DB']->sql_query (thanks to Alan Oguzhan)
-
-2010-10-19  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Set version to 1.2.0alpha3
-
-2010-09-28  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added feature #15075: [Install] make a pre-check for required php-extensions (thanks to Jigal van Hemert)
-
-2010-09-21  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Set version to 1.2.0alpha2
-
-2010-09-20  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Merged branch QueryCache to trunk
-       * Updated documentation to describe how to use Memcached to cache prepared queries
-       * Fixed bug #15751: dbal does not parse setDBinit correctly (thanks to Tamer Erdogan)
-
-2010-08-30  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #15582: Call to deprecated function template::middle()
-
-2010-08-24  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed caching with Memcached
-       * Synchronized code from trunk
-
-2010-08-23  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #15535: Error: No pages are found on the rootlevel! in Frontend when using Oracle
-       * Updated ADOdb version dependency
-       * Set version to 1.2.0alpha1
-
-2010-08-19  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Updated caching mechanism to cache prepared queries
-       * Synchronized code from trunk
-       * Added unit test for feature #15457
-       * Added feature #15457: Add support for prepared queries
-
-2010-08-14  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Code cleanup with useless blank spaces at end of line
-
-2010-08-08  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added unit test for bug #15253: NOT LIKE is not remapped using dbms_lob.instr with Oracle
-       * Fixed bug #12535: DAM-related: Element browser crashes as where-clause cannot be parsed
-
-2010-07-27  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #15160: Queries should only be parsed once
-
-2010-07-17  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Updated PHP documentation
-
-2010-07-16  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added unit test for bug #14818: t3lib_db->listQuery() performance
-       * Fixed bug #14985: FIND_IN_SET should be used isntead of complicated LIKE where clause
-
-2010-07-11  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #15045: Trailing newlines after php closing tag
-
-2010-06-27  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Synchronized @deprecated annotations with Core
-
-2010-06-22  Jeff Segars  <jeff@webempoweredchurch.org>
-
-       * Fixed bug #14814: Improve install tool texts
-
-2010-06-19  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #3855: Log number of returned or affected rows
-       * Updated copyright year in manual
-
-2010-06-12  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #13431: Include BE:forceCharset config option (thanks to Armin Guenther)
-
-2010-06-11  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #14405: Rename the test cases from *_testcase to *Test
-
-2010-06-03  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #14479: Speed up Oracle layer by not defaulting to dbms_lob.instr for LIKE query (thanks to Michiel Roos)
-
-2010-05-28  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #7015: t3lib_DB displays wrong SQL in error case
-
-2010-05-27  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #14496: SQL parser does not handle ALTER TABLE with character set operation
-       * Fixed bug #14456: SQL parser doesn't accept ALTER TABLE statement without CHANGE, DROP or ADD keyword
-       * Fixed bug #14457: 1-2-3 Install Process breaks with PostgreSQL
-
-2010-05-21  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #14372: Mapping does not work with table alias
-       * Follow-up of changeset 32847: DBAL cannot be loaded if typo3conf/ is not writable
-
-2010-05-03  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed 1-2-3 installer crash when having only mysql available
-
-2010-05-01  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #14274: Some exception are not caught when trying to install DBAL in 1-2-3 Install Tool process
-       * Fixed bug #2186: Error installing static_info_tables
-       * Fixed bug #14265: Driver dropdown in install tool should be hidden when only MySQL is available
-
-2010-04-29  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added autoloader for Install Tool
-
-2010-04-22  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #14182: Multiple join conditions are not supported
-
-2010-04-15  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #14120: Add a method to check if database is connected
-
-2010-04-14  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Set version to 1.1.2
-
-2010-04-12  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added feature #13508: Use exec_TRUNCATEquery() instead of DELETE FROM throughout the core
-
-2010-04-06  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added skeleton of a cache for generated queries
-
-2010-03-07  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #4640: Backend login impossible with MSSQL via ODBC (thanks to Felix Eckhofer)
-
-2010-02-21  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #2367: No support for LIMIT [PostgreSQL]
-
-2010-02-14  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Set version to 1.1.1
-
-2010-02-14  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added unit test for #12829: ALTER TABLE is not able to parse length restriction in index creation
-
-2010-02-13  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added unit tests for #4493: WHERE func(expr) IN (n,...m) is broken
-       * Fixed bug #6196: IFNULL operator cannot be parsed
-       * Fixed bug #13528: Argument 1 passed to ux_t3lib_DB::_quoteFieldNames() must be an array, string given
-
-2010-02-11  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Follow-up of #13504: Using TRUNCATE instead of TRUNCATETABLE as public DB API
-
-2010-02-10  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #13504: Cannot parse TRUNCATE TABLE in install tool
-
-2010-02-09  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added unit test for bug #13490: Where clause 0=0 cannot be parsed
-
-2010-02-07  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added feature #12858: Provide an API to insert multiple rows at once
-       * Fixed bug #13453: Method compileINSERT of ux_t3lib_sqlparser should be protected
-       * Added feature #13209: MySQL extended INSERT statements cannot be parsed
-
-2010-02-06  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added unit tests for bug #13430: Cannot parse INSERT when VALUES has no space before left parenthesis
-
-2010-02-05  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #13422: Invalid quoting of numeric column names
-
-2010-02-03  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added unit tests for bug #13412: BETWEEN operator is not supported
-
-2010-01-24  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #13090: version warning with CSS styled content
-
-2010-01-14  Steffen Kamper  <info@sk-typo3.de>
-
-       * Fixed bug #13199: fileadminDir is hardcoded in several places (thanks to Susanne Moog)
-
-2010-01-08  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Updated copyright year
-
-2010-01-05  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added feature #13134: Support of SQL LOCATE function
-
-2010-01-03  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added feature #13135: Support for CASE WHEN flow control
-
-2009-12-30  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Set version to 1.1.0
-
-2009-12-28  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #12603: sql_query does not respect "mapping"
-       * Fixed bug #13104: SQL parser cannot parse escaped single quote in INSERT statement
-
-2009-12-27  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Updated documentation: now using new documentation template
-       * Updated documentation: removed obsolete information, added small cookbook for extension developers, added tutorials for Oracle and PostgreSQL
-
-2009-12-13  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #13003: Move back methods belonging to t3lib_sqlparser
-
-2009-12-11  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #12897: Cannot parse SQL hints
-
-2009-11-29  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #12758: Added support for EXISTS (subquery)
-
-2009-11-29  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Set version to 1.0.2 [TYPO3 4.3.0]
-       * Fixed bug #12800: Add functionality to work with caching framework (support for "IN (subquery)" in where clause)
-       * Follow-up of changeset 26118: parts of initial patch for RFC 12231 had actually not been integrated
-
-2009-11-27  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Cleanup: Reorganized unit-tests
-
-2009-11-25  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Set version to 1.0.1
-
-2009-11-20  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added unit-test for bug #5708: Fieldmapping doesn't work on the "right side" in where clause with table.field
-       * Fixed bugs #5044/#11142: Column's default value is not properly quoted in CREATE TABLE
-       * Added unit-test for bug #12670: Columns with NOT NULL are created as NULLable
-
-2009-11-17  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Set version to 1.0.0 (stable)
-       * Updated documentation: updated copyright and refreshed TOC
-       * Added unit-test for bug #4466: Index on tx_realurl_uniqalias breaks with DBAL
-
-2009-11-16  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Now using Core dispatcher for backend module (thanks to Oliver Hader)
-
-2009-11-15  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #12596: RIGHT OUTER JOIN is not supported
-
-2009-11-11  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added unit test for bug #11093: bigint (int8) values get converted to int4 by int-cast
-
-2009-11-10  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Removed comments stating that SQL parser is experimental
-       * Follow-up of revision 26334: LIKE on Oracle should use dbms_lob.instr() function
-       * Updated Oracle unit tests to use $GLOBALS['TYPO3_DB'] instead of a fixture to avoid side-effects on SQL rewriting
-       * Updated general database unit tests to use $GLOBALS['TYPO3_DB'] instead of a fixture to avoid side-effects on SQL rewriting
-
-2009-11-09  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #10965: Float database field gets converted to integer on insert (thanks to Christian Ducrot)
-       * Fixed bug #12515: DAM-related: CONCAT operator cannot be used after LIKE
-       * Fixed bug #10411: Applied missing chunks of patch
-
-2009-11-07  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added unit test for RFC #6198: Problem with strings in IN
-       * Added unit test for RFC #6953: Mapping of fieldnames in SQL-functions like MIN(), MAX() or SUM() does not work
-
-2009-11-06  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Set version to 0.9.25
-       * Fixed bug: tables and fields were not always properly mapped in INNER JOINs
-       * Added unit tests to test quoting and remapping of tables and fields when using Oracle
-
-2009-11-05  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Set version to 0.9.24
-       * Follow-up of RFC #12452: Reflected change of visibility of method compileFieldCfg() in t3lib_sqlparser
-
-2009-11-04  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Updated ext_emconf.php's author and extension version dependencies
-
-2009-11-03  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added some general unit tests (without any engine-specific test nor mapping)
-       * Cleanup #12440: Copy DBAL-only SQL parser methods from t3lib_sqlparser to ux_t3lib_sqlparser
-       * Fixed bug #12231: New caching framework (4.3-dev) does not work with DBAL
-
-2009-10-28  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Added compatibility operators for PostgreSQL as resource script (thanks to Ries van Twisk)
-       * Added message in Extension Manager to let users know compatibility scripts may need to be run
-
-2009-10-27  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Follow-up of changeset 25876: Using tx_dbal_sqlengine instead of t3lib_sqlengine for sample handlers
-       * Created icons for extension and Debug module
-       * Cleanup: Applied CGL
-
-2009-10-26  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #12354: Include t3lib_sqlengine from Core to DBAL
-       * Fixed bug #12349: Clean-up SQL parser and SQL engine
-
-2009-10-20  Oliver Hader  <oliver@typo3.org>
-
-       * Set version to 0.9.23
-
-2009-10-08  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #6953: Mapping of fieldnames in SQL-functions like MIN(), MAX() or SUM() does not work (thanks to Christian and Michael Miousse)
-
-2009-10-01  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Raised version to 0.9.22
-
-2009-09-29  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #12071: t3lib_sqlparser is not able to parse alias of a joined table
-
-2009-09-20  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #12012: admin_get_tables() method is using PHP5.3-deprecated function mysql_list_tables
-
-2009-09-18  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Raised version to 0.9.21
-
-2009-09-18  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #11984: Remove reference operators for objects
-
-2009-09-03  Xavier Perseguers  <typo3@perseguers.ch>
-
-       * Fixed bug #11436: Unknown tables break Install-Tool (thanks to David Bruchmann)
-       * Fixed bug #11108: DBAL wildly quotes fields and table names
-
-2009-09-04  Karsten Dambekalns <karsten@typo3.org>
-
-       * Raised version to 0.9.20
-
-2008-02-04  Michael Stucki  <michael@typo3.org>
-
-       * Fixed bug #7295: Uninitialized variable in ->handler_getFromTableList() (Patch by Oliver Klee)
-
-2007-05-30  Karsten Dambekalns <karsten@typo3.org>
-
-       * Added default values and some usability improvements to cached info display in debug module (closes bug #3750)
-       * EXPLAIN PLAN support for Oracle (closes bug #3850)
-       * Fixed a warning when using admin_get_fields() on a non-existent table
-       * Fixed a bug causing inserts with more than one affected CLOB field to fail
-       * quoteWhereClause() now die()s when the input cannot be parsed by parseWhereClause()
-       * PHP backtraces can be logged with the queries now (closes bug #3856)
-
-2007-05-29  Karsten Dambekalns <karsten@typo3.org>
-
-       * Closes bug #4462: creates tables without OIDs on PostgreSQL now
-       * Closes bugs #4494, #3759: & is translated to BITAND() on Oracle now
-       * Large text fields are CLOB fields now; for Oracle LIKE comparisons against such fields are translated to dbms_lob.instr() calls. This should fix e.g. bug #5535 as well as issues with TV data that cannot be unserialized (see comments on bug #4638)
-       * Updates to the manual
-       * A fix for bug #5481, field mapping not working on the right side of a comparison in WHERE clauses
-       * Fixed bugs #2438 and #4496 about quoting of DISTINCT in SELECT clauses
-
-2006-07-19  Karsten Dambekalns <karsten@typo3.org>
-
-       * Fixes SQL issues when searching in list view or with the global search box on the bottom of the BE page
-
-2006-06-30  Karsten Dambekalns <karsten@typo3.org>
-
-       * this update closes bugs #3638, #2106, #2866, #3754 (for Firefox, broken in MSIE) and maybe a few more
-       * Implemented support for sysLog() on connection failure
-       * DBAL now honours the no_pconnect setting
-       * For handlers in native mode the setDBinit queries are executed upon connection
-       * The initial value for generated sequences can be configured per handler, to avoid duplicate key errors after having imported data
-       * BLOB fields are handled correctly now during INSERT and UPDATE
-       * Setting $store_lastBuiltQuery acts like in t3lib_db now (fill $debug_lastBuiltQuery)
-       * For the native handler quoting methods directly return the input for speedup, as no quoting is needed in that case
-       * Added support for native and userdefined handler to MetaType()
-       * Changed mapping of types to always use the largest possible integer, map tinytext to varchar instead of text
-       * admin_get_tables() skips tables whose names match /BIN\$/ (coming from the recycle bin on Oracle)
-       * Importing dumps using the install tool now works, see manual for tips
-       * Changed the way NOT NULL and DEFAULT are handled when setting up tables, see manual for the rules that now apply
-       * Code cleanup (indentation, documentation)
-       * Updated the manual and added new content
-
-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.
-       * One slight fix to the SQL check in the BE module (wrong output if
-       an error occurred).
-
-2005-12-26  Karsten Dambekalns <karsten@typo3.org>
-
-       * Code cleanup and improvements to the mapping. Merged 3rd
-       party changes done by DIACC GmbH.
-
-2005-12-23  Karsten Dambekalns <karsten@typo3.org>
-
-       * Fixed a few issues that were left undiscovered yet.
-       * Added a new module to test query building and parsing
-       from the DBAL debug module.
-       * Finalized fix for bug #1649.
-
-2005-12-22  Karsten Dambekalns <karsten@typo3.org>
-
-       * Fixed bug #2077 (NOT handling breaking, consequently
-       discarding WHERE clauses).
-
-2005-12-21  Karsten Dambekalns <karsten@typo3.org>
-
-       * Fixed bug #1781 to allow easier install.
-       * Closed bug #1204 as not reproducable. Probably rather a
-       PHP/Apache bug than a DBAL bug.
-       * Closed bug #1317 which has been fixed earlier. It was due
-       to a msissing check for the incoming SQL (string/array) in the
-       native part of exec_UPDATEquery().
-       * Fixed parseFieldDef() t3lib_sqlparser to allow datatypes
-       with just a trailing comma (like in "tyinytext," as opposed
-       to "varchar(19)". This prevented installation of some
-       extensions.
-       * Fixed bug #2072.
-       * Fixed bug #1206.
-       * Fixed a bug with error logging and array queries (BLOB).
-       * Prepared a fix for bug #1649, pending core list approval.
-       * Fixed a bug in t3lib_page, getMultipleGroupsWhereClause()
-       where double quotes were used to quote a literal for use in
-       SQL. THIS IS MYSQL-ONLY! NEVER DO THIS! ALWAYS USE SINGLE
-       QUOTES!
-
-2005-06-07  Karsten Dambekalns <karsten@typo3.org>
-
-       Documentation update.
-
-2005-05-19  Karsten Dambekalns <karsten@typo3.org>
-
-       Committed changes to go along with the library removal done
-       earlier. Completed debug logging.
-
-2005-02-07  Karsten Dambekalns <karsten@typo3.org>
-
-       Bringing the DBAL extension AS OF JANUARY 2005 into CVS.  Works
-       pretty well, but still needs more work. A few optimizations are
-       planned and some bugs in native mode need to be fixed. Checking
-       this in is (similar to yesterday's commit) more for
-       historic/archival reasons.  This version will NOT work with 3.7.x.
-       You have been warned.
-
-2005-02-06  Karsten Dambekalns <karsten@typo3.org>
-
-       Bringing the DBAL extension AS OF JULY 2004 into CVS. This is
-       rather for historic purposes, more changes will follow in the near
-       future.  This version was already a huge step forward, but it will
-       not work as expected with 3.7.x or 3.8.x. You have been warned.
-
-2004-03-28  Kasper Skaarhoej <kasperYYYY@typo3.com>
-
-       Initial revision
diff --git a/typo3/sysext/dbal/class.tx_dbal_autoloader.php b/typo3/sysext/dbal/class.tx_dbal_autoloader.php
deleted file mode 100644 (file)
index 41a4e8a..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 2010 Xavier Perseguers <typo3@perseguers.ch>
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *  A copy is found in the textfile GPL.txt and important notices to the license
- *  from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
-/**
- * Autoloader included from Install Tool that lets DBAL load itself
- * if it makes sense.
- *
- * $Id$
- *
- * @author Xavier Perseguers <typo3@perseguers.ch>
- *
- * @package TYPO3
- * @subpackage dbal
- */
-class tx_dbal_autoloader {
-
-       /**
-        * Activates DBAL if it is supported.
-        *
-        * @param tx_install $instObj
-        * @return void
-        */
-       public function execute(tx_install $instObj) {
-               if ($instObj->mode == '123') {
-                       switch ($instObj->step) {
-                               case 1:
-                                       if (!t3lib_extMgm::isLoaded('dbal') && $this->isDbalSupported()) {
-                                               $this->activateDbal();
-
-                                               // Reload page to have Install Tool actually load DBAL
-                                               $redirectUrl = t3lib_div::getIndpEnv('TYPO3_REQUEST_URL');
-                                               t3lib_utility_Http::redirect($redirectUrl);
-                                       }
-                                       break;
-                               case 2:
-                                       if (!t3lib_extMgm::isLoaded('dbal') && $this->isDbalSupported()) {
-                                               $this->activateDbal();
-                                       }
-                                       break;
-                               case 3:
-                                       $driver = $instObj->INSTALL['localconf.php']['typo_db_driver'];
-                                       if ($driver === 'mysql') {
-                                               $this->deactivateDbal();
-                                       }
-                                       break;
-                       }
-               }
-       }
-
-       /**
-        * Returns TRUE if PHP modules to run DBAL are loaded.
-        *
-        * @return boolean
-        */
-       protected function isDbalSupported() {
-               return extension_loaded('odbc')
-                               || extension_loaded('pdo')
-                               || extension_loaded('oci8');
-       }
-
-       /**
-        * Activates DBAL.
-        *
-        * @return void
-        */
-       protected function activateDbal() {
-               $extList = t3lib_div::trimExplode(',', $GLOBALS['TYPO3_CONF_VARS']['EXT']['extList']);
-               if (!t3lib_div::inArray($extList, 'adodb')) {
-                       $extList[] = 'adodb';
-               }
-               if (!t3lib_div::inArray($extList, 'dbal')) {
-                       $extList[] = 'dbal';
-               }
-               $this->updateExtensionList(implode(',', $extList));
-       }
-
-       /**
-        * Dectivates DBAL.
-        *
-        * @return void
-        */
-       protected function deactivateDbal() {
-               $extList = t3lib_div::trimExplode(',', $GLOBALS['TYPO3_CONF_VARS']['EXT']['extList']);
-               $extList = array_flip($extList);
-
-               // Remove sysext dbal and adodb
-               if (isset($extList['dbal'])) {
-                       unset($extList['dbal']);
-               }
-               if (isset($extList['adodb'])) {
-                       unset($extList['adodb']);
-               }
-               $extList = array_flip($extList);
-
-               $this->updateExtensionList(implode(',', $extList));
-       }
-
-       /**
-        * Updates the list of extensions.
-        *
-        * @param string $newExtList
-        * @return void
-        */
-       protected function updateExtensionList($newExtList) {
-               // Instance of install tool
-               $instObj = t3lib_div::makeInstance('t3lib_install');
-               $instObj->allowUpdateLocalConf = 1;
-               $instObj->updateIdentity = 'TYPO3 Core Update Manager';
-
-               try {
-                       // Get lines from localconf file
-                       $lines = $instObj->writeToLocalconf_control();
-                       $instObj->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'EXT\'][\'extList\']', $newExtList);
-                       $result = $instObj->writeToLocalconf_control($lines);
-                       if ($result === 'nochange') {
-                               $message = 'DBAL was not loaded.';
-                               if (!@is_writable(PATH_typo3conf)) {
-                                       $message .= ' ' . PATH_typo3conf . ' is not writable!';
-                               }
-                               throw new Exception($message);
-                       }
-
-                       $GLOBALS['TYPO3_CONF_VARS']['EXT']['extList'] = $newExtList;
-                       // Make sure to get cache file for backend, not frontend
-                       $cacheFilePrefix = $GLOBALS['TYPO3_LOADED_EXT']['_CACHEFILE'];
-                       $GLOBALS['TYPO3_LOADED_EXT']['_CACHEFILE'] = str_replace('temp_CACHED_FE', 'temp_CACHED', $cacheFilePrefix);
-                       t3lib_extMgm::removeCacheFiles();
-               } catch (Exception $e) {
-                       $header = 'Error';
-                       $message = $e->getMessage();
-                       t3lib_timeTrack::debug_typo3PrintError($header, $message, FALSE, t3lib_div::getIndpEnv('TYPO3_SITE_URL'));
-                       exit;
-               }
-       }
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/dbal/class.tx_dbal_autoloader.php'])) {
-       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/dbal/class.tx_dbal_autoloader.php']);
-}
-
-// Make instance:
-$SOBE = t3lib_div::makeInstance('tx_dbal_autoloader');
-$SOBE->execute($this);
-?>
\ No newline at end of file
diff --git a/typo3/sysext/dbal/class.tx_dbal_em.php b/typo3/sysext/dbal/class.tx_dbal_em.php
deleted file mode 100644 (file)
index c79d1cc..0000000
+++ /dev/null
@@ -1,392 +0,0 @@
-<?php
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 2010 Xavier Perseguers <typo3@perseguers.ch>
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *  A copy is found in the textfile GPL.txt and important notices to the license
- *  from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
-/**
- * Hooks for TYPO3 Extension Manager.
- *
- * $Id: class.tx_dbal_em.php 40828 2010-12-05 14:55:53Z xperseguers $
- *
- * @author Xavier Perseguers <typo3@perseguers.ch>
- *
- * @package TYPO3
- * @subpackage dbal
- */
-class tx_dbal_em implements tx_em_Index_CheckDatabaseUpdatesHook {
-
-       /**
-        * Maximal length for an identifier in Oracle.
-        *
-        * @var integer
-        */
-       protected $maxIdentifierLength = 30;
-
-       /**
-        * Table names should be short enough in order to let ADOdb generates
-        * the corresponding sequence for the auto-increment field 'uid'.
-        * That is, a sequence of the form {table}_uid
-        *
-        * @var integer
-        */
-       protected $tableNameCharacterReservation = 4;
-
-       /**
-        * Mapping of table and field names.
-        *
-        * @var array
-        */
-       protected $mapping;
-
-       /**
-        * Initializes internal variables.
-        *
-        * @return void
-        */
-       protected function init() {
-               $mapping = @$GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['dbal']['mapping'];
-               if (!$mapping) {
-                       $mapping = array();
-               }
-               $this->mapping = $mapping;
-       }
-
-       /**
-        * Hook that allows pre-processing of database structure modifications.
-        * This returns a user form that will temporarily replace the standard
-        * database update form to let user configure mapping.
-        *
-        * @param string $extKey: Extension key
-        * @param array $extInfo: Extension information array
-        * @param array $diff: Database differences
-        * @param t3lib_install $instObj: Instance of the installer
-        * @param SC_mod_tools_em_index $parent: The calling parent object
-        * @return string Either empty string or a pre-processing user form
-        */
-       public function preProcessDatabaseUpdates($extKey, array $extInfo, array $diff, t3lib_install $instObj, SC_mod_tools_em_index $parent) {
-               $content = '';
-
-               // Remapping is only mandatory for Oracle:
-               if ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['dbal']['handlerCfg']['_DEFAULT']['type'] !== 'adodb'
-                               && $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['dbal']['handlerCfg']['_DEFAULT']['config']['driver'] !== 'oci8') {
-
-                       // Not using Oracle
-                       return '';
-               }
-
-               $this->init();
-
-               if (t3lib_div::GPvar('dbal')) {
-                       $this->updateMapping(t3lib_div::GPvar('dbal'), $instObj);
-               }
-
-               // Search all table and field names which should be remapped
-               $tableCandidates = array();
-               $fieldsCandidates = array();
-               foreach ($diff['extra'] as $table => $config) {
-                       if ($this->needsMapping($table)) {
-                               $tableCandidates[] = $table;
-                       }
-                       foreach ($config['fields'] as $field => $type) {
-                               if ($this->needsMapping($table, $field)) {
-                                       if (!isset($fieldsCandidates[$table])) {
-                                               $fieldsCandidates[$table] = array();
-                                       }
-                                       $fieldsCandidates[$table][$field] = array(
-                                               'fullName' => $field,
-                                       );
-                               }
-
-                       }
-
-                       /*
-                       if (!isset($config['keys'])) {
-                               continue;       // Process next table
-                       }
-
-                       foreach ($config['keys'] as $field => $def) {
-                               if ($field !== 'PRIMARY' && $this->needsMapping($table, $field, TRUE)) {
-                                       if (!t3lib_div::inArray($tableCandidates, $table)) {
-                                               $tableCandidates[] = $table;
-                                       }
-                                       if (!isset($fieldsCandidates[$table])) {
-                                               $fieldsCandidates[$table] = array();
-                                       }
-                                       $fieldsCandidates[$table][$field] = array(
-                                               'fullName' => $table . '_' . $field,
-                                       );
-                               }
-                       }
-                       */
-               }
-
-               if ($tableCandidates || $fieldsCandidates) {
-                       $mappingSuggestions = $this->getMappingSuggestions($extKey, $extInfo, $tableCandidates, $fieldsCandidates);
-                       $content .= $this->generateMappingForm($tableCandidates, $fieldsCandidates, $mappingSuggestions);
-               }
-
-               return $content;
-       }
-
-       /**
-        * Returns TRUE if either the table or the field name should be remapped.
-        *
-        * @param string $table
-        * @param string $field
-        * @param boolean $isKeyField
-        * @return boolean TRUE if mapping is needed, otherwise FALSE
-        */
-       protected function needsMapping($table, $field = '', $isKeyField = FALSE) {
-               $needsRemapping = FALSE;
-
-               // Take existing DBAL mapping into account
-               $origTable = $table;
-               if (isset($this->mapping[$origTable])) {
-                       if (isset($this->mapping[$origTable]['mapTableName'])) {
-                               $table = $this->mapping[$origTable]['mapTableName'];
-                       }
-                       if ($field !== '' && isset($this->mapping[$origTable]['mapFieldNames'])) {
-                               if (isset($this->mapping[$origTable]['mapFieldNames'][$field])) {
-                                       $field = $this->mapping[$origTable]['mapFieldNames'][$field];
-                               }
-                       }
-               }
-
-               if ($field === '') {
-                       if (substr($table, -3) === '_mm') {
-                               $needsRemapping = strlen($table) > $this->maxIdentifierLength;
-                       } else {
-                               $needsRemapping = strlen($table) > $this->maxIdentifierLength - $this->tableNameCharacterReservation;
-                       }
-               } elseif (!$isKeyField) {
-                       $needsRemapping = strlen($field) > $this->maxIdentifierLength;
-               } else {
-                       $needsRemapping = strlen($table . '_' . $field) > $this->maxIdentifierLength;
-               }
-
-               return $needsRemapping;
-       }
-
-       /**
-        * Returns suggestions for the mapping of table/field names.
-        *
-        * @param string $extKey
-        * @param array $extInfo
-        * @param array $tables
-        * @param array $fields
-        * @return array
-        * @api
-        */
-       public function getMappingSuggestions($extKey, array $extInfo, array $tables, array $fields) {
-               $suggestions = array();
-               switch ($extKey) {
-                       case 'direct_mail':
-                               $suggestions['sys_dmail_ttaddress_category_mm'] = array(
-                                       'mapTableName' => 'sys_dmail_ttaddress_cat_mm',
-                               );
-                               $suggestions['sys_dmail_ttcontent_category_mm'] = array(
-                                       'mapTableName' => 'sys_dmail_ttcontent_cat_mm',
-                               );
-                               break;
-                       case 'extbase':
-                               $suggestions['tx_extbase_cache_reflection_tags'] = array(
-                                       'mapTableName' => 'tx_extbase_cache_reflect_tags',
-                               );
-                               break;
-                       case 'templavoila':
-                               $suggestions['tx_templavoila_datastructure'] = array(
-                                       'mapTableName' => 'tx_templavoila_ds',
-                               );
-                               $suggestions['tx_templavoila_tmplobj'] = array(
-                                       'mapTableName' => 'tx_templavoila_tmpl',
-                               );
-                               break;
-                       default:
-                               $dependencies = array_keys($extInfo['EM_CONF']['constraints']['depends']);
-                               if (t3lib_div::inArray($dependencies, 'extbase')) {
-                                       $this->storeExtbaseMappingSuggestions($suggestions, $extKey, $extInfo, $tables, $fields);
-                               }
-               }
-
-               // Existing mapping take precedence over suggestions
-               $suggestions = t3lib_div::array_merge_recursive_overrule($suggestions, $this->mapping);
-
-               return $suggestions;
-       }
-
-       /**
-        * Stores suggestions for the mapping of table/field names for an Extbase-based extension.
-        *
-        * @param array &$suggestions
-        * @param string $extKey
-        * @param array $extInfo
-        * @param array $tables
-        * @param array $fields
-        * @return void
-        */
-       protected function storeExtbaseMappingSuggestions(array &$suggestions, $extKey, array $extInfo, array $tables, array $fields) {
-               foreach ($tables as $table) {
-                       // Remove the "domain_model" part of the table name
-                       $suggestions[$table] = array(
-                               'mapTableName' => str_replace('domain_model_', '', $table),
-                       );
-               }
-       }
-
-       /**
-        * Generates a mapping form.
-        *
-        * @param array $tables
-        * @param array $fields
-        * @param array $suggestions
-        * @return string
-        */
-       protected function generateMappingForm(array $tables, array $fields, array $suggestions) {
-               $out = array();
-               $tableId = uniqid('table');
-               $label = 'DBAL Mapping';
-               $description = sprintf('Some table names are longer than %s characters and/or some field names are longer than %s characters.'
-                               . ' This is incompatible with your database:'
-                               . ' <ul style="list-style: square; margin: 3px 1em; padding: 3px 1em;">'
-                               . '             <li>Table names should be short enough to let ADOdb generates a sequence of the form {table}_uid for the'
-                               . '                     auto-increment "uid" field within %s characters;</li>'
-                               . '             <li>Field names may not contain more than %s characters.</li>'
-                               . ' </ul>',
-                               $this->maxIdentifierLength - $this->tableNameCharacterReservation,
-                       $this->maxIdentifierLength,
-                       $this->maxIdentifierLength,
-                       $this->maxIdentifierLength
-               );
-
-               $tables = array_unique(array_merge($tables, array_keys($fields)));
-               foreach ($tables as $table) {
-                       $newTableName = $table;
-                       if (isset($suggestions[$table]) && isset($suggestions[$table]['mapTableName'])) {
-                               $newTableName = $suggestions[$table]['mapTableName'];
-                       }
-                       $out[] = '
-                               <tr>
-                                       <td style="padding-top: 1em;"><label for="table-' . $table . '">' . $table . '</label></td>
-                                       <td style="padding-top: 1em;">=&gt;</td>
-                                       <td style="padding-top: 1em;"><input type="text" size="35" id="table-' . $table . '" name="dbal[tables][' . $table . ']" value="' . $newTableName . '" /> '
-                                       . strlen($newTableName) . ' characters'
-                                       . '</td>
-                               </tr>';
-
-                       if (isset($fields[$table])) {
-                               foreach ($fields[$table] as $field => $info) {
-                                       $newFieldName = $field;
-                                       if (isset($suggestions[$table]) && isset($suggestions[$table]['mapFieldNames'])) {
-                                               if (isset($suggestions[$table]['mapFieldNames'][$field])) {
-                                                       $newFieldName = $suggestions[$table]['mapFieldNames'][$field];
-                                               }
-                                       }
-                                       $newFieldFullName = preg_replace('/^' . $table . '/', $newTableName, $info['fullName']);
-                                       $newFieldFullName = preg_replace('/' . $field . '$/', $newFieldName, $newFieldFullName);
-                                       $out[] = '
-                                               <tr>
-                                                       <td>&nbsp;&nbsp;&nbsp;&nbsp;<label for="field-' . $table . '_' . $field . '">' . $field . '</label></td>
-                                                       <td>=&gt;</td>
-                                                       <td><input type="text" size="35" id="field-' . $table . '_' . $field . '" name="dbal[fields][' . $table . '][' . $field . ']" value="' . $newFieldName . '" /> '
-                                                       . ($info['fullname'] !== $field ? strlen($newFieldFullName) . ' characters: ' . $newFieldFullName : '')
-                                                       . '</td>
-                                               </tr>';
-                               }
-                       }
-               }
-
-               // Compile rows:
-               $content = '
-                       <!-- Remapping database fields / tables -->
-                       <h3>' . $label . '</h3>
-                       <p>' . $description . '</p>
-                       <table border="0" cellpadding="2" cellspacing="2" id="' . $tableId . '" class="remap-db-table-fields">' . implode('', $out) . '
-                       </table>';
-
-               return $content;
-       }
-
-       /**
-        * Updates the mapping in localconf.php according to form input values.
-        *
-        * @param array $data
-        * @param t3lib_install $instObj
-        * @return void
-        * @api
-        */
-       public function updateMapping(array $data, t3lib_install $instObj) {
-               $newMapping = $this->mapping;
-
-               foreach ($data['tables'] as $table => $newName) {
-                       $newName = trim($newName);
-                       if ($newName && $newName !== $table) {
-                               if (!isset($newMapping[$table])) {
-                                       $newMapping[$table] = array();
-                               }
-                               $newMapping[$table]['mapTableName'] = $newName;
-                       }
-                       if (isset($data['fields'][$table])) {
-                               foreach ($data['fields'][$table] as $field => $newName) {
-                                       $newName = trim($newName);
-                                       if ($newName && $newName !== $field) {
-                                               if (!isset($newMapping[$table])) {
-                                                       $newMapping[$table] = array();
-                                               }
-                                               if (!isset($newMapping[$table]['mapFieldNames'])) {
-                                                       $newMapping[$table]['mapFieldNames'] = array();
-                                               }
-                                               $newMapping[$table]['mapFieldNames'][$field] = $newName;
-                                       }
-                               }
-                       }
-               }
-
-               // Sort table and field names
-               foreach ($newMapping as $table => &$config) {
-                       if (isset($config['mapFieldNames'])) {
-                               ksort($config['mapFieldNames']);
-                       }
-               }
-               ksort($newMapping);
-
-               // Write new mapping to localconf.php
-               $key = '$TYPO3_CONF_VARS[\'EXTCONF\'][\'dbal\'][\'mapping\']';
-               $instObj->allowUpdateLocalConf = 1;
-               $instObj->updateIdentity = 'TYPO3 Extension Manager';
-               $lines = $instObj->writeToLocalconf_control();
-               $instObj->setArrayValueInLocalconfFile($lines, $key, $newMapping);
-
-               if ($instObj->writeToLocalconf($lines)) {
-                       $this->mapping = $newMapping;
-               }
-       }
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/dbal/class.tx_dbal_em.php'])) {
-       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/dbal/class.tx_dbal_em.php']);
-}
-?>
\ No newline at end of file
diff --git a/typo3/sysext/dbal/class.tx_dbal_installtool.php b/typo3/sysext/dbal/class.tx_dbal_installtool.php
deleted file mode 100644 (file)
index 705e850..0000000
+++ /dev/null
@@ -1,587 +0,0 @@
-<?php
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 2010 Xavier Perseguers <typo3@perseguers.ch>
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *  A copy is found in the textfile GPL.txt and important notices to the license
- *  from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
-/**
- * Hooks for TYPO3 Install Tool.
- *
- * $Id$
- *
- * @author Xavier Perseguers <typo3@perseguers.ch>
- *
- * @package TYPO3
- * @subpackage dbal
- */
-class tx_dbal_installtool {
-
-       /**
-        * @var string
-        */
-       protected $templateFilePath = 'res/Templates/';
-
-       /**
-        * @var array
-        */
-       protected $supportedDrivers;
-
-       /**
-        * @var array
-        */
-       protected $availableDrivers;
-
-       /**
-        * @var string
-        */
-       protected $driver;
-
-       /**
-        * Default constructor.
-        */
-       public function __construct() {
-               $this->supportedDrivers = $this->getSupportedDrivers();
-               $this->availableDrivers = $this->getAvailableDrivers();
-
-               $configDriver =& $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['dbal']['handlerCfg']['_DEFAULT']['config']['driver'];
-               $this->driver = t3lib_div::_GET('driver');
-               if (!$this->driver && $configDriver) {
-                       $this->driver = $configDriver;
-               }
-       }
-
-       /**
-        * Hooks into Installer to set required PHP modules.
-        *
-        * @param array $modules
-        * @param tx_install $instObj
-        * @return array modules
-        */
-       public function setRequiredPhpModules(array &$modules, tx_install $instObj) {
-               foreach ($modules as $key => $module) {
-                       if ($module === 'mysql') {
-                               $dbModules = array();
-                               foreach ($this->supportedDrivers as $abstractionLayer => $drivers) {
-                                       $dbModules = array_merge($dbModules, array_keys($drivers));
-                               }
-                               $module = $dbModules;
-                       }
-                       $modifiedModules[] = $module;
-               }
-               return $modifiedModules;
-       }
-
-       /**
-        * Hooks into Installer to let a non-MySQL database to be configured.
-        *
-        * @param array $markers
-        * @param integer $step
-        * @param tx_install $instObj
-        * @return void
-        */
-       public function executeStepOutput(array &$markers, $step, tx_install $instObj) {
-               switch ($step) {
-                       case 2:
-                               $this->createConnectionForm($markers, $instObj);
-                               break;
-                       case 3:
-                               $this->createDatabaseForm($markers, $instObj);
-                               break;
-               }
-       }
-
-       /**
-        * Hooks into Installer to modify lines to be written to localconf.php.
-        *
-        * @param array $lines
-        * @param integer $step
-        * @param tx_install $instObj
-        * @return void
-        */
-       public function executeWriteLocalconf(array &$lines, $step, tx_install $instObj) {
-               switch ($step) {
-                       case 3:
-                       case 4:
-                               $driver = $instObj->INSTALL['localconf.php']['typo_db_driver'];
-                               if (!$driver && $this->driver) {
-                                       // Driver was already configured
-                                       break;
-                               }
-                               $driverConfig = '';
-                               switch ($driver) {
-                                       case 'oci8':
-                                               $driverConfig = '\'driverOptions\' => array(' .
-                                                               '\'connectSID\' => ' . ($instObj->INSTALL['localconf.php']['typo_db_type'] === 'sid' ? 'TRUE' : 'FALSE') .
-                                                               ')';
-                                               break;
-                                       case 'mssql':
-                                       case 'odbc_mssql':
-                                               $driverConfig = '\'useNameQuote\' => TRUE';
-                                               break;
-                                       case 'mysql':
-                                               return;
-                               }
-                               $config = 'array(' .
-                                               '\'_DEFAULT\' => array(' .
-                                               '\'type\' => \'adodb\',' .
-                                               '\'config\' => array(' .
-                                               '\'driver\' => \'' . $driver . '\',' .
-                                               $driverConfig .
-                                               ')' .
-                                               ')' .
-                                               ');';
-                               $instObj->setValueInLocalconfFile($lines, '$TYPO3_CONF_VARS[\'EXTCONF\'][\'dbal\'][\'handlerCfg\']', $config, FALSE);
-                               break;
-               }
-       }
-
-       /**
-        * Creates a specialized form to configure the DBMS connection.
-        *
-        * @param array $markers
-        * @param tx_install $instObj
-        * @return void
-        */
-       protected function createConnectionForm(array &$markers, tx_install $instObj) {
-               // Normalize current driver
-               if (!$this->driver) {
-                       $this->driver = $this->getDefaultDriver();
-               }
-
-               // Get the template file
-               $templateFile = @file_get_contents(
-                       t3lib_extMgm::extPath('dbal') . $this->templateFilePath . 'install.html'
-               );
-               // Get the template part from the file
-               $template = t3lib_parsehtml::getSubpart(
-                       $templateFile, '###TEMPLATE###'
-               );
-
-               // Get the subpart for the connection form
-               $formSubPart = t3lib_parsehtml::getSubpart(
-                       $template, '###CONNECTION_FORM###'
-               );
-               if ($this->getNumberOfAvailableDrivers() == 1 && $this->getDefaultDriver() === 'mysql') {
-                       // Only MySQL is actually available (PDO support may be compiled in
-                       // PHP itself and as such DBAL was activated, behaves as if DBAL were
-                       // not activated
-                       $driverSubPart = '<input type="hidden" name="TYPO3_INSTALL[localconf.php][typo_db_driver]" value="mysql" />';
-               } else {
-                       $driverTemplate = t3lib_parsehtml::getSubpart(
-                               $formSubPart, '###DATABASE_DRIVER###'
-                       );
-                       $driverSubPart = $this->prepareDatabaseDrivers($driverTemplate);
-               }
-               $formSubPart = t3lib_parsehtml::substituteSubpart(
-                       $formSubPart,
-                       '###DATABASE_DRIVER###',
-                       $driverSubPart
-               );
-
-               // Get the subpart related to selected database driver
-               if ($this->driver === '' || $this->driver === 'mysql') {
-                       $driverOptionsSubPart = t3lib_parsehtml::getSubpart(
-                               $template, '###DRIVER_MYSQL###'
-                       );
-               } else {
-                       $driverOptionsSubPart = t3lib_parsehtml::getSubpart(
-                               $template, '###DRIVER_' . t3lib_div::strtoupper($this->driver) . '###'
-                       );
-                       if ($driverOptionsSubPart === '') {
-                               $driverOptionsSubPart = t3lib_parsehtml::getSubpart(
-                                       $template, '###DRIVER_DEFAULT###'
-                               );
-                       }
-               }
-
-               // Define driver-specific markers
-               $driverMarkers = array();
-               switch ($this->driver) {
-                       case 'mssql':
-                               $driverMarkers = array(
-                                       'labelUsername' => 'Username',
-                                       'username' => TYPO3_db_username,
-                                       'labelPassword' => 'Password',
-                                       'password' => TYPO3_db_password,
-                                       'labelHost' => 'Host',
-                                       'host' => TYPO3_db_host ? TYPO3_db_host : 'windows',
-                                       'labelDatabase' => 'Database',
-                                       'database' => TYPO3_db,
-                               );
-                               $nextStep = $instObj->step + 2;
-                               break;
-                       case 'odbc_mssql':
-                               $driverMarkers = array(
-                                       'labelUsername' => 'Username',
-                                       'username' => TYPO3_db_username,
-                                       'labelPassword' => 'Password',
-                                       'password' => TYPO3_db_password,
-                                       'labelHost' => 'Host',
-                                       'host' => TYPO3_db_host ? TYPO3_db_host : 'windows',
-                                       'database' => 'dummy_string',
-                               );
-                               $nextStep = $instObj->step + 2;
-                               break;
-                       case 'oci8':
-                               $driverMarkers = array(
-                                       'labelUsername' => 'Username',
-                                       'username' => TYPO3_db_username,
-                                       'labelPassword' => 'Password',
-                                       'password' => TYPO3_db_password,
-                                       'labelHost' => 'Host',
-                                       'host' => TYPO3_db_host ? TYPO3_db_host : 'localhost',
-                                       'labelType' => 'Type',
-                                       'labelSID' => 'SID',
-                                       'labelServiceName' => 'Service Name',
-                                       'labelDatabase' => 'Name',
-                                       'database' => TYPO3_db,
-                               );
-                               $nextStep = $instObj->step + 2;
-                               break;
-                       case 'postgres':
-                               $driverMarkers = array(
-                                       'labelUsername' => 'Username',
-                                       'username' => TYPO3_db_username,
-                                       'labelPassword' => 'Password',
-                                       'password' => TYPO3_db_password,
-                                       'labelHost' => 'Host',
-                                       'host' => TYPO3_db_host ? TYPO3_db_host : 'localhost',
-                                       'labelDatabase' => 'Database',
-                                       'database' => TYPO3_db,
-                               );
-                               $nextStep = $instObj->step + 2;
-                               break;
-                       default:
-                               $driverMarkers = array(
-                                       'labelUsername' => 'Username',
-                                       'username' => TYPO3_db_username,
-                                       'labelPassword' => 'Password',
-                                       'password' => TYPO3_db_password,
-                                       'labelHost' => 'Host',
-                                       'host' => TYPO3_db_host ? TYPO3_db_host : 'localhost',
-                                       'labelDatabase' => 'Database',
-                                       'database' => TYPO3_db,
-                               );
-                               $nextStep = $instObj->step + 1;
-                               break;
-               }
-
-               // Add header marker for main template
-               $markers['header'] = 'Connect to your database host';
-               // Define the markers content for the subpart
-               $subPartMarkers = array(
-                       'step' => $nextStep,
-                       'action' => htmlspecialchars($instObj->action),
-                       'encryptionKey' => $instObj->createEncryptionKey(),
-                       'branch' => TYPO3_branch,
-                       'driver_options' => $driverOptionsSubPart,
-                       'continue' => 'Continue',
-                       'llDescription' => 'If you have not already created a username and password to access the database, please do so now. This can be done using tools provided by your host.'
-               );
-               $subPartMarkers = array_merge($subPartMarkers, $driverMarkers);
-
-               // Add step marker for main template
-               $markers['step'] = t3lib_parsehtml::substituteMarkerArray(
-                       $formSubPart,
-                       $subPartMarkers,
-                       '###|###',
-                       1,
-                       1
-               );
-       }
-
-       /**
-        * Prepares the list of database drivers for step 2.
-        *
-        * @param string $template
-        * @return string
-        */
-       protected function prepareDatabaseDrivers($template) {
-               $subParts = array(
-                       'abstractionLayer' => t3lib_parsehtml::getSubpart($template, '###ABSTRACTION_LAYER###'),
-                       'vendor' => t3lib_parsehtml::getSubpart($template, '###VENDOR###'),
-               );
-
-               // Create the drop-down list of available drivers
-               $dropdown = '';
-               foreach ($this->availableDrivers as $abstractionLayer => $drivers) {
-                       $options = array();
-                       foreach ($drivers as $driver => $label) {
-                               $markers = array(
-                                       'driver' => $driver,
-                                       'labelvendor' => $label,
-                                       'onclick' => 'document.location=\'index.php?TYPO3_INSTALL[type]=config&mode=123&step=2&driver=' . $driver . '\';',
-                                       'selected' => '',
-                               );
-                               if ($driver === $this->driver) {
-                                       $markers['selected'] .= ' selected="selected"';
-                               }
-                               $options[] = t3lib_parsehtml::substituteMarkerArray(
-                                       $subParts['vendor'],
-                                       $markers,
-                                       '###|###',
-                                       1
-                               );
-                       }
-                       $subPart = t3lib_parsehtml::substituteSubpart(
-                               $subParts['abstractionLayer'],
-                               '###VENDOR###',
-                               implode("\n", $options)
-                       );
-                       $dropdown .= t3lib_parsehtml::substituteMarker(
-                               $subPart,
-                               '###LABELABSTRACTIONLAYER###',
-                               $abstractionLayer
-                       );
-               }
-               $form = t3lib_parsehtml::substituteSubpart(
-                       $template,
-                       '###ABSTRACTION_LAYER###',
-                       $dropdown
-               );
-               $form = t3lib_parsehtml::substituteMarker(
-                       $form,
-                       '###LABELDRIVER###',
-                       'Driver'
-               );
-               return $form;
-       }
-
-       /**
-        * Returns a list of DBAL supported database drivers, with a user-friendly name
-        * and any PHP module dependency.
-        *
-        * @return array
-        */
-       protected function getSupportedDrivers() {
-               $supportedDrivers = array(
-                       'Native' => array(
-                               'mysql' => array(
-                                       'label' => 'MySQL/MySQLi (recommended)',
-                                       'combine' => 'OR',
-                                       'extensions' => array('mysql', 'mysqli'),
-                               ),
-                               'mssql' => array(
-                                       'label' => 'Microsoft SQL Server',
-                                       'extensions' => array('mssql'),
-                               ),
-                               'oci8' => array(
-                                       'label' => 'Oracle OCI8',
-                                       'extensions' => array('oci8'),
-                               ),
-                               'postgres' => array(
-                                       'label' => 'PostgreSQL',
-                                       'extensions' => array('pgsql'),
-                               )
-                       ),
-                       'ODBC' => array(
-                               'odbc_mssql' => array(
-                                       'label' => 'Microsoft SQL Server',
-                                       'extensions' => array('odbc', 'mssql'),
-                               ),
-                       ),
-               );
-               return $supportedDrivers;
-       }
-
-       /**
-        * Returns a list of database drivers that are available on current server.
-        *
-        * @return array
-        */
-       protected function getAvailableDrivers() {
-               $availableDrivers = array();
-               foreach ($this->supportedDrivers as $abstractionLayer => $drivers) {
-                       foreach ($drivers as $driver => $info) {
-                               if (isset($info['combine']) && $info['combine'] === 'OR') {
-                                       $isAvailable = FALSE;
-                               } else {
-                                       $isAvailable = TRUE;
-                               }
-
-                               // Loop through each PHP module dependency to ensure it is loaded
-                               foreach ($info['extensions'] as $extension) {
-                                       if (isset($info['combine']) && $info['combine'] === 'OR') {
-                                               $isAvailable |= extension_loaded($extension);
-                                       } else {
-                                               $isAvailable &= extension_loaded($extension);
-                                       }
-                               }
-
-                               if ($isAvailable) {
-                                       if (!isset($availableDrivers[$abstractionLayer])) {
-                                               $availableDrivers[$abstractionLayer] = array();
-                                       }
-                                       $availableDrivers[$abstractionLayer][$driver] = $info['label'];
-                               }
-                       }
-               }
-               return $availableDrivers;
-       }
-
-       /**
-        * Returns the number of available drivers.
-        *
-        * @return boolean
-        */
-       protected function getNumberOfAvailableDrivers() {
-               $count = 0;
-               foreach ($this->availableDrivers as $drivers) {
-                       $count += count($drivers);
-               }
-               return $count;
-       }
-
-       /**
-        * Returns the driver that is selected by default in the
-        * Install Tool dropdown list.
-        *
-        * @return string
-        */
-       protected function getDefaultDriver() {
-               $defaultDriver = '';
-               if (count($this->availableDrivers)) {
-                       $abstractionLayers = array_keys($this->availableDrivers);
-                       $drivers = array_keys($this->availableDrivers[$abstractionLayers[0]]);
-                       $defaultDriver = $drivers[0];
-               }
-               return $defaultDriver;
-       }
-
-       /**
-        * Creates a specialized form to configure the database.
-        *
-        * @param array $markers
-        * @param tx_install $instObj
-        */
-       protected function createDatabaseForm(array &$markers, tx_install $instObj) {
-               $error_missingConnect = '
-                       <p class="typo3-message message-error">
-                               <strong>
-                                       There is no connection to the database!
-                               </strong>
-                               <br />
-                               (Username: <em>' . TYPO3_db_username . '</em>,
-                               Host: <em>' . TYPO3_db_host . '</em>,
-                               Using Password: YES)
-                               <br />
-                               Go to Step 1 and enter a valid username and password!
-                       </p>
-               ';
-
-               // Add header marker for main template
-               $markers['header'] = 'Select database';
-               // There should be a database host connection at this point
-               if ($result = $GLOBALS['TYPO3_DB']->sql_pconnect(
-                       TYPO3_db_host, TYPO3_db_username, TYPO3_db_password
-               )) {
-                       // Get the template file
-                       $templateFile = @file_get_contents(
-                               t3lib_extMgm::extPath('dbal') . $this->templateFilePath . 'install.html'
-                       );
-                       // Get the template part from the file
-                       $template = t3lib_parsehtml::getSubpart(
-                               $templateFile, '###TEMPLATE###'
-                       );
-                       // Get the subpart for the database choice step
-                       $formSubPart = t3lib_parsehtml::getSubpart(
-                               $template, '###DATABASE_FORM###'
-                       );
-                       // Get the subpart for the database options
-                       $step3DatabaseOptionsSubPart = t3lib_parsehtml::getSubpart(
-                               $formSubPart, '###DATABASEOPTIONS###'
-                       );
-
-                       $dbArr = $instObj->getDatabaseList();
-                       $dbIncluded = FALSE;
-                       foreach ($dbArr as $dbname) {
-                               // Define the markers content for database options
-                               $step3DatabaseOptionMarkers = array(
-                                       'databaseValue' => htmlspecialchars($dbname),
-                                       'databaseSelected' => ($dbname === TYPO3_db) ? 'selected="selected"' : '',
-                                       'databaseName' => htmlspecialchars($dbname)
-                               );
-                               // Add the option HTML to an array
-                               $step3DatabaseOptions[] = t3lib_parsehtml::substituteMarkerArray(
-                                       $step3DatabaseOptionsSubPart,
-                                       $step3DatabaseOptionMarkers,
-                                       '###|###',
-                                       1,
-                                       1
-                               );
-                               if ($dbname === TYPO3_db) {
-                                       $dbIncluded = TRUE;
-                               }
-                       }
-                       if (!$dbIncluded && TYPO3_db) {
-                               // // Define the markers content when no access
-                               $step3DatabaseOptionMarkers = array(
-                                       'databaseValue' => htmlspecialchars(TYPO3_db),
-                                       'databaseSelected' => 'selected="selected"',
-                                       'databaseName' => htmlspecialchars(TYPO3_db) . ' (NO ACCESS!)'
-                               );
-                               // Add the option HTML to an array
-                               $step3DatabaseOptions[] = t3lib_parsehtml::substituteMarkerArray(
-                                       $step3DatabaseOptionsSubPart,
-                                       $step3DatabaseOptionMarkers,
-                                       '###|###',
-                                       1,
-                                       1
-                               );
-                       }
-                       // Substitute the subpart for the database options
-                       $content = t3lib_parsehtml::substituteSubpart(
-                               $formSubPart,
-                               '###DATABASEOPTIONS###',
-                               implode(chr(10), $step3DatabaseOptions)
-                       );
-                       // Define the markers content
-                       $step3SubPartMarkers = array(
-                               'step' => $instObj->step + 1,
-                               'action' => htmlspecialchars($instObj->action),
-                               'llOption2' => 'Select an EMPTY existing database:',
-                               'llRemark2' => 'Any tables used by TYPO3 will be overwritten.',
-                               'continue' => 'Continue'
-                       );
-                       // Add step marker for main template
-                       $markers['step'] = t3lib_parsehtml::substituteMarkerArray(
-                               $content,
-                               $step3SubPartMarkers,
-                               '###|###',
-                               1,
-                               1
-                       );
-               } else {
-                       // Add step marker for main template when no connection
-                       $markers['step'] = $error_missingConnect;
-               }
-       }
-
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/dbal/class.tx_dbal_installtool.php'])) {
-       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/dbal/class.tx_dbal_installtool.php']);
-}
-?>
\ No newline at end of file
diff --git a/typo3/sysext/dbal/class.ux_db_list_extra.php b/typo3/sysext/dbal/class.ux_db_list_extra.php
deleted file mode 100644 (file)
index c40fa5c..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/***************************************************************
-*  Copyright notice
-*
-*  (c) 1999-2009 Kasper Skårhøj (kasperYYYY@typo3.com)
-*  (c) 2006-2009 Karsten Dambekalns <karsten@typo3.org>
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*  A copy is found in the textfile GPL.txt and important notices to the license
-*  from the author is found in LICENSE.txt distributed with these scripts.
-*
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-/**
- * Include file extending localRecordList for DBAL compatibility
- *
- * $Id: class.ux_db_list_extra.php 40828 2010-12-05 14:55:53Z xperseguers $
- *
- * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
- * @author     Karsten Dambekalns <k.dambekalns@fishfarm.de>
- */
-
-/**
- * Child class for rendering of Web > List (not the final class. see class.db_list_extra)
- *
- * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
- * @author     Karsten Dambekalns <k.dambekalns@fishfarm.de>
- * @package TYPO3
- * @subpackage DBAL
- */
-class ux_localRecordList extends localRecordList {
-
-       /**
-        * Creates part of query for searching after a word ($this->searchString) fields in input table
-        *
-        * DBAL specific: no LIKE for numeric fields, in this case "uid" (breaks on Oracle)
-        *                no LIKE for BLOB fields, skip
-        *
-        * @param       string          Table, in which the fields are being searched.
-        * @return      string          Returns part of WHERE-clause for searching, if applicable.
-        */
-       function makeSearchString($table) {
-                       // Make query, only if table is valid and a search string is actually defined:
-               if ($GLOBALS['TCA'][$table] && $this->searchString) {
-
-                               // Loading full table description - we need to traverse fields:
-                       t3lib_div::loadTCA($table);
-
-                               // Initialize field array:
-                       $sfields = array();
-                       $or = '';
-
-                               // add the uid only if input is numeric, cast to int
-                       if (is_numeric($this->searchString)) {
-                               $queryPart = ' AND (uid=' . (int)$this->searchString . ' OR ';
-                       } else {
-                               $queryPart = ' AND (';
-                       }
-
-                       if ($GLOBALS['TYPO3_DB']->runningADOdbDriver('oci8')) {
-                               foreach ($GLOBALS['TCA'][$table]['columns'] as $fieldName => $info) {
-                                       if ($GLOBALS['TYPO3_DB']->cache_fieldType[$table][$fieldName]['metaType'] === 'B') {
-                                               // skip, LIKE is not supported on BLOB columns...
-                                       } elseif ($info['config']['type'] === 'text' || ($info['config']['type'] === 'input' && !preg_match('/date|time|int/', $info['config']['eval']))) {
-                                               $queryPart .= $or . $fieldName . ' LIKE \'%' . $GLOBALS['TYPO3_DB']->quoteStr($this->searchString, $table) . '%\'';
-                                               $or = ' OR ';
-                                       }
-                               }
-                       } else {
-                                       // Traverse the configured columns and add all columns that can be searched
-                               foreach ($GLOBALS['TCA'][$table]['columns'] as $fieldName => $info) {
-                                       if ($info['config']['type'] === 'text' || ($info['config']['type'] === 'input' && !preg_match('/date|time|int/', $info['config']['eval']))) {
-                                               $sfields[] = $fieldName;
-                                       }
-                               }
-
-                                       // If search-fields were defined (and there always are) we create the query:
-                               if (count($sfields)) {
-                                       $like = ' LIKE \'%'.$GLOBALS['TYPO3_DB']->quoteStr($this->searchString, $table) . '%\'';                // Free-text
-                                       $queryPart .= implode($like . ' OR ', $sfields) . $like;
-                               }
-                       }
-
-                               // Return query:
-                       return $queryPart . ')';
-               }
-       }
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/dbal/class.ux_db_list_extra.php'])) {
-       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/dbal/class.ux_db_list_extra.php']);
-}
-
-?>
\ No newline at end of file
diff --git a/typo3/sysext/dbal/class.ux_t3lib_db.php b/typo3/sysext/dbal/class.ux_t3lib_db.php
deleted file mode 100644 (file)
index faedcf6..0000000
+++ /dev/null
@@ -1,3891 +0,0 @@
-<?php
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 2004-2009 Kasper Skårhøj (kasperYYYY@typo3.com)
- *  (c) 2004-2009 Karsten Dambekalns <karsten@typo3.org>
- *  (c) 2009-2010 Xavier Perseguers <typo3@perseguers.ch>
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *  A copy is found in the textfile GPL.txt and important notices to the license
- *  from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-/**
- * Contains a database abstraction layer class for TYPO3
- *
- * $Id: class.ux_t3lib_db.php 42596 2011-01-25 20:02:07Z xperseguers $
- *
- * @author     Kasper Skårhøj <kasper@typo3.com>
- * @author     Karsten Dambekalns <k.dambekalns@fishfarm.de>
- * @author     Xavier Perseguers <typo3@perseguers.ch>
- */
-/**
- * [CLASS/FUNCTION INDEX of SCRIPT]
- *
- *
- *
- *  161: class ux_t3lib_DB extends t3lib_DB
- *  229:        public function __construct()
- *  260:        protected function initInternalVariables()
- *  283:        public function clearCachedFieldInfo()
- *  294:        public function cacheFieldInfo()
- *  342:        protected function analyzeFields($parsedExtSQL)
- *  375:        protected function mapCachedFieldInfo($fieldInfo)
- *
- *                       SECTION: Query Building (Overriding parent methods)
- *  438:        public function exec_INSERTquery($table, $fields_values, $no_quote_fields = '')
- *  575:        public function exec_INSERTmultipleRows($table, array $fields, array $rows, $no_quote_fields = FALSE)
- *  600:        public function exec_UPDATEquery($table,$where,$fields_values,$no_quote_fields = '')
- *  692:        public function exec_DELETEquery($table, $where)
- *  759:        public function exec_SELECTquery($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '')
- *  856:        public function exec_TRUNCATEquery($table)
- *  914:        protected function exec_query(array $queryParts)
- *
- *                       SECTION: Query building
- *  978:        public function INSERTquery($table, $fields_values, $no_quote_fields = '')
- * 1052:        public function INSERTmultipleRows($table, array $fields, array $rows, $no_quote_fields = FALSE)
- * 1085:        public function UPDATEquery($table, $where, $fields_values, $no_quote_fields = '')
- * 1170:        public function DELETEquery($table, $where)
- * 1196:        public function SELECTquery($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '')
- * 1229:        protected function SELECTqueryFromArray(array $params)
- * 1267:        protected function compileSelectParameters(array $params)
- * 1283:        public function TRUNCATEquery($table)
- *
- *                       SECTION: Prepared Query Support
- * 1314:        public function prepare_SELECTquery($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '', array $input_parameters = array())
- * 1416:        protected function getQueryComponents($select_fields, $from_table, $where_clause, $groupBy, $orderBy, $limit)
- * 1465:        protected function precompileSELECTquery(array $components)
- * 1523:        public function exec_PREPAREDquery($query, array $precompiledParts)
- *
- *                       SECTION: Functions for quoting table/field names
- * 1619:        protected function quoteSELECTsubquery(array $components)
- * 1634:        public function quoteSelectFields($select_fields)
- * 1644:        public function quoteFieldNames($select_fields)
- * 1664:        protected function _quoteFieldNames(array $select_fields)
- * 1701:        public function quoteFromTables($from_table)
- * 1717:        protected function _quoteFromTables(array $from_table)
- * 1746:        public function quoteWhereClause($where_clause)
- * 1767:        protected function _quoteWhereClause(array $where_clause)
- * 1843:        protected function quoteGroupBy($groupBy)
- * 1860:        protected function _quoteGroupBy(array $groupBy)
- * 1877:        protected function quoteOrderBy($orderBy)
- * 1894:        protected function _quoteOrderBy(array $orderBy)
- *
- *                       SECTION: Various helper functions
- * 1919:        public function fullQuoteStr($str, $table)
- * 1932:        public function quoteStr($str, $table)
- * 1965:        public function quoteName($name, $handlerKey = NULL, $useBackticks = FALSE)
- * 1984:        public function MetaType($type, $table, $max_length = -1)
- * 2015:        public function MySQLMetaType($t)
- * 2062:        public function MySQLActualType($meta)
- *
- *                       SECTION: SQL wrapper functions (Overriding parent methods)
- * 2105:        public function sql_error()
- * 2125:        public function sql_errno()
- * 2146:        public function sql_num_rows(&$res)
- * 2170:        public function sql_fetch_assoc(&$res)
- * 2233:        public function sql_fetch_row(&$res)
- * 2279:        public function sql_free_result(&$res)
- * 2308:        public function sql_insert_id()
- * 2328:        public function sql_affected_rows()
- * 2350:        public function sql_data_seek(&$res, $seek)
- * 2375:        public function sql_field_metatype($table, $field)
- * 2405:        public function sql_field_type(&$res,$pointer)
- *
- *                       SECTION: Legacy functions, bound to _DEFAULT handler. (Overriding parent methods)
- * 2459:        public function sql($db,$query)
- * 2477:        public function sql_query($query)
- * 2516:        public function sql_pconnect($TYPO3_db_host, $TYPO3_db_username, $TYPO3_db_password)
- * 2534:        public function sql_select_db($TYPO3_db)
- *
- *                       SECTION: SQL admin functions
- * 2566:        public function admin_get_dbs()
- * 2607:        public function admin_get_tables()
- * 2673:        public function admin_get_fields($tableName)
- * 2742:        public function admin_get_keys($tableName)
- * 2847:        public function admin_get_charsets()
- * 2857:        public function admin_query($query)
- *
- *                       SECTION: Handler management
- * 2941:        public function handler_getFromTableList($tableList)
- * 2989:        public function handler_init($handlerKey)
- * 3107:        public function isConnected()
- * 3127:        public function runningNative()
- * 3138:        public function runningADOdbDriver($driver)
- *
- *                       SECTION: Table/Field mapping
- * 3165:        protected function map_needMapping($tableList, $fieldMappingOnly = FALSE, array &$parsedTableList = array())
- * 3215:        protected function map_assocArray($input, $tables, $rev = FALSE)
- * 3263:        protected function map_remapSELECTQueryParts($select_fields, $from_table, $where_clause, $groupBy, $orderBy)
- * 3357:        protected function getMappingKey($tableName)
- * 3371:        protected function getFreeMappingKey($tableName)
- * 3387:        protected function map_sqlParts(&$sqlPartArray, $defaultTable)
- * 3549:        protected function map_subquery(&$parsedQuery)
- * 3589:        protected function map_genericQueryParsed(&$parsedQuery)
- * 3654:        protected function map_fieldNamesInArray($table,&$fieldArray)
- *
- *                       SECTION: Debugging
- * 3695:        public function debugHandler($function,$execTime,$inData)
- * 3790:        public function debug_WHERE($table, $where, $script = '')
- * 3813:        public function debug_log($query,$ms,$data,$join,$errorFlag, $script='')
- * 3846:        public function debug_explain($query)
- *
- * TOTAL FUNCTIONS: 82
- * (This index is automatically created/updated by the extension "extdeveval")
- *
- */
-/**
- * TYPO3 database abstraction layer
- *
- * @author     Kasper Skårhøj <kasper@typo3.com>
- * @author     Karsten Dambekalns <k.dambekalns@fishfarm.de>
- * @package TYPO3
- * @subpackage tx_dbal
- */
-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.
-
-       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"
-                               'sequenceStart' => 1, // ONLY "adodb", first number in sequences/serials/...
-                               'useNameQuote' => 0 // ONLY "adodb", whether to use NameQuote() method from ADOdb to quote names
-                       )
-               ),
-       );
-
-
-       // 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.
-
-       // 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
-
-       /**
-        * SQL parser
-        *
-        * @var tx_dbal_sqlengine
-        */
-       var $SQLparser;
-
-       /**
-        * Installer
-        *
-        * @var t3lib_install
-        */
-       var $Installer;
-
-       /**
-        * Cache for queries
-        *
-        * @var t3lib_cache_frontend_VariableFrontend
-        */
-       protected $queryCache;
-
-
-       /**
-        * Constructor.
-        * Creates SQL parser object and imports configuration from $TYPO3_CONF_VARS['EXTCONF']['dbal']
-        */
-       public function __construct() {
-               // Set SQL parser object for internal use:
-               $this->SQLparser = t3lib_div::makeInstance('tx_dbal_sqlengine');
-               $this->Installer = t3lib_div::makeInstance('t3lib_install');
-
-               if (TYPO3_UseCachingFramework) {
-                       tx_dbal_querycache::initializeCachingFramework();
-
-                       try {
-                               $this->queryCache = $GLOBALS['typo3CacheManager']->getCache(
-                                       'dbal'
-                               );
-                       } catch (t3lib_cache_exception_NoSuchCache $e) {
-                               tx_dbal_querycache::initDbalCache();
-
-                               $this->queryCache = $GLOBALS['typo3CacheManager']->getCache(
-                                       'dbal'
-                               );
-                       }
-               }
-
-               // Set internal variables with configuration:
-               $this->conf = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['dbal'];
-               $this->initInternalVariables();
-       }
-
-       /**
-        * Setting internal variables from $this->conf.
-        *
-        * @return      void
-        */
-       protected 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;
-       }
-
-       /**
-        * Clears the cached field information file.
-        *
-        * @return void
-        */
-       public function clearCachedFieldInfo() {
-               if (file_exists(PATH_typo3conf . 'temp_fieldInfo.php')) {
-                       unlink(PATH_typo3conf . 'temp_fieldInfo.php');
-               }
-       }
-
-       /**
-        * Caches the field information.
-        *
-        * @return void
-        */
-       public function cacheFieldInfo() {
-               $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_fileContent($extSQL);
-                       $this->analyzeFields($parsedExtSQL);
-
-                       // loop over all installed extensions
-                       foreach ($GLOBALS['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_fileContent($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
-                       t3lib_div::writeFile(PATH_typo3conf . 'temp_fieldInfo.php', $cachedFieldInfo);
-
-                       if (strcmp(t3lib_div::getUrl(PATH_typo3conf . 'temp_fieldInfo.php'), $cachedFieldInfo)) {
-                               die('typo3conf/temp_fieldInfo.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_fileContent()
-        * @return void
-        * @see t3lib_install::getFieldDefinitions_fileContent()
-        */
-       protected function analyzeFields($parsedExtSQL) {
-               foreach ($parsedExtSQL as $table => $tdef) {
-                       if (is_array($tdef['fields'])) {
-                               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']['DEFAULT'])) {
-                                               $default = $fdef['featureIndex']['DEFAULT']['value'][0];
-                                               if (isset($fdef['featureIndex']['DEFAULT']['value'][1])) {
-                                                       $default = $fdef['featureIndex']['DEFAULT']['value'][1] . $default . $fdef['featureIndex']['DEFAULT']['value'][1];
-                                               }
-                                               $this->cache_fieldType[$table][$field]['default'] = $default;
-                                       }
-                                       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
-        * @see cacheFieldInfo()
-        */
-       protected function mapCachedFieldInfo($fieldInfo) {
-               if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['dbal']['mapping'])) {
-                       foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['dbal']['mapping'] as $mappedTable => $mappedConf) {
-                               if (array_key_exists($mappedTable, $fieldInfo['incFields'])) {
-                                       $mappedTableAlias = $mappedConf['mapTableName'];
-                                       if (isset($mappedConf['mapFieldNames'][$fieldInfo['incFields'][$mappedTable]])) {
-                                               $fieldInfo['incFields'][$mappedTableAlias] = $mappedConf['mapFieldNames'][$fieldInfo['incFields'][$mappedTable]];
-                                       } else {
-                                               $fieldInfo['incFields'][$mappedTableAlias] = $fieldInfo['incFields'][$mappedTable];
-                                       }
-                               }
-
-                               if (array_key_exists($mappedTable, $fieldInfo['fieldTypes'])) {
-                                       foreach ($fieldInfo['fieldTypes'][$mappedTable] as $field => $fieldConf) {
-                                               $tempMappedFieldConf[$mappedConf['mapFieldNames'][$field]] = $fieldConf;
-                                       }
-
-                                       $fieldInfo['fieldTypes'][$mappedConf['mapTableName']] = $tempMappedFieldConf;
-                               }
-
-                               if (array_key_exists($mappedTable, $fieldInfo['primaryKeys'])) {
-                                       $mappedTableAlias = $mappedConf['mapTableName'];
-                                       if (isset($mappedConf['mapFieldNames'][$fieldInfo['primaryKeys'][$mappedTable]])) {
-                                               $fieldInfo['primaryKeys'][$mappedTableAlias] = $mappedConf['mapFieldNames'][$fieldInfo['primaryKeys'][$mappedTable]];
-                                       } else {
-                                               $fieldInfo['primaryKeys'][$mappedTableAlias] = $fieldInfo['primaryKeys'][$mappedTable];
-                                       }
-                               }
-                       }
-               }
-
-               return $fieldInfo;
-       }
-
-
-       /************************************
-        *
-        * 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)
-
-       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 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
-        */
-       public 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);
-               $hType = (string) $this->handlerCfg[$this->lastHandlerKey]['type'];
-               switch ($hType) {
-                       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']);
-                                       $new_id = $this->sql_insert_id();
-                                       $where = $this->cache_autoIncFields[$table] . '=' . $new_id;
-                                       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], $this->handlerInstance[$this->lastHandlerKey]->sequenceStart);
-                                               $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();
-                                       if (strlen($this->lastQuery[0])) {
-                                               $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->_query($this->lastQuery[0], FALSE);
-                                       }
-                                       if (is_array($this->lastQuery[1])) {
-                                               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])) {
-                                                               $where = '';
-                                                               $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
-                                                       }
-                                               }
-                                       }
-                                       if (is_array($this->lastQuery[2])) {
-                                               foreach ($this->lastQuery[2] as $field => $content) {
-                                                       if (empty($content)) continue;
-
-                                                       if (isset($this->cache_autoIncFields[$table]) && isset($new_id)) {
-                                                               $this->handlerInstance[$this->lastHandlerKey]->UpdateClob($this->quoteFromTables($table), $field, $content, $this->quoteWhereClause($this->cache_autoIncFields[$table] . '=' . $new_id));
-                                                       } elseif (isset($this->cache_primaryKeys[$table])) {
-                                                               $where = '';
-                                                               $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]->UpdateClob($this->quoteFromTables($table), $field, $content, $where);
-                                                       } else {
-                                                               $this->handlerInstance[$this->lastHandlerKey]->CompleteTrans(FALSE);
-                                                               die('Could not update CLOB >>>> 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;
-       }
-
-       /**
-        * Creates and executes an INSERT SQL-statement for $table with multiple rows.
-        * This method uses exec_INSERTquery() and is just a syntax wrapper to it.
-        *
-        * @param       string          Table name
-        * @param       array           Field names
-        * @param       array           Table rows. Each row should be an array with field values mapping to $fields
-        * @param       string/array            See fullQuoteArray()
-        * @return      mixed           Result from last handler, usually TRUE when success and FALSE on failure
-        */
-       public function exec_INSERTmultipleRows($table, array $fields, array $rows, $no_quote_fields = FALSE) {
-               if ((string) $this->handlerCfg[$this->lastHandlerKey]['type'] === 'native') {
-                       return parent::exec_INSERTmultipleRows($table, $fields, $rows, $no_quote_fields);
-               }
-
-               foreach ($rows as $row) {
-                       $fields_values = array();
-                       foreach ($fields as $key => $value) {
-                               $fields_values[$value] = $row[$key];
-                       }
-                       $res = $this->exec_INSERTquery($table, $fields_values, $no_quote_fields);
-               }
-
-               return $res;
-       }
-
-       /**
-        * 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
-        */
-       public 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, FALSE);
-
-                       // Table name:
-                       if ($this->mapping[$table]['mapTableName']) {
-                               $table = $this->mapping[$table]['mapTableName'];
-                       }
-               }
-
-               // Select API
-               $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
-               $hType = (string) $this->handlerCfg[$this->lastHandlerKey]['type'];
-               switch ($hType) {
-                       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();
-                                       if (strlen($this->lastQuery[0])) {
-                                               $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->_query($this->lastQuery[0], FALSE);
-                                       }
-                                       if (is_array($this->lastQuery[1])) {
-                                               foreach ($this->lastQuery[1] as $field => $content) {
-                                                       $this->handlerInstance[$this->lastHandlerKey]->UpdateBlob($this->quoteFromTables($table), $field, $content, $this->quoteWhereClause($where));
-                                               }
-                                       }
-                                       if (is_array($this->lastQuery[2])) {
-                                               foreach ($this->lastQuery[2] as $field => $content) {
-                                                       $this->handlerInstance[$this->lastHandlerKey]->UpdateClob($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
-        */
-       public 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, FALSE);
-
-                       // Table name:
-                       if ($this->mapping[$table]['mapTableName']) {
-                               $table = $this->mapping[$table]['mapTableName'];
-                       }
-               }
-
-               // Select API
-               $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
-               $hType = (string) $this->handlerCfg[$this->lastHandlerKey]['type'];
-               switch ($hType) {
-                       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.
-        * @param       string $from_table Table(s) from which to select. This is what comes right after "FROM ...". Required value.
-        * @param       string $where_clause Optional additional WHERE clauses put in the end of the query. NOTICE: You must escape values in this argument with $this->fullQquoteStr() yourself! DO NOT PUT IN GROUP BY, ORDER BY or LIMIT!
-        * @param       string $groupBy Optional GROUP BY field(s), if none, supply blank string.
-        * @param       string $orderBy Optional ORDER BY field(s), if none, supply blank string.
-        * @param       string $limit Optional LIMIT value ([begin,]max), if none, supply blank string.
-        * @return      mixed           Result from handler. Typically object from DBAL layers.
-        */
-       public 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:
-               $parsedFromTable = array();
-               $remappedParameters = array();
-               if ($tableArray = $this->map_needMapping($ORIG_tableName, FALSE, $parsedFromTable)) {
-                       $from = $parsedFromTable ? $parsedFromTable : $from_table;
-                       $remappedParameters = $this->map_remapSELECTQueryParts($select_fields, $from, $where_clause, $groupBy, $orderBy);
-               }
-
-               // Get handler key and select API:
-               $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
-               $hType = (string) $this->handlerCfg[$this->lastHandlerKey]['type'];
-               switch ($hType) {
-                       case 'native':
-                               if (count($remappedParameters) > 0) {
-                                       list($select_fields, $from_table, $where_clause, $groupBy, $orderBy) = $this->compileSelectParameters($remappedParameters);
-                               }
-                               $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;
-                                       }
-
-                                       if (count($remappedParameters) > 0) {
-                                               $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->SelectLimit($this->SELECTqueryFromArray($remappedParameters), $numrows, $offset);
-                                       } else {
-                                               $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->SelectLimit($this->SELECTquery($select_fields, $from_table, $where_clause, $groupBy, $orderBy), $numrows, $offset);
-                                       }
-                                       $this->lastQuery = $sqlResult->sql;
-                               } else {
-                                       if (count($remappedParameters) > 0) {
-                                               $this->lastQuery = $this->SELECTqueryFromArray($remappedParameters);
-                                       } 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':
-                               if (count($remappedParameters) > 0) {
-                                       list($select_fields, $from_table, $where_clause, $groupBy, $orderBy) = $this->compileSelectParameters($remappedParameters);
-                               }
-                               $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) {
-                       $data = array(
-                               'handlerType' => $hType,
-                               'args' => array($from_table, $select_fields, $where_clause, $groupBy, $orderBy, $limit),
-                               'ORIG_from_table' => $ORIG_tableName,
-                       );
-                       if ($this->conf['debugOptions']['numberRows']) {
-                               $data['numberRows'] = $this->sql_num_rows($sqlResult);
-                       }
-                       $this->debugHandler(
-                               'exec_SELECTquery',
-                                       t3lib_div::milliseconds() - $pt,
-                               $data
-                       );
-               }
-
-               // Return result handler.
-               return $sqlResult;
-       }
-
-       /**
-        * Truncates a table.
-        *
-        * @param       string          Database tablename
-        * @return      mixed           Result from handler
-        */
-       public function exec_TRUNCATEquery($table) {
-               if ($this->debug) {
-                       $pt = t3lib_div::milliseconds();
-               }
-
-               // Do table/field mapping:
-               $ORIG_tableName = $table;
-               if ($tableArray = $this->map_needMapping($table)) {
-                       // Table name:
-                       if ($this->mapping[$table]['mapTableName']) {
-                               $table = $this->mapping[$table]['mapTableName'];
-                       }
-               }
-
-               // Select API
-               $this->lastHandlerKey = $this->handler_getFromTableList($ORIG_tableName);
-               $hType = (string) $this->handlerCfg[$this->lastHandlerKey]['type'];
-               switch ($hType) {
-                       case 'native':
-                               $this->lastQuery = $this->TRUNCATEquery($table);
-                               $sqlResult = mysql_query($this->lastQuery, $this->handlerInstance[$this->lastHandlerKey]['link']);
-                               break;
-                       case 'adodb':
-                               $this->lastQuery = $this->TRUNCATEquery($table);
-                               $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->_query($this->lastQuery, FALSE);
-                               break;
-                       case 'userdefined':
-                               $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->exec_TRUNCATEquery($table);
-                               break;
-               }
-
-               if ($this->printErrors && $this->sql_error()) {
-                       debug(array($this->lastQuery, $this->sql_error()));
-               }
-
-               if ($this->debug) {
-                       $this->debugHandler(
-                               'exec_TRUNCATEquery',
-                                       t3lib_div::milliseconds() - $pt,
-                               array(
-                                       'handlerType' => $hType,
-                                       'args' => array($table),
-                                       'ORIG_from_table' => $ORIG_tableName
-                               )
-                       );
-               }
-
-               // Return result:
-               return $sqlResult;
-       }
-
-       /**
-        * Executes a query.
-        * EXPERIMENTAL since TYPO3 4.4.
-        *
-        * @param array $queryParts SQL parsed by method parseSQL() of t3lib_sqlparser
-        * @return pointer Result pointer / DBAL object
-        * @see ux_t3lib_db::sql_query()
-        */
-       protected function exec_query(array $queryParts) {
-               switch ($queryParts['type']) {
-                       case 'SELECT':
-                               $selectFields = $this->SQLparser->compileFieldList($queryParts['SELECT']);
-                               $fromTables = $this->SQLparser->compileFromTables($queryParts['FROM']);
-                               $whereClause = isset($queryParts['WHERE']) ? $this->SQLparser->compileWhereClause($queryParts['WHERE']) : '1=1';
-                               $groupBy = isset($queryParts['GROUPBY']) ? $this->SQLparser->compileFieldList($queryParts['GROUPBY']) : '';
-                               $orderBy = isset($queryParts['ORDERBY']) ? $this->SQLparser->compileFieldList($queryParts['ORDERBY']) : '';
-                               $limit = isset($queryParts['LIMIT']) ? $this->SQLparser->compileWhereClause($queryParts['LIMIT']) : '';
-                               return $this->exec_SELECTquery($selectFields, $fromTables, $whereClause, $groupBy, $orderBy, $limit);
-
-                       case 'UPDATE':
-                               $table = $queryParts['TABLE'];
-                               $fields = array();
-                               foreach ($queryParts['FIELDS'] as $fN => $fV) {
-                                       $fields[$fN] = $fV[0];
-                               }
-                               $whereClause = isset($queryParts['WHERE']) ? $this->SQLparser->compileWhereClause($queryParts['WHERE']) : '1=1';
-                               return $this->exec_UPDATEquery($table, $whereClause, $fields);
-
-                       case 'INSERT':
-                               $table = $queryParts['TABLE'];
-                               $values = array();
-                               if (isset($queryParts['VALUES_ONLY']) && is_array($queryParts['VALUES_ONLY'])) {
-                                       $fields = $GLOBALS['TYPO3_DB']->cache_fieldType[$table];
-                                       $fc = 0;
-                                       foreach ($fields as $fn => $fd) {
-                                               $values[$fn] = $queryParts['VALUES_ONLY'][$fc++][0];
-                                       }
-                               } else {
-                                       foreach ($queryParts['FIELDS'] as $fN => $fV) {
-                                               $values[$fN] = $fV[0];
-                                       }
-                               }
-                               return $this->exec_INSERTquery($table, $values);
-
-                       case 'DELETE':
-                               $table = $queryParts['TABLE'];
-                               $whereClause = isset($queryParts['WHERE']) ? $this->SQLparser->compileWhereClause($queryParts['WHERE']) : '1=1';
-                               return $this->exec_DELETEquery($table, $whereClause);
-
-                       case 'TRUNCATETABLE':
-                               $table = $queryParts['TABLE'];
-                               return $this->exec_TRUNCATEquery($table);
-               }
-       }
-
-
-       /**************************************
-        *
-        * 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      mixed           Full SQL query for INSERT as string or array (unless $fields_values does not contain any elements in which case it will be FALSE). If BLOB fields will be affected and one is not running the native type, an array will be returned, where 0 => plain SQL, 1 => fieldname/value pairs of BLOB fields
-        */
-       public 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->runningNative() && $this->sql_field_metatype($table, $k) == 'B') {
-                                       // we skip the field in the regular INSERT statement, it is only in blobfields
-                                       $blobfields[$this->quoteFieldNames($k)] = $v;
-                               } elseif (!$this->runningNative() && $this->sql_field_metatype($table, $k) == 'XL') {
-                                       // we skip the field in the regular INSERT statement, it is only in clobfields
-                                       $clobfields[$this->quoteFieldNames($k)] = $v;
-                               } else {
-                                       // Add slashes old-school:
-                                       // cast numerical values
-                                       $mt = $this->sql_field_metatype($table, $k);
-                                       if ($mt{0} == 'I') {
-                                               $v = (int) $v;
-                                       } elseif ($mt{0} == 'F') {
-                                               $v = (double) $v;
-                                       }
-
-                                       $nArr[$this->quoteFieldNames($k)] = (!in_array($k, $no_quote_fields)) ? $this->fullQuoteStr($v, $table) : $v;
-                               }
-                       }
-
-                       if (count($blobfields) || count($clobfields)) {
-                               if (count($nArr)) {
-                                       $query[0] = 'INSERT INTO ' . $this->quoteFromTables($table) . '
-                                       (
-                                               ' . implode(',
-                                               ', array_keys($nArr)) . '
-                                       ) VALUES (
-                                               ' . implode(',
-                                               ', $nArr) . '
-                                       )';
-                               }
-                               if (count($blobfields)) $query[1] = $blobfields;
-                               if (count($clobfields)) $query[2] = $clobfields;
-                               if ($this->debugOutput || $this->store_lastBuiltQuery) $this->debug_lastBuiltQuery = $query[0];
-                       } else {
-                               $query = 'INSERT INTO ' . $this->quoteFromTables($table) . '
-                               (
-                                       ' . implode(',
-                                       ', array_keys($nArr)) . '
-                               ) VALUES (
-                                       ' . implode(',
-                                       ', $nArr) . '
-                               )';
-
-                               if ($this->debugOutput || $this->store_lastBuiltQuery) $this->debug_lastBuiltQuery = $query;
-                       }
-
-                       return $query;
-               }
-       }
-
-       /**
-        * Creates an INSERT SQL-statement for $table with multiple rows.
-        * This method will create multiple INSERT queries concatenated with ';'
-        *
-        * @param       string          Table name
-        * @param       array           Field names
-        * @param       array           Table rows. Each row should be an array with field values mapping to $fields
-        * @param       string/array            See fullQuoteArray()
-        * @return      array           Full SQL query for INSERT as array of strings (unless $fields_values does not contain any elements in which case it will be FALSE). If BLOB fields will be affected and one is not running the native type, an array will be returned for each row, where 0 => plain SQL, 1 => fieldname/value pairs of BLOB fields.
-        */
-       public function INSERTmultipleRows($table, array $fields, array $rows, $no_quote_fields = FALSE) {
-               if ((string) $this->handlerCfg[$this->lastHandlerKey]['type'] === 'native') {
-                       return parent::INSERTmultipleRows($table, $fields, $rows, $no_quote_fields);
-               }
-
-               $result = array();
-
-               foreach ($rows as $row) {
-                       $fields_values = array();
-                       foreach ($fields as $key => $value) {
-                               $fields_values[$value] = $row[$key];
-                       }
-                       $rowQuery = $this->INSERTquery($table, $fields_values, $no_quote_fields);
-                       if (is_array($rowQuery)) {
-                               $result[] = $rowQuery;
-                       } else {
-                               $result[][0] = $rowQuery;
-                       }
-               }
-
-               return $result;
-       }
-
-       /**
-        * 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      mixed           Full SQL query for UPDATE as string or array (unless $fields_values does not contain any elements in which case it will be FALSE). If BLOB fields will be affected and one is not running the native type, an array will be returned, where 0 => plain SQL, 1 => fieldname/value pairs of BLOB fields
-        */
-       public 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)) {
-                       $fields = array();
-                       $blobfields = array();
-                       $clobfields = array();
-                       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();
-                               }
-
-                               $nArr = array();
-                               foreach ($fields_values as $k => $v) {
-                                       if (!$this->runningNative() && $this->sql_field_metatype($table, $k) == 'B') {
-                                               // we skip the field in the regular UPDATE statement, it is only in blobfields
-                                               $blobfields[$this->quoteFieldNames($k)] = $v;
-                                       } elseif (!$this->runningNative() && $this->sql_field_metatype($table, $k) == 'XL') {
-                                               // we skip the field in the regular UPDATE statement, it is only in clobfields
-                                               $clobfields[$this->quoteFieldNames($k)] = $v;
-                                       } else {
-                                               // Add slashes old-school:
-                                               // cast numeric values
-                                               $mt = $this->sql_field_metatype($table, $k);
-                                               if ($mt{0} == 'I') {
-                                                       $v = (int) $v;
-                                               } elseif ($mt{0} == 'F') {
-                                                       $v = (double) $v;
-                                               }
-                                               $nArr[] = $this->quoteFieldNames($k) . '=' . ((!in_array($k, $no_quote_fields)) ? $this->fullQuoteStr($v, $table) : $v);
-                                       }
-                               }
-                       }
-
-                       if (count($blobfields) || count($clobfields)) {
-                               if (count($nArr)) {
-                                       $query[0] = 'UPDATE ' . $this->quoteFromTables($table) . '
-                                               SET
-                                                       ' . implode(',
-                                                       ', $nArr) .
-                                                       (strlen($where) > 0 ? '
-                                               WHERE
-                                                       ' . $this->quoteWhereClause($where) : '');
-                               }
-                               if (count($blobfields)) {
-                                       $query[1] = $blobfields;
-                               }
-                               if (count($clobfields)) {
-                                       $query[2] = $clobfields;
-                               }
-                               if ($this->debugOutput || $this->store_lastBuiltQuery) {
-                                       $this->debug_lastBuiltQuery = $query[0];
-                               }
-                       } else {
-                               $query = 'UPDATE ' . $this->quoteFromTables($table) . '
-                                       SET
-                                               ' . implode(',
-                                               ', $nArr) .
-                                               (strlen($where) > 0 ? '
-                                       WHERE
-                                               ' . $this->quoteWhereClause($where) : '');
-
-                               if ($this->debugOutput || $this->store_lastBuiltQuery) {
-                                       $this->debug_lastBuiltQuery = $query;
-                               }
-                       }
-                       return $query;
-               } else {
-                       throw new InvalidArgumentException(
-                               'TYPO3 Fatal Error: "Where" clause argument for UPDATE query was not a string in $this->UPDATEquery() !',
-                               1270853880
-                       );
-               }
-       }
-
-       /**
-        * Creates a DELETE SQL-statement for $table where $where-clause
-        * Usage count/core: 3
-        *
-        * @param       string          See exec_DELETEquery()
-        * @param       string          See exec_DELETEquery()
-        * @return      string          Full SQL query for DELETE
-        */
-       public function DELETEquery($table, $where) {
-               if (is_string($where)) {
-                       $table = $this->quoteFromTables($table);
-                       $where = $this->quoteWhereClause($where);
-
-                       $query = parent::DELETEquery($table, $where);
-
-                       if ($this->debugOutput || $this->store_lastBuiltQuery) $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
-        *
-        * @param       string          See exec_SELECTquery()
-        * @param       string          See exec_SELECTquery()
-        * @param       string          See exec_SELECTquery()
-        * @param       string          See exec_SELECTquery()
-        * @param       string          See exec_SELECTquery()
-        * @param       string          See exec_SELECTquery()
-        * @return      string          Full SQL query for SELECT
-        */
-       public function SELECTquery($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '') {
-               $this->lastHandlerKey = $this->handler_getFromTableList($from_table);
-               $hType = (string) $this->handlerCfg[$this->lastHandlerKey]['type'];
-               if ($hType === 'adodb' && $this->runningADOdbDriver('postgres')) {
-                       // Possibly rewrite the LIMIT to be PostgreSQL-compatible
-                       $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];
-                               $limit = $numrows . ' OFFSET ' . $offset;
-                       }
-               }
-
-               $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);
-
-               // Call parent method to build actual query
-               $query = parent::SELECTquery($select_fields, $from_table, $where_clause, $groupBy, $orderBy, $limit);
-
-               if ($this->debugOutput || $this->store_lastBuiltQuery) {
-                       $this->debug_lastBuiltQuery = $query;
-               }
-
-               return $query;
-       }
-
-       /**
-        * Creates a SELECT SQL-statement to be used with an ADOdb backend.
-        *
-        * @param       array           parsed parameters: array($select_fields, $from_table, $where_clause, $groupBy, $orderBy)
-        * @return      string          Full SQL query for SELECT
-        */
-       protected function SELECTqueryFromArray(array $params) {
-               // $select_fields
-               $params[0] = $this->_quoteFieldNames($params[0]);
-               // $from_table
-               $params[1] = $this->_quoteFromTables($params[1]);
-               // $where_clause
-               if (count($params[2]) > 0) {
-                       $params[2] = $this->_quoteWhereClause($params[2]);
-               }
-               // $group_by
-               if (count($params[3]) > 0) {
-                       $params[3] = $this->_quoteGroupBy($params[3]);
-               }
-               // $order_by
-               if (count($params[4]) > 0) {
-                       $params[4] = $this->_quoteOrderBy($params[4]);
-               }
-
-               // Compile the SELECT parameters
-               list($select_fields, $from_table, $where_clause, $groupBy, $orderBy) = $this->compileSelectParameters($params);
-
-               // Call parent method to build actual query
-               $query = parent::SELECTquery($select_fields, $from_table, $where_clause, $groupBy, $orderBy);
-
-               if ($this->debugOutput || $this->store_lastBuiltQuery) {
-                       $this->debug_lastBuiltQuery = $query;
-               }
-
-               return $query;
-       }
-
-       /**
-        * Compiles and returns an array of SELECTquery parameters (without $limit) to
-        * be used with SELECTquery() or exec_SELECTquery().
-        *
-        * @param array $params
-        * @return array array($select_fields, $from_table, $where_clause, $groupBy, $orderBy)
-        */
-       protected function compileSelectParameters(array $params) {
-               $select_fields = $this->SQLparser->compileFieldList($params[0]);
-               $from_table = $this->SQLparser->compileFromTables($params[1]);
-               $where_clause = (count($params[2]) > 0) ? $this->SQLparser->compileWhereClause($params[2]) : '';
-               $groupBy = (count($params[3]) > 0) ? $this->SQLparser->compileFieldList($params[3]) : '';
-               $orderBy = (count($params[4]) > 0) ? $this->SQLparser->compileFieldList($params[4]) : '';
-
-               return array($select_fields, $from_table, $where_clause, $groupBy, $orderBy);
-       }
-
-       /**
-        * Creates a TRUNCATE TABLE SQL-statement
-        *
-        * @param       string          See exec_TRUNCATEquery()
-        * @return      string          Full SQL query for TRUNCATE TABLE
-        */
-       public function TRUNCATEquery($table) {
-               $table = $this->quoteFromTables($table);
-
-               // Call parent method to build actual query
-               $query = parent::TRUNCATEquery($table);
-
-               if ($this->debugOutput || $this->store_lastBuiltQuery) {
-                       $this->debug_lastBuiltQuery = $query;
-               }
-
-               return $query;
-       }
-
-       /**************************************
-        *
-        * Prepared Query Support
-        *
-        **************************************/
-
-       /**
-        * Creates a SELECT prepared SQL statement.
-        *
-        * @param string See exec_SELECTquery()
-        * @param string See exec_SELECTquery()
-        * @param string See exec_SELECTquery()
-        * @param string See exec_SELECTquery()
-        * @param string See exec_SELECTquery()
-        * @param string See exec_SELECTquery()
-        * @param array $input_parameters An array of values with as many elements as there are bound parameters in the SQL statement being executed. All values are treated as t3lib_db_PreparedStatement::PARAM_AUTOTYPE.
-        * @return t3lib_db_PreparedStatement Prepared statement
-        */
-       public function prepare_SELECTquery($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '', array $input_parameters = array()) {
-               if ($this->debug) {
-                       $pt = t3lib_div::milliseconds();
-               }
-
-               $precompiledParts = array();
-
-               if ($this->queryCache) {
-                       $cacheKey = 'prepare_SELECTquery-' . tx_dbal_querycache::getCacheKey(array(
-                               'selectFields' => $select_fields,
-                               'fromTable' => $from_table,
-                               'whereClause' => $where_clause,
-                               'groupBy' => $groupBy,
-                               'orderBy' => $orderBy,
-                               'limit' => $limit,
-                       ));
-                       if ($this->queryCache->has($cacheKey)) {
-                               $precompiledParts = $this->queryCache->get($cacheKey);
-                               if ($this->debug) {
-                                       $data = array(
-                                               'args' => array($from_table, $select_fields, $where_clause, $groupBy, $orderBy, $limit, $input_parameters),
-                                               'precompiledParts' => $precompiledParts,
-                                       );
-                                       $this->debugHandler(
-                                               'prepare_SELECTquery (cache hit)',
-                                                       t3lib_div::milliseconds() - $pt,
-                                               $data
-                                       );
-                               }
-                       }
-               }
-
-               if (count($precompiledParts) == 0) {
-                       // Map table / field names if needed:
-                       $ORIG_tableName = $from_table; // Saving table names in $ORIG_from_table since $from_table is transformed beneath:
-                       $parsedFromTable = array();
-                       $queryComponents = array();
-                       if ($tableArray = $this->map_needMapping($ORIG_tableName, FALSE, $parsedFromTable)) {
-                               $from = $parsedFromTable ? $parsedFromTable : $from_table;
-                               $components = $this->map_remapSELECTQueryParts($select_fields, $from, $where_clause, $groupBy, $orderBy);
-                               $queryComponents['SELECT'] = $components[0];
-                               $queryComponents['FROM'] = $components[1];
-                               $queryComponents['WHERE'] = $components[2];
-                               $queryComponents['GROUPBY'] = $components[3];
-                               $queryComponents['ORDERBY'] = $components[4];
-                               $queryComponents['parameters'] = $components[5];
-                       } else {
-                               $queryComponents = $this->getQueryComponents($select_fields, $from_table, $where_clause, $groupBy, $orderBy, $limit);
-                       }
-
-                       $queryComponents['ORIG_tableName'] = $ORIG_tableName;
-
-                       if (!$this->runningNative()) {
-                               // Quotes all fields
-                               $queryComponents['SELECT'] = $this->_quoteFieldNames($queryComponents['SELECT']);
-                               $queryComponents['FROM'] = $this->_quoteFromTables($queryComponents['FROM']);
-                               $queryComponents['WHERE'] = $this->_quoteWhereClause($queryComponents['WHERE']);
-                               $queryComponents['GROUPBY'] = $this->_quoteGroupBy($queryComponents['GROUPBY']);
-                               $queryComponents['ORDERBY'] = $this->_quoteOrderBy($queryComponents['ORDERBY']);
-                       }
-
-                       $precompiledParts = $this->precompileSELECTquery($queryComponents);
-                       if ($this->queryCache) {
-                               try {
-                                       $this->queryCache->set($cacheKey, $precompiledParts);
-                               } catch (t3lib_cache_Exception $e) {
-                                       if ($this->debug) {
-                                               t3lib_div::devLog($e->getMessage(), 'dbal', 1);
-                                       }
-                               }
-                       }
-               }
-
-               $preparedStatement = t3lib_div::makeInstance('t3lib_db_PreparedStatement', '', $from_table, $precompiledParts);
-               /* @var $preparedStatement t3lib_db_PreparedStatement */
-
-               // Bind values to parameters
-               foreach ($input_parameters as $key => $value) {
-                       $preparedStatement->bindValue($key, $value, t3lib_db_PreparedStatement::PARAM_AUTOTYPE);
-               }
-
-               if ($this->debug) {
-                       $data = array(
-                               'args' => array($from_table, $select_fields, $where_clause, $groupBy, $orderBy, $limit, $input_parameters),
-                               'ORIG_from_table' => $ORIG_tableName,
-                       );
-                       $this->debugHandler(
-                               'prepare_SELECTquery',
-                                       t3lib_div::milliseconds() - $pt,
-                               $data
-                       );
-               }
-
-               // Return prepared statement
-               return $preparedStatement;
-       }
-
-       /**
-        * Returns the parsed query components.
-        *
-        * @param string $select_fields
-        * @param string $from_table
-        * @param string $where_clause
-        * @param string $groupBy
-        * @param string $orderBy
-        * @param string $limit
-        * @return array
-        */
-       protected function getQueryComponents($select_fields, $from_table, $where_clause, $groupBy, $orderBy, $limit) {
-               $queryComponents = array(
-                       'SELECT' => '',
-                       'FROM' => '',
-                       'WHERE' => '',
-                       'GROUPBY' => '',
-                       'ORDERBY' => '',
-                       'LIMIT' => '',
-                       'parameters' => array(),
-               );
-
-               $this->lastHandlerKey = $this->handler_getFromTableList($from_table);
-               $hType = (string) $this->handlerCfg[$this->lastHandlerKey]['type'];
-               if ($hType === 'adodb' && $this->runningADOdbDriver('postgres')) {
-                       // Possibly rewrite the LIMIT to be PostgreSQL-compatible
-                       $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];
-                               $limit = $numrows . ' OFFSET ' . $offset;
-                       }
-               }
-               $queryComponents['LIMIT'] = $limit;
-
-               $queryComponents['SELECT'] = $this->SQLparser->parseFieldList($select_fields);
-               if ($this->SQLparser->parse_error) {
-                       die($this->SQLparser->parse_error . ' in ' . __FILE__ . ' : ' . __LINE__);
-               }
-
-               $queryComponents['FROM'] = $this->SQLparser->parseFromTables($from_table);
-
-               $queryComponents['WHERE'] = $this->SQLparser->parseWhereClause($where_clause, '', $queryComponents['parameters']);
-               if (!is_array($queryComponents['WHERE'])) {
-                       die('Could not parse where clause in ' . __FILE__ . ' : ' . __LINE__);
-               }
-
-               $queryComponents['GROUPBY'] = $this->SQLparser->parseFieldList($groupBy);
-               $queryComponents['ORDERBY'] = $this->SQLparser->parseFieldList($orderBy);
-
-               // Return the query components
-               return $queryComponents;
-       }
-
-       /**
-        * Precompiles a SELECT prepared SQL statement.
-        *
-        * @param array $components
-        * @return array Precompiled SQL statement
-        */
-       protected function precompileSELECTquery(array $components) {
-               $parameterWrap = '__' . dechex(time()) . '__';
-               foreach ($components['parameters'] as $key => $params) {
-                       if ($key === '?') {
-                               foreach ($params as $index => $param) {
-                                       $components['parameters'][$key][$index][0] = $parameterWrap . $param[0] . $parameterWrap;
-                               }
-                       } else {
-                               $components['parameters'][$key][0] = $parameterWrap . $params[0] . $parameterWrap;
-                       }
-               }
-
-               $select_fields = $this->SQLparser->compileFieldList($components['SELECT']);
-               $from_table = $this->SQLparser->compileFromTables($components['FROM']);
-               $where_clause = $this->SQLparser->compileWhereClause($components['WHERE']);
-               $groupBy = $this->SQLparser->compileFieldList($components['GROUPBY']);
-               $orderBy = $this->SQLparser->compileFieldList($components['ORDERBY']);
-               $limit = $components['LIMIT'];
-               $precompiledParts = array();
-
-               $this->lastHandlerKey = $this->handler_getFromTableList($components['ORIG_tableName']);
-               $hType = (string) $this->handlerCfg[$this->lastHandlerKey]['type'];
-               $precompiledParts['handler'] = $hType;
-               $precompiledParts['ORIG_tableName'] = $components['ORIG_tableName'];
-
-               switch ($hType) {
-                       case 'native':
-                               $query = parent::SELECTquery($select_fields, $from_table, $where_clause, $groupBy, $orderBy, $limit);
-                               $precompiledParts['queryParts'] = explode($parameterWrap, $query);
-                               break;
-                       case 'adodb':
-                               $query = parent::SELECTquery($select_fields, $from_table, $where_clause, $groupBy, $orderBy);
-                               $precompiledParts['queryParts'] = explode($parameterWrap, $query);
-                               $precompiledParts['LIMIT'] = $limit;
-                               break;
-                       case 'userdefined':
-                               $precompiledParts['queryParts'] = array(
-                                       'SELECT' => $select_fields,
-                                       'FROM' => $from_table,
-                                       'WHERE' => $where_clause,
-                                       'GROUPBY' => $groupBy,
-                                       'ORDERBY' => $orderBy,
-                                       'LIMIT' => $limit,
-                               );
-                               break;
-               }
-
-               return $precompiledParts;
-       }
-
-       /**
-        * Executes a prepared query.
-        *
-        * @param string $query The query to execute
-        * @param array $queryComponents The components of the query to execute
-        * @return pointer MySQL result pointer / DBAL object
-        * @access protected This method may only be called by t3lib_db_PreparedStatement
-        */
-       public function exec_PREPAREDquery($query, array $precompiledParts) {
-               if ($this->debug) {
-                       $pt = t3lib_div::milliseconds();
-               }
-
-               // Get handler key and select API:
-               switch ($precompiledParts['handler']) {
-                       case 'native':
-                               $this->lastQuery = $query;
-                               $sqlResult = mysql_query($this->lastQuery, $this->handlerInstance[$this->lastHandlerKey]['link']);
-                               $this->resourceIdToTableNameMap[(string) $sqlResult] = $precompiledParts['ORIG_tableName'];
-                               break;
-                       case 'adodb':
-                               $limit = $precompiledParts['LIMIT'];
-                               if ($this->runningADOdbDriver('postgres')) {
-                                       // Possibly rewrite the LIMIT to be PostgreSQL-compatible
-                                       $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];
-                                               $limit = $numrows . ' OFFSET ' . $offset;
-                                       }
-                               }
-                               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($query, $numrows, $offset);
-                                       $this->lastQuery = $sqlResult->sql;
-                               } else {
-                                       $this->lastQuery = $query;
-                                       $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 = $precompiledParts['ORIG_tableName'];
-                               break;
-                       case 'userdefined':
-                               $queryParts = $precompiledParts['queryParts'];
-                               $sqlResult = $this->handlerInstance[$this->lastHandlerKey]->exec_SELECTquery(
-                                       $queryParts['SELECT'],
-                                       $queryParts['FROM'],
-                                       $queryParts['WHERE'],
-                                       $queryParts['GROUPBY'],
-                                       $queryParts['ORDERBY'],
-                                       $queryParts['LIMIT']
-                               );
-                               if (is_object($sqlResult)) {
-                                       $sqlResult->TYPO3_DBAL_handlerType = 'userdefined'; // Setting handler type in result object (for later recognition!)
-                                       $sqlResult->TYPO3_DBAL_tableList = $precompiledParts['ORIG_tableName'];
-                               }
-                               break;
-               }
-
-               if ($this->printErrors && $this->sql_error()) {
-                       debug(array($this->lastQuery, $this->sql_error()));
-               }
-
-               if ($this->debug) {
-                       $data = array(
-                               'handlerType' => $precompiledParts['handler'],
-                               'args' => $precompiledParts,
-                               'ORIG_from_table' => $precompiledParts['ORIG_tableName'],
-                       );
-                       if ($this->conf['debugOptions']['numberRows']) {
-                               $data['numberRows'] = $this->sql_num_rows($sqlResult);
-                       }
-                       $this->debugHandler(
-                               'exec_PREPAREDquery',
-                                       t3lib_div::milliseconds() - $pt,
-                               $data
-                       );
-               }
-
-               // Return result handler.
-               return $sqlResult;
-       }
-
-       /**************************************
-        *
-        * Functions for quoting table/field names
-        *
-        **************************************/
-
-       /**
-        * Quotes components of a SELECT subquery.
-        *
-        * @param array $components     Array of SQL query components
-        * @return array
-        */
-       protected function quoteSELECTsubquery(array $components) {
-               $components['SELECT'] = $this->_quoteFieldNames($components['SELECT']);
-               $components['FROM'] = $this->_quoteFromTables($components['FROM']);
-               $components['WHERE'] = $this->_quoteWhereClause($components['WHERE']);
-               return $components;
-       }
-
-       /**
-        * Quotes field (and table) names with the quote character suitable for the DB being used
-        * Use quoteFieldNames instead!
-        *
-        * @param       string          List of fields to be selected from DB
-        * @return      string          Quoted list of fields to be selected from DB
-        * @deprecated since TYPO3 4.0, will be removed in TYPO3 4.6
-        */
-       public function quoteSelectFields($select_fields) {
-               t3lib_div::logDeprecatedFunction();
-
-               $this->quoteFieldNames($select_fields);
-       }
-
-       /**
-        * Quotes field (and table) names with the quote character suitable for the DB being used
-        *
-        * @param       string          List of fields to be used in query to DB
-        * @return      string          Quoted list of fields to be in query to DB
-        */
-       public function quoteFieldNames($select_fields) {
-               if ($select_fields == '') {
-                       return '';
-               }
-               if ($this->runningNative()) {
-                       return $select_fields;
-               }
-
-               $select_fields = $this->SQLparser->parseFieldList($select_fields);
-               if ($this->SQLparser->parse_error) {
-                       die($this->SQLparser->parse_error . ' in ' . __FILE__ . ' : ' . __LINE__);
-               }
-               $select_fields = $this->_quoteFieldNames($select_fields);
-
-               return $this->SQLparser->compileFieldList($select_fields);
-       }
-
-       /**
-        * Quotes field (and table) names in a SQL SELECT clause acccording to DB rules
-        *
-        * @param array $select_fields The parsed fields to quote
-        * @return array
-        * @see quoteFieldNames()
-        */
-       protected function _quoteFieldNames(array $select_fields) {
-               foreach ($select_fields as $k => $v) {
-                       if ($select_fields[$k]['field'] != '' && $select_fields[$k]['field'] != '*' && !is_numeric($select_fields[$k]['field'])) {
-                               $select_fields[$k]['field'] = $this->quoteName($select_fields[$k]['field']);
-                       }
-                       if ($select_fields[$k]['table'] != '' && !is_numeric($select_fields[$k]['table'])) {
-                               $select_fields[$k]['table'] = $this->quoteName($select_fields[$k]['table']);
-                       }
-                       if ($select_fields[$k]['as'] != '') {
-                               $select_fields[$k]['as'] = $this->quoteName($select_fields[$k]['as']);
-                       }
-                       if (isset($select_fields[$k]['func_content.']) && $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']);
-                       }
-                       if (isset($select_fields[$k]['flow-control'])) {
-                               // Quoting flow-control statements
-                               if ($select_fields[$k]['flow-control']['type'] === 'CASE') {
-                                       if (isset($select_fields[$k]['flow-control']['case_field'])) {
-                                               $select_fields[$k]['flow-control']['case_field'] = $this->quoteFieldNames($select_fields[$k]['flow-control']['case_field']);
-                                       }
-                                       foreach ($select_fields[$k]['flow-control']['when'] as $key => $when) {
-                                               $select_fields[$k]['flow-control']['when'][$key]['when_value'] = $this->_quoteWhereClause($when['when_value']);
-                                       }
-                               }
-                       }
-               }
-
-               return $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
-        */
-       public function quoteFromTables($from_table) {
-               if ($from_table == '') {
-                       return '';
-               }
-               if ($this->runningNative()) {
-                       return $from_table;
-               }
-
-               $from_table = $this->SQLparser->parseFromTables($from_table);
-               $from_table = $this->_quoteFromTables($from_table);
-               return $this->SQLparser->compileFromTables($from_table);
-       }
-
-       /**
-        * Quotes table names in a SQL FROM clause acccording to DB rules
-        *
-        * @param array $from_table The parsed FROM clause to quote
-        * @return array
-        * @see quoteFromTables()
-        */
-       protected function _quoteFromTables(array $from_table) {
-               foreach ($from_table as $k => $v) {
-                       $from_table[$k]['table'] = $this->quoteName($from_table[$k]['table']);
-                       if ($from_table[$k]['as'] != '') {
-                               $from_table[$k]['as'] = $this->quoteName($from_table[$k]['as']);
-                       }
-                       if (is_array($v['JOIN'])) {
-                               foreach ($v['JOIN'] as $joinCnt => $join) {
-                                       $from_table[$k]['JOIN'][$joinCnt]['withTable'] = $this->quoteName($join['withTable']);
-                                       $from_table[$k]['JOIN'][$joinCnt]['as'] = ($join['as']) ? $this->quoteName($join['as']) : '';
-                                       foreach ($from_table[$k]['JOIN'][$joinCnt]['ON'] as &$condition) {
-                                               $condition['left']['table'] = ($condition['left']['table']) ? $this->quoteName($condition['left']['table']) : '';
-                                               $condition['left']['field'] = $this->quoteName($condition['left']['field']);
-                                               $condition['right']['table'] = ($condition['right']['table']) ? $this->quoteName($condition['right']['table']) : '';
-                                               $condition['right']['field'] = $this->quoteName($condition['right']['field']);
-                                       }
-                               }
-                       }
-               }
-
-               return $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 be parsed by parseWhereClause
-        * @return      string          Usable where clause with quoted field/table names
-        */
-       public function quoteWhereClause($where_clause) {
-               if ($where_clause === '' || $this->runningNative()) {
-                       return $where_clause;
-               }
-
-               $where_clause = $this->SQLparser->parseWhereClause($where_clause);
-               if (is_array($where_clause)) {
-                       $where_clause = $this->_quoteWhereClause($where_clause);
-                       $where_clause = $this->SQLparser->compileWhereClause($where_clause);
-               } else {
-                       die('Could not parse where clause in ' . __FILE__ . ' : ' . __LINE__);
-               }
-
-               return $where_clause;
-       }
-
-       /**
-        * Quotes field names in a SQL WHERE clause acccording to DB rules
-        *
-        * @param       array           $where_clause The parsed WHERE clause to quote
-        * @return      array
-        * @see quoteWhereClause()
-        */
-       protected function _quoteWhereClause(array $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']);
-                       } elseif (isset($v['func'])) {
-                               switch ($where_clause[$k]['func']['type']) {
-                                       case 'EXISTS':
-                                               $where_clause[$k]['func']['subquery'] = $this->quoteSELECTsubquery($v['func']['subquery']);
-                                               break;
-                                       case 'FIND_IN_SET':
-                                               // quoteStr that will be used for Oracle
-                                               $pattern = str_replace($where_clause[$k]['func']['str'][1], '\\' . $where_clause[$k]['func']['str'][1], $where_clause[$k]['func']['str'][0]);
-                                               // table is not really needed and may in fact be empty in real statements
-                                               // but it's not overriden from t3lib_db at the moment...
-                                               $patternForLike = $this->escapeStrForLike($pattern, $where_clause[$k]['func']['table']);
-                                               $where_clause[$k]['func']['str_like'] = $patternForLike;
-
-                                       // BEWARE: no break here to have next statements too
-                                       case 'IFNULL':
-                                       case 'LOCATE':
-                                               if ($where_clause[$k]['func']['table'] != '') {
-                                                       $where_clause[$k]['func']['table'] = $this->quoteName($v['func']['table']);
-                                               }
-                                               if ($where_clause[$k]['func']['field'] != '') {
-                                                       $where_clause[$k]['func']['field'] = $this->quoteName($v['func']['field']);
-                                               }
-                                               break;
-                               }
-                       } else {
-                               if ($where_clause[$k]['table'] != '') {
-                                       $where_clause[$k]['table'] = $this->quoteName($where_clause[$k]['table']);
-                               }
-                               if (!is_numeric($where_clause[$k]['field'])) {
-                                       $where_clause[$k]['field'] = $this->quoteName($where_clause[$k]['field']);
-                               }
-                               if (isset($where_clause[$k]['calc_table'])) {
-                                       if ($where_clause[$k]['calc_table'] != '') {
-                                               $where_clause[$k]['calc_table'] = $this->quoteName($where_clause[$k]['calc_table']);
-                                       }
-                                       if ($where_clause[$k]['calc_field'] != '') {
-                                               $where_clause[$k]['calc_field'] = $this->quoteName($where_clause[$k]['calc_field']);
-                                       }
-                               }
-                       }
-                       if ($where_clause[$k]['comparator']) {
-                               if (isset($v['value']['operator'])) {
-                                       foreach ($where_clause[$k]['value']['args'] as $argK => $fieldDef) {
-                                               $where_clause[$k]['value']['args'][$argK]['table'] = $this->quoteName($fieldDef['table']);
-                                               $where_clause[$k]['value']['args'][$argK]['field'] = $this->quoteName($fieldDef['field']);
-                                       }
-                               } else {
-                                       // Detecting value type; list or plain:
-                                       if (t3lib_div::inList('NOTIN,IN', strtoupper(str_replace(array(' ', "\n", "\r", "\t"), '', $where_clause[$k]['comparator'])))) {
-                                               if (isset($v['subquery'])) {
-                                                       $where_clause[$k]['subquery'] = $this->quoteSELECTsubquery($v['subquery']);
-                                               }
-                                       } else {
-                                               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], '.')) {
-                                                       $where_clause[$k]['value'][0] = $this->quoteFieldNames($where_clause[$k]['value'][0]);
-                                               }
-                                       }
-                               }
-                       }
-               }
-
-               return $where_clause;
-       }
-
-       /**
-        * Quotes the field (and table) names within a group by clause with the quote
-        * character suitable for the DB being used
-        *
-        * @param       string          A group by clause that can by parsed by parseFieldList
-        * @return      string          Usable group by clause with quoted field/table names
-        */
-       protected function quoteGroupBy($groupBy) {
-               if ($groupBy === '') {
-                       return '';
-               }
-               if ($this->runningNative()) {
-                       return $groupBy;
-               }
-
-               $groupBy = $this->SQLparser->parseFieldList($groupBy);
-               $groupBy = $this->_quoteGroupBy($groupBy);
-
-               return $this->SQLparser->compileFieldList($groupBy);
-       }
-
-       /**
-        * Quotes field names in a SQL GROUP BY clause acccording to DB rules
-        *
-        * @param       array           $groupBy The parsed GROUP BY clause to quote
-        * @return      array
-        * @see quoteGroupBy()
-        */
-       protected function _quoteGroupBy(array $groupBy) {
-               foreach ($groupBy as $k => $v) {
-                       $groupBy[$k]['field'] = $this->quoteName($groupBy[$k]['field']);
-                       if ($groupBy[$k]['table'] != '') {
-                               $groupBy[$k]['table'] = $this->quoteName($groupBy[$k]['table']);
-                       }
-               }
-               return $groupBy;
-       }
-
-       /**
-        * Quotes the field (and table) names within an order by clause with the quote
-        * character suitable for the DB being used
-        *
-        * @param       string          An order by clause that can by parsed by parseFieldList
-        * @return      string          Usable order by clause with quoted field/table names
-        */
-       protected function quoteOrderBy($orderBy) {
-               if ($orderBy === '') {
-                       return '';
-               }
-               if ($this->runningNative()) {
-                       return $orderBy;
-               }
-
-               $orderBy = $this->SQLparser->parseFieldList($orderBy);
-               $orderBy = $this->_quoteOrderBy($orderBy);
-
-               return $this->SQLparser->compileFieldList($orderBy);
-       }
-
-       /**
-        * Quotes field names in a SQL ORDER BY clause acccording to DB rules
-        *
-        * @param       array           $orderBy The parsed ORDER BY clause to quote
-        * @return      array
-        * @see quoteOrderBy()
-        */
-       protected function _quoteOrderBy(array $orderBy) {
-               foreach ($orderBy as $k => $v) {
-                       $orderBy[$k]['field'] = $this->quoteName($orderBy[$k]['field']);
-                       if ($orderBy[$k]['table'] != '') {
-                               $orderBy[$k]['table'] = $this->quoteName($orderBy[$k]['table']);
-                       }
-               }
-               return $orderBy;
-       }
-
-
-       /**************************************
-        *
-        * Various helper functions
-        *
-        **************************************/
-
-       /**
-        * Escaping and quoting values for SQL statements.
-        *
-        * @param       string          Input string
-        * @param       string          Table name for which to quote string. Just enter the table that the field-value is selected from (and any DBAL will look up which handler to use and then how to quote the string!).
-        * @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()
-        */
-       public function fullQuoteStr($str, $table) {
-               return '\'' . $this->quoteStr($str, $table) . '\'';
-       }
-
-       /**
-        * Substitution for PHP function "addslashes()"
-        * NOTICE: You must wrap the output of this function in SINGLE QUOTES to be DBAL compatible. Unless you have to apply the single quotes yourself you should rather use ->fullQuoteStr()!
-        *
-        * @param       string          Input string
-        * @param       string          Table name for which to quote string. Just enter the table that the field-value is selected from (and any DBAL will look up which handler to use and then how to quote the string!).
-        * @return      string          Output string; Quotes (" / ') and \ will be backslashed (or otherwise based on DBAL handler)
-        * @see quoteStr()
-        */
-       public function quoteStr($str, $table) {
-               $this->lastHandlerKey = $this->handler_getFromTableList($table);
-               switch ((string) $this->handlerCfg[$this->lastHandlerKey]['type']) {
-                       case 'native':
-                               if ($this->handlerInstance[$this->lastHandlerKey]['link']) {
-                                       $str = mysql_real_escape_string($str, $this->handlerInstance[$this->lastHandlerKey]['link']);
-                               } else {
-                                       // link may be NULL when unit testing DBAL
-                                       $str = str_replace('\'', '\\\'', $str);
-                               }
-                               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;
-       }
-
-       /**
-        * Quotes an object name (table name, field, ...)
-        *
-        * @param       string          Object's name
-        * @param       string          Handler key
-        * @param       boolean         If method NameQuote() is not used, whether to use backticks instead of driver-specific quotes
-        * @return      string          Properly-quoted object's name
-        */
-       public function quoteName($name, $handlerKey = NULL, $useBackticks = FALSE) {
-               $handlerKey = $handlerKey ? $handlerKey : $this->lastHandlerKey;
-               $useNameQuote = isset($this->handlerCfg[$handlerKey]['config']['useNameQuote']) ? $this->handlerCfg[$handlerKey]['config']['useNameQuote'] : FALSE;
-               if ($useNameQuote) {
-                       return $this->handlerInstance[$handlerKey]->DataDictionary->NameQuote($name);
-               } else {
-                       $quote = $useBackticks ? '`' : $this->handlerInstance[$handlerKey]->nameQuote;
-                       return $quote . $name . $quote;
-               }
-       }
-
-       /**
-        * 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)
-        */
-       public function MetaType($type, $table, $max_length = -1) {
-               $this->lastHandlerKey = $this->handler_getFromTableList($table);
-               $str = '';
-               switch ((string) $this->handlerCfg[$this->lastHandlerKey]['type']) {
-                       case 'native':
-                               $str = $type;
-                               break;
-                       case 'adodb':
-                               if (in_array($table, $this->cache_fieldType)) {
-                                       $rs = $this->handlerInstance[$this->lastHandlerKey]->SelectLimit('SELECT * FROM ' . $this->quoteFromTables($table), 1);
-                                       $str = $rs->MetaType($type, $max_length);
-                               }
-                               break;
-                       case 'userdefined':
-                               $str = $this->handlerInstance[$this->lastHandlerKey]->MetaType($str, $table, $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)
-        */
-       public 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 'XL';
-
-                       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':
-                       case 'TINYINT':
-                       case 'SMALLINT':
-                       case 'MEDIUMINT':
-                       case 'BIGINT':
-                               return 'I8'; // we always return I8 to be on the safe side. Under some circumstances the fields are to small otherwise...
-
-                       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
-        */
-       public 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':
-                       case 'I1':
-                       case 'I2':
-                       case 'I4':
-                       case 'I8':
-                               return 'BIGINT'; // we only have I8 in DBAL, see MySQLMetaType()
-
-                       case 'F':
-                               return 'DOUBLE';
-                       case 'N':
-                               return 'NUMERIC';
-
-                       default:
-                               return $meta;
-               }
-       }
-
-
-       /**************************************
-        *
-        * 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
-        */
-       public 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 error number on the most recent sql() execution (based on $this->lastHandlerKey)
-        *
-        * @return      int             Handler error number
-        */
-       public function sql_errno() {
-               switch ($this->handlerCfg[$this->lastHandlerKey]['type']) {
-                       case 'native':
-                               $output = mysql_errno($this->handlerInstance[$this->lastHandlerKey]['link']);
-                               break;
-                       case 'adodb':
-                               $output = $this->handlerInstance[$this->lastHandlerKey]->ErrorNo();
-                               break;
-                       case 'userdefined':
-                               $output = $this->handlerInstance[$this->lastHandlerKey]->sql_errno();
-                               break;
-               }
-               return $output;
-       }
-
-       /**
-        * Returns the number of selected rows.
-        *
-        * @param       pointer         Result pointer / DBAL object
-        * @return      integer         Number of resulting rows.
-        */
-       public function sql_num_rows(&$res) {
-               if ($res === FALSE) {
-                       return 0;
-               }
-
-               $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.
-        */
-       public 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...
-                                       // MSSQL does not support ADODB_FETCH_BOTH and always returns an assoc. array instead. So
-                                       // we don't need to remove anything.
-                                       if (is_array($output)) {
-                                               if ($this->runningADOdbDriver('mssql')) {
-                                                       // MSSQL does not know such thing as an empty string. So it returns one space instead, which we must fix.
-                                                       foreach ($output as $key => $value) {
-                                                               if ($value === ' ') {
-                                                                       $output[$key] = '';
-                                                               }
-                                                       }
-                                               } else {
-                                                       foreach ($output as $key => $value) {
-                                                               if (is_integer($key)) {
-                                                                       unset($output[$key]);
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-                               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;
-       }
-
-       /**
-        * 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.
-        */
-       public 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...
-                                       // MSSQL does not support ADODB_FETCH_BOTH and always returns an assoc. array instead. So
-                                       // we need to convert resultset.
-                                       if (is_array($output)) {
-                                               $keyIndex = 0;
-                                               foreach ($output as $key => $value) {
-                                                       unset($output[$key]);
-                                                       if (is_integer($key) || $this->runningADOdbDriver('mssql')) {
-                                                               $output[$keyIndex] = $value;
-                                                               if ($value === ' ') {
-                                                                       // MSSQL does not know such thing as an empty string. So it returns one space instead, which we must fix.
-                                                                       $output[$keyIndex] = '';
-                                                               }
-                                                               $keyIndex++;
-                                                       }
-                                               }
-                                       }
-                               }
-                               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.
-        */
-       public function sql_free_result(&$res) {
-               if ($res === FALSE) {
-                       return FALSE;
-               }
-
-               $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.
-        */
-       public 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
-        */
-       public 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.
-        */
-       public 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.
-        *
-        * @param       pointer         MySQL result pointer (of SELECT query) / DBAL object / table name
-        * @param       integer         Field index. In case of ADOdb a string (field name!) FIXME
-        * @return      string          Returns the type of the specified field index
-        */
-       public function sql_field_metatype($table, $field) {
-               // If $table and/or $field are mapped, use the original names instead
-               foreach ($this->mapping as $tableName => $tableMapInfo) {
-                       if (isset($tableMapInfo['mapTableName']) && $tableMapInfo['mapTableName'] === $table) {
-                               // Table name is mapped => use original name
-                               $table = $tableName;
-                       }
-
-                       if (isset($tableMapInfo['mapFieldNames'])) {
-                               foreach ($tableMapInfo['mapFieldNames'] as $fieldName => $fieldMapInfo) {
-                                       if ($fieldMapInfo === $field) {
-                                               // Field name is mapped => use original name
-                                               $field = $fieldName;
-                                       }
-                               }
-                       }
-               }
-
-               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.
-        *
-        * @param       pointer         MySQL result pointer (of SELECT query) / DBAL object / table name
-        * @param       integer         Field index. In case of ADOdb a string (field name!) FIXME
-        * @return      string          Returns the type of the specified field index
-        */
-       public function sql_field_type(&$res, $pointer) {
-               if ($res === NULL) {
-                       debug(array('no res in sql_field_type!'));
-                       return 'text';
-               }
-               elseif (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'];
-                               }
-
-                               break;
-                       case 'userdefined':
-                               $output = $res->sql_field_type($pointer);
-                               break;
-               }
-
-               return $output;
-       }
-
-
-       /**********
-        *
-        * Legacy functions, bound to _DEFAULT handler. (Overriding parent methods)
-        * Deprecated or still experimental.
-        *
-        **********/
-
-       /**
-        * Executes query (on DEFAULT handler!)
-        * DEPRECATED - use exec_* functions from this class instead!
-        *
-        * @param       string          Database name
-        * @param       string          Query to execute
-        * @return      pointer         Result pointer
-        * @deprecated since TYPO3 4.1, will be removed in TYPO3 4.6
-        */
-       public function sql($db, $query) {
-               t3lib_div::logDeprecatedFunction();
-
-               return $this->sql_query($query);
-       }
-
-       /**
-        * Executes a query
-        * EXPERIMENTAL - This method will make its best to handle the query correctly
-        * but if it cannot, it will simply pass the query to DEFAULT handler.
-        *
-        * You should use exec_* function from this class instead!
-        * If you don't, anything that does not use the _DEFAULT handler will probably break!
-        *
-        * This method was deprecated in TYPO3 4.1 but is considered experimental since TYPO3 4.4
-        * as it tries to handle the query correctly anyway.
-        *
-        * @param       string          Query to execute
-        * @return      pointer         Result pointer / DBAL object
-        */
-       public function sql_query($query) {
-               $globalConfig = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['dbal']);
-               if ($globalConfig['sql_query.passthrough']) {
-                       return parent::sql_query($query);
-               }
-
-               // This method is heavily used by Extbase, try to handle it with DBAL-native methods
-               $queryParts = $this->SQLparser->parseSQL($query);
-               if (is_array($queryParts) && t3lib_div::inList('SELECT,UPDATE,INSERT,DELETE', $queryParts['type'])) {
-                       return $this->exec_query($queryParts);
-               }
-
-               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.
-        *
-        * @param       string          Database host IP/domain
-        * @param       string          Username to connect with.
-        * @param       string          Password to connect with.
-        * @return      mixed           Returns handler connection value
-        * @see handler_init()
-        */
-       public 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!
-        */
-       public function sql_select_db($TYPO3_db) {
-               return TRUE;
-       }
-
-
-       /**************************************
-        *
-        * 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
-        */
-       public 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
-        *
-        * When fetching the tables, it skips tables whose names begin with BIN$, as this is taken as a table coming from the "Recycle Bin" on Oracle.
-        *
-        * @return      array           Tables in an array (tablename is in both key and value)
-        * @todo        Should the check for Oracle Recycle Bin stuff be moved elsewhere?
-        * @todo        Should return table details in value! see t3lib_db::admin_get_tables()
-        */
-       public function admin_get_tables() {
-               $whichTables = array();
-
-               // Getting real list of tables:
-               switch ($this->handlerCfg['_DEFAULT']['type']) {
-                       case 'native':
-                               $tables_result = mysql_query('SHOW TABLE STATUS FROM `' . TYPO3_db . '`', $this->handlerInstance['_DEFAULT']['link']);
-                               if (!$this->sql_error()) {
-                                       while ($theTable = $this->sql_fetch_assoc($tables_result)) {
-                                               $whichTables[$theTable['Name']] = $theTable;
-                                       }
-                               }
-                               break;
-                       case 'adodb':
-                               // check needed for install tool - otherwise it will just die because the call to
-                               // MetaTables is done on a stdClass instance
-                               if (method_exists($this->handlerInstance['_DEFAULT'], 'MetaTables')) {
-                                       $sqlTables = $this->handlerInstance['_DEFAULT']->MetaTables('TABLES');
-                                       while (list($k, $theTable) = each($sqlTables)) {
-                                               if (preg_match('/BIN\$/', $theTable)) continue; // skip tables from the Oracle 10 Recycle Bin
-                                               $whichTables[$theTable] = $theTable;
-                                       }
-                               }
-                               break;
-                       case 'userdefined':
-                               $whichTables = $this->handlerInstance['_DEFAULT']->admin_get_tables();
-                               break;
-               }
-
-               // Check mapping:
-               if (is_array($this->mapping) && count($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 => $tDefinition) {
-                               if (isset($tMap[$tN])) {
-                                       $tN = $tMap[$tN];
-                               }
-                               $newList[$tN] = $tDefinition;
-                       }
-
-                       $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
-        *
-        * @param       string          Table name
-        * @return      array           Field information in an associative array with fieldname => field row
-        */
-       public 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);
-                               if (is_array($fieldRows)) {
-                                       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
-        */
-       public 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.
-        *
-        * @return      array
-        */
-       public function admin_get_charsets() {
-               return array();
-       }
-
-       /**
-        * 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
-        */
-       public 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':
-                               case 'TRUNCATETABLE':
-                                       $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);
-
-                                       //if ($this->lastParsedAndMappedQueryArray['type'] == 'INSERT') {
-                                       //      return mysql_query($compiledQuery, $this->link);
-                                       //}
-                                       return mysql_query($compiledQuery, $this->link);
-                                       break;
-                               case 'adodb':
-                                       // Compiling query:
-                                       $compiledQuery = $this->SQLparser->compileSQL($this->lastParsedAndMappedQueryArray);
-                                       switch ($this->lastParsedAndMappedQueryArray['type']) {
-                                               case 'INSERT':
-                                                       return $this->exec_INSERTquery($this->lastParsedAndMappedQueryArray['TABLE'], $compiledQuery);
-                                               case 'TRUNCATETABLE':
-                                                       return $this->exec_TRUNCATEquery($this->lastParsedAndMappedQueryArray['TABLE']);
-                                       }
-                                       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) . '"');
-       }
-
-
-       /************************************
-        *
-        * 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
-        */
-       public function handler_getFromTableList($tableList) {
-
-               $key = $tableList;
-
-               if (!isset($this->cache_handlerKeyFromTableList[$key])) {
-
-                       // Get tables separated:
-                       $_tableList = $tableList;
-                       $tableArray = $this->SQLparser->parseFromTables($_tableList);
-
-                       // If success, traverse the tables:
-                       if (is_array($tableArray) && count($tableArray)) {
-                               $outputHandlerKey = '';
-
-                               foreach ($tableArray as $vArray) {
-                                       // 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!');
-                                       }
-
-                                       $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);
-                               }
-
-                               // Return handler key:
-                               $this->cache_handlerKeyFromTableList[$key] = $outputHandlerKey;
-                       } else {
-                               die('DBAL fatal error: No handler found in handler_getFromTableList() for: "' . $tableList . '" (' . $tableArray . ')');
-                       }
-               }
-
-               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()
-        */
-       public function handler_init($handlerKey) {
-
-               // Find handler configuration:
-               $cfgArray = $this->handlerCfg[$handlerKey];
-               $handlerType = (string) $cfgArray['type'];
-               $output = FALSE;
-
-               if (is_array($cfgArray)) {
-                       if (!$cfgArray['config']['database']) {
-                               // Configuration is incomplete
-                               return;
-                       }
-                       switch ($handlerType) {
-                               case 'native':
-                                       if ($GLOBALS['TYPO3_CONF_VARS']['SYS']['no_pconnect']) {
-                                               $link = mysql_connect($cfgArray['config']['host'] . (isset($cfgArray['config']['port']) ? ':' . $cfgArray['config']['port'] : ''), $cfgArray['config']['username'], $cfgArray['config']['password'], TRUE);
-                                       } else {
-                                               $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(LF, str_replace("' . LF . '", LF, $GLOBALS['TYPO3_CONF_VARS']['SYS']['setDBinit']), TRUE);
-                                               foreach ($setDBinit as $v) {
-                                                       if (mysql_query($v, $link) === FALSE) {
-                                                               t3lib_div::sysLog('Could not initialize DB connection with query "' . $v . '".', 'Core', 3);
-                                                       }
-                                               }
-                                       } else {
-                                               t3lib_div::sysLog('Could not connect to MySQL server ' . $cfgArray['config']['host'] . ' with user ' . $cfgArray['config']['username'] . '.', 'Core', 4);
-                                       }
-                                       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']);
-
-                                       // Set driver-specific options
-                                       if (isset($cfgArray['config']['driverOptions'])) {
-                                               foreach ($cfgArray['config']['driverOptions'] as $optionName => $optionValue) {
-                                                       $optionSetterName = 'set' . ucfirst($optionName);
-                                                       if (method_exists($this->handlerInstance[$handlerKey], $optionSetterName)) {
-                                                               $this->handlerInstance[$handlerKey]->$optionSetterName($optionValue);
-                                                       } else {
-                                                               $this->handlerInstance[$handlerKey]->$optionName = $optionValue;
-                                                       }
-                                               }
-                                       }
-
-                                       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');
-                                               t3lib_div::sysLog('Could not connect to DB server using ADOdb on ' . $cfgArray['config']['host'] . ' with user ' . $cfgArray['config']['username'] . '.', 'Core', 4);
-                                               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;
-                                               if (isset($cfgArray['config']['sequenceStart'])) {
-                                                       $this->handlerInstance[$handlerKey]->sequenceStart = $cfgArray['config']['sequenceStart'];
-                                               } else {
-                                                       $this->handlerInstance[$handlerKey]->sequenceStart = 1;
-                                               }
-                                       }
-                                       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 . '"');
-       }
-
-
-       /**
-        * Checks if database is connected.
-        *
-        * @return boolean
-        */
-       public function isConnected() {
-               $result = FALSE;
-               switch ((string) $this->handlerCfg[$this->lastHandlerKey]['type']) {
-                       case 'native':
-                               $result = is_resource($this->link);
-                               break;
-                       case 'adodb':
-                       case 'userdefined':
-                               $result = is_object($this->handlerInstance[$this->lastHandlerKey]) && $this->handlerInstance[$this->lastHandlerKey]->isConnected();
-                               break;
-               }
-               return $result;
-       }
-
-
-       /**
-        * Checks whether the DBAL is currently inside an operation running on the "native" DB handler (i.e. MySQL)
-        *
-        * @return boolean      TRUE if running on "native" DB handler (i.e. MySQL)
-        */
-       public function runningNative() {
-               return ((string) $this->handlerCfg[$this->lastHandlerKey]['type']==='native');
-       }
-
-
-       /**
-        * Checks whether the ADOdb handler is running with a driver that contains the argument
-        *
-        * @param string        $driver Driver name, matched with strstr().
-        * @return boolean      TRUE if running with the given driver
-        */
-       public function runningADOdbDriver($driver) {
-               return strstr($this->handlerCfg[$this->lastHandlerKey]['config']['driver'], $driver);
-       }
-
-
-       /************************************
-        *
-        * 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.
-        * @param       array           Parsed list of tables, should be passed as reference to be reused and prevent double parsing
-        * @return      mixed           Returns an array of table names (parsed version of input table) if mapping is needed, otherwise just FALSE.
-        */
-       protected function map_needMapping($tableList, $fieldMappingOnly = FALSE, array &$parsedTableList = array()) {
-               $key = $tableList . '|' . $fieldMappingOnly;
-               if (!isset($this->cache_mappingFromTableList[$key])) {
-                       $this->cache_mappingFromTableList[$key] = FALSE; // Default:
-
-                       $tables = $this->SQLparser->parseFromTables($tableList);
-                       if (is_array($tables)) {
-                               $parsedTableList = $tables;
-                               foreach ($tables as $tableCfg) {
-                                       if ($fieldMappingOnly) {
-                                               if (is_array($this->mapping[$tableCfg['table']]['mapFieldNames'])) {
-                                                       $this->cache_mappingFromTableList[$key] = $tables;
-                                               } elseif (is_array($tableCfg['JOIN'])) {
-                                                       foreach ($tableCfg['JOIN'] as $join) {
-                                                               if (is_array($this->mapping[$join['withTable']]['mapFieldNames'])) {
-                                                                       $this->cache_mappingFromTableList[$key] = $tables;
-                                                                       break;
-                                                               }
-                                                       }
-                                               }
-                                       } else {
-                                               if (is_array($this->mapping[$tableCfg['table']])) {
-                                                       $this->cache_mappingFromTableList[$key] = $tables;
-                                               } elseif (is_array($tableCfg['JOIN'])) {
-                                                       foreach ($tableCfg['JOIN'] as $join) {
-                                                               if (is_array($this->mapping[$join['withTable']])) {
-                                                                       $this->cache_mappingFromTableList[$key] = $tables;
-                                                                       break;
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-
-               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.
-        * Observe that alias fields are not mapped of course (should not be a problem though)
-        *
-        * @param       array           Input array, associative keys
-        * @param       array           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!
-        * @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.
-        */
-       protected function map_assocArray($input, $tables, $rev = FALSE) {
-               // Traverse tables from query (hopefully only one table):
-               foreach ($tables as $tableCfg) {
-                       $tableKey = $this->getMappingKey($tableCfg['table']);
-                       if (is_array($this->mapping[$tableKey]['mapFieldNames'])) {
-
-                               // Get the map (reversed if needed):
-                               if ($rev) {
-                                       $theMap = array_flip($this->mapping[$tableKey]['mapFieldNames']);
-                               } else {
-                                       $theMap = $this->mapping[$tableKey]['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
-        *
-        * @param       mixed           Either parsed list of tables (SQLparser->parseFromTables()) or list of fields to select from the table. This is what comes right after "SELECT ...". Required value.
-        * @param       string          Table(s) from which to select. This is what comes right after "FROM ...". Require value.
-        * @param       string          Where clause. This is what comes right after "WHERE ...". Can be blank.
-        * @param       string          Group by field(s)
-        * @param       string          Order by field(s)
-        * @return      void
-        * @see exec_SELECTquery()
-        */
-       protected function map_remapSELECTQueryParts($select_fields, $from_table, $where_clause, $groupBy, $orderBy) {
-               // Backup current mapping as it may be altered if aliases on mapped tables are found
-               $backupMapping = $this->mapping;
-
-               // Tables:
-               $tables = is_array($from_table) ? $from_table : $this->SQLparser->parseFromTables($from_table);
-               $defaultTable = $tables[0]['table'];
-               // Prepare mapping for aliased tables. This will copy the definition of the original table name.
-               // The alias is prefixed with a database-incompatible character to prevent naming clash with real table name
-               // Further access to $this->mapping should be made through $this->getMappingKey() method
-               foreach ($tables as $k => $v) {
-                       if ($v['as'] && is_array($this->mapping[$v['table']]['mapFieldNames'])) {
-                               $mappingKey = $this->getFreeMappingKey($v['as']);
-                               $this->mapping[$mappingKey]['mapFieldNames'] =& $this->mapping[$v['table']]['mapFieldNames'];
-                       }
-                       if (is_array($v['JOIN'])) {
-                               foreach ($v['JOIN'] as $joinCnt => $join) {
-                                       if ($join['as'] && is_array($this->mapping[$join['withTable']]['mapFieldNames'])) {
-                                               $mappingKey = $this->getFreeMappingKey($join['as']);
-                                               $this->mapping[$mappingKey]['mapFieldNames'] =& $this->mapping[$join['withTable']]['mapFieldNames'];
-                                       }
-                               }
-                       }
-               }
-               foreach ($tables as $k => $v) {
-                       $tableKey = $this->getMappingKey($v['table']);
-                       if ($this->mapping[$tableKey]['mapTableName']) {
-                               $tables[$k]['table'] = $this->mapping[$tableKey]['mapTableName'];
-                       }
-                       // Mapping JOINS
-                       if (is_array($v['JOIN'])) {
-                               foreach ($v['JOIN'] as $joinCnt => $join) {
-                                       // Mapping withTable of the JOIN
-                                       $withTableKey = $this->getMappingKey($join['withTable']);
-                                       if ($this->mapping[$withTableKey]['mapTableName']) {
-                                               $tables[$k]['JOIN'][$joinCnt]['withTable'] = $this->mapping[$withTableKey]['mapTableName'];
-                                       }
-                                       $onPartsArray = array();
-                                       // Mapping ON parts of the JOIN
-                                       if (is_array($tables[$k]['JOIN'][$joinCnt]['ON'])) {
-                                               foreach ($tables[$k]['JOIN'][$joinCnt]['ON'] as &$condition) {
-                                                       // Left side of the comparator
-                                                       $leftTableKey = $this->getMappingKey($condition['left']['table']);
-                                                       if (isset($this->mapping[$leftTableKey]['mapFieldNames'][$condition['left']['field']])) {
-                                                               $condition['left']['field'] = $this->mapping[$leftTableKey]['mapFieldNames'][$condition['left']['field']];
-                                                       }
-                                                       if (isset($this->mapping[$leftTableKey]['mapTableName'])) {
-                                                               $condition['left']['table'] = $this->mapping[$leftTableKey]['mapTableName'];
-                                                       }
-                                                       // Right side of the comparator
-                                                       $rightTableKey = $this->getMappingKey($condition['right']['table']);
-                                                       if (isset($this->mapping[$rightTableKey]['mapFieldNames'][$condition['right']['field']])) {
-                                                               $condition['right']['field'] = $this->mapping[$rightTableKey]['mapFieldNames'][$condition['right']['field']];
-                                                       }
-                                                       if (isset($this->mapping[$rightTableKey]['mapTableName'])) {
-                                                               $condition['right']['table'] = $this->mapping[$rightTableKey]['mapTableName'];
-                                                       }
-                                               }
-                                       }
-                               }
-                       }
-               }
-               $fromParts = $tables;
-
-               // Where clause:
-               $parameterReferences = array();
-               $whereParts = $this->SQLparser->parseWhereClause($where_clause, '', $parameterReferences);
-               $this->map_sqlParts($whereParts, $defaultTable);
-
-               // Select fields:
-               $selectParts = $this->SQLparser->parseFieldList($select_fields);
-               $this->map_sqlParts($selectParts, $defaultTable);
-
-               // Group By fields
-               $groupByParts = $this->SQLparser->parseFieldList($groupBy);
-               $this->map_sqlParts($groupByParts, $defaultTable);
-
-               // Order By fields
-               $orderByParts = $this->SQLparser->parseFieldList($orderBy);
-               $this->map_sqlParts($orderByParts, $defaultTable);
-
-               // Restore the original mapping
-               $this->mapping = $backupMapping;
-
-               return array($selectParts, $fromParts, $whereParts, $groupByParts, $orderByParts, $parameterReferences);
-       }
-
-       /**
-        * Returns the key to be used when retrieving information from $this->mapping. This ensures
-        * that mapping from aliased tables is properly retrieved.
-        *
-        * @param string $tableName
-        * @return string
-        */
-       protected function getMappingKey($tableName) {
-               // Search deepest alias mapping
-               while (isset($this->mapping['*' . $tableName])) {
-                       $tableName = '*' . $tableName;
-               }
-               return $tableName;
-       }
-
-       /**
-        * Returns a free key to be used to store mapping information in $this->mapping.
-        *
-        * @param string $tableName
-        * @return string
-        */
-       protected function getFreeMappingKey($tableName) {
-               while (isset($this->mapping[$tableName])) {
-                       $tableName = '*' . $tableName;
-               }
-               return $tableName;
-       }
-
-       /**
-        * Generic mapping of table/field names arrays (as parsed by tx_dbal_sqlengine)
-        *
-        * @param       array           Array with parsed SQL parts; Takes both fields, tables, where-parts, group and order-by. Passed by reference.
-        * @param       string          Default table name to assume if no table is found in $sqlPartArray
-        * @return      void
-        * @access private
-        * @see map_remapSELECTQueryParts()
-        */
-       protected function map_sqlParts(&$sqlPartArray, $defaultTable) {
-               $defaultTableKey = $this->getMappingKey($defaultTable);
-               // Traverse sql Part array:
-               if (is_array($sqlPartArray)) {
-                       foreach ($sqlPartArray as $k => $v) {
-
-                               if (isset($sqlPartArray[$k]['type'])) {
-                                       switch ($sqlPartArray[$k]['type']) {
-                                               case 'flow-control':
-                                                       $temp = array($sqlPartArray[$k]['flow-control']);
-                                                       $this->map_sqlParts($temp, $defaultTable); // Call recursively!
-                                                       $sqlPartArray[$k]['flow-control'] = $temp[0];
-                                                       break;
-                                               case 'CASE':
-                                                       if (isset($sqlPartArray[$k]['case_field'])) {
-                                                               $fieldArray = explode('.', $sqlPartArray[$k]['case_field']);
-                                                               if (count($fieldArray) == 1 && is_array($this->mapping[$defaultTableKey]['mapFieldNames']) && isset($this->mapping[$defaultTableKey]['mapFieldNames'][$fieldArray[0]])) {
-                                                                       $sqlPartArray[$k]['case_field'] = $this->mapping[$defaultTableKey]['mapFieldNames'][$fieldArray[0]];
-                                                               }
-                                                               elseif (count($fieldArray) == 2) {
-                                                                       // Map the external table
-                                                                       $table = $fieldArray[0];
-                                                                       $tableKey = $this->getMappingKey($table);
-                                                                       if (isset($this->mapping[$tableKey]['mapTableName'])) {
-                                                                               $table = $this->mapping[$tableKey]['mapTableName'];
-                                                                       }
-                                                                       // Map the field itself
-                       &n