Merge "Show HTTP error (if any) when scary transclusion fails"

[lhc/web/wiklou.git] / tests / phpunit / includes / db / DatabaseSqliteTest.php

diff --git a/tests/phpunit/includes/db/DatabaseSqliteTest.php b/tests/phpunit/includes/db/DatabaseSqliteTest.php
index f34e862..d226598 100644 (file)
--- a/tests/phpunit/includes/db/DatabaseSqliteTest.php
+++ b/tests/phpunit/includes/db/DatabaseSqliteTest.php
@@ -19,6 +19,7 @@ class MockDatabaseSqlite extends DatabaseSqliteStandalone {
 
 /**
  * @group sqlite
+ * @group Database
  */
 class DatabaseSqliteTest extends MediaWikiTestCase {
        var $db;
@@ -38,6 +39,19 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
                return preg_replace( '/\s+/', ' ', $this->db->replaceVars( $sql ) );
        }
 
+       private function assertResultIs( $expected, $res ) {
+               $this->assertNotNull( $res );
+               $i = 0;
+               foreach( $res as $row ) {
+                       foreach( $expected[$i] as $key => $value ) {
+                               $this->assertTrue( isset( $row->$key ) );
+                               $this->assertEquals( $value, $row->$key );
+                       }
+                       $i++;
+               }
+               $this->assertEquals( count( $expected ), $i, 'Unexpected number of rows' );
+       }
+
        public function testReplaceVars() {
                $this->assertEquals( 'foo', $this->replaceVars( 'foo' ), "Don't break anything accidentally" );
 
@@ -85,7 +99,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
                $this->assertEquals( 'sqlite_master', $db->tableName( 'sqlite_master' ) );
                $this->assertEquals( 'foobar', $db->tableName( 'bar' ) );
        }
-       
+
        public function testDuplicateTableStructure() {
                $db = new DatabaseSqliteStandalone( ':memory:' );
                $db->query( 'CREATE TABLE foo(foo, barfoo)' );
@@ -106,7 +120,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
                        'Create a temporary duplicate only'
                );
        }
-       
+
        public function testDuplicateTableStructureVirtual() {
                $db = new DatabaseSqliteStandalone( ':memory:' );
                if ( $db->getFulltextSearchModule() != 'FTS3' ) {
@@ -127,6 +141,33 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
                );
        }
 
+       public function testDeleteJoin() {
+               $db = new DatabaseSqliteStandalone( ':memory:' );
+               $db->query( 'CREATE TABLE a (a_1)', __METHOD__ );
+               $db->query( 'CREATE TABLE b (b_1, b_2)', __METHOD__ );
+               $db->insert( 'a', array(
+                               array( 'a_1' => 1 ),
+                               array( 'a_1' => 2 ),
+                               array( 'a_1' => 3 ),
+                       ),
+                       __METHOD__
+               );
+               $db->insert( 'b', array(
+                               array( 'b_1' => 2, 'b_2' => 'a' ),
+                               array( 'b_1' => 3, 'b_2' => 'b' ),
+                       ),
+                       __METHOD__
+               );
+               $db->deleteJoin( 'a', 'b', 'a_1', 'b_1', array( 'b_2' => 'a' ), __METHOD__ );
+               $res = $db->query( "SELECT * FROM a", __METHOD__ );
+               $this->assertResultIs( array(
+                               array( 'a_1' => 1 ),
+                               array( 'a_1' => 3 ),
+                       ),
+                       $res
+               );
+       }
+
        public function testEntireSchema() {
                global $IP;
 
@@ -151,13 +192,14 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
                        '1.15',
                        '1.16',
                        '1.17',
+                       '1.18',
                );
 
                // Mismatches for these columns we can safely ignore
                $ignoredColumns = array(
                        'user_newtalk.user_last_timestamp', // r84185
                );
-                       
+
                $currentDB = new DatabaseSqliteStandalone( ':memory:' );
                $currentDB->sourceFile( "$IP/maintenance/tables.sql" );
                $currentTables = $this->getTables( $currentDB );
@@ -208,15 +250,26 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
                }
        }
 
+       public function testInsertIdType() {
+               $db = new DatabaseSqliteStandalone( ':memory:' );
+               $this->assertInstanceOf( 'ResultWrapper',
+                       $db->query( 'CREATE TABLE a ( a_1 )', __METHOD__ ), "Database creationg" );
+               $this->assertTrue( $db->insert( 'a', array( 'a_1' => 10 ), __METHOD__ ),
+                       "Insertion worked" );
+               $this->assertEquals( "integer", gettype( $db->insertId() ), "Actual typecheck" );
+               $this->assertTrue( $db->close(), "closing database" );
+       }
+
        private function prepareDB( $version ) {
                static $maint = null;
                if ( $maint === null ) {
                        $maint = new FakeMaintenance();
                        $maint->loadParamsAndArgs( null, array( 'quiet' => 1 ) );
                }
-               
+
+               global $IP;
                $db = new DatabaseSqliteStandalone( ':memory:' );
-               $db->sourceFile( dirname( __FILE__ ) . "/sqlite/tables-$version.sql" );
+               $db->sourceFile( "$IP/tests/phpunit/data/db/sqlite/tables-$version.sql" );
                $updater = DatabaseUpdater::newForDB( $db, false, $maint );
                $updater->doUpdates( array( 'core' ) );
                return $db;
@@ -226,6 +279,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
                $list = array_flip( $db->listTables() );
                $excluded = array(
                        'math', // moved out of core in 1.18
+                       'trackbacks', // removed from core in 1.19
                        'searchindex',
                        'searchindex_content',
                        'searchindex_segments',