Merge SQLite search from branches/sqlite/ to trunk

config/Installer.php

@@ -1268,7 +1268,7 @@ function setSchema( $schema, $engine ) {
 			print " done.</li>\n";
 
 
-			if ($conf->DBtype == 'ibm_db2') {
+			if ( $conf->DBtype == 'ibm_db2' ) {
 				// Now that table creation is done, make sure everything is committed
 				// Do this before doing inserts through API
 				if ($wgDatabase->lastError()) {
@@ -1279,6 +1279,10 @@ function setSchema( $schema, $engine ) {
 					print "<li>MediaWiki tables successfully created</li>\n";
 					$wgDatabase->commit();
 				}
+			} elseif ( $conf->DBtype == 'sqlite' ) {
+				// Ensure proper searchindex format. We have to do that separately because
+				// if SQLite is compiled without the FTS3 module, table creation syntax will be invalid.
+				sqlite_setup_searchindex();
 			}
 
 			print "<li>Initializing statistics...</li>\n";

includes/AutoLoader.php

@@ -483,8 +483,10 @@
 	'SearchResult' => 'includes/search/SearchEngine.php',
 	'SearchResultSet' => 'includes/search/SearchEngine.php',
 	'SearchResultTooMany' => 'includes/search/SearchEngine.php',
+	'SearchSqlite' => 'includes/search/SearchSqlite.php',
 	'SearchUpdate' => 'includes/search/SearchUpdate.php',
 	'SearchUpdateMyISAM' => 'includes/search/SearchUpdate.php',
+	'SqliteSearchResultSet' => 'includes/search/SearchSqlite.php',
 
 	# includes/specials
 	'SpecialAllmessages' => 'includes/specials/SpecialAllmessages.php',

includes/db/DatabaseSqlite.php

@@ -96,6 +96,20 @@ public static function generateFileName( $dir, $dbName ) {
 		return "$dir/$dbName.sqlite";
 	}
 
+	/**
+	 * Returns version of currently supported SQLite fulltext search module or false if none present.
+	 * @return String
+	 */
+	function getFulltextSearchModule() {
+		$table = 'dummy_search_test';
+		$this->query( "DROP TABLE IF EXISTS $table", __METHOD__ );
+		if ( $this->query( "CREATE VIRTUAL TABLE $table USING FTS3(dummy_field)", __METHOD__, true ) ) {
+			$this->query( "DROP TABLE IF EXISTS $table", __METHOD__ );
+			return 'FTS3';
+		}
+		return false;
+	}
+
 	/**
 	 * SQLite doesn't allow buffered results or data seeking etc, so we'll use fetchAll as the result
 	 */
@@ -319,15 +333,15 @@ function unionQueries( $sqls, $all ) {
 	}
 
 	function wasDeadlock() {
-		return $this->lastErrno() == SQLITE_BUSY;
+		return $this->lastErrno() == 5; // SQLITE_BUSY
 	}
 
 	function wasErrorReissuable() {
-		return $this->lastErrno() ==  SQLITE_SCHEMA;
+		return $this->lastErrno() ==  17; // SQLITE_SCHEMA;
 	}
 
 	function wasReadOnlyError() {
-		return $this->lastErrno() == SQLITE_READONLY;
+		return $this->lastErrno() == 8; // SQLITE_READONLY;
 	}
 
 	/**
@@ -460,7 +474,7 @@ public function setup_database() {
 	}
 
 	public function getSearchEngine() {
-		return "SearchEngineDummy";
+		return "SearchSqlite";
 	}
 
 	/**