Code

Replaced greenDAO with androidx.room#506

Code

Draft

JaniruTEC wants to merge 127 commits intodevelopcryptomator/android:developfrom feature/dao-migrationcryptomator/android:feature/dao-migrationCopy head branch name to clipboard

+5,144-1,251

Commits

Commits on Oct 18, 2023

• Started Dao Migration

  Show description for d961136
  JaniruTEC

  committed
  d961136

  Copy full SHA for d961136

• Simplified database schema

  Show description for c6ba13a
  JaniruTEC

  committed
  c6ba13a

  Copy full SHA for c6ba13a

• Merge branch 'develop' into feature/dao-migration

  JaniruTEC

  committed
  f8bbd54

  Copy full SHA for f8bbd54

• Removed unnecessary historic method "clearCache"

  Show description for 1e60faa
  JaniruTEC

  committed
  1e60faa

  Copy full SHA for 1e60faa

Commits on Oct 19, 2023

• Added logging/comments to database configuration

  JaniruTEC

  committed
  10fd468

  Copy full SHA for 10fd468

• Added logging to legacy/manual migrations

  JaniruTEC

  committed
  068818e

  Copy full SHA for 068818e

Commits on Oct 23, 2023

• Reorganized migrations

  JaniruTEC

  committed
  cde0c78

  Copy full SHA for cde0c78

Commits on Oct 27, 2023

• Refactored injection of Migration12To13

  JaniruTEC

  committed
  b2aeef9

  Copy full SHA for b2aeef9

• Added logging to auto migrations

  JaniruTEC

  committed
  4809e4a

  Copy full SHA for 4809e4a

• Merge branch 'develop' into feature/dao-migration

  JaniruTEC

  committed
  4cce1eb

  Copy full SHA for 4cce1eb

Commits on Oct 31, 2023

• Reformatted "org.cryptomator.data.db" package

  Show description for f1421b3
  JaniruTEC

  committed
  f1421b3

  Copy full SHA for f1421b3

Commits on Nov 4, 2023

• Fixed formatting introduced by merge commit 4cce1eb

  JaniruTEC

  committed
  741212b

  Copy full SHA for 741212b

• Externalized database version for use in other locations

  JaniruTEC

  committed
  ab92786

  Copy full SHA for ab92786

• Started fixing UpgradeDatabaseTest

  JaniruTEC

  committed
  712194f

  Copy full SHA for 712194f

• Reformatted UpgradeDatabaseTest

  JaniruTEC

  committed
  87ab541

  Copy full SHA for 87ab541

• Fixed regression in Sql: Caller is now allowed to omit columns to receive all

  JaniruTEC

  committed
  af6a691

  Copy full SHA for af6a691

• Added and configured "room-testing"

  JaniruTEC

  committed
  91d3e80

  Copy full SHA for 91d3e80

Commits on Nov 23, 2023

• Merge branch 'develop' into feature/dao-migration

  JaniruTEC

  committed
  3057b47

  Copy full SHA for 3057b47

Commits on Nov 25, 2023

• Added first tests for migrations involving room using "room-testing"

  JaniruTEC

  committed
  420a1d3

  Copy full SHA for 420a1d3

• Changed timing of migrations

  JaniruTEC

  committed
  a83e968

  Copy full SHA for a83e968

• Refactored CloudRepositoryImpl to use CloudDao directly

  JaniruTEC

  committed
  7e84617

  Copy full SHA for 7e84617

• Refactored database to be initialized on demand

  JaniruTEC

  committed
  bc7f8a2

  Copy full SHA for bc7f8a2

• Changed configuration to use template db for creation of app db

  Show description for 9423a87
  JaniruTEC

  committed
  9423a87

  Copy full SHA for 9423a87

• Updated tests to use template db

  JaniruTEC

  committed
  bfbff57

  Copy full SHA for bfbff57

• Replaced asset-based template with runtime-generated file

  JaniruTEC

  committed
  f40a147

  Copy full SHA for f40a147

• Wrapped runtime-generated template with lazy stream

  JaniruTEC

  committed
  3e619a1

  Copy full SHA for 3e619a1

• Added template generation to dagger graph

  JaniruTEC

  committed
  4091a51

  Copy full SHA for 4091a51

