зеркало из https://github.com/mozilla/gecko-dev.git
Bug 491954 - Views should select exact columns, r=sdwilsh a=blocking191
This commit is contained in:
Родитель
a6ecf55b84
Коммит
c862548ff4
|
@ -55,16 +55,17 @@
|
||||||
)
|
)
|
||||||
#define CREATE_MOZ_PLACES CREATE_MOZ_PLACES_BASE("moz_places", "")
|
#define CREATE_MOZ_PLACES CREATE_MOZ_PLACES_BASE("moz_places", "")
|
||||||
#define CREATE_MOZ_PLACES_TEMP CREATE_MOZ_PLACES_BASE("moz_places_temp", "TEMP")
|
#define CREATE_MOZ_PLACES_TEMP CREATE_MOZ_PLACES_BASE("moz_places_temp", "TEMP")
|
||||||
#define CREATE_MOZ_PLACES_VIEW NS_LITERAL_CSTRING( \
|
|
||||||
"CREATE TEMPORARY VIEW moz_places_view AS " \
|
|
||||||
"SELECT * FROM moz_places_temp " \
|
|
||||||
"UNION ALL " \
|
|
||||||
"SELECT * FROM moz_places " \
|
|
||||||
"WHERE id NOT IN (SELECT id FROM moz_places_temp) " \
|
|
||||||
)
|
|
||||||
#define MOZ_PLACES_COLUMNS \
|
#define MOZ_PLACES_COLUMNS \
|
||||||
"id, url, title, rev_host, visit_count, hidden, typed, favicon_id, " \
|
"id, url, title, rev_host, visit_count, hidden, typed, favicon_id, " \
|
||||||
"frecency"
|
"frecency"
|
||||||
|
#define CREATE_MOZ_PLACES_VIEW NS_LITERAL_CSTRING( \
|
||||||
|
"CREATE TEMPORARY VIEW moz_places_view AS " \
|
||||||
|
"SELECT " MOZ_PLACES_COLUMNS " FROM moz_places_temp " \
|
||||||
|
"UNION ALL " \
|
||||||
|
"SELECT " MOZ_PLACES_COLUMNS " FROM moz_places " \
|
||||||
|
"WHERE id NOT IN (SELECT id FROM moz_places_temp) " \
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
#define CREATE_MOZ_HISTORYVISITS_BASE(__name, __temporary) NS_LITERAL_CSTRING( \
|
#define CREATE_MOZ_HISTORYVISITS_BASE(__name, __temporary) NS_LITERAL_CSTRING( \
|
||||||
"CREATE " __temporary " TABLE " __name " (" \
|
"CREATE " __temporary " TABLE " __name " (" \
|
||||||
|
@ -80,15 +81,15 @@
|
||||||
CREATE_MOZ_HISTORYVISITS_BASE("moz_historyvisits", "")
|
CREATE_MOZ_HISTORYVISITS_BASE("moz_historyvisits", "")
|
||||||
#define CREATE_MOZ_HISTORYVISITS_TEMP \
|
#define CREATE_MOZ_HISTORYVISITS_TEMP \
|
||||||
CREATE_MOZ_HISTORYVISITS_BASE("moz_historyvisits_temp", "TEMP")
|
CREATE_MOZ_HISTORYVISITS_BASE("moz_historyvisits_temp", "TEMP")
|
||||||
#define CREATE_MOZ_HISTORYVISITS_VIEW NS_LITERAL_CSTRING( \
|
|
||||||
"CREATE TEMPORARY VIEW moz_historyvisits_view AS " \
|
|
||||||
"SELECT * FROM moz_historyvisits_temp " \
|
|
||||||
"UNION ALL " \
|
|
||||||
"SELECT * FROM moz_historyvisits " \
|
|
||||||
"WHERE id NOT IN (SELECT id FROM moz_historyvisits_temp) " \
|
|
||||||
)
|
|
||||||
#define MOZ_HISTORYVISITS_COLUMNS \
|
#define MOZ_HISTORYVISITS_COLUMNS \
|
||||||
"id, from_visit, place_id, visit_date, visit_type, session"
|
"id, from_visit, place_id, visit_date, visit_type, session"
|
||||||
|
#define CREATE_MOZ_HISTORYVISITS_VIEW NS_LITERAL_CSTRING( \
|
||||||
|
"CREATE TEMPORARY VIEW moz_historyvisits_view AS " \
|
||||||
|
"SELECT " MOZ_HISTORYVISITS_COLUMNS " FROM moz_historyvisits_temp " \
|
||||||
|
"UNION ALL " \
|
||||||
|
"SELECT " MOZ_HISTORYVISITS_COLUMNS " FROM moz_historyvisits " \
|
||||||
|
"WHERE id NOT IN (SELECT id FROM moz_historyvisits_temp) " \
|
||||||
|
)
|
||||||
|
|
||||||
#define CREATE_MOZ_INPUTHISTORY NS_LITERAL_CSTRING( \
|
#define CREATE_MOZ_INPUTHISTORY NS_LITERAL_CSTRING( \
|
||||||
"CREATE TABLE moz_inputhistory (" \
|
"CREATE TABLE moz_inputhistory (" \
|
||||||
|
|
Загрузка…
Ссылка в новой задаче