Raised DBAL to version 1.2.0alpha3
authorXavier Perseguers <typo3@perseguers.ch>
Tue, 19 Oct 2010 13:27:06 +0000 (13:27 +0000)
committerXavier Perseguers <typo3@perseguers.ch>
Tue, 19 Oct 2010 13:27:06 +0000 (13:27 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9164 709f56b5-9817-0410-a4d7-c38de5d9e867

14 files changed:
ChangeLog
typo3/sysext/dbal/ChangeLog
typo3/sysext/dbal/class.tx_dbal_installtool.php
typo3/sysext/dbal/class.ux_t3lib_db.php
typo3/sysext/dbal/class.ux_t3lib_sqlparser.php
typo3/sysext/dbal/ext_emconf.php
typo3/sysext/dbal/ext_localconf.php
typo3/sysext/dbal/last_synched_target
typo3/sysext/dbal/lib/class.tx_dbal_sqlengine.php
typo3/sysext/dbal/lib/class.tx_dbal_tsparserext.php
typo3/sysext/dbal/tests/BaseTestCase.php
typo3/sysext/dbal/tests/FakeDbConnection.php
typo3/sysext/dbal/tests/fixtures/mssql.config.php
typo3/sysext/dbal/tests/fixtures/oci8.config.php

index 2f77dab..143caf5 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-19  Xavier Perseguers  <typo3@perseguers.ch>
+
+       * Raised DBAL to version 1.2.0alpha3
+
 2010-10-19  Steffen Kamper  <steffen@typo3.org>
 
        * Fixed bug #16055: BE debug mode should also enable debug mode for libraries
index 9b5aeb9..fb8070a 100644 (file)
@@ -1,3 +1,11 @@
+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
index 41148d1..3607746 100644 (file)
@@ -72,6 +72,27 @@ class tx_dbal_installtool {
        }
 
        /**
+        * 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
index 1c12ac7..acff99b 100644 (file)
@@ -29,7 +29,7 @@
 /**
  * Contains a database abstraction layer class for TYPO3
  *
- * $Id: class.ux_t3lib_db.php 37006 2010-08-19 16:40:34Z xperseguers $
+ * $Id: class.ux_t3lib_db.php 38418 2010-09-21 16:46:57Z xperseguers $
  *
  * @author     Kasper Skårhøj <kasper@typo3.com>
  * @author     Karsten Dambekalns <k.dambekalns@fishfarm.de>
@@ -1369,7 +1369,13 @@ class ux_t3lib_DB extends t3lib_DB {
 
                        $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);
+                                       }
+                               }
                        }
                }
 
index c21edca..4593b20 100644 (file)
@@ -29,7 +29,7 @@
 /**
  * PHP SQL engine
  *
- * $Id: class.ux_t3lib_sqlparser.php 37143 2010-08-23 21:13:44Z xperseguers $
+ * $Id: class.ux_t3lib_sqlparser.php 37188 2010-08-24 16:44:32Z xperseguers $
  *
  * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author     Karsten Dambekalns <k.dambekalns@fishfarm.de>
index b2f5fb3..e2cf66b 100644 (file)
@@ -3,7 +3,7 @@
 ########################################################################
 # Extension Manager/Repository config file for ext "dbal".
 #
-# Auto generated 21-09-2010 12:06
+# Auto generated 19-10-2010 15:16
 #
 # Manual updates:
 # Only the data in the array - everything else is removed by next
@@ -32,13 +32,13 @@ $EM_CONF[$_EXTKEY] = array(
        'author_company' => '',
        'CGLcompliance' => '',
        'CGLcompliance_note' => '',
-       'version' => '1.2.0alpha2',
-       '_md5_values_when_last_written' => 'a:43:{s:9:"ChangeLog";s:4:"927b";s:28:"class.tx_dbal_autoloader.php";s:4:"0ce6";s:29:"class.tx_dbal_installtool.php";s:4:"d2fb";s:26:"class.ux_db_list_extra.php";s:4:"60d9";s:21:"class.ux_t3lib_db.php";s:4:"4432";s:28:"class.ux_t3lib_sqlparser.php";s:4:"cdfb";s:16:"ext_autoload.php";s:4:"93d1";s:21:"ext_conf_template.txt";s:4:"f5cf";s:12:"ext_icon.gif";s:4:"c9ba";s:17:"ext_localconf.php";s:4:"5ece";s:14:"ext_tables.php";s:4:"b187";s:14:"ext_tables.sql";s:4:"1f95";s:27:"doc/class.tslib_fe.php.diff";s:4:"0083";s:14:"doc/manual.sxw";s:4:"7b79";s:45:"handlers/class.tx_dbal_handler_openoffice.php";s:4:"8556";s:43:"handlers/class.tx_dbal_handler_rawmysql.php";s:4:"ef52";s:40:"handlers/class.tx_dbal_handler_xmldb.php";s:4:"3ec1";s:32:"lib/class.tx_dbal_querycache.php";s:4:"0530";s:31:"lib/class.tx_dbal_sqlengine.php";s:4:"5821";s:33:"lib/class.tx_dbal_tsparserext.php";s:4:"8597";s:14:"mod1/clear.gif";s:4:"cc11";s:13:"mod1/conf.php";s:4:"6e63";s:14:"mod1/index.php";s:4:"9865";s:18:"mod1/locallang.xml";s:4:"0b57";s:22:"mod1/locallang_mod.xml";s:4:"86ef";s:19:"mod1/moduleicon.gif";s:4:"2b8f";s:10:"res/README";s:4:"be19";s:26:"res/Templates/install.html";s:4:"62c9";s:30:"res/oracle/indexed_search.diff";s:4:"ec81";s:23:"res/oracle/realurl.diff";s:4:"86da";s:25:"res/oracle/scheduler.diff";s:4:"7c06";s:27:"res/oracle/templavoila.diff";s:4:"1fd5";s:43:"res/postgresql/postgresql-compatibility.sql";s:4:"bbff";s:22:"tests/BaseTestCase.php";s:4:"8992";s:26:"tests/FakeDbConnection.php";s:4:"c2ac";s:23:"tests/dbGeneralTest.php";s:4:"a3fe";s:21:"tests/dbMssqlTest.php";s:4:"8db0";s:22:"tests/dbOracleTest.php";s:4:"9cc2";s:26:"tests/dbPostgresqlTest.php";s:4:"740d";s:30:"tests/sqlParserGeneralTest.php";s:4:"f886";s:31:"tests/fixtures/mssql.config.php";s:4:"cd6d";s:30:"tests/fixtures/oci8.config.php";s:4:"452f";s:36:"tests/fixtures/postgresql.config.php";s:4:"3795";}',
+       'version' => '1.2.0alpha3',
+       '_md5_values_when_last_written' => 'a:43:{s:9:"ChangeLog";s:4:"5513";s:28:"class.tx_dbal_autoloader.php";s:4:"0ce6";s:29:"class.tx_dbal_installtool.php";s:4:"7cf3";s:26:"class.ux_db_list_extra.php";s:4:"60d9";s:21:"class.ux_t3lib_db.php";s:4:"b446";s:28:"class.ux_t3lib_sqlparser.php";s:4:"cdfb";s:16:"ext_autoload.php";s:4:"93d1";s:21:"ext_conf_template.txt";s:4:"f5cf";s:12:"ext_icon.gif";s:4:"c9ba";s:17:"ext_localconf.php";s:4:"66e9";s:14:"ext_tables.php";s:4:"b187";s:14:"ext_tables.sql";s:4:"1f95";s:27:"doc/class.tslib_fe.php.diff";s:4:"0083";s:14:"doc/manual.sxw";s:4:"7b79";s:45:"handlers/class.tx_dbal_handler_openoffice.php";s:4:"8556";s:43:"handlers/class.tx_dbal_handler_rawmysql.php";s:4:"ef52";s:40:"handlers/class.tx_dbal_handler_xmldb.php";s:4:"3ec1";s:32:"lib/class.tx_dbal_querycache.php";s:4:"0530";s:31:"lib/class.tx_dbal_sqlengine.php";s:4:"5821";s:33:"lib/class.tx_dbal_tsparserext.php";s:4:"8597";s:14:"mod1/clear.gif";s:4:"cc11";s:13:"mod1/conf.php";s:4:"6e63";s:14:"mod1/index.php";s:4:"9865";s:18:"mod1/locallang.xml";s:4:"0b57";s:22:"mod1/locallang_mod.xml";s:4:"86ef";s:19:"mod1/moduleicon.gif";s:4:"2b8f";s:10:"res/README";s:4:"be19";s:26:"res/Templates/install.html";s:4:"62c9";s:30:"res/oracle/indexed_search.diff";s:4:"ec81";s:23:"res/oracle/realurl.diff";s:4:"86da";s:25:"res/oracle/scheduler.diff";s:4:"7c06";s:27:"res/oracle/templavoila.diff";s:4:"1fd5";s:43:"res/postgresql/postgresql-compatibility.sql";s:4:"bbff";s:22:"tests/BaseTestCase.php";s:4:"8992";s:26:"tests/FakeDbConnection.php";s:4:"c2ac";s:23:"tests/dbGeneralTest.php";s:4:"a3fe";s:21:"tests/dbMssqlTest.php";s:4:"8db0";s:22:"tests/dbOracleTest.php";s:4:"9cc2";s:26:"tests/dbPostgresqlTest.php";s:4:"740d";s:30:"tests/sqlParserGeneralTest.php";s:4:"f886";s:31:"tests/fixtures/mssql.config.php";s:4:"cd6d";s:30:"tests/fixtures/oci8.config.php";s:4:"452f";s:36:"tests/fixtures/postgresql.config.php";s:4:"3795";}',
        'constraints' => array(
                'depends' => array(
                        'adodb' => '5.11.0-',
                        'php' => '5.2.0-0.0.0',
-                       'typo3' => '4.5.0alpha2-0.0.0',
+                       'typo3' => '4.5.0alpha3-0.0.0',
                ),
                'conflicts' => array(
                ),
index 352e12c..de99cea 100644 (file)
@@ -10,4 +10,5 @@ $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/class.db_list_extra.inc'] = t3lib_
 // Register a hook for the installer
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['stepOutput'][] = 'EXT:dbal/class.tx_dbal_installtool.php:tx_dbal_installtool';
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['writeLocalconf'][] = 'EXT:dbal/class.tx_dbal_installtool.php:tx_dbal_installtool';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['ext/install/mod/class.tx_install.php']['requiredPhpModules'][] = 'EXT:dbal/class.tx_dbal_installtool.php:tx_dbal_installtool';
 ?>
\ No newline at end of file
index a4282ea..90e8124 100644 (file)
@@ -1 +1 @@
-https://svn.typo3.org/TYPO3v4/Extensions/dbal/tags/1.2.0alpha2/
+https://svn.typo3.org/TYPO3v4/Extensions/dbal/tags/1.2.0alpha3/
index 01d972e..6cd30a8 100644 (file)
@@ -30,7 +30,7 @@
 /**
  * PHP SQL engine
  *
- * $Id: class.tx_dbal_sqlengine.php 35523 2010-07-11 14:04:44Z xperseguers $
+ * $Id: class.tx_dbal_sqlengine.php 38370 2010-09-20 20:12:59Z xperseguers $
  *
  * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @author Xavier Perseguers <typo3@perseguers.ch>
index a0bec1c..99dd269 100644 (file)
@@ -29,7 +29,7 @@
 /**
  * Class that renders fields for the Extension Manager configuration.
  *
- * $Id: class.tx_dbal_tsparserext.php 36759 2010-08-14 15:55:24Z xperseguers $
+ * $Id: class.tx_dbal_tsparserext.php 37022 2010-08-19 19:34:19Z xperseguers $
  * @author Xavier Perseguers <typo3@perseguers.ch>
  *
  * @package TYPO3
index dba0fdd..47c8503 100644 (file)
@@ -28,7 +28,7 @@
  * Subclass this base class if you want to take advantage of the framework
  * capabilities.
  *
- * $Id: BaseTestCase.php 36760 2010-08-14 15:58:41Z xperseguers $
+ * $Id: BaseTestCase.php 37022 2010-08-19 19:34:19Z xperseguers $
  *
  * @author Robert Lemke <robert@typo3.org>
  *
index a1cc177..9bfccb0 100644 (file)
@@ -26,7 +26,7 @@
 /**
  * Fake ADOdb connection factory.
  *
- * $Id: FakeDbConnection.php 36760 2010-08-14 15:58:41Z xperseguers $
+ * $Id: FakeDbConnection.php 37022 2010-08-19 19:34:19Z xperseguers $
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
  *
index 133de08..fc2b882 100644 (file)
@@ -2,7 +2,7 @@
 /**
  * MS SQL configuration
  *
- * $Id: mssql.config.php 36760 2010-08-14 15:58:41Z xperseguers $
+ * $Id: mssql.config.php 37022 2010-08-19 19:34:19Z xperseguers $
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
  *
index 149df81..397246e 100644 (file)
@@ -2,7 +2,7 @@
 /**
  * Oracle configuration
  *
- * $Id: oci8.config.php 36760 2010-08-14 15:58:41Z xperseguers $
+ * $Id: oci8.config.php 37022 2010-08-19 19:34:19Z xperseguers $
  *
  * @author Xavier Perseguers <typo3@perseguers.ch>
  *