• Cleaned up DatabaseModule

  Show description for 9c6ec19
  JaniruTEC

  committed
  9c6ec19

  Copy full SHA for 9c6ec19

Commits on Nov 29, 2023

• Added warning if database is built on main thread

  JaniruTEC

  committed
  9e11d77

  Copy full SHA for 9e11d77

Commits on Dec 3, 2023

• Extracted TemplateDatabaseContext from object

  JaniruTEC

  committed
  bd9e23a

  Copy full SHA for bd9e23a

• Added tests and changed contract of TemplateDatabaseContext

  JaniruTEC

  committed
  386aa53

  Copy full SHA for 386aa53

Commits on Jan 10, 2024

• Updated tests for migrations to use new template db mechanism

  JaniruTEC

  committed
  802a2a1

  Copy full SHA for 802a2a1

• Added exception and performed minor cleanup

  JaniruTEC

  committed
  fb76f16

  Copy full SHA for fb76f16

• Separated room schemas from androidTest assets

  JaniruTEC

  committed
  32fe9fc

  Copy full SHA for 32fe9fc

• Changed action for foreign key in "VaultEntity" to "RESTRICT"

  JaniruTEC

  committed
  3d62a48

  Copy full SHA for 3d62a48

• Cleaned up and improved implementations in "Sql.java"

  JaniruTEC

  committed
  b7d2073

  Copy full SHA for b7d2073

Commits on Jan 11, 2024

• Performed minor cleanup

  Show description for 6d18c56
  JaniruTEC

  committed
  6d18c56

  Copy full SHA for 6d18c56

• Enabled foreign key constraints for migrations

  JaniruTEC

  committed
  af82df5

  Copy full SHA for af82df5

• Fixed wrong test

  JaniruTEC

  committed
  465c196

  Copy full SHA for 465c196

• Updated "Sql.java" to offer new id column

  JaniruTEC

  committed
  0cc2ea0

  Copy full SHA for 0cc2ea0

• Added additional cleanup to UpgradeDatabaseTest

  JaniruTEC

  committed
  9718e51

  Copy full SHA for 9718e51

• Cleaned up Entities and Entity mapping

  JaniruTEC

  committed
  0290c20

  Copy full SHA for 0290c20

Commits on Jan 18, 2024

• Added explicit orders to VaultEntity at v13

  Show description for 4f2d05f
  JaniruTEC

  committed
  4f2d05f

  Copy full SHA for 4f2d05f

• Added explicit orders to VaultEntity at current version

  JaniruTEC

  committed
  d15d3b2

  Copy full SHA for d15d3b2

Commits on Feb 29, 2024

• Merge branch 'develop' into feature/dao-migration

  JaniruTEC

  committed
  c0d9309

  Copy full SHA for c0d9309

• Added tests to handle mismatch between db and schema

  JaniruTEC

  committed
  5035ce4

  Copy full SHA for 5035ce4

Commits on Apr 10, 2024

• Removed erroneous import for "okio.use" in favor of "kotlin.io.use"

  Show description for ee4a18c
  JaniruTEC

  committed
  ee4a18c

  Copy full SHA for ee4a18c

• Added utility methods for comparing databases

  JaniruTEC

  committed
  d7e6be6

  Copy full SHA for d7e6be6

• Added "assertCursorEquals"

  JaniruTEC

  committed
  aed7e38

  Copy full SHA for aed7e38

• Commented "Cursor?.stringify" defined in CryptomatorDatabase.kt

  JaniruTEC

  committed
  a6d4776

  Copy full SHA for a6d4776

• Added tests for migration to v13

  Show description for c13b12f
  JaniruTEC

  committed
  c13b12f

  Copy full SHA for c13b12f

• Added tests/snippets to explain/reproduce bug #529 [1]

  Show description for 267b20b
  JaniruTEC

  committed
  267b20b

  Copy full SHA for 267b20b

• Applied code style to BugTest.kt and SmallBugTest.kt

  Show description for eb02fc0
  JaniruTEC

  committed
  eb02fc0

  Copy full SHA for eb02fc0

• Finalized work on BugTest.kt and SmallBugTest.kt

  Show description for 7b78b92
  JaniruTEC

  committed
  7b78b92

  Copy full SHA for 7b78b92

