summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authornick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-27 16:08:08 +0000
committernick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-27 16:08:08 +0000
commit3273dceb702908e7a2e7c13488d0bdfcdce2148b (patch)
tree30aa669e4d6312122cb98527317f58614d89c629 /app
parent395608dc4edab1f468a2bcf9189d3c34b87f919b (diff)
downloadchromium_src-3273dceb702908e7a2e7c13488d0bdfcdce2148b.zip
chromium_src-3273dceb702908e7a2e7c13488d0bdfcdce2148b.tar.gz
chromium_src-3273dceb702908e7a2e7c13488d0bdfcdce2148b.tar.bz2
In the sync database, use protobuf-based storage. Drop the old
bookmark-only columns. Add getters and setters for BookmarkSpecifics to syncapi as well as syncable entries. Make the datatype be a required property when creating a syncapi node. Add a datatype for the 'google chrome' top level folder. Add database migrations from version 67 to the new schema. Add infrastructure to support migrations generically. Add unit tests for the migrations. Pull a new version of the protobuf library to pick up a fix for a bug that this change exposed (I upstreamed the fix). Fix some example code in the sql helpers so that it would actually compile. BUG=29899,30041 TEST=New unit tests for migrations: unit tests are based on actual database dumps. Additionally, I manually tested 2-client sync using combos of old-protocol servers, new-protocol servers, and initial database versions v67, v68, and v0 (new client). I manually verified that add/edit/delete works in these combination cases. Afterwards I verified (by inspecting the sync databases) that the ModelTypes are consistent across the various migration/protocol paths. Review URL: http://codereview.chromium.org/554066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37253 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/sql/connection.h4
-rw-r--r--app/sql/statement.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/sql/connection.h b/app/sql/connection.h
index 52587ac..6927c89 100644
--- a/app/sql/connection.h
+++ b/app/sql/connection.h
@@ -224,8 +224,8 @@ class Connection {
// you having to manage unique names. See StatementID above for more.
//
// Example:
- // sql::Statement stmt = connection_.GetCachedStatement(
- // SQL_FROM_HERE, "SELECT * FROM foo");
+ // sql::Statement stmt(connection_.GetCachedStatement(
+ // SQL_FROM_HERE, "SELECT * FROM foo"));
// if (!stmt)
// return false; // Error creating statement.
scoped_refptr<StatementRef> GetCachedStatement(const StatementID& id,
diff --git a/app/sql/statement.h b/app/sql/statement.h
index 92495c7..22682c8 100644
--- a/app/sql/statement.h
+++ b/app/sql/statement.h
@@ -25,7 +25,7 @@ enum ColType {
};
// Normal usage:
-// sql::Statement s = connection_.GetUniqueStatement(...);
+// sql::Statement s(connection_.GetUniqueStatement(...));
// if (!s) // You should check for errors before using the statement.
// return false;
//