diff --git a/db/schemas/com.readrops.readropsdb.Database/1.json b/db/schemas/com.readrops.db.Database/1.json similarity index 100% rename from db/schemas/com.readrops.readropsdb.Database/1.json rename to db/schemas/com.readrops.db.Database/1.json diff --git a/db/schemas/com.readrops.readropsdb.Database/2.json b/db/schemas/com.readrops.readropsdb.Database/2.json deleted file mode 100644 index ad240f05..00000000 --- a/db/schemas/com.readrops.readropsdb.Database/2.json +++ /dev/null @@ -1,431 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 2, - "identityHash": "09ffedb5d59c0709ed6662d9f068c91f", - "entities": [ - { - "tableName": "Feed", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT, `description` TEXT, `url` TEXT, `siteUrl` TEXT, `lastUpdated` TEXT, `text_color` INTEGER NOT NULL, `background_color` INTEGER NOT NULL, `icon_url` TEXT, `etag` TEXT, `last_modified` TEXT, `folder_id` INTEGER, `remoteId` TEXT, `account_id` INTEGER NOT NULL, `notification_enabled` INTEGER NOT NULL DEFAULT 1, FOREIGN KEY(`folder_id`) REFERENCES `Folder`(`id`) ON UPDATE NO ACTION ON DELETE SET NULL , FOREIGN KEY(`account_id`) REFERENCES `Account`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "description", - "columnName": "description", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "url", - "columnName": "url", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "siteUrl", - "columnName": "siteUrl", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "lastUpdated", - "columnName": "lastUpdated", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "textColor", - "columnName": "text_color", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "backgroundColor", - "columnName": "background_color", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "iconUrl", - "columnName": "icon_url", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "etag", - "columnName": "etag", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "lastModified", - "columnName": "last_modified", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "folderId", - "columnName": "folder_id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "remoteId", - "columnName": "remoteId", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "accountId", - "columnName": "account_id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "notificationEnabled", - "columnName": "notification_enabled", - "affinity": "INTEGER", - "notNull": true, - "defaultValue": "1" - } - ], - "primaryKey": { - "columnNames": [ - "id" - ], - "autoGenerate": true - }, - "indices": [ - { - "name": "index_Feed_folder_id", - "unique": false, - "columnNames": [ - "folder_id" - ], - "createSql": "CREATE INDEX IF NOT EXISTS `index_Feed_folder_id` ON `${TABLE_NAME}` (`folder_id`)" - }, - { - "name": "index_Feed_account_id", - "unique": false, - "columnNames": [ - "account_id" - ], - "createSql": "CREATE INDEX IF NOT EXISTS `index_Feed_account_id` ON `${TABLE_NAME}` (`account_id`)" - } - ], - "foreignKeys": [ - { - "table": "Folder", - "onDelete": "SET NULL", - "onUpdate": "NO ACTION", - "columns": [ - "folder_id" - ], - "referencedColumns": [ - "id" - ] - }, - { - "table": "Account", - "onDelete": "CASCADE", - "onUpdate": "NO ACTION", - "columns": [ - "account_id" - ], - "referencedColumns": [ - "id" - ] - } - ] - }, - { - "tableName": "Item", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `title` TEXT, `description` TEXT, `clean_description` TEXT, `link` TEXT, `image_link` TEXT, `author` TEXT, `pub_date` INTEGER, `content` TEXT, `feed_id` INTEGER NOT NULL, `guid` TEXT, `read_time` REAL NOT NULL, `read` INTEGER NOT NULL, `read_changed` INTEGER NOT NULL, `read_it_later` INTEGER NOT NULL, `remoteId` TEXT, FOREIGN KEY(`feed_id`) REFERENCES `Feed`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "title", - "columnName": "title", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "description", - "columnName": "description", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "cleanDescription", - "columnName": "clean_description", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "link", - "columnName": "link", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "imageLink", - "columnName": "image_link", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "author", - "columnName": "author", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "pubDate", - "columnName": "pub_date", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "content", - "columnName": "content", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "feedId", - "columnName": "feed_id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "guid", - "columnName": "guid", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "readTime", - "columnName": "read_time", - "affinity": "REAL", - "notNull": true - }, - { - "fieldPath": "read", - "columnName": "read", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "readChanged", - "columnName": "read_changed", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "readItLater", - "columnName": "read_it_later", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "remoteId", - "columnName": "remoteId", - "affinity": "TEXT", - "notNull": false - } - ], - "primaryKey": { - "columnNames": [ - "id" - ], - "autoGenerate": true - }, - "indices": [ - { - "name": "index_Item_feed_id", - "unique": false, - "columnNames": [ - "feed_id" - ], - "createSql": "CREATE INDEX IF NOT EXISTS `index_Item_feed_id` ON `${TABLE_NAME}` (`feed_id`)" - }, - { - "name": "index_Item_guid", - "unique": false, - "columnNames": [ - "guid" - ], - "createSql": "CREATE INDEX IF NOT EXISTS `index_Item_guid` ON `${TABLE_NAME}` (`guid`)" - } - ], - "foreignKeys": [ - { - "table": "Feed", - "onDelete": "CASCADE", - "onUpdate": "NO ACTION", - "columns": [ - "feed_id" - ], - "referencedColumns": [ - "id" - ] - } - ] - }, - { - "tableName": "Folder", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT, `remoteId` TEXT, `account_id` INTEGER NOT NULL, FOREIGN KEY(`account_id`) REFERENCES `Account`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "remoteId", - "columnName": "remoteId", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "accountId", - "columnName": "account_id", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "columnNames": [ - "id" - ], - "autoGenerate": true - }, - "indices": [ - { - "name": "index_Folder_account_id", - "unique": false, - "columnNames": [ - "account_id" - ], - "createSql": "CREATE INDEX IF NOT EXISTS `index_Folder_account_id` ON `${TABLE_NAME}` (`account_id`)" - } - ], - "foreignKeys": [ - { - "table": "Account", - "onDelete": "CASCADE", - "onUpdate": "NO ACTION", - "columns": [ - "account_id" - ], - "referencedColumns": [ - "id" - ] - } - ] - }, - { - "tableName": "Account", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `url` TEXT, `account_name` TEXT, `displayed_name` TEXT, `account_type` INTEGER, `last_modified` INTEGER NOT NULL, `current_account` INTEGER NOT NULL, `token` TEXT, `writeToken` TEXT, `notifications_enabled` INTEGER NOT NULL)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "url", - "columnName": "url", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "accountName", - "columnName": "account_name", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "displayedName", - "columnName": "displayed_name", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "accountType", - "columnName": "account_type", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "lastModified", - "columnName": "last_modified", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "currentAccount", - "columnName": "current_account", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "writeToken", - "columnName": "writeToken", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "notificationsEnabled", - "columnName": "notifications_enabled", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "columnNames": [ - "id" - ], - "autoGenerate": true - }, - "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, '09ffedb5d59c0709ed6662d9f068c91f')" - ] - } -} \ No newline at end of file diff --git a/db/src/androidTest/java/com/readrops/db/DatabaseMigrationsTest.kt b/db/src/androidTest/java/com/readrops/db/DatabaseMigrationsTest.kt index b38d325d..038d02fc 100644 --- a/db/src/androidTest/java/com/readrops/db/DatabaseMigrationsTest.kt +++ b/db/src/androidTest/java/com/readrops/db/DatabaseMigrationsTest.kt @@ -17,7 +17,7 @@ class DatabaseMigrationsTest { @get:Rule val helper = MigrationTestHelper( InstrumentationRegistry.getInstrumentation(), - "com.readrops.readropsdb.Database/", + "com.readrops.db.Database/", FrameworkSQLiteOpenHelperFactory() )