jenkins-bot has submitted this change and it was merged.
Change subject: Fixed OracleUpdater::doPageRestrictionsPKUKFix prefix
......................................................................
Fixed OracleUpdater::doPageRestrictionsPKUKFix prefix
Previously OracleUpdater::doPageRestrictionsPKUKFix had the
database prefix hard-coded into the SQL query. This removes
the hard-coded value and replaces it with the actual configured
prefix.
Change-Id: If60f23af7fd238d4c91ebf25b095749345a2718d
---
M includes/installer/OracleUpdater.php
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/installer/OracleUpdater.php
b/includes/installer/OracleUpdater.php
index b416f4b..90b4c87 100644
--- a/includes/installer/OracleUpdater.php
+++ b/includes/installer/OracleUpdater.php
@@ -202,7 +202,12 @@
protected function doPageRestrictionsPKUKFix() {
$this->output( "Altering PAGE_RESTRICTIONS keys ... " );
- $meta = $this->db->query( 'SELECT column_name FROM
all_cons_columns WHERE owner = \''.strtoupper($this->db->getDBname()).'\' AND
constraint_name = \'MW_PAGE_RESTRICTIONS_PK\' AND rownum = 1' );
+ $meta = $this->db->query( 'SELECT column_name FROM
all_cons_columns WHERE owner = \'' .
+ strtoupper( $this->db->getDBname() ) .
+ '\' AND constraint_name = \'' .
+ $this->db->tablePrefix() .
+ 'PAGE_RESTRICTIONS_PK\' AND rownum = 1'
+ );
$row = $meta->fetchRow();
if ( $row['column_name'] == 'PR_ID' ) {
$this->output( "seems to be up to date.\n" );
--
To view, visit https://gerrit.wikimedia.org/r/66042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If60f23af7fd238d4c91ebf25b095749345a2718d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_21
Gerrit-Owner: Freakolowsky <fr...@drajv.si>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Waldir <wal...@email.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
