jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/239173 )
Change subject: Fix sql
......................................................................
Fix sql
Fixed sql by using the new sql settings in more recent versions of
mediawiki.
Remove $wgExtNewTables with file that does not exist.
Remove drop sql because not needed and will delete any save sql tables in that
table.
Add support for SQLite.
Bug: T112400
Change-Id: I63efb88e1f8b8b3afde04691bac78faeca241369
---
M SacredText.php
M SacredText.verses.sql
2 files changed, 7 insertions(+), 27 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SacredText.php b/SacredText.php
index f6ce109..bae519c 100644
--- a/SacredText.php
+++ b/SacredText.php
@@ -160,29 +160,10 @@
return true;
}
-function updateSacredTextDB() {
- global $wgExtNewTables, $wgSacredUpdateTable;
- // Abort schema update if the config setting says so; this is, e.g., in
case you feel no
- // need to drop that table and create it again
- if ( !$wgSacredUpdateTable ) {
- return true;
+function updateSacredTextDB( DatabaseUpdater $updater ) {
+ if ( $updater->getDB()->getType() == 'mysql' ||
$updater->getDB()->getType() == 'sqlite' ) {
+ $updater->addExtensionTable( 'sacredtext_verses', __DIR__ .
'/SacredText.verses.sql' );
}
- $wgExtNewTables[] = array(
- 'sacredtext_verses1',
- dirname( __FILE__ ) . '/SacredText.verses.sql' );
- /*$dir = dirname( __FILE__ ) . '/data/';
- while( $file = readdir( $dir ) )
- {
- if($file == '.' && $file == '..') continue;
- if(!is_file($dir.$file)) continue;
- if(!preg_match('^(.*)\.sql$', $file, $matches)) continue;
- $wgExtNewTables[] = array(
- $matches[1],
- $dir.$file);
- }*/
-
- $wgExtNewTables[] = array(
- 'sacredtext_verses_kjv_entire',
- dirname( __FILE__ ) . '/data/bible_kjv_entire.sql' );
+
return true;
}
diff --git a/SacredText.verses.sql b/SacredText.verses.sql
index 6ce3508..0d59b44 100644
--- a/SacredText.verses.sql
+++ b/SacredText.verses.sql
@@ -2,10 +2,10 @@
-- SQL for SacredText Extension
--
-- Table for SacredText verses
-DROP TABLE IF EXISTS /*_*/sacredtext_verses;
+
CREATE TABLE /*_*/sacredtext_verses (
-- Primary key
- st_verse_index int(11) NOT NULL auto_increment,
+ st_verse_index int(11) NOT NULL PRIMARY KEY AUTO_INCREMENT,
-- Religious text
st_religious_text ENUM('Christian Bible', 'Hebrew Bible', 'Quran') NOT
NULL default 'Christian Bible',
-- Book (ex. John)
@@ -19,6 +19,5 @@
-- Translation
st_translation VARCHAR(255) COLLATE utf8_unicode_ci NOT NULL,
-- Actual text
- st_text TEXT character set utf8 collate utf8_unicode_ci NOT NULL,
- PRIMARY KEY (`st_verse_index`)
+ st_text TEXT character set utf8 collate utf8_unicode_ci NOT NULL
) /*$wgDBTableOptions*/;
--
To view, visit https://gerrit.wikimedia.org/r/239173
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I63efb88e1f8b8b3afde04691bac78faeca241369
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/SacredText
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: MarkAHershberger <m...@nichework.com>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
