-
Notifications
You must be signed in to change notification settings - Fork 169
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix migrations 1 #1446
Merged
Merged
Fix migrations 1 #1446
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
0196806
Fix wrong ordering and defaults of previous migrations.
dessalines d96953f
Fixing an issue with incorrect selection.
dessalines 5f28567
Dont use vars for migration.
dessalines 0b0ad57
Merge branch 'main' into fix_migrations_1
dessalines cf26221
Fixing lint.
dessalines File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,272 @@ | ||
| { | ||
| "formatVersion": 1, | ||
| "database": { | ||
| "version": 32, | ||
| "identityHash": "99bc8f49ded581785ce3c6aba1422623", | ||
| "entities": [ | ||
| { | ||
| "tableName": "Account", | ||
| "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `current` INTEGER NOT NULL, `instance` TEXT NOT NULL, `name` TEXT NOT NULL, `jwt` TEXT NOT NULL, `default_listing_type` INTEGER NOT NULL DEFAULT 0, `default_sort_type` INTEGER NOT NULL DEFAULT 0, `verification_state` INTEGER NOT NULL DEFAULT 0, `is_admin` INTEGER NOT NULL, `is_mod` INTEGER NOT NULL, PRIMARY KEY(`id`))", | ||
| "fields": [ | ||
| { | ||
| "fieldPath": "id", | ||
| "columnName": "id", | ||
| "affinity": "INTEGER", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "current", | ||
| "columnName": "current", | ||
| "affinity": "INTEGER", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "instance", | ||
| "columnName": "instance", | ||
| "affinity": "TEXT", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "name", | ||
| "columnName": "name", | ||
| "affinity": "TEXT", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "jwt", | ||
| "columnName": "jwt", | ||
| "affinity": "TEXT", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "defaultListingType", | ||
| "columnName": "default_listing_type", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "defaultSortType", | ||
| "columnName": "default_sort_type", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "verificationState", | ||
| "columnName": "verification_state", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "isAdmin", | ||
| "columnName": "is_admin", | ||
| "affinity": "INTEGER", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "isMod", | ||
| "columnName": "is_mod", | ||
| "affinity": "INTEGER", | ||
| "notNull": true | ||
| } | ||
| ], | ||
| "primaryKey": { | ||
| "autoGenerate": false, | ||
| "columnNames": [ | ||
| "id" | ||
| ] | ||
| }, | ||
| "indices": [], | ||
| "foreignKeys": [] | ||
| }, | ||
| { | ||
| "tableName": "AppSettings", | ||
| "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `font_size` INTEGER NOT NULL DEFAULT 16, `theme` INTEGER NOT NULL DEFAULT 0, `theme_color` INTEGER NOT NULL DEFAULT 0, `post_view_mode` INTEGER NOT NULL DEFAULT 0, `show_bottom_nav` INTEGER NOT NULL DEFAULT 1, `post_navigation_gesture_mode` INTEGER NOT NULL DEFAULT 0, `show_collapsed_comment_content` INTEGER NOT NULL DEFAULT 0, `show_comment_action_bar_by_default` INTEGER NOT NULL DEFAULT 1, `show_voting_arrows_in_list_view` INTEGER NOT NULL DEFAULT 1, `show_parent_comment_navigation_buttons` INTEGER NOT NULL DEFAULT 0, `navigate_parent_comments_with_volume_buttons` INTEGER NOT NULL DEFAULT 0, `use_custom_tabs` INTEGER NOT NULL DEFAULT 1, `use_private_tabs` INTEGER NOT NULL DEFAULT 0, `secure_window` INTEGER NOT NULL DEFAULT 0, `blur_nsfw` INTEGER NOT NULL DEFAULT 1, `show_text_descriptions_in_navbar` INTEGER NOT NULL DEFAULT 1, `markAsReadOnScroll` INTEGER NOT NULL DEFAULT 0, `backConfirmationMode` INTEGER NOT NULL DEFAULT 1, `show_post_link_previews` INTEGER NOT NULL DEFAULT 1, `post_actionbar_mode` INTEGER NOT NULL DEFAULT 0, `auto_play_gifs` INTEGER NOT NULL DEFAULT 0, `swipe_to_action_preset` INTEGER NOT NULL DEFAULT 0, `last_version_code_viewed` INTEGER NOT NULL DEFAULT 0)", | ||
| "fields": [ | ||
| { | ||
| "fieldPath": "id", | ||
| "columnName": "id", | ||
| "affinity": "INTEGER", | ||
| "notNull": true | ||
| }, | ||
| { | ||
| "fieldPath": "fontSize", | ||
| "columnName": "font_size", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "16" | ||
| }, | ||
| { | ||
| "fieldPath": "theme", | ||
| "columnName": "theme", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "themeColor", | ||
| "columnName": "theme_color", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "postViewMode", | ||
| "columnName": "post_view_mode", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "showBottomNav", | ||
| "columnName": "show_bottom_nav", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "1" | ||
| }, | ||
| { | ||
| "fieldPath": "postNavigationGestureMode", | ||
| "columnName": "post_navigation_gesture_mode", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "showCollapsedCommentContent", | ||
| "columnName": "show_collapsed_comment_content", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "showCommentActionBarByDefault", | ||
| "columnName": "show_comment_action_bar_by_default", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "1" | ||
| }, | ||
| { | ||
| "fieldPath": "showVotingArrowsInListView", | ||
| "columnName": "show_voting_arrows_in_list_view", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "1" | ||
| }, | ||
| { | ||
| "fieldPath": "showParentCommentNavigationButtons", | ||
| "columnName": "show_parent_comment_navigation_buttons", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "navigateParentCommentsWithVolumeButtons", | ||
| "columnName": "navigate_parent_comments_with_volume_buttons", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "useCustomTabs", | ||
| "columnName": "use_custom_tabs", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "1" | ||
| }, | ||
| { | ||
| "fieldPath": "usePrivateTabs", | ||
| "columnName": "use_private_tabs", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "secureWindow", | ||
| "columnName": "secure_window", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "blurNSFW", | ||
| "columnName": "blur_nsfw", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "1" | ||
| }, | ||
| { | ||
| "fieldPath": "showTextDescriptionsInNavbar", | ||
| "columnName": "show_text_descriptions_in_navbar", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "1" | ||
| }, | ||
| { | ||
| "fieldPath": "markAsReadOnScroll", | ||
| "columnName": "markAsReadOnScroll", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "backConfirmationMode", | ||
| "columnName": "backConfirmationMode", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "1" | ||
| }, | ||
| { | ||
| "fieldPath": "showPostLinkPreviews", | ||
| "columnName": "show_post_link_previews", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "1" | ||
| }, | ||
| { | ||
| "fieldPath": "postActionBarMode", | ||
| "columnName": "post_actionbar_mode", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "autoPlayGifs", | ||
| "columnName": "auto_play_gifs", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "swipeToActionPreset", | ||
| "columnName": "swipe_to_action_preset", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| }, | ||
| { | ||
| "fieldPath": "lastVersionCodeViewed", | ||
| "columnName": "last_version_code_viewed", | ||
| "affinity": "INTEGER", | ||
| "notNull": true, | ||
| "defaultValue": "0" | ||
| } | ||
| ], | ||
| "primaryKey": { | ||
| "autoGenerate": true, | ||
| "columnNames": [ | ||
| "id" | ||
| ] | ||
| }, | ||
| "indices": [], | ||
| "foreignKeys": [] | ||
| } | ||
| ], | ||
| "views": [], | ||
| "setupQueries": [ | ||
| "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", | ||
| "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '99bc8f49ded581785ce3c6aba1422623')" | ||
| ] | ||
| } | ||
| } |
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I really wanted to be able to use the Enums and ordinals here, but Room makes you use constants for their
currentValueannotations.