Commits on Apr 13, 2024

• Specified journal mode

  Show description for 95f65c3
  JaniruTEC

  committed
  95f65c3

  Copy full SHA for 95f65c3

• Added first implementation of "CacheControlledSupportSQLiteDatabase"

  Show description for ff67959
  JaniruTEC

  committed
  ff67959

  Copy full SHA for ff67959

• Refactored "CacheControlledSupportSQLiteDatabase"

  Show description for 1afa7b7
  JaniruTEC

  committed
  1afa7b7

  Copy full SHA for 1afa7b7

• Narrowed visibility for members of "AOP_SQLiteDatabase" class

  Show description for 7d5de82
  JaniruTEC

  committed
  7d5de82

  Copy full SHA for 7d5de82

• Renamed parts of cache-control

  Show description for 13261d6
  JaniruTEC

  committed
  13261d6

  Copy full SHA for 13261d6

• Renamed class "CacheControlledSupportSQLiteDatabase" and its members

  Show description for 42f572a
  JaniruTEC

  committed
  42f572a

  Copy full SHA for 42f572a

• Reorganized cache-control to improve abstraction

  Show description for db2edda
  JaniruTEC

  committed
  db2edda

  Copy full SHA for db2edda

• Renamed "RandomUUIDSQLMappingFunction" to "RandomUUIDMapping"

  Show description for eae6c03
  JaniruTEC

  committed
  eae6c03

  Copy full SHA for eae6c03

• Refactored "SQLMappingFunction"

  Show description for 35b4e00
  JaniruTEC

  committed
  35b4e00

  Copy full SHA for 35b4e00

• Redefined logic of "MappingSupportSQLiteQuery"

  Show description for 95eede5
  JaniruTEC

  committed
  95eede5

  Copy full SHA for 95eede5

• Re-enabled tests

  Show description for b3449f0
  JaniruTEC

  committed
  b3449f0

  Copy full SHA for b3449f0

• Added first tests for "MappingSupportSQLiteDatabase"

  Show description for 6b1a9b5
  JaniruTEC

  committed
  6b1a9b5

  Copy full SHA for 6b1a9b5

• Added support for mapping cursors

  Show description for af17db5
  JaniruTEC

  committed
  af17db5

  Copy full SHA for af17db5

• Renamed "DataForTestQueryCancelable"

  Show description for 34f75af
  JaniruTEC

  committed
  34f75af

  Copy full SHA for 34f75af

• Extracted methods "cartesianProduct" and "toArgumentsStream"

  Show description for ed0fe82
  JaniruTEC

  committed
  ed0fe82

  Copy full SHA for ed0fe82

• Added test for "update"

  Show description for c89f4b1
  JaniruTEC

  committed
  c89f4b1

  Copy full SHA for c89f4b1

• Specified contract for "SupportSQLiteDatabase.insert"

  Show description for d98ce8b
  JaniruTEC

  committed
  d98ce8b

  Copy full SHA for d98ce8b

• Added tests for "insert"

  Show description for bfcca43
  JaniruTEC

  committed
  bfcca43

  Copy full SHA for bfcca43

Commits on Apr 21, 2024

• Refactored "Sql" to follow the API contract of "SupportSQLiteDatabase"

  Show description for 6af9811
  JaniruTEC

  committed
  6af9811

  Copy full SHA for 6af9811

• Fixed "migrate12To14IndexSideEffects"

  Show description for abf19e2
  JaniruTEC

  committed
  abf19e2

  Copy full SHA for abf19e2

• Applied fix for #529 [1] to re-enabled tests

  Show description for 0e63cad
  JaniruTEC

  committed
  0e63cad

  Copy full SHA for 0e63cad

Commits on Apr 22, 2024

• Moved logic for handling extra calls to dedicated class "OneOffDelegate"

  Show description for 9f70454
  JaniruTEC

  committed
  9f70454

  Copy full SHA for 9f70454

• Implemented "MappingSupportSQLiteQuery.bindTo" with "OneOffDelegate"

  Show description for b691766
  JaniruTEC

  committed
  b691766

  Copy full SHA for b691766

