| Index: third_party/WebKit/Source/modules/webdatabase/ChangeVersionWrapper.cpp
|
| diff --git a/third_party/WebKit/Source/modules/webdatabase/ChangeVersionWrapper.cpp b/third_party/WebKit/Source/modules/webdatabase/ChangeVersionWrapper.cpp
|
| index f6529ad836d0a0943b8898333a304b428aeb6a83..d499fa8bdb2fd8bbb4f0d80d72e84d668a6ba5e6 100644
|
| --- a/third_party/WebKit/Source/modules/webdatabase/ChangeVersionWrapper.cpp
|
| +++ b/third_party/WebKit/Source/modules/webdatabase/ChangeVersionWrapper.cpp
|
| @@ -47,15 +47,15 @@ bool ChangeVersionWrapper::performPreflight(SQLTransactionBackend* transaction)
|
| String actualVersion;
|
| if (!database->getVersionFromDatabase(actualVersion)) {
|
| int sqliteError = database->sqliteDatabase().lastError();
|
| - database->reportChangeVersionResult(1, SQLError::UNKNOWN_ERR, sqliteError);
|
| - m_sqlError = SQLErrorData::create(SQLError::UNKNOWN_ERR, "unable to read the current version",
|
| + database->reportChangeVersionResult(1, SQLError::kUnknownErr, sqliteError);
|
| + m_sqlError = SQLErrorData::create(SQLError::kUnknownErr, "unable to read the current version",
|
| sqliteError, database->sqliteDatabase().lastErrorMsg());
|
| return false;
|
| }
|
|
|
| if (actualVersion != m_oldVersion) {
|
| - database->reportChangeVersionResult(2, SQLError::VERSION_ERR, 0);
|
| - m_sqlError = SQLErrorData::create(SQLError::VERSION_ERR, "current version of the database and `oldVersion` argument do not match");
|
| + database->reportChangeVersionResult(2, SQLError::kVersionErr, 0);
|
| + m_sqlError = SQLErrorData::create(SQLError::kVersionErr, "current version of the database and `oldVersion` argument do not match");
|
| return false;
|
| }
|
|
|
| @@ -70,8 +70,8 @@ bool ChangeVersionWrapper::performPostflight(SQLTransactionBackend* transaction)
|
|
|
| if (!database->setVersionInDatabase(m_newVersion)) {
|
| int sqliteError = database->sqliteDatabase().lastError();
|
| - database->reportChangeVersionResult(3, SQLError::UNKNOWN_ERR, sqliteError);
|
| - m_sqlError = SQLErrorData::create(SQLError::UNKNOWN_ERR, "unable to set new version in database",
|
| + database->reportChangeVersionResult(3, SQLError::kUnknownErr, sqliteError);
|
| + m_sqlError = SQLErrorData::create(SQLError::kUnknownErr, "unable to set new version in database",
|
| sqliteError, database->sqliteDatabase().lastErrorMsg());
|
| return false;
|
| }
|
|
|