Hack in unions for each call to itemData and itemCreators (isNot sear…

…ches failed).
Juris-M · Sep 10, 2017 · b1f29aa · b1f29aa
1 parent 91c5c90
commit b1f29aa
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/chrome/content/zotero/xpcom/data/search.js b/chrome/content/zotero/xpcom/data/search.js
@@ -1665,12 +1665,9 @@ Zotero.Search.prototype._buildQuery = Zotero.Promise.coroutine(function* () {
 		}
 	}
 
-	var altsql = sql
-		.replace(/\s+itemData\s+/g, " itemDataAlt ")
-		.replace(/\s+itemCreatorsAlt\s+/g, " itemCreatorsAlt ");
+	this._sql = sql
+		.replace(/\s+itemData\s+/g, " (SELECT * FROM itemData UNION ALL SELECT itemID,fieldID,valueID FROM itemDataAlt) ")
+		.replace(/\s+itemCreators\s+/g, " (SELECT * FROM itemCreators UNION ALL SELECT itemID,creatorID,creatorTypeID,orderIndex FROM itemCreatorsAlt) ");
 
-	var realsql = sql + " UNION " + altsql;
-
-	this._sql = realsql;
-	this._sqlParams = sqlParams.length ? sqlParams.concat(sqlParams): false;
+	this._sqlParams = sqlParams.length ? sqlParams: false;
 });