Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Briar Mailbox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
briar
Briar Mailbox
Commits
b2e05675
Verified
Commit
b2e05675
authored
3 years ago
by
Sebastian
Browse files
Options
Downloads
Patches
Plain Diff
Upgrade H2 to 2.0.202
parent
3330a9e4
Branches
h2-2.0.202
No related tags found
No related merge requests found
Pipeline
#8534
passed
3 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
mailbox-core/build.gradle
+1
-1
1 addition, 1 deletion
mailbox-core/build.gradle
mailbox-core/src/main/java/org/briarproject/mailbox/core/db/JdbcDatabase.kt
+4
-4
4 additions, 4 deletions
...ain/java/org/briarproject/mailbox/core/db/JdbcDatabase.kt
with
5 additions
and
5 deletions
mailbox-core/build.gradle
+
1
−
1
View file @
b2e05675
...
@@ -27,7 +27,7 @@ dependencies {
...
@@ -27,7 +27,7 @@ dependencies {
implementation
"io.ktor:ktor-jackson:$ktor_version"
implementation
"io.ktor:ktor-jackson:$ktor_version"
api
"org.slf4j:slf4j-api:1.7.32"
api
"org.slf4j:slf4j-api:1.7.32"
implementation
'com.h2database:h2:
1.4
.20
0
'
implementation
'com.h2database:h2:
2.0
.20
2
'
// Base 32
// Base 32
implementation
'dev.keiji.rfc4648:rfc4648:1.0.0'
implementation
'dev.keiji.rfc4648:rfc4648:1.0.0'
...
...
This diff is collapsed.
Click to expand it.
mailbox-core/src/main/java/org/briarproject/mailbox/core/db/JdbcDatabase.kt
+
4
−
4
View file @
b2e05675
...
@@ -37,7 +37,7 @@ abstract class JdbcDatabase(private val dbTypes: DatabaseTypes, private val cloc
...
@@ -37,7 +37,7 @@ abstract class JdbcDatabase(private val dbTypes: DatabaseTypes, private val cloc
CREATE TABLE settings
CREATE TABLE settings
(namespace _STRING NOT NULL,
(namespace _STRING NOT NULL,
settingKey _STRING NOT NULL,
settingKey _STRING NOT NULL,
v
alue _STRING NOT NULL,
settingsV
alue _STRING NOT NULL,
PRIMARY KEY (namespace, settingKey))
PRIMARY KEY (namespace, settingKey))
"""
.
trimIndent
()
"""
.
trimIndent
()
...
@@ -406,7 +406,7 @@ abstract class JdbcDatabase(private val dbTypes: DatabaseTypes, private val cloc
...
@@ -406,7 +406,7 @@ abstract class JdbcDatabase(private val dbTypes: DatabaseTypes, private val cloc
var
rs
:
ResultSet
?
=
null
var
rs
:
ResultSet
?
=
null
return
try
{
return
try
{
val
sql
=
"""
val
sql
=
"""
SELECT settingKey,
v
alue FROM settings
SELECT settingKey,
settingsV
alue FROM settings
WHERE namespace = ?
WHERE namespace = ?
"""
.
trimIndent
()
"""
.
trimIndent
()
...
@@ -437,7 +437,7 @@ abstract class JdbcDatabase(private val dbTypes: DatabaseTypes, private val cloc
...
@@ -437,7 +437,7 @@ abstract class JdbcDatabase(private val dbTypes: DatabaseTypes, private val cloc
try
{
try
{
// Update any settings that already exist
// Update any settings that already exist
var
sql
=
"""
var
sql
=
"""
UPDATE settings SET
v
alue = ?
UPDATE settings SET
settingsV
alue = ?
WHERE namespace = ? AND settingKey = ?
WHERE namespace = ? AND settingKey = ?
"""
.
trimIndent
()
"""
.
trimIndent
()
...
@@ -456,7 +456,7 @@ abstract class JdbcDatabase(private val dbTypes: DatabaseTypes, private val cloc
...
@@ -456,7 +456,7 @@ abstract class JdbcDatabase(private val dbTypes: DatabaseTypes, private val cloc
}
}
// Insert any settings that don't already exist
// Insert any settings that don't already exist
sql
=
"""
sql
=
"""
INSERT INTO settings (namespace, settingKey,
v
alue)
INSERT INTO settings (namespace, settingKey,
settingsV
alue)
VALUES (?, ?, ?)
VALUES (?, ?, ?)
"""
.
trimIndent
()
"""
.
trimIndent
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment