Merge pull request #481 from sparklemotion/encoding-when-results-are-hash

Ensure the `Database#encoding` method works when results are "as hash"

Author: tenderlove

lib/sqlite3/database.rb

@@ -138,7 +138,9 @@ def initialize file, options = {}, zvfs = nil
     #
     # Fetch the encoding set on this database
     def encoding
-      @encoding ||= Encoding.find(execute("PRAGMA encoding").first.first)
+      @encoding ||= prepare("PRAGMA encoding") { |stmt|
+        Encoding.find(stmt.first.first)
+      }
     end
 
     # Installs (or removes) a block that will be invoked for every access

test/test_encoding.rb

@@ -13,6 +13,14 @@ def teardown
       @db.close
     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
+
+      db = SQLite3::Database.new(":memory:")
+      assert_equal Encoding.find("UTF-8"), db.encoding
+    end
+
     def test_select_encoding_on_utf_16
       str = "foo"
       utf16 = ([1].pack("I") == [1].pack("N")) ? "UTF-16BE" : "UTF-16LE"