mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix LIKE errors in Fx44

Browse source 
In Fx44, SQL queries must use '?' with LIKE and cannot concatenate a
placeholder string (e.g., 'foo%'). This is for Sqlite.jsm only, so it
doesn't affect 4.0.
This commit is contained in:
Dan Stillman 2016-02-03 01:13:30 -05:00
parent 7c7ea6a66d
commit 9fb85a263a
4 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
chrome/content/zotero/preferences/preferences_advanced.js
View file

@ -341,9 +341,11 @@ Zotero_Preferences.Attachment_Base_Directory = {
changePath: Zotero.Promise.coroutine(function* (basePath) {
// Find all current attachments with relative attachment paths
var sql = "SELECT itemID FROM itemAttachments WHERE linkMode=? AND path LIKE '"
+ Zotero.Attachments.BASE_PATH_PLACEHOLDER + "%'";
var params = [Zotero.Attachments.LINK_MODE_LINKED_FILE];
var sql = "SELECT itemID FROM itemAttachments WHERE linkMode=? AND path LIKE ?";
var params = [
Zotero.Attachments.LINK_MODE_LINKED_FILE,
Zotero.Attachments.BASE_PATH_PLACEHOLDER + "%"
];
var oldRelativeAttachmentIDs = yield Zotero.DB.columnQueryAsync(sql, params);
//Find all attachments on the new base path
@ -483,9 +485,11 @@ Zotero_Preferences.Attachment_Base_Directory = {
clearPath: Zotero.Promise.coroutine(function* () {
// Find all current attachments with relative paths
var sql = "SELECT itemID FROM itemAttachments WHERE linkMode=? AND path LIKE '"
+ Zotero.Attachments.BASE_PATH_PLACEHOLDER + "%'";
var params = [Zotero.Attachments.LINK_MODE_LINKED_FILE];
var sql = "SELECT itemID FROM itemAttachments WHERE linkMode=? AND path LIKE ?";
var params = [
Zotero.Attachments.LINK_MODE_LINKED_FILE,
Zotero.Attachments.BASE_PATH_PLACEHOLDER + "%"
];
var relativeAttachmentIDs = yield Zotero.DB.columnQueryAsync(sql, params);
// Prompt for confirmation

9
chrome/content/zotero/xpcom/db.js
View file

@ -369,12 +369,9 @@ Zotero.DBConnection.prototype.getNextName = Zotero.Promise.coroutine(function* (
[libraryID, table, field, name] = [null, libraryID, table, field];
}
var sql = "SELECT SUBSTR(" + field + ", " + (name.length + 1) + ") "
+ "FROM " + table + " "
+ "WHERE libraryID=? AND "
+ field + " LIKE '" + name + "%' "
+ " ORDER BY " + field;
var params = [libraryID];
var sql = "SELECT SUBSTR(" + field + ", " + (name.length + 1) + ") FROM " + table
+ " WHERE libraryID=? AND " + field + " LIKE ? ORDER BY " + field;
var params = [libraryID, name + "%"];
var suffixes = yield this.columnQueryAsync(sql, params);
suffixes.filter(function (x) x.match(/^( [0-9]+)?$/));

3
chrome/content/zotero/xpcom/storage/storageLocal.js
View file

@ -438,7 +438,8 @@ Zotero.Sync.Storage.Local = {
sql += ") "
// Skip attachments with empty path, which can't be saved, and files with .zotero*
// paths, which have somehow ended up in some users' libraries
+ "AND path!='' AND path NOT LIKE 'storage:.zotero%'";
+ "AND path!='' AND path NOT LIKE ?";
params.push('storage:.zotero%');
return Zotero.DB.columnQueryAsync(sql, params);
},

10
test/tests/zoteroPaneTest.js
View file

@ -56,6 +56,16 @@ describe("ZoteroPane", function() {
})
})
describe("#newCollection()", function () {
it("should create a collection", function* () {
var promise = waitForDialog();
var id = yield zp.newCollection();
yield promise;
var collection = Zotero.Collections.get(id);
assert.isTrue(collection.name.startsWith(Zotero.getString('pane.collections.untitled')));
});
});
describe("#itemSelected()", function () {
it.skip("should update the item count", function* () {
var collection = new Zotero.Collection;