Skip to content

Commit

Permalink
fix: throw java.lang.ExceptionInInitializerError when calling SQLiteC…
Browse files Browse the repository at this point in the history
…onfig.Pragma.values()

Closes: #1123
  • Loading branch information
ianhash authored Jun 11, 2024
1 parent 235143b commit ec0a524
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 31 deletions.
67 changes: 37 additions & 30 deletions src/main/java/org/sqlite/SQLiteConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,9 @@ static DriverPropertyInfo[] getDriverPropertyInfo() {
return result;
}

private static final String[] OnOff = new String[] {"true", "false"};
static class OnOff {
private static final String[] Values = new String[] {"true", "false"};
}

static final Set<String> pragmaSet = new TreeSet<String>();

Expand Down Expand Up @@ -377,11 +379,14 @@ public enum Pragma {

// Parameters requiring SQLite3 API invocation
OPEN_MODE("open_mode", "Database open-mode flag", null),
SHARED_CACHE("shared_cache", "Enable SQLite Shared-Cache mode, native driver only", OnOff),
SHARED_CACHE(
"shared_cache",
"Enable SQLite Shared-Cache mode, native driver only",
OnOff.Values),
LOAD_EXTENSION(
"enable_load_extension",
"Enable SQLite load_extension() function, native driver only",
OnOff),
OnOff.Values),

