sqlite3 0.0.3 → 0.0.4

data/Rakefile

@@ -14,6 +14,7 @@ begin
     gem.authors = ["Jakub Kuźma"]
     gem.add_dependency "ffi", ">= 0.5.1"
     gem.add_development_dependency "test-unit", ">= 2.0"
+    gem.add_development_dependency "activerecord", ">= 2.3.5"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.post_install_message = <<-EOM
 ==== WARNING ===================================================================

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/sqlite3.rb

@@ -1,16 +1,9 @@
-# start (required by translator)
-require "time"
-require "date"
-# end
-
 require "ffi"
 
 require "sqlite3/constants"
 require "sqlite3/errors"
 require "sqlite3/pragmas"
 require "sqlite3/statement"
-require "sqlite3/translator"
 require "sqlite3/resultset"
-require "sqlite3/value"
 require "sqlite3/encoding"
 require "sqlite3/database"

data/lib/sqlite3/constants.rb

@@ -1,13 +1,13 @@
 module SQLite3
   module Constants
 
-    module TextRep
-      UTF8    = 1
-      UTF16LE = 2
-      UTF16BE = 3
-      UTF16   = 4
-      ANY     = 5
-    end
+    # module TextRep
+    #   UTF8    = 1
+    #   UTF16LE = 2
+    #   UTF16BE = 3
+    #   UTF16   = 4
+    #   ANY     = 5
+    # end
 
     module ColumnType
       INTEGER = 1

data/lib/sqlite3/database.rb

@@ -55,7 +55,7 @@ module SQLite3
 
     # A boolean indicating whether or not type translation is enabled for this
     # database.
-    attr_accessor :type_translation
+    # attr_accessor :type_translation
 
     # Encoding used to comunicate with database.
     attr_reader :encoding
@@ -77,9 +77,9 @@ module SQLite3
 
       @closed = false
       @results_as_hash = options.fetch(:results_as_hash, false)
-      @type_translation = options.fetch(:type_translation, false)
-      @translator = nil
-      @transaction_active = false
+      # @type_translation = options.fetch(:type_translation, false)
+      # @translator = nil
+      # @transaction_active = false
     end
 
     # Return +true+ if the string is a valid (ie, parsable) SQL statement, and
@@ -106,9 +106,9 @@ module SQLite3
     # instances. Furthermore, the translators are instantiated lazily, so that
     # if a database does not use type translation, it will not be burdened by
     # the overhead of a useless type translator. (See the Translator class.)
-    def translator
-      @translator ||= Translator.new
-    end
+    # def translator
+    #   @translator ||= Translator.new
+    # end
 
     # Closes this database.
     def close
@@ -197,16 +197,16 @@ module SQLite3
     #
     # This always returns +nil+, making it unsuitable for queries that return
     # rows.
-    def execute_batch(sql, *bind_vars)
-      sql = sql.strip
-      until sql.empty? do
-        prepare(sql) do |stmt|
-          stmt.execute(*bind_vars)
-          sql = stmt.remainder.strip
-        end
-      end
-      nil
-    end
+    # def execute_batch(sql, *bind_vars)
+    #   sql = sql.strip
+    #   until sql.empty? do
+    #     prepare(sql) do |stmt|
+    #       stmt.execute(*bind_vars)
+    #       sql = stmt.remainder.strip
+    #     end
+    #   end
+    #   nil
+    # end
 
     # This is a convenience method for creating a statement, binding
     # paramters to it, and calling execute:
@@ -219,18 +219,18 @@ module SQLite3
     # returned, or you could have problems with locks on the table. If called
     # with a block, +close+ will be invoked implicitly when the block
     # terminates.
