Reorganized Oracle configuration
authorXavier Perseguers <typo3@perseguers.ch>
Sat, 7 Nov 2009 09:19:18 +0000 (09:19 +0000)
committerXavier Perseguers <typo3@perseguers.ch>
Sat, 7 Nov 2009 09:19:18 +0000 (09:19 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Extensions/dbal/trunk@26282 735d13b6-9817-0410-8766-e36946ffe9aa

typo3/sysext/dbal/tests/db_oracle_testcase.php
typo3/sysext/dbal/tests/fixtures/oci8.config.php

index f68a042..a58189e 100644 (file)
@@ -180,9 +180,9 @@ class db_oracle_testcase extends BaseTestCase {
                $this->fixture->_callRef('map_remapSELECTQueryParts', $selectFields, $fromTables, $whereClause, $groupBy, $orderBy);
                $query = $this->cleanSql($this->fixture->SELECTquery($selectFields, $fromTables, $whereClause, $groupBy, $orderBy));
 
-               $expected = 'SELECT * FROM "XP_tt_news_cat"';
-               $expected .= ' INNER JOIN "XP_tt_news_cat_mm" ON "XP_tt_news_cat"."XP_uid"="XP_tt_news_cat_mm"."XP_uid_foreign"';
-               $expected .= ' INNER JOIN "XP_tt_news" ON "XP_tt_news"."XP_uid"="XP_tt_news_cat_mm"."XP_uid_local"';
+               $expected = 'SELECT * FROM "ext_tt_news_cat"';
+               $expected .= ' INNER JOIN "ext_tt_news_cat_mm" ON "ext_tt_news_cat"."cat_uid"="ext_tt_news_cat_mm"."uid_foreign"';
+               $expected .= ' INNER JOIN "ext_tt_news" ON "ext_tt_news"."news_uid"="ext_tt_news_cat_mm"."local_uid"';
                $expected .= ' WHERE 1 = 1';
                $this->assertEquals($expected, $query);
        }
index 0b9b037..2d50593 100644 (file)
@@ -24,31 +24,26 @@ $TYPO3_CONF_VARS['EXTCONF']['dbal']['mapping'] = array(
        'cachingframework_cache_hash' => array(
                'mapTableName' => 'cf_cache_hash',
        ),
-       'tx_templavoila_datastructure' => array(
-               'mapTableName' => 'tx_templavoila_ds',
-               'mapFieldNames' => array(
-                       'dataprot' => 'my_dataprot',
-                       'title' => 'my_title',
-               ),
-       ),
        'tt_news' => array(
-               'mapTableName' => 'XP_tt_news',
+               'mapTableName' => 'ext_tt_news',
                'mapFieldNames' => array(
-                       'uid' => 'XP_uid',
+                       'uid' => 'news_uid',
                ),
        ),
        'tt_news_cat' => array(
-               'mapTableName' => 'XP_tt_news_cat',
+               'mapTableName' => 'ext_tt_news_cat',
                'mapFieldNames' => array(
-                       'uid' => 'XP_uid',
+                       'uid' => 'cat_uid',
                ),
        ),
        'tt_news_cat_mm' => array(
-               'mapTableName' => 'XP_tt_news_cat_mm',
+               'mapTableName' => 'ext_tt_news_cat_mm',
                'mapFieldNames' => array(
-                       'uid_local' => 'XP_uid_local',
-                       'uid_foreign' => 'XP_uid_foreign',
+                       'uid_local' => 'local_uid',
                ),
        ),
+       'tx_templavoila_datastructure' => array(
+               'mapTableName' => 'tx_templavoila_ds',
+       ),
 );
 ?>
\ No newline at end of file