feat(DataStore): database recreation based on new schema #551
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ed two integration tests
lawmicha
reviewed
Jun 17, 2020
AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/AWSDataStorePlugin.swift
Outdated
Show resolved
Hide resolved
| @@ -16,12 +16,11 @@ final class SQLiteStorageEngineAdapter: StorageEngineAdapter { | |||
|
|
|||
| internal var connection: Connection! | |||
| private var dbFilePath: URL? | |||
| static let dbVersionKey = "com.awsamazon.dataStore.dbVersion" | |||
There was a problem hiding this comment.
a search for "com." shows a few examples like com.amazonaws.DataStore.AWSIncomingEventReconciliationQueue so let's keep it the same like com.amazonaws.DataStore.dbVersion
There was a problem hiding this comment.
Changed, but in PictureThis the bundle identifier is "com.awsamazon.PictureThis" instead of "com.amazonaws.PictureThis". I guess "awsamazon" or "amazonaws" doesn't matter?
There was a problem hiding this comment.
oh good point, not sure which is the right one, more important for the codebase to be consistent regardless of PictureThis's bundle since it's external sample app
...lugins/DataStore/AWSDataStoreCategoryPlugin/Storage/SQLite/StorageEngineAdapter+SQLite.swift
Outdated
Show resolved
Hide resolved
...lugins/DataStore/AWSDataStoreCategoryPlugin/Storage/SQLite/StorageEngineAdapter+SQLite.swift
Outdated
Show resolved
Hide resolved
AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Storage/StorageEngine.swift
Outdated
Show resolved
Hide resolved
AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/Core/DataStoreModelsVersionTests.swift
Outdated
Show resolved
Hide resolved
AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/Core/DataStoreModelsVersionTests.swift
Outdated
Show resolved
Hide resolved
AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/Core/DataStoreModelsVersionTests.swift
Outdated
Show resolved
Hide resolved
AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/Core/DataStoreModelsVersionTests.swift
Outdated
Show resolved
Hide resolved
...ifyPlugins/DataStore/AWSDataStoreCategoryPluginTests/TestSupport/Mocks/MockFileManager.swift
Outdated
Show resolved
Hide resolved
lawmicha
reviewed
Jun 17, 2020
...ugins/DataStore/AWSDataStoreCategoryPluginIntegrationTests/DataStoreConfigurationTests.swift
Show resolved
Hide resolved
...ugins/DataStore/AWSDataStoreCategoryPluginIntegrationTests/DataStoreConfigurationTests.swift
Outdated
Show resolved
Hide resolved
...ugins/DataStore/AWSDataStoreCategoryPluginIntegrationTests/DataStoreConfigurationTests.swift
Outdated
Show resolved
Hide resolved
...ugins/DataStore/AWSDataStoreCategoryPluginIntegrationTests/DataStoreConfigurationTests.swift
Outdated
Show resolved
Hide resolved
...ugins/DataStore/AWSDataStoreCategoryPluginIntegrationTests/DataStoreConfigurationTests.swift
Outdated
Show resolved
Hide resolved
| _ = UserDefaults.removeObject(userDefaults) | ||
| } | ||
|
|
||
| func testVersionInUserDefaultsRemainsSameAndFileExists() { |
There was a problem hiding this comment.
test name like testClearIfNewVersionWithVersionSameAsPrevious
let previousVersion = "previousVersion"
userDefaults.set(previousVersion ..
try SQLiteStorageEngineAdaapter.clearIfNewVersion(previousVersion,
There was a problem hiding this comment.
Actually, here is having an additional var necessary?
userDefaults.set("previousVersion", forKey: SQLiteStorageEngineAdapter.dbVersionKey) is OK? Because "previousVersion" is used only once.
...Plugins/DataStore/AWSDataStoreCategoryPluginTests/Core/SQLiteStorageEngineAdapterTests.swift
Show resolved
Hide resolved
...Plugins/DataStore/AWSDataStoreCategoryPluginTests/Core/SQLiteStorageEngineAdapterTests.swift
Outdated
Show resolved
Hide resolved
...Plugins/DataStore/AWSDataStoreCategoryPluginTests/Core/SQLiteStorageEngineAdapterTests.swift
Outdated
Show resolved
Hide resolved
...Plugins/DataStore/AWSDataStoreCategoryPluginTests/Core/SQLiteStorageEngineAdapterTests.swift
Outdated
Show resolved
Hide resolved
lawmicha
reviewed
Jun 18, 2020
| userDefaults: userDefaults, | ||
| fileManager: mockFileManager) | ||
| } catch { | ||
| XCTAssertEqual(error as? MockFileManagerError, MockFileManagerError.removeItemError) |
There was a problem hiding this comment.
assert is DataStoreError.invalidDatabase
| try fileManager.removeItem(at: dbFilePath) | ||
| } catch { | ||
| log.error("\(#function) Failed to delete database file located at: \(dbFilePath), error: \(error)") | ||
| throw error |
There was a problem hiding this comment.
wrap in DataStoreError.invalidDatabase(path: dbFilePath.absoluteString, error)
lawmicha
reviewed
Jun 18, 2020
...Plugins/DataStore/AWSDataStoreCategoryPluginTests/Core/SQLiteStorageEngineAdapterTests.swift
Outdated
Show resolved
Hide resolved
lawmicha
reviewed
Jun 18, 2020
...lugins/DataStore/AWSDataStoreCategoryPlugin/Storage/SQLite/StorageEngineAdapter+SQLite.swift
Outdated
Show resolved
Hide resolved
lawmicha
reviewed
Jun 18, 2020
...ugins/DataStore/AWSDataStoreCategoryPluginIntegrationTests/DataStoreConfigurationTests.swift
Outdated
Show resolved
Hide resolved
lawmicha
approved these changes
Jun 18, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes:
UserDefaultsdatabaseModelRegistration.versionto verify the right one is being used when starting theStorageAdapterBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.