Merge pull request #575 from miyucy/patch-1

Fix invalid encoding name

Author: flavorjones

CHANGELOG.md

@@ -7,6 +7,11 @@
 - `Database#optimize` which wraps the `pragma optimize;` statement. Also added `Constants::Optimize` to allow advanced users to pass a bitmask of options. See https://www.sqlite.org/pragma.html#pragma_optimize. [#572] @alexcwatt @flavorjones
 
 
+### Fixed
+
+- Fix `Database#encoding=` support for switching the database encoding to `UTF-16BE`, which has been broken since `Database#encoding=` was introduced in v1.3.12 in 2016. [#575] @miyucy
+
+
 ## 2.2.0 / 2024-10-30
 
 ### Added

lib/sqlite3/pragmas.rb

@@ -93,7 +93,7 @@ def set_int_pragma(name, value)
     LOCKING_MODES = [["normal"], ["exclusive"]]
 
     # The list of valid encodings.
-    ENCODINGS = [["utf-8"], ["utf-16"], ["utf-16le"], ["utf-16be "]]
+    ENCODINGS = [["utf-8"], ["utf-16"], ["utf-16le"], ["utf-16be"]]
 
     # The list of valid WAL checkpoints.
     WAL_CHECKPOINTS = [["passive"], ["full"], ["restart"], ["truncate"]]

test/test_pragmas.rb

@@ -73,5 +73,53 @@ def test_optimize_with_args
         @db.test_statements
       )
     end
+
+    def test_encoding_uppercase
+      assert_equal(Encoding::UTF_8, @db.encoding)
+
+      @db.encoding = "UTF-16"
+      assert_equal(Encoding::UTF_16LE, @db.encoding)
+
+      @db.encoding = "UTF-16LE"
+      assert_equal(Encoding::UTF_16LE, @db.encoding)
+
+      @db.encoding = "UTF-16BE"
+      assert_equal(Encoding::UTF_16BE, @db.encoding)
+
+      @db.encoding = "UTF-8"
+      assert_equal(Encoding::UTF_8, @db.encoding)
+    end
+
+    def test_encoding_lowercase
+      assert_equal(Encoding::UTF_8, @db.encoding)
+
+      @db.encoding = "utf-16"
+      assert_equal(Encoding::UTF_16LE, @db.encoding)
+
+      @db.encoding = "utf-16le"
+      assert_equal(Encoding::UTF_16LE, @db.encoding)
+
+      @db.encoding = "utf-16be"
+      assert_equal(Encoding::UTF_16BE, @db.encoding)
+
+      @db.encoding = "utf-8"
+      assert_equal(Encoding::UTF_8, @db.encoding)
+    end
+
+    def test_encoding_objects
+      assert_equal(Encoding::UTF_8, @db.encoding)
+
+      @db.encoding = Encoding::UTF_16
+      assert_equal(Encoding::UTF_16LE, @db.encoding)
+
+      @db.encoding = Encoding::UTF_16LE
+      assert_equal(Encoding::UTF_16LE, @db.encoding)
+
+      @db.encoding = Encoding::UTF_16BE
+      assert_equal(Encoding::UTF_16BE, @db.encoding)
+
+      @db.encoding = Encoding::UTF_8
+      assert_equal(Encoding::UTF_8, @db.encoding)
+    end
   end
 end