sqlite3 0.0.2 → 0.0.3

data/lib/sqlite3/encoding.rb

@@ -0,0 +1,43 @@
+module SQLite3
+  class Encoding
+    class << self
+      def find(encoding)
+        enc = encoding.to_s
+        if enc.downcase == "utf-16"
+          utf_16native
+        else
+          ::Encoding.find(enc).tap do |e|
+            if utf_16?(e) && e != utf_16native
+              raise ArgumentError, "requested to use byte order different than native"
+            end
+          end
+        end
+      end
+
+      def utf_16?(str_or_enc)
+        enc = str_or_enc.kind_of?(::Encoding) ? str_or_enc : str_or_enc.encoding
+        [utf_16le, utf_16be].include?(enc)
+      end
+
+      def utf_16native
+        "Ruby".unpack("i")[0] == 2036495698 ? utf_16le : utf_16be
+      end
+
+      def us_ascii
+        ::Encoding::US_ASCII
+      end
+
+      def utf_8
+        ::Encoding::UTF_8
+      end
+
+      def utf_16le
+        ::Encoding::UTF_16LE
+      end
+
+      def utf_16be
+        ::Encoding::UTF_16BE
+      end
+    end
+  end
+end

data/lib/sqlite3/errors.rb

@@ -1,5 +1,3 @@
-require "sqlite3/constants"
-
 module SQLite3
 
   class Exception < ::StandardError

data/lib/sqlite3/pragmas.rb

@@ -1,5 +1,3 @@
-require "sqlite3/errors"
-
 module SQLite3
 
   # This module is intended for inclusion solely by the Database class. It

data/lib/sqlite3/resultset.rb

@@ -1,6 +1,3 @@
-require "sqlite3/constants"
-require "sqlite3/errors"
-
 module SQLite3
 
   # The ResultSet object encapsulates the enumerability of a query's output.
@@ -31,10 +28,11 @@ module SQLite3
 
     # Create a new ResultSet attached to the given database, using the
     # given sql text.
-    def initialize(db, stmt)
+    def initialize(db, stmt, utf_16 = false)
       @db = db
       @driver = @db.driver
       @stmt = stmt
+      @utf_16 = utf_16
       commence
     end
 
@@ -103,14 +101,16 @@ module SQLite3
         @driver.data_count(@stmt.handle).times do |column|
           type  = @driver.column_type(@stmt.handle, column)
 
-          if type == Constants::ColumnType::TEXT
-            row << @driver.column_text(@stmt.handle, column)
-          elsif type == Constants::ColumnType::NULL
+          if type == Constants::ColumnType::NULL
             row << nil
           elsif type == Constants::ColumnType::BLOB
             row << @driver.column_blob(@stmt.handle, column)
+          elsif type == Constants::ColumnType::INTEGER
+            row << @driver.column_int64(@stmt.handle, column)
+          elsif type == Constants::ColumnType::FLOAT
+            row << @driver.column_double(@stmt.handle, column)
           else
-            row << @driver.column_text(@stmt.handle, column)
+            row << @driver.column_text(@stmt.handle, column, @utf_16)
           end
         end
 

data/lib/sqlite3/statement.rb

@@ -1,18 +1,5 @@
-require "sqlite3/errors"
-require "sqlite3/resultset"
-
-class String
-  def to_blob
-    SQLite3::Blob.new(self)
-  end
-end
-
 module SQLite3
 
-  # A class for differentiating between strings and blobs, when binding them
-  # into statements.
-  class Blob < String; end
-
   # A statement represents a prepared-but-unexecuted SQL query. It will rarely
   # (if ever) be instantiated directly by a client, and is most often obtained
   # via the Database#prepare method.
@@ -30,12 +17,13 @@ module SQLite3
     # encapsulates the given SQL text. If the text contains more than one
     # statement (i.e., separated by semicolons), then the #remainder property
     # will be set to the trailing text.
-    def initialize(db, sql, utf16 = false)
+    def initialize(db, sql, utf_16 = false)
       raise ArgumentError, "nil argument passed as sql text" unless sql
       @db = db
       @driver = @db.driver
       @closed = false
       @results = @columns = nil
+      @utf_16 = utf_16
       result, @handle, @remainder = @driver.prepare(@db.handle, sql)
       Error.check(result, @db)
     end
@@ -98,12 +86,10 @@ module SQLite3
           end
         when Numeric then
           @driver.bind_double(@handle, param, value.to_f)
-        when Blob then
-          @driver.bind_blob(@handle, param, value)
         when nil then
           @driver.bind_null(@handle, param)
         else