-    def query(sql, *bind_vars)
-      result = prepare(sql).execute(*bind_vars)
-      if block_given?
-        begin
-          yield result
-        ensure
-          result.close
-        end
-      else
-        return result
-      end
-    end
+    # def query(sql, *bind_vars)
+    #   result = prepare(sql).execute(*bind_vars)
+    #   if block_given?
+    #     begin
+    #       yield result
+    #     ensure
+    #       result.close
+    #     end
+    #   else
+    #     return result
+    #   end
+    # end
 
     # A convenience method for obtaining the first row of a result set, and
     # discarding all others. It is otherwise identical to #execute.
@@ -266,14 +266,14 @@ module SQLite3
 
     # Returns the total number of changes made to this database instance
     # since it was opened.
-    def total_changes
-      @driver.total_changes(@handle)
-    end
+    # def total_changes
+    #   @driver.total_changes(@handle)
+    # end
 
     # Interrupts the currently executing operation, causing it to abort.
-    def interrupt
-      @driver.interrupt(@handle)
-    end
+    # def interrupt
+    #   @driver.interrupt(@handle)
+    # end
 
     # Indicates that if a request for a resource terminates because that
     # resource is busy, SQLite should sleep and retry for up to the indicated

data/lib/sqlite3/driver/ffi/api.rb

@@ -38,7 +38,7 @@ EOF
         # attach_function :sqlite3_reset, [:pointer], :int
         attach_function :sqlite3_step, [:pointer], :int
         attach_function :sqlite3_last_insert_rowid, [:pointer], :int64
-        # attach_function :sqlite3_changes, [:pointer], :int
+        attach_function :sqlite3_changes, [:pointer], :int
         # attach_function :sqlite3_total_changes, [:pointer], :int
         # attach_function :sqlite3_interrupt, [:pointer], :void
         # attach_function :sqlite3_complete, [:string], :int

data/lib/sqlite3/driver/ffi/driver.rb

@@ -146,7 +146,7 @@ module SQLite3
         api_delegate :bind_parameter_index
         api_delegate :bind_parameter_name
         api_delegate :busy_timeout
-        # api_delegate :changes
+        api_delegate :changes
         api_delegate :close
         # api_delegate :column_bytes
         # api_delegate :column_bytes16

data/lib/sqlite3/resultset.rb

@@ -114,11 +114,11 @@ module SQLite3
           end
         end
 
-        if @db.type_translation
-          row = @stmt.types.zip(row).map do |type, value|
-            @db.translator.translate(type, value)
-          end
-        end
+        # if @db.type_translation
+        #   row = @stmt.types.zip(row).map do |type, value|
+        #     @db.translator.translate(type, value)
+        #   end
+        # end
 
         if @db.results_as_hash
           new_row = HashWithTypes[ *(@stmt.columns.zip(row).to_a.flatten) ]
@@ -133,7 +133,7 @@ module SQLite3
           row.fields = @stmt.columns
         end
 
-        row.types = @stmt.types
+        # row.types = @stmt.types
 
         return row
       end

data/test/test_active_record.rb

