Jeroen De Dauw has submitted this change and it was merged.
Change subject: Amend case of MYSQL in some files
......................................................................
Amend case of MYSQL in some files
Also fix some incorrect namespaces
Change-Id: I3ce6efbb18b6176adb7d50308622eee57fb8531d
---
M src/MediaWiki/MWTableBuilderBuilder.php
R src/MySQL/MySQLFieldSqlBuilder.php
R src/MySQL/MySQLSchemaSqlBuilder.php
R src/MySQL/MySQLTableDefinitionReader.php
R src/MySQL/MySQLTableSqlBuilder.php
M src/SQLite/SQLiteSchemaSqlBuilder.php
R tests/phpunit/MySQL/MySQLFieldSqlBuilderTest.php
R tests/phpunit/MySQL/MySQLSchemaSqlBuilderTest.php
M tests/phpunit/MySQL/MySQLTableDefinitionReaderTest.php
M tests/phpunit/MySQL/MySQLTableSqlBuilderTest.php
M tests/phpunit/SQLite/SQLiteFieldSqlBuilderTest.php
M tests/phpunit/SQLite/SQLiteTableDefinitionReaderTest.php
12 files changed, 26 insertions(+), 26 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/MediaWiki/MWTableBuilderBuilder.php
b/src/MediaWiki/MWTableBuilderBuilder.php
index d5839c4..b416980 100644
--- a/src/MediaWiki/MWTableBuilderBuilder.php
+++ b/src/MediaWiki/MWTableBuilderBuilder.php
@@ -5,7 +5,7 @@
use DatabaseBase;
use RuntimeException;
use Wikibase\Database\DBConnectionProvider;
-use Wikibase\Database\MySQL\MySqlTableSqlBuilder;
+use Wikibase\Database\MySQL\MySQLTableSqlBuilder;
use Wikibase\Database\Schema\TableBuilder;
use Wikibase\Database\SQLite\SQLiteTableSqlBuilder;
@@ -50,7 +50,7 @@
$dbType = $this->connectionProvider->getConnection()->getType();
if ( $dbType === 'mysql' ) {
- return $this->newMySqlTableSqlBuilder();
+ return $this->newMySQLTableSqlBuilder();
}
if ( $dbType === 'sqlite' ) {
@@ -60,9 +60,9 @@
throw new RuntimeException( "Cannot build a
MediaWikiQueryInterface for database type '$dbType'." );
}
- protected function newMySqlTableSqlBuilder() {
+ protected function newMySQLTableSqlBuilder() {
- return new MySqlTableSqlBuilder(
+ return new MySQLTableSqlBuilder(
$this->connectionProvider->getConnection()->getDBname(),
$this->newEscaper(),
$this->newTableNameFormatter()
diff --git a/src/MySQL/MySqlFieldSqlBuilder.php
b/src/MySQL/MySQLFieldSqlBuilder.php
similarity index 96%
rename from src/MySQL/MySqlFieldSqlBuilder.php
rename to src/MySQL/MySQLFieldSqlBuilder.php
index 095ca3f..bcfcfd5 100644
--- a/src/MySQL/MySqlFieldSqlBuilder.php
+++ b/src/MySQL/MySQLFieldSqlBuilder.php
@@ -12,7 +12,7 @@
* @licence GNU GPL v2+
* @author Adam Shorland
*/
-class MySqlFieldSqlBuilder extends FieldSqlBuilder {
+class MySQLFieldSqlBuilder extends FieldSqlBuilder {
protected $escaper;
diff --git a/src/MySQL/MySqlSchemaSqlBuilder.php
b/src/MySQL/MySQLSchemaSqlBuilder.php
similarity index 89%
rename from src/MySQL/MySqlSchemaSqlBuilder.php
rename to src/MySQL/MySQLSchemaSqlBuilder.php
index d8e8262..17a0389 100644
--- a/src/MySQL/MySqlSchemaSqlBuilder.php
+++ b/src/MySQL/MySQLSchemaSqlBuilder.php
@@ -14,7 +14,7 @@
* @author Jeroen De Dauw < [email protected] >
* @author Adam Shorland
*/
-class MySqlSchemaSqlBuilder implements SchemaModificationSqlBuilder {
+class MySQLSchemaSqlBuilder implements SchemaModificationSqlBuilder {
protected $fieldSqlBuilder;
@@ -22,7 +22,7 @@
* @param Escaper $fieldValueEscaper
*/
public function __construct( Escaper $fieldValueEscaper ) {
- $this->fieldSqlBuilder = new MySqlFieldSqlBuilder(
$fieldValueEscaper );
+ $this->fieldSqlBuilder = new MySQLFieldSqlBuilder(
$fieldValueEscaper );
}
/**
diff --git a/src/MySQL/MySqlTableDefinitionReader.php
b/src/MySQL/MySQLTableDefinitionReader.php
similarity index 98%
rename from src/MySQL/MySqlTableDefinitionReader.php
rename to src/MySQL/MySQLTableDefinitionReader.php
index adcca72..22afbae 100644
--- a/src/MySQL/MySqlTableDefinitionReader.php
+++ b/src/MySQL/MySQLTableDefinitionReader.php
@@ -15,7 +15,7 @@
* @author Jeroen De Dauw < [email protected] >
* @author Adam Shorland
*/
-class MySqlTableDefinitionReader implements TableDefinitionReader {
+class MySQLTableDefinitionReader implements TableDefinitionReader {
protected $queryInterface;
diff --git a/src/MySQL/MySqlTableSqlBuilder.php
b/src/MySQL/MySQLTableSqlBuilder.php
similarity index 96%
rename from src/MySQL/MySqlTableSqlBuilder.php
rename to src/MySQL/MySQLTableSqlBuilder.php
index cc5c80f..c1ae2ab 100644
--- a/src/MySQL/MySqlTableSqlBuilder.php
+++ b/src/MySQL/MySQLTableSqlBuilder.php
@@ -18,7 +18,7 @@
* @author Jeroen De Dauw < [email protected] >
* @author Adam Shorland
*/
-class MySqlTableSqlBuilder extends TableSqlBuilder {
+class MySQLTableSqlBuilder extends TableSqlBuilder {
protected $dbName;
protected $escaper;
@@ -34,7 +34,7 @@
$this->dbName = $dbName;
$this->escaper = $fieldValueEscaper;
$this->tableNameFormatter = $tableNameFormatter;
- $this->fieldSqlBuilder = new MySqlFieldSqlBuilder(
$this->escaper );
+ $this->fieldSqlBuilder = new MySQLFieldSqlBuilder(
$this->escaper );
}
/**
diff --git a/src/SQLite/SQLiteSchemaSqlBuilder.php
b/src/SQLite/SQLiteSchemaSqlBuilder.php
index 9965458..f7d8a38 100644
--- a/src/SQLite/SQLiteSchemaSqlBuilder.php
+++ b/src/SQLite/SQLiteSchemaSqlBuilder.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Database\MySQL;
+namespace Wikibase\Database\SQLite;
use Wikibase\Database\Schema\Definitions\FieldDefinition;
use Wikibase\Database\Schema\SchemaModificationSqlBuilder;
diff --git a/tests/phpunit/MySQL/MySqlFieldSqlBuilderTest.php
b/tests/phpunit/MySQL/MySQLFieldSqlBuilderTest.php
similarity index 84%
rename from tests/phpunit/MySQL/MySqlFieldSqlBuilderTest.php
rename to tests/phpunit/MySQL/MySQLFieldSqlBuilderTest.php
index 699b673..3c90e2f 100644
--- a/tests/phpunit/MySQL/MySqlFieldSqlBuilderTest.php
+++ b/tests/phpunit/MySQL/MySQLFieldSqlBuilderTest.php
@@ -2,11 +2,11 @@
namespace Wikibase\Database\Tests\MySQL;
-use Wikibase\Database\MySQL\MySqlFieldSqlBuilder;
+use Wikibase\Database\MySQL\MySQLFieldSqlBuilder;
use Wikibase\Database\Schema\Definitions\FieldDefinition;
/**
- * @covers Wikibase\Database\MySql\MySqlFieldSqlBuilder
+ * @covers Wikibase\Database\MySQL\MySQLFieldSqlBuilder
*
* @group Wikibase
* @group WikibaseDatabase
@@ -15,7 +15,7 @@
* @licence GNU GPL v2+
* @author Adam Shorland
*/
-class MySqlFieldSqlBuilderTest extends \PHPUnit_Framework_TestCase {
+class MySQLFieldSqlBuilderTest extends \PHPUnit_Framework_TestCase {
private function newInstance() {
$mockEscaper = $this->getMock( 'Wikibase\Database\Escaper' );
@@ -23,7 +23,7 @@
->method( 'getEscapedValue' )
->will( $this->returnArgument(0) );
- return new MySqlFieldSqlBuilder( $mockEscaper );
+ return new MySQLFieldSqlBuilder( $mockEscaper );
}
/**
diff --git a/tests/phpunit/MySQL/MySqlSchemaSqlBuilderTest.php
b/tests/phpunit/MySQL/MySQLSchemaSqlBuilderTest.php
similarity index 82%
rename from tests/phpunit/MySQL/MySqlSchemaSqlBuilderTest.php
rename to tests/phpunit/MySQL/MySQLSchemaSqlBuilderTest.php
index 732f729..098a50d 100644
--- a/tests/phpunit/MySQL/MySqlSchemaSqlBuilderTest.php
+++ b/tests/phpunit/MySQL/MySQLSchemaSqlBuilderTest.php
@@ -2,11 +2,11 @@
namespace Wikibase\Database\Tests\MySQL;
-use Wikibase\Database\MySQL\MySqlSchemaSqlBuilder;
+use Wikibase\Database\MySQL\MySQLSchemaSqlBuilder;
use Wikibase\Database\Schema\Definitions\FieldDefinition;
/**
- * @covers Wikibase\Database\MySQL\MySqlSchemaSqlBuilder
+ * @covers Wikibase\Database\MySQL\MySQLSchemaSqlBuilder
*
* @group Wikibase
* @group WikibaseDatabase
@@ -15,7 +15,7 @@
* @licence GNU GPL v2+
* @author Adam Shorland
*/
-class MySqlSchemaSqlBuilderTest extends \PHPUnit_Framework_TestCase {
+class MySQLSchemaSqlBuilderTest extends \PHPUnit_Framework_TestCase {
private function newInstance() {
$mockEscaper = $this->getMock( 'Wikibase\Database\Escaper' );
@@ -23,7 +23,7 @@
->method( 'getEscapedValue' )
->will( $this->returnArgument(0) );
- return new MySqlSchemaSqlBuilder( $mockEscaper );
+ return new MySQLSchemaSqlBuilder( $mockEscaper );
}
public function testGetRemoveFieldSql(){
diff --git a/tests/phpunit/MySQL/MySQLTableDefinitionReaderTest.php
b/tests/phpunit/MySQL/MySQLTableDefinitionReaderTest.php
index 9c2a991..876c239 100644
--- a/tests/phpunit/MySQL/MySQLTableDefinitionReaderTest.php
+++ b/tests/phpunit/MySQL/MySQLTableDefinitionReaderTest.php
@@ -1,8 +1,8 @@
<?php
-namespace Wikibase\Database\Tests;
+namespace Wikibase\Database\Tests\MySQL;
-use Wikibase\Database\MySQL\MySqlTableDefinitionReader;
+use Wikibase\Database\MySQL\MySQLTableDefinitionReader;
use Wikibase\Database\QueryInterface\ResultIterator;
use Wikibase\Database\Schema\Definitions\FieldDefinition;
use Wikibase\Database\Schema\Definitions\IndexDefinition;
@@ -36,7 +36,7 @@
->will( $this->returnValue( new ResultIterator(
$result ) ) );
}
- return new MySqlTableDefinitionReader( $mockQueryInterface );
+ return new MySQLTableDefinitionReader( $mockQueryInterface );
}
/**
diff --git a/tests/phpunit/MySQL/MySQLTableSqlBuilderTest.php
b/tests/phpunit/MySQL/MySQLTableSqlBuilderTest.php
index fa24bd1..52cd4a8 100644
--- a/tests/phpunit/MySQL/MySQLTableSqlBuilderTest.php
+++ b/tests/phpunit/MySQL/MySQLTableSqlBuilderTest.php
@@ -4,7 +4,7 @@
use Wikibase\Database\Schema\Definitions\FieldDefinition;
use Wikibase\Database\Schema\Definitions\IndexDefinition;
-use Wikibase\Database\MySQL\MySqlTableSqlBuilder;
+use Wikibase\Database\MySQL\MySQLTableSqlBuilder;
use Wikibase\Database\Schema\Definitions\TableDefinition;
/**
@@ -39,7 +39,7 @@
->method( 'formatTableName' )
->will( $this->returnArgument(0) );
- return new MySqlTableSqlBuilder(
+ return new MySQLTableSqlBuilder(
self::DB_NAME,
$mockEscaper,
$mockTableNameFormatter
diff --git a/tests/phpunit/SQLite/SQLiteFieldSqlBuilderTest.php
b/tests/phpunit/SQLite/SQLiteFieldSqlBuilderTest.php
index 2216998..48eb384 100644
--- a/tests/phpunit/SQLite/SQLiteFieldSqlBuilderTest.php
+++ b/tests/phpunit/SQLite/SQLiteFieldSqlBuilderTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Database\Tests\MySQL;
+namespace Wikibase\Database\Tests\SQLite;
use Wikibase\Database\Schema\Definitions\FieldDefinition;
use Wikibase\Database\SQLite\SQLiteFieldSqlBuilder;
diff --git a/tests/phpunit/SQLite/SQLiteTableDefinitionReaderTest.php
b/tests/phpunit/SQLite/SQLiteTableDefinitionReaderTest.php
index aa1cf97..7fc8731 100644
--- a/tests/phpunit/SQLite/SQLiteTableDefinitionReaderTest.php
+++ b/tests/phpunit/SQLite/SQLiteTableDefinitionReaderTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Wikibase\Database\Tests;
+namespace Wikibase\Database\Tests\SQLite;
use Wikibase\Database\QueryInterface\ResultIterator;
use Wikibase\Database\Schema\Definitions\FieldDefinition;
--
To view, visit https://gerrit.wikimedia.org/r/87048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ce6efbb18b6176adb7d50308622eee57fb8531d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikibaseDatabase
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