-          @driver.bind_text(@handle, param, value)
+          @driver.bind_string(@handle, param, value.to_s)
         end
       else
         param = param.to_s
@@ -133,7 +119,7 @@ module SQLite3
       reset! if active?
 
       bind_params(*bind_vars) unless bind_vars.empty?
-      @results = ResultSet.new(@db, self)
+      @results = ResultSet.new(@db, self, @utf_16)
 
       if block_given?
         yield @results

data/lib/sqlite3/translator.rb

@@ -1,6 +1,3 @@
-require "time"
-require "date"
-
 module SQLite3
 
   # The Translator class encapsulates the logic and callbacks necessary for

data/lib/sqlite3/value.rb

@@ -1,5 +1,3 @@
-require "sqlite3/constants"
-
 module SQLite3
 
   class Value

data/test/test_database_initialization.rb

@@ -23,4 +23,29 @@ class TestDatabaseInitialization < Test::Unit::TestCase
     @db.close
     assert @db.closed?
   end
+
+  def test_encoding_conversion_from_utf_16_to_utf_8
+    expected_string = "test"
+    db_filename = "test_database_encoding.db"
+    File.delete(db_filename) if File.exists?(db_filename)
+    db = SQLite3::Database.new(db_filename, :encoding => "utf-16le")
+    db.execute("CREATE TABLE t1(t TEXT)")
+    db.execute("INSERT INTO t1 VALUES (?)", expected_string.encode(Encoding::UTF_8))
+    db.execute("INSERT INTO t1 VALUES (?)", expected_string.encode(Encoding::UTF_16LE))
+    rows = db.execute("SELECT * FROM t1")
+    assert_equal 2, rows.size
+    assert_equal expected_string.encode(Encoding::UTF_16LE), rows[0][0]
+    assert_equal Encoding::UTF_16LE, rows[0][0].encoding
+    assert_equal expected_string.encode(Encoding::UTF_16LE), rows[1][0]
+    assert_equal Encoding::UTF_16LE, rows[1][0].encoding
+    db.close
+    db = SQLite3::Database.new(db_filename)
+    rows = db.execute("SELECT * FROM t1")
+    assert_equal 2, rows.size
+    assert_equal expected_string, rows[0][0]
+    assert_equal Encoding::UTF_8, rows[0][0].encoding
+    assert_equal expected_string, rows[1][0]
+    assert_equal Encoding::UTF_8, rows[1][0].encoding
+    File.delete(db_filename) if File.exists?(db_filename)
+  end
 end

data/test/test_database_queries_utf_16.rb

@@ -0,0 +1,80 @@
+require "helper"
+
+class TestDatabaseQueriesUtf16 < Test::Unit::TestCase
+  def setup
+    @db = SQLite3::Database.new(":memory:", :encoding => "utf-16")
+    @db.execute("CREATE TABLE t1(id INTEGER PRIMARY KEY ASC, t TEXT, nu1 NUMERIC, i1 INTEGER, i2 INTEGER, no BLOB)")
+  end
+
+  def teardown
+    @db.close
+  end
+
+  def test_tables_empty
+    assert_equal [], @db.execute("SELECT * FROM t1")
+  end
+
+  def test_execute
+    @db.execute("INSERT INTO t1 VALUES(NULL, 'text1', 1.22, 42, 4294967296, NULL)")
+    rows = @db.execute("SELECT * FROM t1")
+    assert_equal 1, rows.size
+    row = rows[0]
+    assert_equal "text1".encode(Encoding::UTF_16LE), row[1]
+    assert_equal Encoding::UTF_16LE, row[1].encoding
+    assert_equal 1.22, row[2]
+    assert_equal 42, row[3]
+    assert_equal 4294967296, row[4]
+    assert_nil row[5]
+  end
+
+  def test_execute_with_bindings
+    blob = open("test/fixtures/SQLite.gif", "rb").read
+    @db.execute("INSERT INTO t1 VALUES(?, ?, ?, ?, ?, ?)", nil, "text1", 1.22, 42, 4294967296, blob)
+    rows = @db.execute("SELECT * FROM t1")
+    assert_equal 1, rows.size
+    row = rows[0]
+    assert_equal "text1".encode(Encoding::UTF_16LE), row[1]
+    assert_equal Encoding::UTF_16LE, row[1].encoding
+    assert_equal 1.22, row[2]
+    assert_equal 42, row[3]
+    assert_equal 4294967296, row[4]
+    assert_equal blob, row[5]
+    assert_equal Encoding::ASCII_8BIT, row[5].encoding
+  end
+
+  def test_execute_with_different_encodings
+    expected_string = "text1"
+    @db.execute("INSERT INTO t1 VALUES(NULL, ?, NULL, NULL, NULL, NULL)", expected_string.encode(Encoding::ASCII_8BIT))
+    @db.execute("INSERT INTO t1 VALUES(NULL, ?, NULL, NULL, NULL, NULL)", expected_string.encode(Encoding::UTF_8))
+    @db.execute("INSERT INTO t1 VALUES(NULL, ?, NULL, NULL, NULL, NULL)", expected_string.encode(Encoding::UTF_16LE))
+    @db.execute("INSERT INTO t1 VALUES(NULL, ?, NULL, NULL, NULL, NULL)", expected_string.encode(Encoding::UTF_16BE))
+    rows = @db.execute("SELECT * FROM t1")
+    assert_equal 4, rows.size
+    assert_equal expected_string, rows[0][1]
+    assert_equal expected_string.encode(Encoding::UTF_16LE), rows[1][1]
+    assert_equal expected_string.encode(Encoding::UTF_16LE), rows[2][1]
+    assert_equal expected_string.encode(Encoding::UTF_16LE), rows[3][1]
+    assert_equal Encoding::ASCII_8BIT, rows[0][1].encoding
+    assert_equal Encoding::UTF_16LE, rows[1][1].encoding
+    assert_equal Encoding::UTF_16LE, rows[2][1].encoding
+    assert_equal Encoding::UTF_16LE, rows[3][1].encoding
+  end
+
+  def test_execute_with_bad_query
+    assert_raise(SQLite3::SQLException) { @db.execute("bad query") }
+    assert_equal %Q{near "bad": syntax error}, @db.errmsg
+    assert_equal 1, @db.errcode
+  end
+
+  def test_last_insert_row_id
+    @db.execute("INSERT INTO t1 VALUES(NULL, NULL, NULL, NULL, NULL, NULL)")
+    id = @db.last_insert_row_id
+    rows = @db.execute("SELECT * FROM t1 WHERE id = #{id}")
+    assert_equal 1, rows.size
+  end
+
+  # def test_execute_with_closed_database
+  #   @db.close
+  #   @db.execute("SELECT * FROM t1")
+  # end
+end

data/test/test_database_queries_utf_8.rb

@@ -0,0 +1,80 @@
+require "helper"
+
+class TestDatabaseQueriesUtf8 < Test::Unit::TestCase
+  def setup
+    @db = SQLite3::Database.new(":memory:")
+    @db.execute("CREATE TABLE t1(id INTEGER PRIMARY KEY ASC, t TEXT, nu1 NUMERIC, i1 INTEGER, i2 INTEGER, no BLOB)")
+  end
+
+  def teardown
+    @db.close
+  end
+
+  def test_tables_empty
+    assert_equal [], @db.execute("SELECT * FROM t1")
+  end
+
+  def test_execute
+    @db.execute("INSERT INTO t1 VALUES(NULL, 'text1', 1.22, 42, 4294967296, NULL)")
+    rows = @db.execute("SELECT * FROM t1")
+    assert_equal 1, rows.size
+    row = rows[0]
+    assert_equal "text1", row[1]
+    assert_equal Encoding::UTF_8, row[1].encoding
+    assert_equal 1.22, row[2]
+    assert_equal 42, row[3]
+    assert_equal 4294967296, row[4]
+    assert_nil row[5]
+  end
+
+  def test_execute_with_bindings
+    blob = open("test/fixtures/SQLite.gif", "rb").read
+    @db.execute("INSERT INTO t1 VALUES(?, ?, ?, ?, ?, ?)", nil, "text1", 1.22, 42, 4294967296, blob)
+    rows = @db.execute("SELECT * FROM t1")
+    assert_equal 1, rows.size
+    row = rows[0]
+    assert_equal "text1", row[1]
+    assert_equal Encoding::UTF_8, row[1].encoding
+    assert_equal 1.22, row[2]
+    assert_equal 42, row[3]
+    assert_equal 4294967296, row[4]
+    assert_equal blob, row[5]
+    assert_equal Encoding::ASCII_8BIT, row[5].encoding
+  end
+
+  def test_execute_with_different_encodings
+    expected_string = "text1"
+    @db.execute("INSERT INTO t1 VALUES(NULL, ?, NULL, NULL, NULL, NULL)", expected_string.encode(Encoding::ASCII_8BIT))
+    @db.execute("INSERT INTO t1 VALUES(NULL, ?, NULL, NULL, NULL, NULL)", expected_string.encode(Encoding::UTF_8))
+    @db.execute("INSERT INTO t1 VALUES(NULL, ?, NULL, NULL, NULL, NULL)", expected_string.encode(Encoding::UTF_16LE))
+    @db.execute("INSERT INTO t1 VALUES(NULL, ?, NULL, NULL, NULL, NULL)", expected_string.encode(Encoding::UTF_16BE))
+    rows = @db.execute("SELECT * FROM t1")
+    assert_equal 4, rows.size
+    assert_equal expected_string, rows[0][1]
+    assert_equal expected_string, rows[1][1]
+    assert_equal expected_string, rows[2][1]
+    assert_equal expected_string, rows[3][1]
+    assert_equal Encoding::ASCII_8BIT, rows[0][1].encoding
+    assert_equal Encoding::UTF_8, rows[1][1].encoding
+    assert_equal Encoding::UTF_8, rows[2][1].encoding
+    assert_equal Encoding::UTF_8, rows[3][1].encoding
+  end
+
+  def test_execute_with_bad_query
+    assert_raise(SQLite3::SQLException) { @db.execute("bad query") }
+    assert_equal %Q{near "bad": syntax error}, @db.errmsg
+    assert_equal 1, @db.errcode
+  end
+
+  def test_last_insert_row_id
+    @db.execute("INSERT INTO t1 VALUES(NULL, NULL, NULL, NULL, NULL, NULL)")
+    id = @db.last_insert_row_id
+    rows = @db.execute("SELECT * FROM t1 WHERE id = #{id}")
+    assert_equal 1, rows.size
+  end
+
+  # def test_execute_with_closed_database
+  #   @db.close
+  #   @db.execute("SELECT * FROM t1")
+  # end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sqlite3
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 +01:00
+date: 2009-11-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,7 @@ files:
 - lib/sqlite3/database.rb
 - lib/sqlite3/driver/ffi/api.rb
 - lib/sqlite3/driver/ffi/driver.rb