• Added "ValueExtractor" as argument type of "pseudo equality" methods

  Show description for 77fa76f
  JaniruTEC

  committed
  77fa76f

  Copy full SHA for 77fa76f

• Enforced single call convention for parts of "MappingSupportSQLiteQuery"

  Show description for cfde324
  JaniruTEC

  committed
  cfde324

  Copy full SHA for cfde324

• Refactored "insert" and "compileStatement"

  Show description for 40a4ed5
  JaniruTEC

  committed
  40a4ed5

  Copy full SHA for 40a4ed5

Commits on May 25, 2024

• Merge remote-tracking branch 'origin/develop' into feature/dao-migration

  JaniruTEC

  committed
  7eb386f

  Copy full SHA for 7eb386f

• Merge remote-tracking branch 'origin/develop' into feature/dao-migration

  Show description for 01d43ff
  JaniruTEC

  committed
  01d43ff

  Copy full SHA for 01d43ff

Commits on Jun 1, 2024

• Improved caching to properly handle unconventional keys

  Show description for bcfbef9
  JaniruTEC

  committed
  bcfbef9

  Copy full SHA for bcfbef9

Commits on Jun 2, 2024

• Added test for "SupportSQLiteDatabase.compileStatement"

  Show description for 51056e6
  JaniruTEC

  committed
  51056e6

  Copy full SHA for 51056e6

• Moved database templating to separate dagger module

  JaniruTEC

  committed
  5fef226

  Copy full SHA for 5fef226

• Made database templating more robust

  Show description for a216813
  JaniruTEC

  committed
  a216813

  Copy full SHA for a216813

• Added handling for database corruption

  Show description for 499afed
  JaniruTEC

  committed
  499afed

  Copy full SHA for 499afed

• Added "useFinally" to improve corruption handling

  JaniruTEC

  committed
  fed62e2

  Copy full SHA for fed62e2

• Added test for opening previously corrupted/version 0 database

  Show description for b00ec8e
  JaniruTEC

  committed
  b00ec8e

  Copy full SHA for b00ec8e

• Performed housekeeping

  Show description for d65e674
  JaniruTEC

  committed
  d65e674

  Copy full SHA for d65e674

• Centralized database configuration

  Show description for 01a8bd6
  JaniruTEC

  committed
  01a8bd6

  Copy full SHA for 01a8bd6

• Added logging for database corruption

  JaniruTEC

  committed
  7f91090

  Copy full SHA for 7f91090

Commits on Jun 4, 2024

• Added tests for verifying BOMs

  Show description for 0937ba3
  JaniruTEC

  committed
  0937ba3

  Copy full SHA for 0937ba3

• Added tests for verifying BOMs for dependencies of "MappingSupportSQLiteDatabase"

  Show description for 93417c3
  JaniruTEC

  committed
  93417c3

  Copy full SHA for 93417c3

• Refactored tests for verifying BOMs

  Show description for 01eab75
  JaniruTEC

  committed
  01eab75

  Copy full SHA for 01eab75

• Improved tests for verifying BOMs

  Show description for a198130
  JaniruTEC

  committed
  a198130

  Copy full SHA for a198130

Commits on Jun 19, 2024

• Added tests for "MappingSupportSQLiteStatement.newBoundStatement"

  Show description for 64ae9bd
  JaniruTEC

  committed
  64ae9bd

  Copy full SHA for 64ae9bd

• Added large tests for "MappingSupportSQLiteStatement.newBoundStatement"

  Show description for e475391
  JaniruTEC

  committed
  e475391

  Copy full SHA for e475391

• Refactored "testInsert" and tests in "MappingSupportSQLiteStatementTest"

  Show description for 2897603
  JaniruTEC

  committed
  2897603

  Copy full SHA for 2897603

• Refactored "testInsertConflictAlgorithms" to also use "testSingleInsert"

  Show description for 93997c4
  JaniruTEC

  committed
  93997c4

  Copy full SHA for 93997c4

• Reformatted "MappingSupportSQLiteDatabaseTest.kt"

  Show description for ec9dfff
  JaniruTEC

  committed
  ec9dfff

  Copy full SHA for ec9dfff

Commits on Sep 25, 2024

