Merge pull request #485 from sparklemotion/no-encoding-cache

Don't cache the database encoding
sparklemotion · Jan 24, 2024 · f5f6859 · f5f6859
2 parents ca7a142 + d15f6c3
commit f5f6859
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/sqlite3/database.rb b/lib/sqlite3/database.rb
@@ -117,7 +117,6 @@ def initialize file, options = {}, zvfs = nil
 
       @tracefunc = nil
       @authorizer = nil
-      @encoding = nil
       @busy_handler = nil
       @collations = {}
       @functions = {}
@@ -138,9 +137,7 @@ def initialize file, options = {}, zvfs = nil
     #
     # Fetch the encoding set on this database
     def encoding
-      @encoding ||= prepare("PRAGMA encoding") { |stmt|
-        Encoding.find(stmt.first.first)
-      }
+      prepare("PRAGMA encoding") { |stmt| Encoding.find(stmt.first.first) }
     end
 
     # Installs (or removes) a block that will be invoked for every access

diff --git a/test/test_encoding.rb b/test/test_encoding.rb
@@ -13,6 +13,14 @@ def teardown
       @db.close
     end
 
+    def test_change_encoding
+      db = SQLite3::Database.new(":memory:")
+      assert_equal Encoding.find("UTF-8"), db.encoding
+
+      db.execute "PRAGMA encoding='UTF-16le'"
+      assert_equal Encoding.find("UTF-16le"), db.encoding
+    end
+
     def test_encoding_when_results_are_hash
       db = SQLite3::Database.new(":memory:", results_as_hash: true)
       assert_equal Encoding.find("UTF-8"), db.encoding