+- lib/sqlite3/encoding.rb
 - lib/sqlite3/errors.rb
 - lib/sqlite3/pragmas.rb
 - lib/sqlite3/resultset.rb
@@ -60,20 +61,26 @@ files:
 - lib/sqlite3/translator.rb
 - lib/sqlite3/value.rb
 - lib/sqlite3/version.rb
+- test/fixtures/SQLite.gif
 - test/helper.rb
 - test/test_database_initialization.rb
-- test/test_database_queries.rb
+- test/test_database_queries_utf_16.rb
+- test/test_database_queries_utf_8.rb
 has_rdoc: true
 homepage: http://github.com/qoobaa/sqlite3
 licenses: []
 
-post_install_message: |+
-  
-  WARNING!
-  
+post_install_message: |
+  ==== WARNING ===================================================================
   This is an early alpha version of SQLite3/Ruby FFI bindings!
-  If you need native, production ready bindings install sqlite3-ruby instead.
+  Currently we support Ruby 1.9 ONLY.
+  
+  If you need native bindings for Ruby 1.8 - install sqlite3-ruby instead.
+  You may need to uninstall this sqlite3 gem as well.
   
+  Thank you for installing sqlite3 gem! Suggestions: qoobaa@gmail.com
+  ================================================================================
+
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -98,6 +105,7 @@ signing_key:
 specification_version: 3
 summary: SQLite3/Ruby FFI bindings
 test_files: 
-- test/helper.rb
-- test/test_database_queries.rb
+- test/test_database_queries_utf_8.rb
+- test/test_database_queries_utf_16.rb
 - test/test_database_initialization.rb
+- test/helper.rb

data/test/test_database_queries.rb

@@ -1,29 +0,0 @@
-require "helper"
-
-class TestDatabaseQueries < Test::Unit::TestCase
-  def setup
-    @db_filename = "test_database.db"
-    File.delete(@db_filename) if File.exists?(@db_filename)
-    @db = SQLite3::Database.new(@db_filename)
-    @db.execute("CREATE TABLE t1(id INTEGER PRIMARY KEY ASC, t TEXT, nu NUMERIC, i INTEGER, no BLOB)")
-  end
-
-  def teardown
-    File.delete(@db_filename) if File.exists?(@db_filename)
-  end
-
-  def test_tables_empty
-    assert_equal [], @db.execute("SELECT * FROM t1")
-  end
-
-  def test_insert_and_select
-    @db.execute("INSERT INTO t1 VALUES(NULL, 'text1', 1.22, 42, NULL)")
-    rows = @db.execute("SELECT * FROM t1")
-    assert_equal 1, rows.size
-    row = rows[0]
-    assert_equal "text1", row[1]
-    assert_equal "1.22", row[2]
-    assert_equal "42", row[3]
-    assert_nil row[4]
-  end
-end