• Refactored calls to "runMigrationsAndValidate" in "UpgradeDatabaseTest"

  Show description for a411e45
  JaniruTEC

  committed
  a411e45

  Copy full SHA for a411e45

• Upgraded room to version 2.6.1

  Show description for 1406d5d
  JaniruTEC

  committed
  1406d5d

  Copy full SHA for 1406d5d

• Refactored bindings in "MappingSupportSQLiteStatement"

  Show description for c039e0a
  JaniruTEC

  committed
  c039e0a

  Copy full SHA for c039e0a

• Made "MappingSupportSQLiteStatement" threadsafe

  Show description for 5588563
  JaniruTEC

  committed
  5588563

  Copy full SHA for 5588563

• Refactored initialization of "DatabaseOpenHelperFactory"

  Show description for df6c32b
  JaniruTEC

  committed
  df6c32b

  Copy full SHA for df6c32b

• Refactored initialization of database template

  Show description for 818bac6
  JaniruTEC

  committed
  818bac6

  Copy full SHA for 818bac6

• Standardized database configuration

  Show description for 5c37c12
  JaniruTEC

  committed
  5c37c12

  Copy full SHA for 5c37c12

• Standardized database closing

  Show description for f496fe1
  JaniruTEC

  committed
  f496fe1

  Copy full SHA for f496fe1

• Added missing WAL configuration/verification

  Show description for 26bad8d
  JaniruTEC

  committed
  26bad8d

  Copy full SHA for 26bad8d

• Refactored WAL initialization

  Show description for 9abed18
  JaniruTEC

  committed
  9abed18

  Copy full SHA for 9abed18

• Performed cleanup

  Show description for f206740
  JaniruTEC

  committed
  f206740

  Copy full SHA for f206740

• Moved "pseudo equality" methods to dedicated class

  Show description for 2c17283
  JaniruTEC

  committed
  2c17283

  Copy full SHA for 2c17283

• Moved helper methods for "Iterables" to dedicated class

  Show description for c581e77
  JaniruTEC

  committed
  c581e77

  Copy full SHA for c581e77

• Added type-checks to tests for "MappingSupportSQLiteQuery"

  Show description for 3f35615
  JaniruTEC

  committed
  3f35615

  Copy full SHA for 3f35615

• Prepared merging upstream v13

  JaniruTEC

  committed
  4aa1c90

  Copy full SHA for 4aa1c90

• Merge branch 'develop' into feature/dao-migration

  JaniruTEC

  committed
  c9a0d3d

  Copy full SHA for c9a0d3d

Commits on Oct 18, 2024

• Finished merge of upstream v13 into production logic

  Show description for 2e68cc5
  JaniruTEC

  committed
  2e68cc5

  Copy full SHA for 2e68cc5

• Added "Upgrade12To13" to migration paths in tests

  JaniruTEC

  committed
  d034f95

  Copy full SHA for d034f95

• Made tests provided by upstream v13 runnable

  Show description for e7778c6
  JaniruTEC

  committed
  e7778c6

  Copy full SHA for e7778c6

• Added "MigrationContainer"

  Show description for b663aaf
  JaniruTEC

  committed
  b663aaf

  Copy full SHA for b663aaf

• Refactored "CorruptedDatabaseTest"

  Show description for 0b164f8
  JaniruTEC

  committed
  0b164f8

  Copy full SHA for 0b164f8

• Added "testOpenVersion0DatabaseVerifyStreamAccessed"

  JaniruTEC

  committed
  70cb60a

  Copy full SHA for 70cb60a

• Added "testOpenDatabaseWithRecovery"

  Show description for 8251fc9
  JaniruTEC

  committed
  8251fc9

  Copy full SHA for 8251fc9

• Consolidated common test-logic to "DatabaseTests.kt"

  Show description for 998a476
  JaniruTEC

  committed
  998a476

  Copy full SHA for 998a476

Commits on Oct 20, 2024

• Added "assertOrder"

  Show description for 6ed2b42
  JaniruTEC

  committed
  6ed2b42

  Copy full SHA for 6ed2b42

• Fixed ordered tests in "CorruptedDatabaseTest"

  Show description for 4951ebb
  JaniruTEC

  committed
  4951ebb

  Copy full SHA for 4951ebb