[MediaWiki-commits] [Gerrit] mediawiki...ExternalData[master]: Use DatabaseBase::factory() over Database::factory()

2016-09-28 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Use DatabaseBase::factory() over Database::factory()
..


Use DatabaseBase::factory() over Database::factory()

Change-Id: I59a3019feef680f869119da4c614e9bcb1309ae1
---
M ED_Utils.php
1 file changed, 18 insertions(+), 5 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ED_Utils.php b/ED_Utils.php
index 0117a66..be0f341 100644
--- a/ED_Utils.php
+++ b/ED_Utils.php
@@ -211,10 +211,23 @@
}
 
// DatabaseBase::newFromType() was added in MW 1.17 - it was
-   // then replaced by DatabaseBase::factory() in MW 1.18
-   $factoryFunction = array( 'DatabaseBase', 'factory' );
-   //$newFromTypeFunction = array( 'DatabaseBase', 'newFromType' );
-   if ( is_callable( $factoryFunction ) ) {
+   // then replaced by DatabaseBase::factory() in MW 1.18, and
+   // and renamed to Database::factory() in MW 1.28.
+   if ( method_exists( 'Database', 'factory' ) ) {
+   $db = Database::factory( $db_type,
+   array(
+   'host' => $db_server,
+   'user' => $db_username,
+   'password' => $db_password,
+   // Both 'dbname' and 'dbName' have been
+   // used in different versions.
+   'dbname' => $db_name,
+   'dbName' => $db_name,
+   'flags' => $db_flags,
+   'tablePrefix' => $db_tableprefix,
+   )
+   );
+   } elseif ( method_exists( 'DatabaseBase', 'factory' ) ) {
$db = DatabaseBase::factory( $db_type,
array(
'host' => $db_server,
@@ -228,7 +241,7 @@
'tablePrefix' => $db_tableprefix,
)
);
-   } else { //if ( is_callable( $newFromTypeFunction ) ) {
+   } else {
$db = DatabaseBase::newFromType( $db_type,
array(
'host' => $db_server,

-- 
To view, visit https://gerrit.wikimedia.org/r/313335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I59a3019feef680f869119da4c614e9bcb1309ae1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ExternalData
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ExternalData[master]: Use DatabaseBase::factory() over Database::factory()

2016-09-28 Thread Aaron Schulz (Code Review) 
Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/313335

Change subject: Use DatabaseBase::factory() over Database::factory()
..

Use DatabaseBase::factory() over Database::factory()

Change-Id: I59a3019feef680f869119da4c614e9bcb1309ae1
---
M ED_Utils.php
1 file changed, 16 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ExternalData 
refs/changes/35/313335/1

diff --git a/ED_Utils.php b/ED_Utils.php
index 0117a66..5f1b455 100644
--- a/ED_Utils.php
+++ b/ED_Utils.php
@@ -212,9 +212,21 @@
 
// DatabaseBase::newFromType() was added in MW 1.17 - it was
// then replaced by DatabaseBase::factory() in MW 1.18
-   $factoryFunction = array( 'DatabaseBase', 'factory' );
-   //$newFromTypeFunction = array( 'DatabaseBase', 'newFromType' );
-   if ( is_callable( $factoryFunction ) ) {
+   if ( method_exists( 'Database', 'factory' ) ) {
+   $db = Database::factory( $db_type,
+   array(
+   'host' => $db_server,
+   'user' => $db_username,
+   'password' => $db_password,
+   // Both 'dbname' and 'dbName' have been
+   // used in different versions.
+   'dbname' => $db_name,
+   'dbName' => $db_name,
+   'flags' => $db_flags,
+   'tablePrefix' => $db_tableprefix,
+   )
+   );
+   } elseif ( method_exists( 'DatabaseBase', 'factory' ) ) {
$db = DatabaseBase::factory( $db_type,
array(
'host' => $db_server,
@@ -228,7 +240,7 @@
'tablePrefix' => $db_tableprefix,
)
);
-   } else { //if ( is_callable( $newFromTypeFunction ) ) {
+   } else {
$db = DatabaseBase::newFromType( $db_type,
array(
'host' => $db_server,

-- 
To view, visit https://gerrit.wikimedia.org/r/313335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59a3019feef680f869119da4c614e9bcb1309ae1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ExternalData
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits