Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/syncable/directory_backing_store_unittest.cc

Issue 7981006: [Sync] use base::Time in sync (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix win compile error Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/sync/syncable/directory_backing_store.cc ('K') | « chrome/browser/sync/syncable/directory_backing_store.cc ('k') | chrome/browser/sync/syncable/syncable.h » ('j') | chrome/browser/sync/syncable/syncable.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/syncable/directory_backing_store_unittest.cc
diff --git a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
index f05bc6f1d4adf17afcf12d84d82e2b773e0cabb6..1ff6c2875f842ae27871751f0576ffc6b1423a38 100644
--- a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
+++ b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/sync/syncable/directory_manager.h"
#include "chrome/browser/sync/syncable/syncable-inl.h"
#include "chrome/browser/sync/syncable/syncable.h"
+#include "chrome/browser/sync/util/time.h"
#include "sql/connection.h"
#include "sql/statement.h"
#include "testing/gtest/include/gtest/gtest-param-test.h"
@@ -50,6 +51,7 @@ class MigrationTest : public testing::TestWithParam<int> {
void SetUpVersion73Database();
void SetUpVersion74Database();
void SetUpVersion75Database();
+ void SetUpVersion76Database();
void SetUpCurrentDatabaseAndCheckVersion() {
SetUpVersion70Database(); // Prepopulates data.
@@ -69,6 +71,132 @@ class MigrationTest : public testing::TestWithParam<int> {
class DirectoryBackingStoreTest : public MigrationTest {};
+#if defined(OS_WIN)
+
+// On Windows, we used to store timestamps in FILETIME format.
+#define LEGACY_META_TIMES_1 129079956640320000
+#define LEGACY_META_TIMES_2 128976886618480000
+#define LEGACY_META_TIMES_4 129002163642690000
+#define LEGACY_META_TIMES_5 129001555500000000
+#define LEGACY_META_TIMES_6 129053976170000000
+#define LEGACY_META_TIMES_7 128976864758480000
+#define LEGACY_META_TIMES_8 128976864758480000
+#define LEGACY_META_TIMES_9 128976864758480000
+#define LEGACY_META_TIMES_10 128976864758480000
+#define LEGACY_META_TIMES_11 129079956948440000
+#define LEGACY_META_TIMES_12 129079957513650000
+#define LEGACY_META_TIMES_13 129079957985300000
+#define LEGACY_META_TIMES_14 129079958383000000
+
+// Generated via:
+//
+// ruby -ane '$F[1].sub!("LEGACY_", ""); $F[2] = Integer($F[2]) / 10000 - 11644473600000; print "#{$F[0]} #{$F[1]} #{$F[2]}\n"'
+//
+// Magic numbers taken from
+// http://stackoverflow.com/questions/5398557/java-library-for-dealing-with-win32-filetime .
+
+// Now we store them in Java format (ms since the Unix epoch).
+#define META_TIMES_1 1263522064032
+#define META_TIMES_2 1253215061848
+#define META_TIMES_4 1255742764269
+#define META_TIMES_5 1255681950000
+#define META_TIMES_6 1260924017000
+#define META_TIMES_7 1253212875848
+#define META_TIMES_8 1253212875848
+#define META_TIMES_9 1253212875848
+#define META_TIMES_10 1253212875848
+#define META_TIMES_11 1263522094844
+#define META_TIMES_12 1263522151365
+#define META_TIMES_13 1263522198530
+#define META_TIMES_14 1263522238300
+
+#else
+
+// On other platforms, we used to store timestamps in time_t format (s
+// since the Unix epoch).
+#define LEGACY_META_TIMES_1 1263522064
+#define LEGACY_META_TIMES_2 1253215061
+#define LEGACY_META_TIMES_4 1255742764
+#define LEGACY_META_TIMES_5 1255681950
+#define LEGACY_META_TIMES_6 1260924017
+#define LEGACY_META_TIMES_7 1253212875
+#define LEGACY_META_TIMES_8 1253212875
+#define LEGACY_META_TIMES_9 1253212875
+#define LEGACY_META_TIMES_10 1253212875
+#define LEGACY_META_TIMES_11 1263522094
+#define LEGACY_META_TIMES_12 1263522151
+#define LEGACY_META_TIMES_13 1263522198
+#define LEGACY_META_TIMES_14 1263522238
+
+// Now we store them in Java format (ms since the Unix epoch).
+#define META_TIMES_1 1263522064000
+#define META_TIMES_2 1253215061000
+#define META_TIMES_4 1255742764000
+#define META_TIMES_5 1255681950000
+#define META_TIMES_6 1260924017000
+#define META_TIMES_7 1253212875000
+#define META_TIMES_8 1253212875000
+#define META_TIMES_9 1253212875000
+#define META_TIMES_10 1253212875000
+#define META_TIMES_11 1263522094000
+#define META_TIMES_12 1263522151000
+#define META_TIMES_13 1263522198000
+#define META_TIMES_14 1263522238000
+
+#endif
+
+// Helper macros for the database dumps in the SetUpVersion*Database
+// functions.
+#define LEGACY_META_TIMES(x) LEGACY_META_TIMES_##x
+#define META_TIMES(x) META_TIMES_##x
+#define STR(s) #s
+#define XSTR(s) STR(s)
+#define STR_LEGACY_META_TIMES(x) XSTR(LEGACY_META_TIMES(x))
+#define LEGACY_TIME_COLS(x) \
+ STR_LEGACY_META_TIMES(x) "," STR_LEGACY_META_TIMES(x) "," \
+ STR_LEGACY_META_TIMES(x) "," STR_LEGACY_META_TIMES(x)
+
+// Heler functions for use with ExpectTimes().
+
+std::map<int64, base::Time> GetLegacyMetaTimes() {
+ std::map<int64, base::Time> legacy_meta_times;
+ // Since these times are in legacy format, the time values are
+ // meaningless, although the conversion is lossless so they can
+ // still be compared.
+ legacy_meta_times[1] = browser_sync::ProtoTimeToTime(LEGACY_META_TIMES(1));
+ legacy_meta_times[2] = browser_sync::ProtoTimeToTime(LEGACY_META_TIMES(2));
+ legacy_meta_times[4] = browser_sync::ProtoTimeToTime(LEGACY_META_TIMES(4));
+ legacy_meta_times[5] = browser_sync::ProtoTimeToTime(LEGACY_META_TIMES(5));
+ legacy_meta_times[6] = browser_sync::ProtoTimeToTime(LEGACY_META_TIMES(6));
+ legacy_meta_times[7] = browser_sync::ProtoTimeToTime(LEGACY_META_TIMES(7));
+ legacy_meta_times[8] = browser_sync::ProtoTimeToTime(LEGACY_META_TIMES(8));
+ legacy_meta_times[9] = browser_sync::ProtoTimeToTime(LEGACY_META_TIMES(9));
+ legacy_meta_times[10] = browser_sync::ProtoTimeToTime(LEGACY_META_TIMES(10));
+ legacy_meta_times[11] = browser_sync::ProtoTimeToTime(LEGACY_META_TIMES(11));
+ legacy_meta_times[12] = browser_sync::ProtoTimeToTime(LEGACY_META_TIMES(12));
+ legacy_meta_times[13] = browser_sync::ProtoTimeToTime(LEGACY_META_TIMES(13));
+ legacy_meta_times[14] = browser_sync::ProtoTimeToTime(LEGACY_META_TIMES(14));
+ return legacy_meta_times;
+}
+
+std::map<int64, base::Time> GetMetaTimes() {
+ std::map<int64, base::Time> meta_times;
+ meta_times[1] = browser_sync::ProtoTimeToTime(META_TIMES(1));
+ meta_times[2] = browser_sync::ProtoTimeToTime(META_TIMES(2));
+ meta_times[4] = browser_sync::ProtoTimeToTime(META_TIMES(4));
+ meta_times[5] = browser_sync::ProtoTimeToTime(META_TIMES(5));
+ meta_times[6] = browser_sync::ProtoTimeToTime(META_TIMES(6));
+ meta_times[7] = browser_sync::ProtoTimeToTime(META_TIMES(7));
+ meta_times[8] = browser_sync::ProtoTimeToTime(META_TIMES(8));
+ meta_times[9] = browser_sync::ProtoTimeToTime(META_TIMES(9));
+ meta_times[10] = browser_sync::ProtoTimeToTime(META_TIMES(10));
+ meta_times[11] = browser_sync::ProtoTimeToTime(META_TIMES(11));
+ meta_times[12] = browser_sync::ProtoTimeToTime(META_TIMES(12));
+ meta_times[13] = browser_sync::ProtoTimeToTime(META_TIMES(13));
+ meta_times[14] = browser_sync::ProtoTimeToTime(META_TIMES(14));
+ return meta_times;
+}
+
void MigrationTest::SetUpVersion67Database() {
// This is a version 67 database dump whose contents were backformed from
// the contents of the version 68 database dump (the v68 migration was
@@ -100,68 +228,57 @@ void MigrationTest::SetUpVersion67Database() {
"bookmark_url varchar,server_bookmark_url varchar,"
"singleton_tag varchar,bookmark_favicon blob,"
"server_bookmark_favicon blob);"
- "INSERT INTO metas VALUES(1,-1,0,129079956640320000,0,"
- "129079956640320000,0,0,0,'r','r','r','r','r',0,0,0,1,0,0,0,0,NULL,"
+ "INSERT INTO metas VALUES(1,-1,0," LEGACY_TIME_COLS(1)
+ ",0,0,'r','r','r','r','r',0,0,0,1,0,0,0,0,NULL,"
"NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);"
- "INSERT INTO metas VALUES(2,669,669,128976886618480000,"
- "128976886618480000,128976886618480000,128976886618480000,-2097152,"
+ "INSERT INTO metas VALUES(2,669,669," LEGACY_TIME_COLS(2) ",-2097152,"
"4,'s_ID_2','s_ID_9','s_ID_9','s_ID_2','s_ID_2',0,0,1,0,1,0,1,1,"
"'Deleted Item',NULL,'Deleted Item','Deleted Item','Deleted Item',"
"'http://www.google.com/','http://www.google.com/2',NULL,'AASGASGA',"
"'ASADGADGADG');"
- "INSERT INTO metas VALUES(4,681,681,129002163642690000,"
- "129002163642690000,129002163642690000,129002163642690000,-3145728,"
+ "INSERT INTO metas VALUES(4,681,681," LEGACY_TIME_COLS(4) ",-3145728,"
"3,'s_ID_4','s_ID_9','s_ID_9','s_ID_4','s_ID_4',0,0,1,0,1,0,1,1,"
"'Welcome to Chromium',NULL,'Welcome to Chromium',"
"'Welcome to Chromium','Welcome to Chromium',"
"'http://www.google.com/chrome/intl/en/welcome.html',"
"'http://www.google.com/chrome/intl/en/welcome.html',NULL,NULL,"
"NULL);"
- "INSERT INTO metas VALUES(5,677,677,129001555500000000,"
- "129001555500000000,129001555500000000,129001555500000000,1048576,"
+ "INSERT INTO metas VALUES(5,677,677," LEGACY_TIME_COLS(5) ",1048576,"
"7,'s_ID_5','s_ID_9','s_ID_9','s_ID_5','s_ID_5',0,0,1,0,1,0,1,1,"
"'Google',NULL,'Google','Google','Google','http://www.google.com/',"
"'http://www.google.com/',NULL,'AGASGASG','AGFDGASG');"
- "INSERT INTO metas VALUES(6,694,694,129053976170000000,"
- "129053976170000000,129053976170000000,129053976170000000,-4194304,"
+ "INSERT INTO metas VALUES(6,694,694," LEGACY_TIME_COLS(6) ",-4194304,"
"6,'s_ID_6','s_ID_9','s_ID_9','r','r',0,0,0,1,1,1,0,1,"
"'The Internet',NULL,'The Internet','The Internet',"
"'The Internet',NULL,NULL,NULL,NULL,NULL);"
- "INSERT INTO metas VALUES(7,663,663,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,"
+ "INSERT INTO metas VALUES(7,663,663," LEGACY_TIME_COLS(7) ","
"1048576,0,'s_ID_7','r','r','r','r',0,0,0,1,1,1,0,1,"
"'Google Chrome',NULL,'Google Chrome','Google Chrome',"
"'Google Chrome',NULL,NULL,'google_chrome',NULL,NULL);"
- "INSERT INTO metas VALUES(8,664,664,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,"
+ "INSERT INTO metas VALUES(8,664,664," LEGACY_TIME_COLS(8) ",1048576,"
"0,'s_ID_8','s_ID_7','s_ID_7','r','r',0,0,0,1,1,1,0,1,'Bookmarks',"
"NULL,'Bookmarks','Bookmarks','Bookmarks',NULL,NULL,"
"'google_chrome_bookmarks',NULL,NULL);"
- "INSERT INTO metas VALUES(9,665,665,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,"
+ "INSERT INTO metas VALUES(9,665,665," LEGACY_TIME_COLS(9) ","
"1048576,1,'s_ID_9','s_ID_8','s_ID_8','r','s_ID_10',0,0,0,1,1,1,0,"
"1,'Bookmark Bar',NULL,'Bookmark Bar','Bookmark Bar','Bookmark Bar',"
"NULL,NULL,'bookmark_bar',NULL,NULL);"
- "INSERT INTO metas VALUES(10,666,666,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,2097152,"
+ "INSERT INTO metas VALUES(10,666,666," LEGACY_TIME_COLS(10) ",2097152,"
"2,'s_ID_10','s_ID_8','s_ID_8','s_ID_9','r',0,0,0,1,1,1,0,1,"
"'Other Bookmarks',NULL,'Other Bookmarks','Other Bookmarks',"
"'Other Bookmarks',NULL,NULL,'other_bookmarks',"
"NULL,NULL);"
- "INSERT INTO metas VALUES(11,683,683,129079956948440000,"
- "129079956948440000,129079956948440000,129079956948440000,-1048576,"
+ "INSERT INTO metas VALUES(11,683,683," LEGACY_TIME_COLS(11) ",-1048576,"
"8,'s_ID_11','s_ID_6','s_ID_6','r','s_ID_13',0,0,0,0,1,0,0,1,"
"'Home (The Chromium Projects)',NULL,'Home (The Chromium Projects)',"
"'Home (The Chromium Projects)','Home (The Chromium Projects)',"
"'http://dev.chromium.org/','http://dev.chromium.org/other',NULL,"
"'AGATWA','AFAGVASF');"
- "INSERT INTO metas VALUES(12,685,685,129079957513650000,"
- "129079957513650000,129079957513650000,129079957513650000,0,9,"
+ "INSERT INTO metas VALUES(12,685,685," LEGACY_TIME_COLS(12) ",0,9,"
"'s_ID_12','s_ID_6','s_ID_6','s_ID_13','s_ID_14',0,0,0,1,1,1,0,1,"
"'Extra Bookmarks',NULL,'Extra Bookmarks','Extra Bookmarks',"
"'Extra Bookmarks',NULL,NULL,NULL,NULL,NULL);"
- "INSERT INTO metas VALUES(13,687,687,129079957985300000,"
- "129079957985300000,129079957985300000,129079957985300000,-917504,"
+ "INSERT INTO metas VALUES(13,687,687," LEGACY_TIME_COLS(13) ",-917504,"
"10,'s_ID_13','s_ID_6','s_ID_6','s_ID_11','s_ID_12',0,0,0,0,1,0,0,"
"1,'ICANN | Internet Corporation for Assigned Names and Numbers',"
"'ICANN Internet Corporation for Assigned Names and Numbers',"
@@ -170,8 +287,7 @@ void MigrationTest::SetUpVersion67Database() {
"'ICANN | Internet Corporation for Assigned Names and Numbers',"
"'http://www.icann.com/','http://www.icann.com/',NULL,"
"'PNGAXF0AAFF','DAAFASF');"
- "INSERT INTO metas VALUES(14,692,692,129079958383000000,"
- "129079958383000000,129079958383000000,129079958383000000,1048576,"
+ "INSERT INTO metas VALUES(14,692,692," LEGACY_TIME_COLS(14) ",1048576,"
"11,'s_ID_14','s_ID_6','s_ID_6','s_ID_12','r',0,0,0,0,1,0,0,1,"
"'The WebKit Open Source Project',NULL,"
"'The WebKit Open Source Project','The WebKit Open Source Project',"
@@ -222,68 +338,56 @@ void MigrationTest::SetUpVersion68Database() {
"bookmark_url varchar,server_bookmark_url varchar,"
"singleton_tag varchar,bookmark_favicon blob,"
"server_bookmark_favicon blob);"
- "INSERT INTO metas VALUES(1,-1,0,129079956640320000,0,"
- "129079956640320000,0,0,0,'r','r','r','r','r',0,0,0,1,0,0,0,0,NULL,"
+ "INSERT INTO metas VALUES(1,-1,0," LEGACY_TIME_COLS(1)
+ ",0,0,'r','r','r','r','r',0,0,0,1,0,0,0,0,NULL,"
"NULL,NULL,NULL,NULL,NULL,NULL);"
- "INSERT INTO metas VALUES(2,669,669,128976886618480000,"
- "128976886618480000,128976886618480000,128976886618480000,-2097152,"
+ "INSERT INTO metas VALUES(2,669,669," LEGACY_TIME_COLS(2) ",-2097152,"
"4,'s_ID_2','s_ID_9','s_ID_9','s_ID_2','s_ID_2',0,0,1,0,1,0,1,1,"
"'Deleted Item','Deleted Item','http://www.google.com/',"
"'http://www.google.com/2',NULL,'AASGASGA','ASADGADGADG');"
- "INSERT INTO metas VALUES(4,681,681,129002163642690000,"
- "129002163642690000,129002163642690000,129002163642690000,-3145728,"
+ "INSERT INTO metas VALUES(4,681,681," LEGACY_TIME_COLS(4) ",-3145728,"
"3,'s_ID_4','s_ID_9','s_ID_9','s_ID_4','s_ID_4',0,0,1,0,1,0,1,1,"
"'Welcome to Chromium','Welcome to Chromium',"
"'http://www.google.com/chrome/intl/en/welcome.html',"
"'http://www.google.com/chrome/intl/en/welcome.html',NULL,NULL,"
"NULL);"
- "INSERT INTO metas VALUES(5,677,677,129001555500000000,"
- "129001555500000000,129001555500000000,129001555500000000,1048576,"
+ "INSERT INTO metas VALUES(5,677,677," LEGACY_TIME_COLS(5) ",1048576,"
"7,'s_ID_5','s_ID_9','s_ID_9','s_ID_5','s_ID_5',0,0,1,0,1,0,1,1,"
"'Google','Google','http://www.google.com/',"
"'http://www.google.com/',NULL,'AGASGASG','AGFDGASG');"
- "INSERT INTO metas VALUES(6,694,694,129053976170000000,"
- "129053976170000000,129053976170000000,129053976170000000,-4194304,"
+ "INSERT INTO metas VALUES(6,694,694," LEGACY_TIME_COLS(6) ",-4194304,"
"6,'s_ID_6','s_ID_9','s_ID_9','r','r',0,0,0,1,1,1,0,1,"
"'The Internet','The Internet',NULL,NULL,NULL,NULL,NULL);"
- "INSERT INTO metas VALUES(7,663,663,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,"
+ "INSERT INTO metas VALUES(7,663,663," LEGACY_TIME_COLS(7) ","
"1048576,0,'s_ID_7','r','r','r','r',0,0,0,1,1,1,0,1,"
"'Google Chrome','Google Chrome',NULL,NULL,'google_chrome',NULL,"
"NULL);"
- "INSERT INTO metas VALUES(8,664,664,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,"
+ "INSERT INTO metas VALUES(8,664,664," LEGACY_TIME_COLS(8) ",1048576,"
"0,'s_ID_8','s_ID_7','s_ID_7','r','r',0,0,0,1,1,1,0,1,'Bookmarks',"
"'Bookmarks',NULL,NULL,'google_chrome_bookmarks',NULL,NULL);"
- "INSERT INTO metas VALUES(9,665,665,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,"
+ "INSERT INTO metas VALUES(9,665,665," LEGACY_TIME_COLS(9) ","
"1048576,1,'s_ID_9','s_ID_8','s_ID_8','r','s_ID_10',0,0,0,1,1,1,0,"
"1,'Bookmark Bar','Bookmark Bar',NULL,NULL,'bookmark_bar',NULL,"
"NULL);"
- "INSERT INTO metas VALUES(10,666,666,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,2097152,"
+ "INSERT INTO metas VALUES(10,666,666," LEGACY_TIME_COLS(10) ",2097152,"
"2,'s_ID_10','s_ID_8','s_ID_8','s_ID_9','r',0,0,0,1,1,1,0,1,"
"'Other Bookmarks','Other Bookmarks',NULL,NULL,'other_bookmarks',"
"NULL,NULL);"
- "INSERT INTO metas VALUES(11,683,683,129079956948440000,"
- "129079956948440000,129079956948440000,129079956948440000,-1048576,"
+ "INSERT INTO metas VALUES(11,683,683," LEGACY_TIME_COLS(11) ",-1048576,"
"8,'s_ID_11','s_ID_6','s_ID_6','r','s_ID_13',0,0,0,0,1,0,0,1,"
"'Home (The Chromium Projects)','Home (The Chromium Projects)',"
"'http://dev.chromium.org/','http://dev.chromium.org/other',NULL,"
"'AGATWA','AFAGVASF');"
- "INSERT INTO metas VALUES(12,685,685,129079957513650000,"
- "129079957513650000,129079957513650000,129079957513650000,0,9,"
+ "INSERT INTO metas VALUES(12,685,685," LEGACY_TIME_COLS(12) ",0,9,"
"'s_ID_12','s_ID_6','s_ID_6','s_ID_13','s_ID_14',0,0,0,1,1,1,0,1,"
"'Extra Bookmarks','Extra Bookmarks',NULL,NULL,NULL,NULL,NULL);"
- "INSERT INTO metas VALUES(13,687,687,129079957985300000,"
- "129079957985300000,129079957985300000,129079957985300000,-917504,"
+ "INSERT INTO metas VALUES(13,687,687," LEGACY_TIME_COLS(13) ",-917504,"
"10,'s_ID_13','s_ID_6','s_ID_6','s_ID_11','s_ID_12',0,0,0,0,1,0,0,"
"1,'ICANN | Internet Corporation for Assigned Names and Numbers',"
"'ICANN | Internet Corporation for Assigned Names and Numbers',"
"'http://www.icann.com/','http://www.icann.com/',NULL,"
"'PNGAXF0AAFF','DAAFASF');"
- "INSERT INTO metas VALUES(14,692,692,129079958383000000,"
- "129079958383000000,129079958383000000,129079958383000000,1048576,"
+ "INSERT INTO metas VALUES(14,692,692," LEGACY_TIME_COLS(14) ",1048576,"
"11,'s_ID_14','s_ID_6','s_ID_6','s_ID_12','r',0,0,0,0,1,0,0,1,"
"'The WebKit Open Source Project','The WebKit Open Source Project',"
"'http://webkit.org/','http://webkit.org/x',NULL,'PNGX','PNG2Y');"
@@ -327,19 +431,17 @@ void MigrationTest::SetUpVersion69Database() {
"singleton_tag varchar,bookmark_favicon blob,"
"server_bookmark_favicon blob, specifics blob, "
"server_specifics blob);"
- "INSERT INTO metas VALUES(1,-1,0,129079956640320000,0,129079956640320000,"
- "0,0,0,'r','r','r','r','r',0,0,0,1,0,0,0,0,NULL,NULL,NULL,NULL,NULL,"
+ "INSERT INTO metas VALUES(1,-1,0," LEGACY_TIME_COLS(1)
+ ",0,0,'r','r','r','r','r',0,0,0,1,0,0,0,0,NULL,NULL,NULL,NULL,NULL,"
"NULL,NULL,X'',X'');"
- "INSERT INTO metas VALUES(2,669,669,128976886618480000,"
- "128976886618480000,128976886618480000,128976886618480000,-2097152,"
+ "INSERT INTO metas VALUES(2,669,669," LEGACY_TIME_COLS(2) ",-2097152,"
"4,'s_ID_2','s_ID_9','s_ID_9','s_ID_2','s_ID_2',0,0,1,0,1,0,1,1,"
"'Deleted Item','Deleted Item','http://www.google.com/',"
"'http://www.google.com/2',NULL,'AASGASGA','ASADGADGADG',"
"X'C28810220A16687474703A2F2F7777772E676F6F676C652E636F6D2F120841415"
"34741534741',X'C28810260A17687474703A2F2F7777772E676F6F676C652E636F"
"6D2F32120B4153414447414447414447');"
- "INSERT INTO metas VALUES(4,681,681,129002163642690000,"
- "129002163642690000,129002163642690000,129002163642690000,-3145728,"
+ "INSERT INTO metas VALUES(4,681,681," LEGACY_TIME_COLS(4) ",-3145728,"
"3,'s_ID_4','s_ID_9','s_ID_9','s_ID_4','s_ID_4',0,0,1,0,1,0,1,1,"
"'Welcome to Chromium','Welcome to Chromium',"
"'http://www.google.com/chrome/intl/en/welcome.html',"
@@ -348,52 +450,43 @@ void MigrationTest::SetUpVersion69Database() {
"D652F696E746C2F656E2F77656C636F6D652E68746D6C1200',X'C28810350A3168"
"7474703A2F2F7777772E676F6F676C652E636F6D2F6368726F6D652F696E746C2F6"
"56E2F77656C636F6D652E68746D6C1200');"
- "INSERT INTO metas VALUES(5,677,677,129001555500000000,"
- "129001555500000000,129001555500000000,129001555500000000,1048576,7,"
+ "INSERT INTO metas VALUES(5,677,677," LEGACY_TIME_COLS(5) ",1048576,7,"
"'s_ID_5','s_ID_9','s_ID_9','s_ID_5','s_ID_5',0,0,1,0,1,0,1,1,"
"'Google','Google','http://www.google.com/',"
"'http://www.google.com/',NULL,'AGASGASG','AGFDGASG',X'C28810220A166"
"87474703A2F2F7777772E676F6F676C652E636F6D2F12084147415347415347',X'"
"C28810220A16687474703A2F2F7777772E676F6F676C652E636F6D2F12084147464"
"447415347');"
- "INSERT INTO metas VALUES(6,694,694,129053976170000000,"
- "129053976170000000,129053976170000000,129053976170000000,-4194304,6"
+ "INSERT INTO metas VALUES(6,694,694," LEGACY_TIME_COLS(6) ",-4194304,6"
",'s_ID_6','s_ID_9','s_ID_9','r','r',0,0,0,1,1,1,0,1,'The Internet',"
"'The Internet',NULL,NULL,NULL,NULL,NULL,X'C2881000',X'C2881000');"
- "INSERT INTO metas VALUES(7,663,663,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,0,"
+ "INSERT INTO metas VALUES(7,663,663," LEGACY_TIME_COLS(7) ",1048576,0,"
"'s_ID_7','r','r','r','r',0,0,0,1,1,1,0,1,'Google Chrome',"
"'Google Chrome',NULL,NULL,'google_chrome',NULL,NULL,NULL,NULL);"
- "INSERT INTO metas VALUES(8,664,664,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,0,"
+ "INSERT INTO metas VALUES(8,664,664," LEGACY_TIME_COLS(8) ",1048576,0,"
"'s_ID_8','s_ID_7','s_ID_7','r','r',0,0,0,1,1,1,0,1,'Bookmarks',"
"'Bookmarks',NULL,NULL,'google_chrome_bookmarks',NULL,NULL,"
"X'C2881000',X'C2881000');"
- "INSERT INTO metas VALUES(9,665,665,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,1,"
+ "INSERT INTO metas VALUES(9,665,665," LEGACY_TIME_COLS(9) ",1048576,1,"
"'s_ID_9','s_ID_8','s_ID_8','r','s_ID_10',0,0,0,1,1,1,0,1,"
"'Bookmark Bar','Bookmark Bar',NULL,NULL,'bookmark_bar',NULL,NULL,"
"X'C2881000',X'C2881000');"
- "INSERT INTO metas VALUES(10,666,666,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,2097152,2,"
+ "INSERT INTO metas VALUES(10,666,666," LEGACY_TIME_COLS(10) ",2097152,2,"
"'s_ID_10','s_ID_8','s_ID_8','s_ID_9','r',0,0,0,1,1,1,0,1,"
"'Other Bookmarks','Other Bookmarks',NULL,NULL,'other_bookmarks',"
"NULL,NULL,X'C2881000',X'C2881000');"
- "INSERT INTO metas VALUES(11,683,683,129079956948440000,"
- "129079956948440000,129079956948440000,129079956948440000,-1048576,"
+ "INSERT INTO metas VALUES(11,683,683," LEGACY_TIME_COLS(11) ",-1048576,"
"8,'s_ID_11','s_ID_6','s_ID_6','r','s_ID_13',0,0,0,0,1,0,0,1,"
"'Home (The Chromium Projects)','Home (The Chromium Projects)',"
"'http://dev.chromium.org/','http://dev.chromium.org/other',NULL,"
"'AGATWA','AFAGVASF',X'C28810220A18687474703A2F2F6465762E6368726F6D6"
"9756D2E6F72672F1206414741545741',X'C28810290A1D687474703A2F2F646576"
"2E6368726F6D69756D2E6F72672F6F7468657212084146414756415346');"
- "INSERT INTO metas VALUES(12,685,685,129079957513650000,"
- "129079957513650000,129079957513650000,129079957513650000,0,9,"
+ "INSERT INTO metas VALUES(12,685,685," LEGACY_TIME_COLS(12) ",0,9,"
"'s_ID_12','s_ID_6','s_ID_6','s_ID_13','s_ID_14',0,0,0,1,1,1,0,1,"
"'Extra Bookmarks','Extra Bookmarks',NULL,NULL,NULL,NULL,NULL,"
"X'C2881000',X'C2881000');"
- "INSERT INTO metas VALUES(13,687,687,129079957985300000,"
- "129079957985300000,129079957985300000,129079957985300000,-917504,"
+ "INSERT INTO metas VALUES(13,687,687," LEGACY_TIME_COLS(13) ",-917504,"
"10,'s_ID_13','s_ID_6','s_ID_6','s_ID_11','s_ID_12',0,0,0,0,1,0,0,"
"1,'ICANN | Internet Corporation for Assigned Names and Numbers',"
"'ICANN | Internet Corporation for Assigned Names and Numbers',"
@@ -401,8 +494,7 @@ void MigrationTest::SetUpVersion69Database() {
"'DAAFASF',X'C28810240A15687474703A2F2F7777772E6963616E6E2E636F6D2F1"
"20B504E474158463041414646',X'C28810200A15687474703A2F2F7777772E6963"
"616E6E2E636F6D2F120744414146415346');"
- "INSERT INTO metas VALUES(14,692,692,129079958383000000,"
- "129079958383000000,129079958383000000,129079958383000000,1048576,11,"
+ "INSERT INTO metas VALUES(14,692,692," LEGACY_TIME_COLS(14) ",1048576,11,"
"'s_ID_14','s_ID_6','s_ID_6','s_ID_12','r',0,0,0,0,1,0,0,1,"
"'The WebKit Open Source Project','The WebKit Open Source Project',"
"'http://webkit.org/','http://webkit.org/x',NULL,'PNGX','PNG2Y',"
@@ -456,74 +548,62 @@ void MigrationTest::SetUpVersion70Database() {
"non_unique_name varchar,server_non_unique_name varchar(255),"
"unique_server_tag varchar,unique_client_tag varchar,"
"specifics blob,server_specifics blob);"
- "INSERT INTO metas VALUES(1,-1,0,129079956640320000,0,129079956640320000,"
- "0,0,0,'r','r','r','r','r',0,0,0,1,0,0,NULL,NULL,NULL,NULL,X'',X'');"
- "INSERT INTO metas VALUES(2,669,669,128976886618480000,"
- "128976886618480000,128976886618480000,128976886618480000,"
+ "INSERT INTO metas VALUES(1,-1,0," LEGACY_TIME_COLS(1)
+ ",0,0,'r','r','r','r','r',0,0,0,1,0,0,NULL,NULL,NULL,NULL,X'',X'');"
+ "INSERT INTO metas VALUES(2,669,669," LEGACY_TIME_COLS(2) ","
"-2097152,4,'s_ID_2','s_ID_9','s_ID_9','s_ID_2','s_ID_2',0,0,1,0,0,"
"1,'Deleted Item','Deleted Item',NULL,NULL,X'C28810220A16687474703A"
"2F2F7777772E676F6F676C652E636F6D2F12084141534741534741',X'C2881026"
"0A17687474703A2F2F7777772E676F6F676C652E636F6D2F32120B415341444741"
"4447414447');"
- "INSERT INTO metas VALUES(4,681,681,129002163642690000,"
- "129002163642690000,129002163642690000,129002163642690000,-3145728,"
+ "INSERT INTO metas VALUES(4,681,681," LEGACY_TIME_COLS(4) ",-3145728,"
"3,'s_ID_4','s_ID_9','s_ID_9','s_ID_4','s_ID_4',0,0,1,0,0,1,"
"'Welcome to Chromium','Welcome to Chromium',NULL,NULL,X'C28810350A"
"31687474703A2F2F7777772E676F6F676C652E636F6D2F6368726F6D652F696E74"
"6C2F656E2F77656C636F6D652E68746D6C1200',X'C28810350A31687474703A2F"
"2F7777772E676F6F676C652E636F6D2F6368726F6D652F696E746C2F656E2F7765"
"6C636F6D652E68746D6C1200');"
- "INSERT INTO metas VALUES(5,677,677,129001555500000000,"
- "129001555500000000,129001555500000000,129001555500000000,1048576,7,"
+ "INSERT INTO metas VALUES(5,677,677," LEGACY_TIME_COLS(5) ",1048576,7,"
"'s_ID_5','s_ID_9','s_ID_9','s_ID_5','s_ID_5',0,0,1,0,0,1,'Google',"
"'Google',NULL,NULL,X'C28810220A16687474703A2F2F7777772E676F6F676C6"
"52E636F6D2F12084147415347415347',X'C28810220A16687474703A2F2F77777"
"72E676F6F676C652E636F6D2F12084147464447415347');"
- "INSERT INTO metas VALUES(6,694,694,129053976170000000,"
- "129053976170000000,129053976170000000,129053976170000000,-4194304,"
+ "INSERT INTO metas VALUES(6,694,694," LEGACY_TIME_COLS(6) ",-4194304,"
"6,'s_ID_6','s_ID_9','s_ID_9','r','r',0,0,0,1,1,0,'The Internet',"
"'The Internet',NULL,NULL,X'C2881000',X'C2881000');"
- "INSERT INTO metas VALUES(7,663,663,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,0,"
+ "INSERT INTO metas VALUES(7,663,663," LEGACY_TIME_COLS(7) ",1048576,0,"
"'s_ID_7','r','r','r','r',0,0,0,1,1,0,'Google Chrome',"
"'Google Chrome','google_chrome',NULL,NULL,NULL);"
- "INSERT INTO metas VALUES(8,664,664,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,0,"
+ "INSERT INTO metas VALUES(8,664,664," LEGACY_TIME_COLS(8) ",1048576,0,"
"'s_ID_8','s_ID_7','s_ID_7','r','r',0,0,0,1,1,0,'Bookmarks',"
"'Bookmarks','google_chrome_bookmarks',NULL,X'C2881000',"
"X'C2881000');"
- "INSERT INTO metas VALUES(9,665,665,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,"
+ "INSERT INTO metas VALUES(9,665,665," LEGACY_TIME_COLS(9) ",1048576,"
"1,'s_ID_9','s_ID_8','s_ID_8','r','s_ID_10',0,0,0,1,1,0,"
"'Bookmark Bar','Bookmark Bar','bookmark_bar',NULL,X'C2881000',"
"X'C2881000');"
- "INSERT INTO metas VALUES(10,666,666,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,"
+ "INSERT INTO metas VALUES(10,666,666," LEGACY_TIME_COLS(10) ","
"2097152,2,'s_ID_10','s_ID_8','s_ID_8','s_ID_9','r',0,0,0,1,1,0,"
"'Other Bookmarks','Other Bookmarks','other_bookmarks',NULL,"
"X'C2881000',X'C2881000');"
- "INSERT INTO metas VALUES(11,683,683,129079956948440000,"
- "129079956948440000,129079956948440000,129079956948440000,-1048576,"
+ "INSERT INTO metas VALUES(11,683,683," LEGACY_TIME_COLS(11) ",-1048576,"
"8,'s_ID_11','s_ID_6','s_ID_6','r','s_ID_13',0,0,0,0,0,0,"
"'Home (The Chromium Projects)','Home (The Chromium Projects)',"
"NULL,NULL,X'C28810220A18687474703A2F2F6465762E6368726F6D69756D2E6F"
"72672F1206414741545741',X'C28810290A1D687474703A2F2F6465762E636872"
"6F6D69756D2E6F72672F6F7468657212084146414756415346');"
- "INSERT INTO metas VALUES(12,685,685,129079957513650000,"
- "129079957513650000,129079957513650000,129079957513650000,0,9,"
+ "INSERT INTO metas VALUES(12,685,685," LEGACY_TIME_COLS(12) ",0,9,"
"'s_ID_12','s_ID_6','s_ID_6','s_ID_13','s_ID_14',0,0,0,1,1,0,"
"'Extra Bookmarks','Extra Bookmarks',NULL,NULL,X'C2881000',"
"X'C2881000');"
- "INSERT INTO metas VALUES(13,687,687,129079957985300000,"
- "129079957985300000,129079957985300000,129079957985300000,-917504,"
+ "INSERT INTO metas VALUES(13,687,687," LEGACY_TIME_COLS(13) ",-917504,"
"10,'s_ID_13','s_ID_6','s_ID_6','s_ID_11','s_ID_12',0,0,0,0,0,0,"
"'ICANN | Internet Corporation for Assigned Names and Numbers',"
"'ICANN | Internet Corporation for Assigned Names and Numbers',"
"NULL,NULL,X'C28810240A15687474703A2F2F7777772E6963616E6E2E636F6D2F"
"120B504E474158463041414646',X'C28810200A15687474703A2F2F7777772E69"
"63616E6E2E636F6D2F120744414146415346');"
- "INSERT INTO metas VALUES(14,692,692,129079958383000000,"
- "129079958383000000,129079958383000000,129079958383000000,1048576,"
+ "INSERT INTO metas VALUES(14,692,692," LEGACY_TIME_COLS(14) ",1048576,"
"11,'s_ID_14','s_ID_6','s_ID_6','s_ID_12','r',0,0,0,0,0,0,"
"'The WebKit Open Source Project','The WebKit Open Source Project',"
"NULL,NULL,X'C288101A0A12687474703A2F2F7765626B69742E6F72672F120450"
@@ -555,73 +635,65 @@ void MigrationTest::SetUpVersion71Database() {
"non_unique_name varchar,server_non_unique_name varchar(255),"
"unique_server_tag varchar,unique_client_tag varchar,specifics blob,"
"server_specifics blob);"
- "INSERT INTO 'metas' VALUES(1,-1,0,129079956640320000,0,"
- "129079956640320000,0,0,0,'r','r','r','r','r',0,0,0,1,0,0,NULL,NULL,"
+ "INSERT INTO 'metas' VALUES(1,-1,0," LEGACY_TIME_COLS(1)
+ ",0,0,'r','r','r','r','r',0,0,0,1,0,0,NULL,NULL,"
"NULL,NULL,X'',X'');"
- "INSERT INTO 'metas' VALUES(2,669,669,128976886618480000,"
- "128976886618480000,128976886618480000,128976886618480000,-2097152,4,"
+ "INSERT INTO 'metas' VALUES(2,669,669," LEGACY_TIME_COLS(2) ",-2097152,4,"
"'s_ID_2','s_ID_9','s_ID_9','s_ID_2','s_ID_2',0,0,1,0,0,1,"
"'Deleted Item','Deleted Item',NULL,NULL,X'C28810220A16687474703A2F2F"
"7777772E676F6F676C652E636F6D2F12084141534741534741',X'C28810260A1768"
"7474703A2F2F7777772E676F6F676C652E636F6D2F32120B41534144474144474144"
"47');"
- "INSERT INTO 'metas' VALUES(4,681,681,129002163642690000,"
- "129002163642690000,129002163642690000,129002163642690000,-3145728,3,"
+ "INSERT INTO 'metas' VALUES(4,681,681," LEGACY_TIME_COLS(4) ",-3145728,3,"
"'s_ID_4','s_ID_9','s_ID_9','s_ID_4','s_ID_4',0,0,1,0,0,1,"
"'Welcome to Chromium','Welcome to Chromium',NULL,NULL,X'C28810350A31"
"687474703A2F2F7777772E676F6F676C652E636F6D2F6368726F6D652F696E746C2F"
"656E2F77656C636F6D652E68746D6C1200',X'C28810350A31687474703A2F2F7777"
"772E676F6F676C652E636F6D2F6368726F6D652F696E746C2F656E2F77656C636F6D"
"652E68746D6C1200');"
- "INSERT INTO 'metas' VALUES(5,677,677,129001555500000000,"
- "129001555500000000,129001555500000000,129001555500000000,1048576,7,"
+ "INSERT INTO 'metas' VALUES(5,677,677," LEGACY_TIME_COLS(5) ",1048576,7,"
"'s_ID_5','s_ID_9','s_ID_9','s_ID_5','s_ID_5',0,0,1,0,0,1,'Google',"
"'Google',NULL,NULL,X'C28810220A16687474703A2F2F7777772E676F6F676C652"
"E636F6D2F12084147415347415347',X'C28810220A16687474703A2F2F7777772E6"
"76F6F676C652E636F6D2F12084147464447415347');"
- "INSERT INTO 'metas' VALUES(6,694,694,129053976170000000,"
- "129053976170000000,129053976170000000,129053976170000000,-4194304,6,"
+ "INSERT INTO 'metas' VALUES(6,694,694," LEGACY_TIME_COLS(6) ",-4194304,6,"
"'s_ID_6','s_ID_9','s_ID_9','r','r',0,0,0,1,1,0,'The Internet',"
"'The Internet',NULL,NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(7,663,663,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,0,"
+ "INSERT INTO 'metas' VALUES(7,663,663," LEGACY_TIME_COLS(7) ",1048576,0,"
"'s_ID_7','r','r','r','r',0,0,0,1,1,0,'Google Chrome','Google Chrome'"
",'google_chrome',NULL,NULL,NULL);"
- "INSERT INTO 'metas' VALUES(8,664,664,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,0,"
+ "INSERT INTO 'metas' VALUES(8,664,664," LEGACY_TIME_COLS(8) ",1048576,0,"
"'s_ID_8','s_ID_7','s_ID_7','r','r',0,0,0,1,1,0,'Bookmarks',"
"'Bookmarks','google_chrome_bookmarks',NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(9,665,665,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,1,"
+ "INSERT INTO 'metas' VALUES(9,665,665," LEGACY_TIME_COLS(9) ",1048576,1,"
"'s_ID_9','s_ID_8','s_ID_8','r','s_ID_10',0,0,0,1,1,0,'Bookmark Bar',"
"'Bookmark Bar','bookmark_bar',NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(10,666,666,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,2097152,2,"
+ "INSERT INTO 'metas' VALUES(10,666,666," LEGACY_TIME_COLS(10)
+ ",2097152,2,"
"'s_ID_10','s_ID_8','s_ID_8','s_ID_9','r',0,0,0,1,1,0,"
"'Other Bookmarks','Other Bookmarks','other_bookmarks',NULL,"
"X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(11,683,683,129079956948440000,"
- "129079956948440000,129079956948440000,129079956948440000,-1048576,8,"
+ "INSERT INTO 'metas' VALUES(11,683,683," LEGACY_TIME_COLS(11)
+ ",-1048576,8,"
"'s_ID_11','s_ID_6','s_ID_6','r','s_ID_13',0,0,0,0,0,0,"
"'Home (The Chromium Projects)','Home (The Chromium Projects)',NULL,"
"NULL,X'C28810220A18687474703A2F2F6465762E6368726F6D69756D2E6F72672F1"
"206414741545741',X'C28810290A1D687474703A2F2F6465762E6368726F6D69756"
"D2E6F72672F6F7468657212084146414756415346');"
- "INSERT INTO 'metas' VALUES(12,685,685,129079957513650000,"
- "129079957513650000,129079957513650000,129079957513650000,0,9,"
+ "INSERT INTO 'metas' VALUES(12,685,685," LEGACY_TIME_COLS(12) ",0,9,"
"'s_ID_12','s_ID_6','s_ID_6','s_ID_13','s_ID_14',0,0,0,1,1,0,"
"'Extra Bookmarks','Extra Bookmarks',NULL,NULL,X'C2881000',"
"X'C2881000');"
- "INSERT INTO 'metas' VALUES(13,687,687,129079957985300000,"
- "129079957985300000,129079957985300000,129079957985300000,-917504,10,"
+ "INSERT INTO 'metas' VALUES(13,687,687," LEGACY_TIME_COLS(13)
+ ",-917504,10,"
"'s_ID_13','s_ID_6','s_ID_6','s_ID_11','s_ID_12',0,0,0,0,0,0,"
"'ICANN | Internet Corporation for Assigned Names and Numbers',"
"'ICANN | Internet Corporation for Assigned Names and Numbers',NULL,"
"NULL,X'C28810240A15687474703A2F2F7777772E6963616E6E2E636F6D2F120B504"
"E474158463041414646',X'C28810200A15687474703A2F2F7777772E6963616E6E2"
"E636F6D2F120744414146415346');"
- "INSERT INTO 'metas' VALUES(14,692,692,129079958383000000,"
- "129079958383000000,129079958383000000,129079958383000000,1048576,11,"
+ "INSERT INTO 'metas' VALUES(14,692,692," LEGACY_TIME_COLS(14)
+ ",1048576,11,"
"'s_ID_14','s_ID_6','s_ID_6','s_ID_12','r',0,0,0,0,0,0,"
"'The WebKit Open Source Project','The WebKit Open Source Project',"
"NULL,NULL,""X'C288101A0A12687474703A2F2F7765626B69742E6F72672F120450"
@@ -659,73 +731,65 @@ void MigrationTest::SetUpVersion72Database() {
"non_unique_name varchar,server_non_unique_name varchar(255),"
"unique_server_tag varchar,unique_client_tag varchar,specifics blob,"
"server_specifics blob);"
- "INSERT INTO 'metas' VALUES(1,-1,0,129079956640320000,0,"
- "129079956640320000,0,0,0,'r','r','r','r','r',0,0,0,1,0,0,NULL,NULL,"
+ "INSERT INTO 'metas' VALUES(1,-1,0," LEGACY_TIME_COLS(1)
+ ",0,0,'r','r','r','r','r',0,0,0,1,0,0,NULL,NULL,"
"NULL,NULL,X'',X'');"
- "INSERT INTO 'metas' VALUES(2,669,669,128976886618480000,"
- "128976886618480000,128976886618480000,128976886618480000,-2097152,4,"
+ "INSERT INTO 'metas' VALUES(2,669,669," LEGACY_TIME_COLS(2) ",-2097152,4,"
"'s_ID_2','s_ID_9','s_ID_9','s_ID_2','s_ID_2',0,0,1,0,0,1,"
"'Deleted Item','Deleted Item',NULL,NULL,X'C28810220A16687474703A2F2F"
"7777772E676F6F676C652E636F6D2F12084141534741534741',X'C28810260A1768"
"7474703A2F2F7777772E676F6F676C652E636F6D2F32120B41534144474144474144"
"47');"
- "INSERT INTO 'metas' VALUES(4,681,681,129002163642690000,"
- "129002163642690000,129002163642690000,129002163642690000,-3145728,3,"
+ "INSERT INTO 'metas' VALUES(4,681,681," LEGACY_TIME_COLS(4) ",-3145728,3,"
"'s_ID_4','s_ID_9','s_ID_9','s_ID_4','s_ID_4',0,0,1,0,0,1,"
"'Welcome to Chromium','Welcome to Chromium',NULL,NULL,X'C28810350A31"
"687474703A2F2F7777772E676F6F676C652E636F6D2F6368726F6D652F696E746C2F"
"656E2F77656C636F6D652E68746D6C1200',X'C28810350A31687474703A2F2F7777"
"772E676F6F676C652E636F6D2F6368726F6D652F696E746C2F656E2F77656C636F6D"
"652E68746D6C1200');"
- "INSERT INTO 'metas' VALUES(5,677,677,129001555500000000,"
- "129001555500000000,129001555500000000,129001555500000000,1048576,7,"
+ "INSERT INTO 'metas' VALUES(5,677,677," LEGACY_TIME_COLS(5) ",1048576,7,"
"'s_ID_5','s_ID_9','s_ID_9','s_ID_5','s_ID_5',0,0,1,0,0,1,'Google',"
"'Google',NULL,NULL,X'C28810220A16687474703A2F2F7777772E676F6F676C652"
"E636F6D2F12084147415347415347',X'C28810220A16687474703A2F2F7777772E6"
"76F6F676C652E636F6D2F12084147464447415347');"
- "INSERT INTO 'metas' VALUES(6,694,694,129053976170000000,"
- "129053976170000000,129053976170000000,129053976170000000,-4194304,6,"
+ "INSERT INTO 'metas' VALUES(6,694,694," LEGACY_TIME_COLS(6) ",-4194304,6,"
"'s_ID_6','s_ID_9','s_ID_9','r','r',0,0,0,1,1,0,'The Internet',"
"'The Internet',NULL,NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(7,663,663,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,0,"
+ "INSERT INTO 'metas' VALUES(7,663,663," LEGACY_TIME_COLS(7) ",1048576,0,"
"'s_ID_7','r','r','r','r',0,0,0,1,1,0,'Google Chrome','Google Chrome'"
",'google_chrome',NULL,NULL,NULL);"
- "INSERT INTO 'metas' VALUES(8,664,664,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,0,"
+ "INSERT INTO 'metas' VALUES(8,664,664," LEGACY_TIME_COLS(8) ",1048576,0,"
"'s_ID_8','s_ID_7','s_ID_7','r','r',0,0,0,1,1,0,'Bookmarks',"
"'Bookmarks','google_chrome_bookmarks',NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(9,665,665,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,1,"
+ "INSERT INTO 'metas' VALUES(9,665,665," LEGACY_TIME_COLS(9) ",1048576,1,"
"'s_ID_9','s_ID_8','s_ID_8','r','s_ID_10',0,0,0,1,1,0,'Bookmark Bar',"
"'Bookmark Bar','bookmark_bar',NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(10,666,666,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,2097152,2,"
+ "INSERT INTO 'metas' VALUES(10,666,666," LEGACY_TIME_COLS(10)
+ ",2097152,2,"
"'s_ID_10','s_ID_8','s_ID_8','s_ID_9','r',0,0,0,1,1,0,"
"'Other Bookmarks','Other Bookmarks','other_bookmarks',NULL,"
"X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(11,683,683,129079956948440000,"
- "129079956948440000,129079956948440000,129079956948440000,-1048576,8,"
+ "INSERT INTO 'metas' VALUES(11,683,683," LEGACY_TIME_COLS(11)
+ ",-1048576,8,"
"'s_ID_11','s_ID_6','s_ID_6','r','s_ID_13',0,0,0,0,0,0,"
"'Home (The Chromium Projects)','Home (The Chromium Projects)',NULL,"
"NULL,X'C28810220A18687474703A2F2F6465762E6368726F6D69756D2E6F72672F1"
"206414741545741',X'C28810290A1D687474703A2F2F6465762E6368726F6D69756"
"D2E6F72672F6F7468657212084146414756415346');"
- "INSERT INTO 'metas' VALUES(12,685,685,129079957513650000,"
- "129079957513650000,129079957513650000,129079957513650000,0,9,"
+ "INSERT INTO 'metas' VALUES(12,685,685," LEGACY_TIME_COLS(12) ",0,9,"
"'s_ID_12','s_ID_6','s_ID_6','s_ID_13','s_ID_14',0,0,0,1,1,0,"
"'Extra Bookmarks','Extra Bookmarks',NULL,NULL,X'C2881000',"
"X'C2881000');"
- "INSERT INTO 'metas' VALUES(13,687,687,129079957985300000,"
- "129079957985300000,129079957985300000,129079957985300000,-917504,10,"
+ "INSERT INTO 'metas' VALUES(13,687,687," LEGACY_TIME_COLS(13)
+ ",-917504,10,"
"'s_ID_13','s_ID_6','s_ID_6','s_ID_11','s_ID_12',0,0,0,0,0,0,"
"'ICANN | Internet Corporation for Assigned Names and Numbers',"
"'ICANN | Internet Corporation for Assigned Names and Numbers',NULL,"
"NULL,X'C28810240A15687474703A2F2F7777772E6963616E6E2E636F6D2F120B504"
"E474158463041414646',X'C28810200A15687474703A2F2F7777772E6963616E6E2"
"E636F6D2F120744414146415346');"
- "INSERT INTO 'metas' VALUES(14,692,692,129079958383000000,"
- "129079958383000000,129079958383000000,129079958383000000,1048576,11,"
+ "INSERT INTO 'metas' VALUES(14,692,692," LEGACY_TIME_COLS(14)
+ ",1048576,11,"
"'s_ID_14','s_ID_6','s_ID_6','s_ID_12','r',0,0,0,0,0,0,"
"'The WebKit Open Source Project','The WebKit Open Source Project',"
"NULL,NULL,""X'C288101A0A12687474703A2F2F7765626B69742E6F72672F120450"
@@ -763,73 +827,65 @@ void MigrationTest::SetUpVersion73Database() {
"non_unique_name varchar,server_non_unique_name varchar(255),"
"unique_server_tag varchar,unique_client_tag varchar,specifics blob,"
"server_specifics blob);"
- "INSERT INTO 'metas' VALUES(1,-1,0,129079956640320000,0,"
- "129079956640320000,0,0,0,'r','r','r','r','r',0,0,0,1,0,0,NULL,NULL,"
+ "INSERT INTO 'metas' VALUES(1,-1,0," LEGACY_TIME_COLS(1)
+ ",0,0,'r','r','r','r','r',0,0,0,1,0,0,NULL,NULL,"
"NULL,NULL,X'',X'');"
- "INSERT INTO 'metas' VALUES(2,669,669,128976886618480000,"
- "128976886618480000,128976886618480000,128976886618480000,-2097152,4,"
+ "INSERT INTO 'metas' VALUES(2,669,669," LEGACY_TIME_COLS(2) ",-2097152,4,"
"'s_ID_2','s_ID_9','s_ID_9','s_ID_2','s_ID_2',0,0,1,0,0,1,"
"'Deleted Item','Deleted Item',NULL,NULL,X'C28810220A16687474703A2F2F"
"7777772E676F6F676C652E636F6D2F12084141534741534741',X'C28810260A1768"
"7474703A2F2F7777772E676F6F676C652E636F6D2F32120B41534144474144474144"
"47');"
- "INSERT INTO 'metas' VALUES(4,681,681,129002163642690000,"
- "129002163642690000,129002163642690000,129002163642690000,-3145728,3,"
+ "INSERT INTO 'metas' VALUES(4,681,681," LEGACY_TIME_COLS(4) ",-3145728,3,"
"'s_ID_4','s_ID_9','s_ID_9','s_ID_4','s_ID_4',0,0,1,0,0,1,"
"'Welcome to Chromium','Welcome to Chromium',NULL,NULL,X'C28810350A31"
"687474703A2F2F7777772E676F6F676C652E636F6D2F6368726F6D652F696E746C2F"
"656E2F77656C636F6D652E68746D6C1200',X'C28810350A31687474703A2F2F7777"
"772E676F6F676C652E636F6D2F6368726F6D652F696E746C2F656E2F77656C636F6D"
"652E68746D6C1200');"
- "INSERT INTO 'metas' VALUES(5,677,677,129001555500000000,"
- "129001555500000000,129001555500000000,129001555500000000,1048576,7,"
+ "INSERT INTO 'metas' VALUES(5,677,677," LEGACY_TIME_COLS(5) ",1048576,7,"
"'s_ID_5','s_ID_9','s_ID_9','s_ID_5','s_ID_5',0,0,1,0,0,1,'Google',"
"'Google',NULL,NULL,X'C28810220A16687474703A2F2F7777772E676F6F676C652"
"E636F6D2F12084147415347415347',X'C28810220A16687474703A2F2F7777772E6"
"76F6F676C652E636F6D2F12084147464447415347');"
- "INSERT INTO 'metas' VALUES(6,694,694,129053976170000000,"
- "129053976170000000,129053976170000000,129053976170000000,-4194304,6,"
+ "INSERT INTO 'metas' VALUES(6,694,694," LEGACY_TIME_COLS(6) ",-4194304,6,"
"'s_ID_6','s_ID_9','s_ID_9','r','r',0,0,0,1,1,0,'The Internet',"
"'The Internet',NULL,NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(7,663,663,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,0,"
+ "INSERT INTO 'metas' VALUES(7,663,663," LEGACY_TIME_COLS(7) ",1048576,0,"
"'s_ID_7','r','r','r','r',0,0,0,1,1,0,'Google Chrome','Google Chrome'"
",'google_chrome',NULL,NULL,NULL);"
- "INSERT INTO 'metas' VALUES(8,664,664,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,0,"
+ "INSERT INTO 'metas' VALUES(8,664,664," LEGACY_TIME_COLS(8) ",1048576,0,"
"'s_ID_8','s_ID_7','s_ID_7','r','r',0,0,0,1,1,0,'Bookmarks',"
"'Bookmarks','google_chrome_bookmarks',NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(9,665,665,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,1048576,1,"
+ "INSERT INTO 'metas' VALUES(9,665,665," LEGACY_TIME_COLS(9) ",1048576,1,"
"'s_ID_9','s_ID_8','s_ID_8','r','s_ID_10',0,0,0,1,1,0,'Bookmark Bar',"
"'Bookmark Bar','bookmark_bar',NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(10,666,666,128976864758480000,"
- "128976864758480000,128976864758480000,128976864758480000,2097152,2,"
+ "INSERT INTO 'metas' VALUES(10,666,666," LEGACY_TIME_COLS(10)
+ ",2097152,2,"
"'s_ID_10','s_ID_8','s_ID_8','s_ID_9','r',0,0,0,1,1,0,"
"'Other Bookmarks','Other Bookmarks','other_bookmarks',NULL,"
"X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(11,683,683,129079956948440000,"
- "129079956948440000,129079956948440000,129079956948440000,-1048576,8,"
+ "INSERT INTO 'metas' VALUES(11,683,683," LEGACY_TIME_COLS(11)
+ ",-1048576,8,"
"'s_ID_11','s_ID_6','s_ID_6','r','s_ID_13',0,0,0,0,0,0,"
"'Home (The Chromium Projects)','Home (The Chromium Projects)',NULL,"
"NULL,X'C28810220A18687474703A2F2F6465762E6368726F6D69756D2E6F72672F1"
"206414741545741',X'C28810290A1D687474703A2F2F6465762E6368726F6D69756"
"D2E6F72672F6F7468657212084146414756415346');"
- "INSERT INTO 'metas' VALUES(12,685,685,129079957513650000,"
- "129079957513650000,129079957513650000,129079957513650000,0,9,"
+ "INSERT INTO 'metas' VALUES(12,685,685," LEGACY_TIME_COLS(12) ",0,9,"
"'s_ID_12','s_ID_6','s_ID_6','s_ID_13','s_ID_14',0,0,0,1,1,0,"
"'Extra Bookmarks','Extra Bookmarks',NULL,NULL,X'C2881000',"
"X'C2881000');"
- "INSERT INTO 'metas' VALUES(13,687,687,129079957985300000,"
- "129079957985300000,129079957985300000,129079957985300000,-917504,10,"
+ "INSERT INTO 'metas' VALUES(13,687,687," LEGACY_TIME_COLS(13)
+ ",-917504,10,"
"'s_ID_13','s_ID_6','s_ID_6','s_ID_11','s_ID_12',0,0,0,0,0,0,"
"'ICANN | Internet Corporation for Assigned Names and Numbers',"
"'ICANN | Internet Corporation for Assigned Names and Numbers',NULL,"
"NULL,X'C28810240A15687474703A2F2F7777772E6963616E6E2E636F6D2F120B504"
"E474158463041414646',X'C28810200A15687474703A2F2F7777772E6963616E6E2"
"E636F6D2F120744414146415346');"
- "INSERT INTO 'metas' VALUES(14,692,692,129079958383000000,"
- "129079958383000000,129079958383000000,129079958383000000,1048576,11,"
+ "INSERT INTO 'metas' VALUES(14,692,692," LEGACY_TIME_COLS(14)
+ ",1048576,11,"
"'s_ID_14','s_ID_6','s_ID_6','s_ID_12','r',0,0,0,0,0,0,"
"'The WebKit Open Source Project','The WebKit Open Source Project',"
"NULL,NULL,""X'C288101A0A12687474703A2F2F7765626B69742E6F72672F120450"
@@ -880,69 +936,69 @@ void MigrationTest::SetUpVersion74Database() {
"efault 0,server_is_del bit default 0,non_unique_name varchar,server"
"_non_unique_name varchar(255),unique_server_tag varchar,unique_clie"
"nt_tag varchar,specifics blob,server_specifics blob);"
- "INSERT INTO 'metas' VALUES(1,-1,0,129079956640320000,0,1290799566403200"
- "00,0,0,0,'r','r','r','r','r',0,0,0,1,0,0,NULL,NULL,NULL,NULL,X'',X'"
+ "INSERT INTO 'metas' VALUES(1,-1,0," LEGACY_TIME_COLS(1)
+ ",0,0,'r','r','r','r','r',0,0,0,1,0,0,NULL,NULL,NULL,NULL,X'',X'"
"');"
- "INSERT INTO 'metas' VALUES(2,669,669,128976886618480000,128976886618480"
- "000,128976886618480000,128976886618480000,-2097152,4,'s_ID_2','s_ID"
+ "INSERT INTO 'metas' VALUES(2,669,669," LEGACY_TIME_COLS(2)
+ ",-2097152,4,'s_ID_2','s_ID"
"_9','s_ID_9','s_ID_2','s_ID_2',0,0,1,0,0,1,'Deleted Item','Deleted "
"Item',NULL,NULL,X'C28810220A16687474703A2F2F7777772E676F6F676C652E6"
"36F6D2F12084141534741534741',X'C28810260A17687474703A2F2F7777772E67"
"6F6F676C652E636F6D2F32120B4153414447414447414447');"
- "INSERT INTO 'metas' VALUES(4,681,681,129002163642690000,129002163642690"
- "000,129002163642690000,129002163642690000,-3145728,3,'s_ID_4','s_ID"
+ "INSERT INTO 'metas' VALUES(4,681,681," LEGACY_TIME_COLS(4)
+ ",-3145728,3,'s_ID_4','s_ID"
"_9','s_ID_9','s_ID_4','s_ID_4',0,0,1,0,0,1,'Welcome to Chromium','W"
"elcome to Chromium',NULL,NULL,X'C28810350A31687474703A2F2F7777772E6"
"76F6F676C652E636F6D2F6368726F6D652F696E746C2F656E2F77656C636F6D652E"
"68746D6C1200',X'C28810350A31687474703A2F2F7777772E676F6F676C652E636"
"F6D2F6368726F6D652F696E746C2F656E2F77656C636F6D652E68746D6C1200');"
- "INSERT INTO 'metas' VALUES(5,677,677,129001555500000000,129001555500000"
- "000,129001555500000000,129001555500000000,1048576,7,'s_ID_5','s_ID_"
+ "INSERT INTO 'metas' VALUES(5,677,677," LEGACY_TIME_COLS(5)
+ ",1048576,7,'s_ID_5','s_ID_"
"9','s_ID_9','s_ID_5','s_ID_5',0,0,1,0,0,1,'Google','Google',NULL,NU"
"LL,X'C28810220A16687474703A2F2F7777772E676F6F676C652E636F6D2F120841"
"47415347415347',X'C28810220A16687474703A2F2F7777772E676F6F676C652E6"
"36F6D2F12084147464447415347');"
- "INSERT INTO 'metas' VALUES(6,694,694,129053976170000000,129053976170000"
- "000,129053976170000000,129053976170000000,-4194304,6,'s_ID_6','s_ID"
+ "INSERT INTO 'metas' VALUES(6,694,694," LEGACY_TIME_COLS(6)
+ ",-4194304,6,'s_ID_6','s_ID"
"_9','s_ID_9','r','r',0,0,0,1,1,0,'The Internet','The Internet',NULL"
",NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(7,663,663,128976864758480000,128976864758480"
- "000,128976864758480000,128976864758480000,1048576,0,'s_ID_7','r','r"
+ "INSERT INTO 'metas' VALUES(7,663,663," LEGACY_TIME_COLS(7)
+ ",1048576,0,'s_ID_7','r','r"
"','r','r',0,0,0,1,1,0,'Google Chrome','Google Chrome','google_chrom"
"e',NULL,NULL,NULL);"
- "INSERT INTO 'metas' VALUES(8,664,664,128976864758480000,128976864758480"
- "000,128976864758480000,128976864758480000,1048576,0,'s_ID_8','s_ID_"
+ "INSERT INTO 'metas' VALUES(8,664,664," LEGACY_TIME_COLS(8)
+ ",1048576,0,'s_ID_8','s_ID_"
"7','s_ID_7','r','r',0,0,0,1,1,0,'Bookmarks','Bookmarks','google_chr"
"ome_bookmarks',NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(9,665,665,128976864758480000,128976864758480"
- "000,128976864758480000,128976864758480000,1048576,1,'s_ID_9','s_ID_"
+ "INSERT INTO 'metas' VALUES(9,665,665," LEGACY_TIME_COLS(9)
+ ",1048576,1,'s_ID_9','s_ID_"
"8','s_ID_8','r','s_ID_10',0,0,0,1,1,0,'Bookmark Bar','Bookmark Bar'"
",'bookmark_bar',NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(10,666,666,128976864758480000,12897686475848"
- "0000,128976864758480000,128976864758480000,2097152,2,'s_ID_10','s_I"
+ "INSERT INTO 'metas' VALUES(10,666,666," LEGACY_TIME_COLS(10)
+ ",2097152,2,'s_ID_10','s_I"
"D_8','s_ID_8','s_ID_9','r',0,0,0,1,1,0,'Other Bookmarks','Other Boo"
"kmarks','other_bookmarks',NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(11,683,683,129079956948440000,12907995694844"
- "0000,129079956948440000,129079956948440000,-1048576,8,'s_ID_11','s_"
+ "INSERT INTO 'metas' VALUES(11,683,683," LEGACY_TIME_COLS(11)
+ ",-1048576,8,'s_ID_11','s_"
"ID_6','s_ID_6','r','s_ID_13',0,0,0,0,0,0,'Home (The Chromium Projec"
"ts)','Home (The Chromium Projects)',NULL,NULL,X'C28810220A186874747"
"03A2F2F6465762E6368726F6D69756D2E6F72672F1206414741545741',X'C28810"
"290A1D687474703A2F2F6465762E6368726F6D69756D2E6F72672F6F74686572120"
"84146414756415346');"
- "INSERT INTO 'metas' VALUES(12,685,685,129079957513650000,12907995751365"
- "0000,129079957513650000,129079957513650000,0,9,'s_ID_12','s_ID_6','"
+ "INSERT INTO 'metas' VALUES(12,685,685," LEGACY_TIME_COLS(12)
+ ",0,9,'s_ID_12','s_ID_6','"
"s_ID_6','s_ID_13','s_ID_14',0,0,0,1,1,0,'Extra Bookmarks','Extra Bo"
"okmarks',NULL,NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(13,687,687,129079957985300000,12907995798530"
- "0000,129079957985300000,129079957985300000,-917504,10,'s_ID_13','s_"
+ "INSERT INTO 'metas' VALUES(13,687,687," LEGACY_TIME_COLS(13)
+ ",-917504,10,'s_ID_13','s_"
"ID_6','s_ID_6','s_ID_11','s_ID_12',0,0,0,0,0,0,'ICANN | Internet Co"
"rporation for Assigned Names and Numbers','ICANN | Internet Corpora"
"tion for Assigned Names and Numbers',NULL,NULL,X'C28810240A15687474"
"703A2F2F7777772E6963616E6E2E636F6D2F120B504E474158463041414646',X'C"
"28810200A15687474703A2F2F7777772E6963616E6E2E636F6D2F12074441414641"
"5346');"
- "INSERT INTO 'metas' VALUES(14,692,692,129079958383000000,12907995838300"
- "0000,129079958383000000,129079958383000000,1048576,11,'s_ID_14','s_"
+ "INSERT INTO 'metas' VALUES(14,692,692," LEGACY_TIME_COLS(14)
+ ",1048576,11,'s_ID_14','s_"
"ID_6','s_ID_6','s_ID_12','r',0,0,0,0,0,0,'The WebKit Open Source Pr"
"oject','The WebKit Open Source Project',NULL,NULL,X'C288101A0A12687"
"474703A2F2F7765626B69742E6F72672F1204504E4758',X'C288101C0A13687474"
@@ -983,72 +1039,72 @@ void MigrationTest::SetUpVersion75Database() {
"dir bit default 0,server_is_del bit default 0,non_unique_name varc"
"har,server_non_unique_name varchar(255),unique_server_tag varchar,"
"unique_client_tag varchar,specifics blob,server_specifics blob);"
- "INSERT INTO 'metas' VALUES(1,-1,0,129079956640320000,0,129079956640"
- "320000,0,0,0,'r','r','r','r','r',0,0,0,1,0,0,NULL,NULL,NULL,NUL"
+ "INSERT INTO 'metas' VALUES(1,-1,0," LEGACY_TIME_COLS(1)
+ ",0,0,'r','r','r','r','r',0,0,0,1,0,0,NULL,NULL,NULL,NUL"
"L,X'',X'');"
- "INSERT INTO 'metas' VALUES(2,669,669,128976886618480000,12897688661"
- "8480000,128976886618480000,128976886618480000,-2097152,4,'s_ID_"
+ "INSERT INTO 'metas' VALUES(2,669,669," LEGACY_TIME_COLS(2)
+ ",-2097152,4,'s_ID_"
"2','s_ID_9','s_ID_9','s_ID_2','s_ID_2',0,0,1,0,0,1,'Deleted Ite"
"m','Deleted Item',NULL,NULL,X'C28810220A16687474703A2F2F7777772"
"E676F6F676C652E636F6D2F12084141534741534741',X'C28810260A176874"
"74703A2F2F7777772E676F6F676C652E636F6D2F32120B41534144474144474"
"14447');"
- "INSERT INTO 'metas' VALUES(4,681,681,129002163642690000,12900216364"
- "2690000,129002163642690000,129002163642690000,-3145728,3,'s_ID_"
+ "INSERT INTO 'metas' VALUES(4,681,681," LEGACY_TIME_COLS(4)
+ ",-3145728,3,'s_ID_"
"4','s_ID_9','s_ID_9','s_ID_4','s_ID_4',0,0,1,0,0,1,'Welcome to "
"Chromium','Welcome to Chromium',NULL,NULL,X'C28810350A316874747"
"03A2F2F7777772E676F6F676C652E636F6D2F6368726F6D652F696E746C2F65"
"6E2F77656C636F6D652E68746D6C1200',X'C28810350A31687474703A2F2F7"
"777772E676F6F676C652E636F6D2F6368726F6D652F696E746C2F656E2F7765"
"6C636F6D652E68746D6C1200');"
- "INSERT INTO 'metas' VALUES(5,677,677,129001555500000000,12900155550"
- "0000000,129001555500000000,129001555500000000,1048576,7,'s_ID_5"
+ "INSERT INTO 'metas' VALUES(5,677,677," LEGACY_TIME_COLS(5)
+ ",1048576,7,'s_ID_5"
"','s_ID_9','s_ID_9','s_ID_5','s_ID_5',0,0,1,0,0,1,'Google','Goo"
"gle',NULL,NULL,X'C28810220A16687474703A2F2F7777772E676F6F676C65"
"2E636F6D2F12084147415347415347',X'C28810220A16687474703A2F2F777"
"7772E676F6F676C652E636F6D2F12084147464447415347');"
- "INSERT INTO 'metas' VALUES(6,694,694,129053976170000000,12905397617"
- "0000000,129053976170000000,129053976170000000,-4194304,6,'s_ID_"
+ "INSERT INTO 'metas' VALUES(6,694,694," LEGACY_TIME_COLS(6)
+ ",-4194304,6,'s_ID_"
"6','s_ID_9','s_ID_9','r','r',0,0,0,1,1,0,'The Internet','The In"
"ternet',NULL,NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(7,663,663,128976864758480000,12897686475"
- "8480000,128976864758480000,128976864758480000,1048576,0,'s_ID_7"
+ "INSERT INTO 'metas' VALUES(7,663,663," LEGACY_TIME_COLS(7)
+ ",1048576,0,'s_ID_7"
"','r','r','r','r',0,0,0,1,1,0,'Google Chrome','Google Chrome','"
"google_chrome',NULL,NULL,NULL);"
- "INSERT INTO 'metas' VALUES(8,664,664,128976864758480000,12897686475"
- "8480000,128976864758480000,128976864758480000,1048576,0,'s_ID_8"
+ "INSERT INTO 'metas' VALUES(8,664,664," LEGACY_TIME_COLS(8)
+ ",1048576,0,'s_ID_8"
"','s_ID_7','s_ID_7','r','r',0,0,0,1,1,0,'Bookmarks','Bookmarks'"
",'google_chrome_bookmarks',NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(9,665,665,128976864758480000,12897686475"
- "8480000,128976864758480000,128976864758480000,1048576,1,'s_ID_9"
+ "INSERT INTO 'metas' VALUES(9,665,665," LEGACY_TIME_COLS(9)
+ ",1048576,1,'s_ID_9"
"','s_ID_8','s_ID_8','r','s_ID_10',0,0,0,1,1,0,'Bookmark Bar','B"
"ookmark Bar','bookmark_bar',NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(10,666,666,128976864758480000,1289768647"
- "58480000,128976864758480000,128976864758480000,2097152,2,'s_ID_"
+ "INSERT INTO 'metas' VALUES(10,666,666," LEGACY_TIME_COLS(10)
+ ",2097152,2,'s_ID_"
"10','s_ID_8','s_ID_8','s_ID_9','r',0,0,0,1,1,0,'Other Bookmarks"
"','Other Bookmarks','other_bookmarks',NULL,X'C2881000',X'C28810"
"00');"
- "INSERT INTO 'metas' VALUES(11,683,683,129079956948440000,1290799569"
- "48440000,129079956948440000,129079956948440000,-1048576,8,'s_ID"
+ "INSERT INTO 'metas' VALUES(11,683,683," LEGACY_TIME_COLS(11)
+ ",-1048576,8,'s_ID"
"_11','s_ID_6','s_ID_6','r','s_ID_13',0,0,0,0,0,0,'Home (The Chr"
"omium Projects)','Home (The Chromium Projects)',NULL,NULL,X'C28"
"810220A18687474703A2F2F6465762E6368726F6D69756D2E6F72672F120641"
"4741545741',X'C28810290A1D687474703A2F2F6465762E6368726F6D69756"
"D2E6F72672F6F7468657212084146414756415346');"
- "INSERT INTO 'metas' VALUES(12,685,685,129079957513650000,1290799575"
- "13650000,129079957513650000,129079957513650000,0,9,'s_ID_12','s"
+ "INSERT INTO 'metas' VALUES(12,685,685," LEGACY_TIME_COLS(12)
+ ",0,9,'s_ID_12','s"
"_ID_6','s_ID_6','s_ID_13','s_ID_14',0,0,0,1,1,0,'Extra Bookmark"
"s','Extra Bookmarks',NULL,NULL,X'C2881000',X'C2881000');"
- "INSERT INTO 'metas' VALUES(13,687,687,129079957985300000,1290799579"
- "85300000,129079957985300000,129079957985300000,-917504,10,'s_ID"
+ "INSERT INTO 'metas' VALUES(13,687,687," LEGACY_TIME_COLS(13)
+ ",-917504,10,'s_ID"
"_13','s_ID_6','s_ID_6','s_ID_11','s_ID_12',0,0,0,0,0,0,'ICANN |"
" Internet Corporation for Assigned Names and Numbers','ICANN | "
"Internet Corporation for Assigned Names and Numbers',NULL,NULL,"
"X'C28810240A15687474703A2F2F7777772E6963616E6E2E636F6D2F120B504"
"E474158463041414646',X'C28810200A15687474703A2F2F7777772E696361"
"6E6E2E636F6D2F120744414146415346');"
- "INSERT INTO 'metas' VALUES(14,692,692,129079958383000000,1290799583"
- "83000000,129079958383000000,129079958383000000,1048576,11,'s_ID"
+ "INSERT INTO 'metas' VALUES(14,692,692," LEGACY_TIME_COLS(14)
+ ",1048576,11,'s_ID"
"_14','s_ID_6','s_ID_6','s_ID_12','r',0,0,0,0,0,0,'The WebKit Op"
"en Source Project','The WebKit Open Source Project',NULL,NULL,X"
"'C288101A0A12687474703A2F2F7765626B69742E6F72672F1204504E4758',"
@@ -1058,6 +1114,104 @@ void MigrationTest::SetUpVersion75Database() {
ASSERT_TRUE(connection.CommitTransaction());
}
+void MigrationTest::SetUpVersion76Database() {
+ sql::Connection connection;
+ ASSERT_TRUE(connection.Open(GetDatabasePath()));
+ ASSERT_TRUE(connection.BeginTransaction());
+ ASSERT_TRUE(connection.Execute(
+ "CREATE TABLE share_version (id VARCHAR(128) primary key, data INT);"
+ "INSERT INTO 'share_version' VALUES('nick@chromium.org',76);"
+ "CREATE TABLE models (model_id BLOB primary key, progress_marker BLOB, in"
+ "itial_sync_ended BOOLEAN default 0);"
+ "INSERT INTO 'models' VALUES(X'C2881000',X'0888810218B605',1);"
+ "CREATE TABLE 'metas'(metahandle bigint primary key ON CONFLICT FAIL,base"
+ "_version bigint default -1,server_version bigint default 0,mtime big"
+ "int default 0,server_mtime bigint default 0,ctime bigint default 0,s"
+ "erver_ctime bigint default 0,server_position_in_parent bigint defaul"
+ "t 0,local_external_id bigint default 0,id varchar(255) default 'r',p"
+ "arent_id varchar(255) default 'r',server_parent_id varchar(255) defa"
+ "ult 'r',prev_id varchar(255) default 'r',next_id varchar(255) defaul"
+ "t 'r',is_unsynced bit default 0,is_unapplied_update bit default 0,is"
+ "_del bit default 0,is_dir bit default 0,server_is_dir bit default 0,"
+ "server_is_del bit default 0,non_unique_name varchar,server_non_uniqu"
+ "e_name varchar(255),unique_server_tag varchar,unique_client_tag varc"
+ "har,specifics blob,server_specifics blob);"
+ "INSERT INTO 'metas' VALUES(1,-1,0," LEGACY_TIME_COLS(1)
+ ",0,0,'r','r','r','r','r',0,0,0,1,0,0,NULL,NULL,NULL,NULL,X'',X'')"
+ ";"
+ "INSERT INTO 'metas' VALUES(2,669,669," LEGACY_TIME_COLS(2)
+ ",-2097152,4,'s_ID_2','s_ID_9"
+ "','s_ID_9','s_ID_2','s_ID_2',0,0,1,0,0,1,'Deleted Item','Deleted Ite"
+ "m',NULL,NULL,X'C28810220A16687474703A2F2F7777772E676F6F676C652E636F6"
+ "D2F12084141534741534741',X'C28810260A17687474703A2F2F7777772E676F6F6"
+ "76C652E636F6D2F32120B4153414447414447414447');"
+ "INSERT INTO 'metas' VALUES(4,681,681," LEGACY_TIME_COLS(4)
+ ",-3145728,3,'s_ID_4','s_ID_9"
+ "','s_ID_9','s_ID_4','s_ID_4',0,0,1,0,0,1,'Welcome to Chromium','Welc"
+ "ome to Chromium',NULL,NULL,X'C28810350A31687474703A2F2F7777772E676F6"
+ "F676C652E636F6D2F6368726F6D652F696E746C2F656E2F77656C636F6D652E68746"
+ "D6C1200',X'C28810350A31687474703A2F2F7777772E676F6F676C652E636F6D2F6"
+ "368726F6D652F696E746C2F656E2F77656C636F6D652E68746D6C1200');"
+ "INSERT INTO 'metas' VALUES(5,677,677," LEGACY_TIME_COLS(5)
+ ",1048576,7,'s_ID_5','s_ID_9'"
+ ",'s_ID_9','s_ID_5','s_ID_5',0,0,1,0,0,1,'Google','Google',NULL,NULL,"
+ "X'C28810220A16687474703A2F2F7777772E676F6F676C652E636F6D2F1208414741"
+ "5347415347',X'C28810220A16687474703A2F2F7777772E676F6F676C652E636F6D"
+ "2F12084147464447415347');"
+ "INSERT INTO 'metas' VALUES(6,694,694," LEGACY_TIME_COLS(6)
+ ",-4194304,6,'s_ID_6','s_ID_9"
+ "','s_ID_9','r','r',0,0,0,1,1,0,'The Internet','The Internet',NULL,NU"
+ "LL,X'C2881000',X'C2881000');"
+ "INSERT INTO 'metas' VALUES(7,663,663," LEGACY_TIME_COLS(7)
+ ",1048576,0,'s_ID_7','r','r',"
+ "'r','r',0,0,0,1,1,0,'Google Chrome','Google Chrome','google_chrome',"
+ "NULL,NULL,NULL);"
+ "INSERT INTO 'metas' VALUES(8,664,664," LEGACY_TIME_COLS(8)
+ ",1048576,0,'s_ID_8','s_ID_7'"
+ ",'s_ID_7','r','r',0,0,0,1,1,0,'Bookmarks','Bookmarks','google_chrome"
+ "_bookmarks',NULL,X'C2881000',X'C2881000');"
+ "INSERT INTO 'metas' VALUES(9,665,665," LEGACY_TIME_COLS(9)
+ ",1048576,1,'s_ID_9','s_ID_8'"
+ ",'s_ID_8','r','s_ID_10',0,0,0,1,1,0,'Bookmark Bar','Bookmark Bar','b"
+ "ookmark_bar',NULL,X'C2881000',X'C2881000');"
+ "INSERT INTO 'metas' VALUES(10,666,666," LEGACY_TIME_COLS(10)
+ ",2097152,2,'s_ID_10','s_ID_"
+ "8','s_ID_8','s_ID_9','r',0,0,0,1,1,0,'Other Bookmarks','Other Bookma"
+ "rks','other_bookmarks',NULL,X'C2881000',X'C2881000');"
+ "INSERT INTO 'metas' VALUES(11,683,683," LEGACY_TIME_COLS(11)
+ ",-1048576,8,'s_ID_11','s_ID"
+ "_6','s_ID_6','r','s_ID_13',0,0,0,0,0,0,'Home (The Chromium Projects)"
+ "','Home (The Chromium Projects)',NULL,NULL,X'C28810220A18687474703A2"
+ "F2F6465762E6368726F6D69756D2E6F72672F1206414741545741',X'C28810290A1"
+ "D687474703A2F2F6465762E6368726F6D69756D2E6F72672F6F74686572120841464"
+ "14756415346');"
+ "INSERT INTO 'metas' VALUES(12,685,685," LEGACY_TIME_COLS(12)
+ ",0,9,'s_ID_12','s_ID_6','s_"
+ "ID_6','s_ID_13','s_ID_14',0,0,0,1,1,0,'Extra Bookmarks','Extra Bookm"
+ "arks',NULL,NULL,X'C2881000',X'C2881000');"
+ "INSERT INTO 'metas' VALUES(13,687,687," LEGACY_TIME_COLS(13)
+ ",-917504,10,'s_ID_13','s_ID"
+ "_6','s_ID_6','s_ID_11','s_ID_12',0,0,0,0,0,0,'ICANN | Internet Corpo"
+ "ration for Assigned Names and Numbers','ICANN | Internet Corporation"
+ " for Assigned Names and Numbers',NULL,NULL,X'C28810240A15687474703A2"
+ "F2F7777772E6963616E6E2E636F6D2F120B504E474158463041414646',X'C288102"
+ "00A15687474703A2F2F7777772E6963616E6E2E636F6D2F120744414146415346');"
+ "INSERT INTO 'metas' VALUES(14,692,692," LEGACY_TIME_COLS(14)
+ ",1048576,11,'s_ID_14','s_ID"
+ "_6','s_ID_6','s_ID_12','r',0,0,0,0,0,0,'The WebKit Open Source Proje"
+ "ct','The WebKit Open Source Project',NULL,NULL,X'C288101A0A126874747"
+ "03A2F2F7765626B69742E6F72672F1204504E4758',X'C288101C0A13687474703A2"
+ "F2F7765626B69742E6F72672F781205504E473259');"
+ "CREATE TABLE 'share_info' (id TEXT primary key, name TEXT, store_birthda"
+ "y TEXT, db_create_version TEXT, db_create_time INT, next_id INT defa"
+ "ult -2, cache_guid TEXT , notification_state BLOB);"
+ "INSERT INTO 'share_info' VALUES('nick@chromium.org','nick@chromium.org',"
+ "'c27e9f59-08ca-46f8-b0cc-f16a2ed778bb','Unknown',1263522064,-65542,'"
+ "9010788312004066376x-6609234393368420856x',NULL);"
+ ));
+ ASSERT_TRUE(connection.CommitTransaction());
+}
+
TEST_F(DirectoryBackingStoreTest, MigrateVersion67To68) {
SetUpVersion67Database();
@@ -1377,6 +1531,62 @@ TEST_F(DirectoryBackingStoreTest, MigrateVersion75To76) {
"autofill_profiles_added_during_migration"));
}
+// Expect that all time fields of the given entry kernel will be the
+// given time.
+void ExpectTime(const EntryKernel& entry_kernel,
+ const base::Time& expected_time) {
+ EXPECT_EQ(expected_time, entry_kernel.ref(CTIME));
+ EXPECT_EQ(expected_time, entry_kernel.ref(SERVER_CTIME));
+ EXPECT_EQ(expected_time, entry_kernel.ref(MTIME));
+ EXPECT_EQ(expected_time, entry_kernel.ref(SERVER_MTIME));
+}
+
+// Expect that all the entries in |index| have times matching those in
+// the given map (from metahandle to expect time).
+void ExpectTimes(const MetahandlesIndex& index,
+ const std::map<int64, base::Time>& expected_times) {
+ for (MetahandlesIndex::const_iterator it = index.begin();
+ it != index.end(); ++it) {
+ int64 meta_handle = (*it)->ref(META_HANDLE);
+ std::map<int64, base::Time>::const_iterator it2 =
+ expected_times.find(meta_handle);
+ if (it2 == expected_times.end()) {
+ ADD_FAILURE() << "Could not find expected time for " << meta_handle;
+ continue;
+ }
+ ExpectTime(**it, it2->second);
+ }
+}
+
+TEST_F(DirectoryBackingStoreTest, MigrateVersion76To77) {
+ SetUpVersion76Database();
+
+ scoped_ptr<DirectoryBackingStore> dbs(
+ new DirectoryBackingStore(GetUsername(), GetDatabasePath()));
+ dbs->BeginLoad();
+ ASSERT_FALSE(dbs->needs_column_refresh_);
+
+ {
+ MetahandlesIndex index;
+ STLElementDeleter<MetahandlesIndex> index_deleter(&index);
+ dbs->LoadEntries(&index);
+ ExpectTimes(index, GetLegacyMetaTimes());
+ }
+
+ ASSERT_TRUE(dbs->MigrateVersion76To77());
+ ASSERT_EQ(77, dbs->GetVersion());
+
+ {
+ MetahandlesIndex index;
+ STLElementDeleter<MetahandlesIndex> index_deleter(&index);
+ dbs->LoadEntries(&index);
+ ExpectTimes(index, GetMetaTimes());
+ }
+
+ dbs->EndLoad();
+ ASSERT_FALSE(dbs->needs_column_refresh_);
+}
+
TEST_P(MigrationTest, ToCurrentVersion) {
switch (GetParam()) {
case 67:
@@ -1406,6 +1616,9 @@ TEST_P(MigrationTest, ToCurrentVersion) {
case 75:
SetUpVersion75Database();
break;
+ case 76:
+ SetUpVersion76Database();
+ break;
default:
// If you see this error, it may mean that you've increased the
// database version number but you haven't finished adding unit tests
@@ -1416,11 +1629,13 @@ TEST_P(MigrationTest, ToCurrentVersion) {
// 2. Set a breakpoint in this function and run the unit test.
// 3. Allow this test to run to completion (step out of the call),
// without allowing ~MigrationTest to execute.
- // 4. Examine this->scoped_dir_ to determine the location of the
+ // 4. Examine this->temp_dir_ to determine the location of the
// test database (it is currently of the version you need).
- // 5. Dump this using the sqlite command line tool:
+ // 5. Dump this using the sqlite3 command line tool:
// > .output foo_dump.sql
// > .dump
+ // 6. Replace the timestamp columns with META_TIMES(x) (or
+ // LEGACY_META_TIMES(x) if before Version 77).
FAIL() << "Need to supply database dump for version " << GetParam();
}
@@ -1515,6 +1730,8 @@ TEST_P(MigrationTest, ToCurrentVersion) {
dbs->LoadEntries(&index);
dbs->EndLoad();
+ ExpectTimes(index, GetMetaTimes());
+
MetahandlesIndex::iterator it = index.begin();
ASSERT_TRUE(it != index.end());
ASSERT_EQ(1, (*it)->ref(META_HANDLE));
« chrome/browser/sync/syncable/directory_backing_store.cc ('K') | « chrome/browser/sync/syncable/directory_backing_store.cc ('k') | chrome/browser/sync/syncable/syncable.h » ('j') | chrome/browser/sync/syncable/syncable.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698