Revert "merged master"

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

diff --git a/tests/phpunit/includes/db/TestORMRowTest.php b/tests/phpunit/includes/db/TestORMRowTest.php
index 49c2161..fe5867a 100644 (file)
--- a/tests/phpunit/includes/db/TestORMRowTest.php
+++ b/tests/phpunit/includes/db/TestORMRowTest.php
@@ -38,6 +38,8 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
+require_once dirname( __FILE__ ) . "/ORMRowTest.php";
+
 class TestORMRowTest extends ORMRowTest {
 
        /**
@@ -53,7 +55,7 @@ class TestORMRowTest extends ORMRowTest {
         * @return IORMTable
         */
        protected function getTableInstance() {
-               return TestORMtable::singleton();
+               return TestORMTable::singleton();
        }
 
        public function setUp() {
@@ -66,7 +68,7 @@ class TestORMRowTest extends ORMRowTest {
                $idField = $isSqlite ? 'INTEGER' : 'INT unsigned';
                $primaryKey = $isSqlite ? 'PRIMARY KEY AUTOINCREMENT' : 'auto_increment PRIMARY KEY';
 
-               $dbw->safeQuery(
+               $dbw->query(
                        'CREATE TABLE IF NOT EXISTS ' . $dbw->tableName( 'orm_test' ) . '(
                                test_id                    ' . $idField . '        NOT NULL ' . $primaryKey . ',
                                test_name                  VARCHAR(255)        NOT NULL,