@@ -0,0 +1,93 @@
+require "helper"
+require "active_record"
+
+class CreateUsers < ActiveRecord::Migration
+  def self.up
+    create_table :users do |t|
+      t.string :login
+      t.integer :login_count
+      t.binary :avatar
+      t.float :ranking
+      t.date :birthdate
+      t.boolean :active
+      t.datetime :expires_at
+      t.text :about_me
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :users
+  end
+end
+
+class User < ActiveRecord::Base
+
+end
+
+class TestActiveRecord < Test::Unit::TestCase
+  def setup
+    ActiveRecord::Base.establish_connection(:adapter  => "sqlite3", :database => ":memory:")
+    ActiveRecord::Base.default_timezone = :utc
+    CreateUsers.migrate(:up)
+  end
+
+  def test_user_count
+    assert_equal 0, User.count
+  end
+
+  def test_user_columns
+    column_names = User.column_names
+    assert column_names.include?("id")
+    assert column_names.include?("login")
+    assert column_names.include?("login_count")
+    assert column_names.include?("avatar")
+    assert column_names.include?("ranking")
+    assert column_names.include?("birthdate")
+    assert column_names.include?("active")
+    assert column_names.include?("expires_at")
+    assert column_names.include?("about_me")
+    assert column_names.include?("created_at")
+    assert column_names.include?("updated_at")
+  end
+
+  def test_user_create
+    login = "bob"
+    avatar = open("test/fixtures/SQLite.gif", "rb").read
+    login_count = 0
+    ranking = 1.0
+    active = true
+    birthdate = Date.new(1969, 12, 1)
+    expires_at = DateTime.new(2100, 12, 1, 12, 54, 22)
+    about_me = "aboutme" * 500
+
+    User.create!(:login => login,
+                 :login_count => login_count,
+                 :avatar => avatar,
+                 :ranking => ranking,
+                 :active => active,
+                 :birthdate => birthdate,
+                 :expires_at => expires_at,
+                 :about_me => about_me)
+
+    user = User.first
+
+    assert_equal login, user.login
+    assert_equal login_count, user.login_count
+    assert_equal avatar, user.avatar
+    assert_equal ranking, user.ranking
+    assert_equal active, user.active
+    assert_equal birthdate, user.birthdate
+    assert_equal expires_at, user.expires_at
+    assert_equal about_me, user.about_me
+  end
+
+  def test_user_update
+    User.create!(:login => "bob")
+    user = User.first
+    assert_equal "bob", user.login
+    user.update_attributes(:login => "alice")
+    user = User.first
+    assert_equal "alice", user.login
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sqlite3
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - "Jakub Ku\xC5\xBAma"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 +01:00
+date: 2009-12-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "2.0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.3.5
+    version: 
 description: SQLite3/Ruby FFI bindings
 email: qoobaa@gmail.com
 executables: []
@@ -58,11 +68,9 @@ files:
 - lib/sqlite3/pragmas.rb
 - lib/sqlite3/resultset.rb
 - lib/sqlite3/statement.rb
-- lib/sqlite3/translator.rb
-- lib/sqlite3/value.rb
-- lib/sqlite3/version.rb
 - test/fixtures/SQLite.gif
 - test/helper.rb
+- test/test_active_record.rb
 - test/test_database_initialization.rb
 - test/test_database_queries_utf_16.rb
 - test/test_database_queries_utf_8.rb
@@ -107,5 +115,6 @@ summary: SQLite3/Ruby FFI bindings
 test_files: 
 - test/test_database_queries_utf_8.rb
 - test/test_database_queries_utf_16.rb
+- test/test_active_record.rb
 - test/test_database_initialization.rb
 - test/helper.rb

data/lib/sqlite3/translator.rb

