зеркало из https://github.com/mozilla/gecko-dev.git
merge upstream changes
This commit is contained in:
Коммит
636534da50
|
@ -165,6 +165,7 @@ HistoryStore.prototype = {
|
||||||
|
|
||||||
get _urlStm() {
|
get _urlStm() {
|
||||||
this._log.trace("Creating SQL statement: _urlStm");
|
this._log.trace("Creating SQL statement: _urlStm");
|
||||||
|
try {
|
||||||
let stm = this._db.createStatement(
|
let stm = this._db.createStatement(
|
||||||
"SELECT * FROM " +
|
"SELECT * FROM " +
|
||||||
"(SELECT url,title FROM moz_places_temp WHERE id = :id LIMIT 1) " +
|
"(SELECT url,title FROM moz_places_temp WHERE id = :id LIMIT 1) " +
|
||||||
|
@ -175,6 +176,14 @@ HistoryStore.prototype = {
|
||||||
"LIMIT 1 " +
|
"LIMIT 1 " +
|
||||||
") " +
|
") " +
|
||||||
"LIMIT 1");
|
"LIMIT 1");
|
||||||
|
} catch (e) {
|
||||||
|
// On Fennec, this gets an error that there is no such table
|
||||||
|
// as moz_places_temp in existence
|
||||||
|
/*this._log.warn("moz_places_view exists?");
|
||||||
|
this._log.warn( this._db.tableExists("moz_places_view"));*/
|
||||||
|
this._log.warn(this._db.lastErrorString);
|
||||||
|
throw(e);
|
||||||
|
}
|
||||||
this.__defineGetter__("_urlStm", function() stm);
|
this.__defineGetter__("_urlStm", function() stm);
|
||||||
return stm;
|
return stm;
|
||||||
},
|
},
|
||||||
|
|
Загрузка…
Ссылка в новой задаче