| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2013 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 | 40 |
| 41 bool ChangeVersionWrapper::performPreflight(SQLTransactionBackend* transaction) | 41 bool ChangeVersionWrapper::performPreflight(SQLTransactionBackend* transaction) |
| 42 { | 42 { |
| 43 ASSERT(transaction && transaction->database()); | 43 ASSERT(transaction && transaction->database()); |
| 44 | 44 |
| 45 Database* database = transaction->database(); | 45 Database* database = transaction->database(); |
| 46 | 46 |
| 47 String actualVersion; | 47 String actualVersion; |
| 48 if (!database->getVersionFromDatabase(actualVersion)) { | 48 if (!database->getVersionFromDatabase(actualVersion)) { |
| 49 int sqliteError = database->sqliteDatabase().lastError(); | 49 int sqliteError = database->sqliteDatabase().lastError(); |
| 50 database->reportChangeVersionResult(1, SQLError::UNKNOWN_ERR, sqliteErro
r); | 50 database->reportChangeVersionResult(1, SQLError::kUnknownErr, sqliteErro
r); |
| 51 m_sqlError = SQLErrorData::create(SQLError::UNKNOWN_ERR, "unable to read
the current version", | 51 m_sqlError = SQLErrorData::create(SQLError::kUnknownErr, "unable to read
the current version", |
| 52 sqliteError, database->sqliteDatabase().lastErrorMsg()); | 52 sqliteError, database->sqliteDatabase().lastErrorMsg()); |
| 53 return false; | 53 return false; |
| 54 } | 54 } |
| 55 | 55 |
| 56 if (actualVersion != m_oldVersion) { | 56 if (actualVersion != m_oldVersion) { |
| 57 database->reportChangeVersionResult(2, SQLError::VERSION_ERR, 0); | 57 database->reportChangeVersionResult(2, SQLError::kVersionErr, 0); |
| 58 m_sqlError = SQLErrorData::create(SQLError::VERSION_ERR, "current versio
n of the database and `oldVersion` argument do not match"); | 58 m_sqlError = SQLErrorData::create(SQLError::kVersionErr, "current versio
n of the database and `oldVersion` argument do not match"); |
| 59 return false; | 59 return false; |
| 60 } | 60 } |
| 61 | 61 |
| 62 return true; | 62 return true; |
| 63 } | 63 } |
| 64 | 64 |
| 65 bool ChangeVersionWrapper::performPostflight(SQLTransactionBackend* transaction) | 65 bool ChangeVersionWrapper::performPostflight(SQLTransactionBackend* transaction) |
| 66 { | 66 { |
| 67 ASSERT(transaction && transaction->database()); | 67 ASSERT(transaction && transaction->database()); |
| 68 | 68 |
| 69 Database* database = transaction->database(); | 69 Database* database = transaction->database(); |
| 70 | 70 |
| 71 if (!database->setVersionInDatabase(m_newVersion)) { | 71 if (!database->setVersionInDatabase(m_newVersion)) { |
| 72 int sqliteError = database->sqliteDatabase().lastError(); | 72 int sqliteError = database->sqliteDatabase().lastError(); |
| 73 database->reportChangeVersionResult(3, SQLError::UNKNOWN_ERR, sqliteErro
r); | 73 database->reportChangeVersionResult(3, SQLError::kUnknownErr, sqliteErro
r); |
| 74 m_sqlError = SQLErrorData::create(SQLError::UNKNOWN_ERR, "unable to set
new version in database", | 74 m_sqlError = SQLErrorData::create(SQLError::kUnknownErr, "unable to set
new version in database", |
| 75 sqliteError, database->sqliteDatabase().lastErrorMsg()); | 75 sqliteError, database->sqliteDatabase().lastErrorMsg()); |
| 76 return false; | 76 return false; |
| 77 } | 77 } |
| 78 | 78 |
| 79 database->setExpectedVersion(m_newVersion); | 79 database->setExpectedVersion(m_newVersion); |
| 80 | 80 |
| 81 database->reportChangeVersionResult(0, -1, 0); // OK | 81 database->reportChangeVersionResult(0, -1, 0); // OK |
| 82 return true; | 82 return true; |
| 83 } | 83 } |
| 84 | 84 |
| 85 void ChangeVersionWrapper::handleCommitFailedAfterPostflight(SQLTransactionBacke
nd* transaction) | 85 void ChangeVersionWrapper::handleCommitFailedAfterPostflight(SQLTransactionBacke
nd* transaction) |
| 86 { | 86 { |
| 87 transaction->database()->setCachedVersion(m_oldVersion); | 87 transaction->database()->setCachedVersion(m_oldVersion); |
| 88 } | 88 } |
| 89 | 89 |
| 90 } // namespace blink | 90 } // namespace blink |
| OLD | NEW |