// Pragmas that can be set after opening the database
CACHE_SIZE(
Expand All @@ -395,24 +400,25 @@ public enum Pragma {
CASE_SENSITIVE_LIKE(
"case_sensitive_like",
"Installs a new application-defined LIKE function that is either case sensitive or insensitive depending on the value",
OnOff),
COUNT_CHANGES("count_changes", "Deprecated", OnOff),
OnOff.Values),
COUNT_CHANGES("count_changes", "Deprecated", OnOff.Values),
DEFAULT_CACHE_SIZE("default_cache_size", "Deprecated", null),
DEFER_FOREIGN_KEYS(
"defer_foreign_keys",
"When the defer_foreign_keys PRAGMA is on, enforcement of all foreign key constraints is delayed until the outermost transaction is committed. The defer_foreign_keys pragma defaults to OFF so that foreign key constraints are only deferred if they are created as \"DEFERRABLE INITIALLY DEFERRED\". The defer_foreign_keys pragma is automatically switched off at each COMMIT or ROLLBACK. Hence, the defer_foreign_keys pragma must be separately enabled for each transaction. This pragma is only meaningful if foreign key constraints are enabled, of course.",
OnOff),
EMPTY_RESULT_CALLBACKS("empty_result_callback", "Deprecated", OnOff),
OnOff.Values),
EMPTY_RESULT_CALLBACKS("empty_result_callback", "Deprecated", OnOff.Values),
ENCODING(
"encoding",
"Set the encoding that the main database will be created with if it is created by this session",
toStringArray(Encoding.values())),
FOREIGN_KEYS("foreign_keys", "Set the enforcement of foreign key constraints", OnOff),
FULL_COLUMN_NAMES("full_column_names", "Deprecated", OnOff),
FOREIGN_KEYS(
"foreign_keys", "Set the enforcement of foreign key constraints", OnOff.Values),
FULL_COLUMN_NAMES("full_column_names", "Deprecated", OnOff.Values),
FULL_SYNC(
"fullsync",
"Whether or not the F_FULLFSYNC syncing method is used on systems that support it. Only Mac OS X supports F_FULLFSYNC.",
OnOff),
OnOff.Values),
INCREMENTAL_VACUUM(
"incremental_vacuum",
"Causes up to N pages to be removed from the freelist. The database file is truncated by the same amount. The incremental_vacuum pragma has no effect if the database is not in auto_vacuum=incremental mode or if there are no pages on the freelist. If there are fewer than N pages on the freelist, or if N is less than 1, or if the \"(N)\" argument is omitted, then the entire freelist is cleared.",
Expand All @@ -425,8 +431,8 @@ public enum Pragma {
"journal_size_limit",
"Limit the size of rollback-journal and WAL files left in the file-system after transactions or checkpoints",
null),
LEGACY_ALTER_TABLE("legacy_alter_table", "Use legacy alter table behavior", OnOff),
LEGACY_FILE_FORMAT("legacy_file_format", "No-op", OnOff),
LEGACY_ALTER_TABLE("legacy_alter_table", "Use legacy alter table behavior", OnOff.Values),
LEGACY_FILE_FORMAT("legacy_file_format", "No-op", OnOff.Values),
LOCKING_MODE(
"locking_mode",
"Set the database connection locking-mode",
Expand All @@ -437,17 +443,18 @@ public enum Pragma {
null),
MAX_PAGE_COUNT(
"max_page_count", "Set the maximum number of pages in the database file", null),
READ_UNCOMMITTED("read_uncommitted", "Set READ UNCOMMITTED isolation", OnOff),
RECURSIVE_TRIGGERS("recursive_triggers", "Set the recursive trigger capability", OnOff),
READ_UNCOMMITTED("read_uncommitted", "Set READ UNCOMMITTED isolation", OnOff.Values),
RECURSIVE_TRIGGERS(
"recursive_triggers", "Set the recursive trigger capability", OnOff.Values),
REVERSE_UNORDERED_SELECTS(
"reverse_unordered_selects",
"When enabled, this PRAGMA causes many SELECT statements without an ORDER BY clause to emit their results in the reverse order from what they normally would",
OnOff),
OnOff.Values),
SECURE_DELETE(
"secure_delete",
"When secure_delete is on, SQLite overwrites deleted content with zeros",
new String[] {"true", "false", "fast"}),
SHORT_COLUMN_NAMES("short_column_names", "Deprecated", OnOff),
SHORT_COLUMN_NAMES("short_column_names", "Deprecated", OnOff.Values),
SYNCHRONOUS(
"synchronous",
"Set the \"synchronous\" flag",
Expand Down Expand Up @@ -555,6 +562,20 @@ public enum Pragma {
this.choices = choices;
}

/**
* Convert the given enum values to a string array
*
* @param list Array if PragmaValue.
* @return String array of Enum values
*/
private static String[] toStringArray(PragmaValue[] list) {
String[] result = new String[list.length];
for (int i = 0; i < list.length; i++) {
result[i] = list[i].getValue();
}
return result;
}

public final String getPragmaName() {
return pragmaName;
}
Expand Down Expand Up @@ -700,20 +721,6 @@ private static interface PragmaValue {
public String getValue();
}

/**
* Convert the given enum values to a string array
*
* @param list Array if PragmaValue.
* @return String array of Enum values
*/
private static String[] toStringArray(PragmaValue[] list) {
String[] result = new String[list.length];
for (int i = 0; i < list.length; i++) {
result[i] = list[i].getValue();
}
return result;
}

public enum Encoding implements PragmaValue {
UTF8("'UTF-8'"),
UTF16("'UTF-16'"),
Expand Down
15 changes: 14 additions & 1 deletion src/test/java/org/sqlite/SQLiteConfigTest.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package org.sqlite;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.*;

import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
import org.junit.jupiter.api.Test;
import org.sqlite.SQLiteConfig.Pragma;

public class SQLiteConfigTest {

Expand Down Expand Up @@ -50,4 +53,14 @@ public void setBusyTimeout() {
.isEqualTo("100");
assertThat(config.getBusyTimeout()).isEqualTo(100);
}

@Test
public void pragmaSet() {
Set<String> expectedPragmaSet = new HashSet<>();
for (Pragma v : SQLiteConfig.Pragma.values()) {
expectedPragmaSet.add(v.pragmaName);
}

assertThat(SQLiteConfig.pragmaSet).isEqualTo(expectedPragmaSet);
}
}

0 comments on commit ec0a524

Please sign in to comment.