Skip to content

dep: update vendored sqlite to 3.49.1 #605

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

Merged
merged 4 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

### Dependencies

- Updated to rake-compiler-dock v1.9.1.
- Vendored sqlite is updated to [v3.49.1](https://sqlite.org/releaselog/3_49_1.html) (from v3.47.2). #605 @flavorjones
- Updated to rake-compiler-dock v1.9.1. #610 @flavorjones


## 2.5.0 / 2024-12-25
Expand Down
16 changes: 8 additions & 8 deletions dependencies.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
sqlite3:
# checksum verified by first checking the published sha3(256) checksum against https://sqlite.org/download.html:
# 52cd4a2304b627abbabe1a438ba853d0f6edb8e2774fcb5773c7af11077afe94
# 6cc831c9f588b637e5bd48d9fbf28e58737e08daf825c81085fb8e0a0b8ad14c
#
# $ sha3sum -a 256 ports/archives/sqlite-autoconf-3470200.tar.gz
# 52cd4a2304b627abbabe1a438ba853d0f6edb8e2774fcb5773c7af11077afe94 ports/archives/sqlite-autoconf-3470200.tar.gz
# $ sha3sum -a 256 ports/archives/sqlite-autoconf-3490100.tar.gz
# 6cc831c9f588b637e5bd48d9fbf28e58737e08daf825c81085fb8e0a0b8ad14c ports/archives/sqlite-autoconf-3490100.tar.gz
#
# $ sha256sum ports/archives/sqlite-autoconf-3470200.tar.gz
# f1b2ee412c28d7472bc95ba996368d6f0cdcf00362affdadb27ed286c179540b ports/archives/sqlite-autoconf-3470200.tar.gz
version: "3.47.2"
# $ sha256sum ports/archives/sqlite-autoconf-3490100.tar.gz
# 106642d8ccb36c5f7323b64e4152e9b719f7c0215acf5bfeac3d5e7f97b59254 ports/archives/sqlite-autoconf-3490100.tar.gz
version: "3.49.1"
files:
- url: "https://sqlite.org/2024/sqlite-autoconf-3470200.tar.gz"
sha256: "f1b2ee412c28d7472bc95ba996368d6f0cdcf00362affdadb27ed286c179540b"
- url: "https://sqlite.org/2025/sqlite-autoconf-3490100.tar.gz"
sha256: "106642d8ccb36c5f7323b64e4152e9b719f7c0215acf5bfeac3d5e7f97b59254"
6 changes: 3 additions & 3 deletions ext/sqlite3/database.c
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ load_extension_internal(VALUE self, VALUE file)
}
#endif

#ifdef HAVE_SQLITE3_ENABLE_LOAD_EXTENSION
#if defined(HAVE_SQLITE3_ENABLE_LOAD_EXTENSION) && defined(HAVE_SQLITE3_LOAD_EXTENSION)
/* call-seq: db.enable_load_extension(onoff)
*
* Enable or disable extension loading.
Expand Down Expand Up @@ -992,11 +992,11 @@ init_sqlite3_database(void)

#ifdef HAVE_SQLITE3_LOAD_EXTENSION
rb_define_private_method(cSqlite3Database, "load_extension_internal", load_extension_internal, 1);
#endif

#ifdef HAVE_SQLITE3_ENABLE_LOAD_EXTENSION
rb_define_method(cSqlite3Database, "enable_load_extension", enable_load_extension, 1);
#endif
#endif


rb_sqlite3_aggregator_init();
}
Expand Down
1 change: 0 additions & 1 deletion ext/sqlite3/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ def configure_packaged_libraries
recipe.configure_options += [
"--disable-shared",
"--enable-static",
"--disable-tcl",
"--enable-fts5"
]
ENV.to_h.tap do |env|
Expand Down
22 changes: 20 additions & 2 deletions test/test_database.rb
Original file line number Diff line number Diff line change
Expand Up @@ -667,16 +667,25 @@ def test_strict_mode
assert_match(/no such column: "?nope"?/, error.message)
end

def test_load_extension_is_defined_on_expected_platforms
if ::RUBY_PLATFORM =~ /mingw|mswin/ && SQLite3::SQLITE_PACKAGED_LIBRARIES
skip("as of sqlite 3.48.0, the autoconf amalgamation does not reliably find dlopen" \
"on windows when building sqlite from source")
end
assert_respond_to(db, :load_extension)
assert_respond_to(db, :enable_load_extension)
end

def test_load_extension_error_with_nonexistent_path
skip("extensions are not enabled") unless db.respond_to?(:load_extension)
skip("extensions are not enabled") unless db.respond_to?(:enable_load_extension)
db.enable_load_extension(true)

assert_raises(SQLite3::Exception) { db.load_extension("/nonexistent/path") }
assert_raises(SQLite3::Exception) { db.load_extension(Pathname.new("nonexistent")) }
end

def test_load_extension_error_with_invalid_argument
skip("extensions are not enabled") unless db.respond_to?(:load_extension)
skip("extensions are not enabled") unless db.respond_to?(:enable_load_extension)
db.enable_load_extension(true)

assert_raises(TypeError) { db.load_extension(1) }
Expand All @@ -686,6 +695,8 @@ def test_load_extension_error_with_invalid_argument
end

def test_load_extension_with_an_extension_descriptor
skip("extensions are not enabled") unless db.respond_to?(:enable_load_extension)

mock_database_load_extension_internal(db)

db.load_extension(Pathname.new("/path/to/ext2"))
Expand All @@ -698,7 +709,10 @@ def test_load_extension_with_an_extension_descriptor
end

def test_initialize_extensions_with_extensions_calls_enable_load_extension
skip("extensions are not enabled") unless db.respond_to?(:enable_load_extension)

mock_database_load_extension_internal(db)

class << db
attr_accessor :enable_load_extension_called
attr_reader :enable_load_extension_arg
Expand Down Expand Up @@ -734,6 +748,8 @@ def enable_load_extension(val)
end

def test_initialize_extensions_object_is_an_extension_specifier
skip("extensions are not enabled") unless db.respond_to?(:enable_load_extension)

mock_database_load_extension_internal(db)

db.initialize_extensions([Pathname.new("/path/to/extension")])
Expand All @@ -746,6 +762,8 @@ def test_initialize_extensions_object_is_an_extension_specifier
end

def test_initialize_extensions_object_not_an_extension_specifier
skip("extensions are not enabled") unless db.respond_to?(:enable_load_extension)

mock_database_load_extension_internal(db)

db.initialize_extensions(["/path/to/extension"])
Expand Down