@@ -1,106 +0,0 @@
-module SQLite3
-
-  # The Translator class encapsulates the logic and callbacks necessary for
-  # converting string data to a value of some specified type. Every Database
-  # instance may have a Translator instance, in order to assist in type
-  # translation (Database#type_translation).
-  #
-  # Further, applications may define their own custom type translation logic
-  # by registering translator blocks with the corresponding database's
-  # translator instance (Database#translator).
-  class Translator
-
-    # Create a new Translator instance. It will be preinitialized with default
-    # translators for most SQL data types.
-    def initialize
-      @translators = Hash.new(proc { |type, value| value })
-      @type_name_cache = {}
-      register_default_translators
-    end
-
-    # Add a new translator block, which will be invoked to process type
-    # translations to the given type. The type should be an SQL datatype, and
-    # may include parentheses (i.e., "VARCHAR(30)"). However, any parenthetical
-    # information is stripped off and discarded, so type translation decisions
-    # are made solely on the "base" type name.
-    #
-    # The translator block itself should accept two parameters, "type" and
-    # "value". In this case, the "type" is the full type name (including
-    # parentheses), so the block itself may include logic for changing how a
-    # type is translated based on the additional data. The "value" parameter
-    # is the (string) data to convert.
-    #
-    # The block should return the translated value.
-    def add_translator(type, &block) # :yields: type, value
-      @translators[ type_name(type) ] = block
-    end
-
-    # Translate the given string value to a value of the given type. In the
-    # absense of an installed translator block for the given type, the value
-    # itself is always returned. Further, +nil+ values are never translated,
-    # and are always passed straight through regardless of the type parameter.
-    def translate(type, value)
-      unless value.nil?
-        @translators[ type_name(type) ].call(type, value)
-      end
-    end
-
-    # A convenience method for working with type names. This returns the "base"
-    # type name, without any parenthetical data.
-    def type_name(type)
-      @type_name_cache[type] ||= begin
-                                   type = "" if type.nil?
-                                   type = $1 if type =~ /^(.*?)\(/
-                                   type.upcase
-                                 end
-    end
-    private :type_name
-
-    # Register the default translators for the current Translator instance.
-    # This includes translators for most major SQL data types.
-    def register_default_translators
-      [ "time",
-        "timestamp" ].each { |type| add_translator(type) { |t, v| Time.parse(v) } }
-
-      add_translator("date") { |t,v| Date.parse(v) }
-      add_translator("datetime") { |t,v| DateTime.parse(v) }
-
-      [ "decimal",
-        "float",
-        "numeric",
-        "double",
-        "real",
-        "dec",
-        "fixed" ].each { |type| add_translator(type) { |t,v| v.to_f } }
-
-      [ "integer",
-        "smallint",
-        "mediumint",
-        "int",
-        "bigint" ].each { |type| add_translator(type) { |t,v| v.to_i } }
-
-      [ "bit",
-        "bool",
-        "boolean" ].each do |type|
-        add_translator(type) do |t,v|
-          !(v.strip.gsub(/00+/,"0") == "0" ||
-            v.downcase == "false" ||
-            v.downcase == "f" ||
-            v.downcase == "no" ||
-            v.downcase == "n")
-        end
-      end
-
-      add_translator("tinyint") do |type, value|
-        if type =~ /\(\s*1\s*\)/
-          value.to_i == 1
-        else
-          value.to_i
-        end
-      end
-    end
-    private :register_default_translators
-
-  end
-
-end

data/lib/sqlite3/value.rb

@@ -1,60 +0,0 @@
-module SQLite3
-
-  class Value
-    attr_reader :handle
-
-    def initialize(db, handle)
-      @driver = db.driver
-      @handle = handle
-    end
-
-    def null?
-      type == :null
-    end
-
-    def to_blob
-      @driver.value_blob(@handle)
-    end
-
-    def length(utf16 = false)
-      if utf16
-        @driver.value_bytes16(@handle)
-      else
-        @driver.value_bytes(@handle)
-      end
-    end
-
-    def to_f
-      @driver.value_double(@handle)
-    end
-
-    def to_i
-      @driver.value_int(@handle)
-    end
-
-    def to_int64
-      @driver.value_int64(@handle)
-    end
-
-    def to_s(utf16 = false)
-      @driver.value_text(@handle, utf16)
-    end
-
-    def type
-      case @driver.value_type(@handle)
-      when Constants::ColumnType::INTEGER
-        :int
-      when Constants::ColumnType::FLOAT
-        :float
-      when Constants::ColumnType::TEXT
-        :text
-      when Constants::ColumnType::BLOB
-        :blob
-      when Constants::ColumnType::NULL
-        :null
-      end
-    end
-
-  end
-
-end

data/lib/sqlite3/version.rb

@@ -1,14 +0,0 @@
-module SQLite3
-
-  module Version
-
-    MAJOR = 1
-    MINOR = 2
-    TINY  = 4
-
-    STRING = [ MAJOR, MINOR, TINY ].join(".")
-    #:beta-tag:
-
-  end
-
-end