sqlite3-ruby 1.3.0.beta.1 → 1.3.0.beta.2

data/CHANGELOG.rdoc

@@ -1,3 +1,19 @@
+=== 1.3.0.beta.2 / 2010-05-15
+
+* Enhancements
+  * Added support for type translations [tenderlove]
+
+      @db.translator.add_translator('sometime') do |type, thing|
+        'output' # this will be returned as value for that column
+      end
+
+* Bugfixes
+  * Allow extension compilation search for common lib paths [kashif]
+    (lookup /usr/local, /opt/local and /usr)
+  * Corrected extension compilation under MSVC [romuloceccon]
+  * Define load_extension functionality based on availability [tenderlove]
+  * Deprecation notices for Database#query. Fixes RF #28192
+
 === 1.3.0.beta.1 / 2010-05-10
 
 * Enhancements

data/Manifest.txt

@@ -28,10 +28,13 @@ lib/sqlite3/value.rb
 lib/sqlite3/version.rb
 setup.rb
 tasks/faq.rake
+tasks/gem.rake
 tasks/native.rake
 tasks/vendor_sqlite3.rake
 test/helper.rb
 test/test_database.rb
+test/test_deprecated.rb
+test/test_encoding.rb
 test/test_integration.rb
 test/test_integration_open_close.rb
 test/test_integration_pending.rb

data/README.rdoc

@@ -1,8 +1,8 @@
 = SQLite3/Ruby Interface
 
-* http://sqlite3-ruby.rubyforge.org
-* http://rubyforge.org/projects/sqlite3-ruby
 * http://github.com/luislavena/sqlite3-ruby
+* http://rubyforge.org/projects/sqlite-ruby
+* http://sqlite-ruby.rubyforge.org
 
 == DESCRIPTION
 
@@ -14,7 +14,10 @@ Note that this module is NOT compatible with SQLite 2.x.
 
 == Compilation and Installation
 
-Simply do the following, after installing SQLite3:
+Install SQLite3, enabling option SQLITE_ENABLE_COLUMN_METADATA (see
+www.sqlite.org/compile.html for details).
+
+Then do the following:
 
   ruby setup.rb config
   ruby setup.rb setup
@@ -41,7 +44,7 @@ FAQ, please send them to jamis@37signals.com
 
 The source repository is accessible via git:
 
-  git clone git://github.com/jamis/sqlite3-ruby.git
+  git clone git://github.com/luislavena/sqlite3-ruby.git
 
 == Contact Information
 

data/ext/sqlite3/database.c

@@ -460,7 +460,7 @@ static VALUE errmsg(VALUE self)
  * Return an integer representing the last error to have occurred with this
  * database.
  */
-static VALUE errcode(VALUE self)
+static VALUE errcode_(VALUE self)
 {
   sqlite3RubyPtr ctx;
   Data_Get_Struct(self, sqlite3Ruby, ctx);
@@ -665,14 +665,20 @@ void init_sqlite3_database()
   rb_define_method(cSqlite3Database, "define_aggregator", define_aggregator, 2);
   rb_define_method(cSqlite3Database, "interrupt", interrupt, 0);
   rb_define_method(cSqlite3Database, "errmsg", errmsg, 0);
-  rb_define_method(cSqlite3Database, "errcode", errcode, 0);
+  rb_define_method(cSqlite3Database, "errcode", errcode_, 0);
   rb_define_method(cSqlite3Database, "complete?", complete_p, 1);
   rb_define_method(cSqlite3Database, "changes", changes, 0);
   rb_define_method(cSqlite3Database, "authorizer=", set_authorizer, 1);
   rb_define_method(cSqlite3Database, "busy_handler", busy_handler, -1);
   rb_define_method(cSqlite3Database, "busy_timeout=", set_busy_timeout, 1);
+
+#ifdef HAVE_SQLITE3_LOAD_EXTENSION
   rb_define_method(cSqlite3Database, "load_extension", load_extension, 1);
+#endif
+
+#ifdef HAVE_SQLITE3_ENABLE_LOAD_EXTENSION
   rb_define_method(cSqlite3Database, "enable_load_extension", enable_load_extension, 1);
+#endif
 
 #ifdef HAVE_RUBY_ENCODING_H
   rb_define_method(cSqlite3Database, "encoding", db_encoding, 0);

data/ext/sqlite3/extconf.rb

@@ -6,14 +6,23 @@ require 'mkmf'
 
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
-$CFLAGS << ' -O3 -Wall -Wcast-qual -Wwrite-strings -Wconversion' <<
-           '  -Wmissing-noreturn -Winline'
+sqlite = dir_config('sqlite3', ['/usr/local', '/opt/local', '/usr'])
 
-sqlite    = dir_config 'sqlite3', '/opt/local/include', '/opt/local/lib'
+if RUBY_PLATFORM =~ /mswin/
+  $CFLAGS << ' -W3'
+else
+  $CFLAGS << ' -O3 -Wall -Wcast-qual -Wwrite-strings -Wconversion' <<
+             ' -Wmissing-noreturn -Winline'
+end
 
 def asplode missing
-  abort "#{missing} is missing. Try 'port install sqlite3 +universal' " +
-        "or 'yum install sqlite3-devel'"
+  if RUBY_PLATFORM =~ /mswin/
+    abort "#{missing} is missing. Install SQLite3 from " +
+          "http://www.sqlite.org/ first."
+  else
+    abort "#{missing} is missing. Try 'port install sqlite3 +universal' " +
+          "or 'yum install sqlite3-devel'"
+  end
 end
 
 asplode('sqlite3.h')  unless find_header  'sqlite3.h'
@@ -21,6 +30,10 @@ asplode('sqlite3') unless find_library 'sqlite3', 'sqlite3_libversion_number'
 
 # Functions defined in 1.9 but not 1.8
 have_func('rb_proc_arity')
-have_func('rb_obj_method_arity')
+
+# These functions may not be defined
+have_func('sqlite3_column_database_name')
+have_func('sqlite3_enable_load_extension')
+have_func('sqlite3_load_extension')
 
 create_makefile('sqlite3/sqlite3_native')

data/ext/sqlite3/statement.c

@@ -378,6 +378,8 @@ static VALUE bind_parameter_count(VALUE self)
   return INT2NUM((long)sqlite3_bind_parameter_count(ctx->st));
 }
 
+#ifdef HAVE_SQLITE3_COLUMN_DATABASE_NAME
+
 /* call-seq: stmt.database_name(column_index)
  *
  * Return the database name for the column at +column_index+
@@ -392,6 +394,8 @@ static VALUE database_name(VALUE self, VALUE index)
       sqlite3_column_database_name(ctx->st, NUM2INT(index)));
 }
 
+#endif
+
 void init_sqlite3_statement()
 {
   cSqlite3Statement = rb_define_class_under(mSqlite3, "Statement", rb_cObject);
@@ -408,5 +412,8 @@ void init_sqlite3_statement()
   rb_define_method(cSqlite3Statement, "column_name", column_name, 1);
   rb_define_method(cSqlite3Statement, "column_decltype", column_decltype, 1);
   rb_define_method(cSqlite3Statement, "bind_parameter_count", bind_parameter_count, 0);
+
+#ifdef HAVE_SQLITE3_COLUMN_DATABASE_NAME
   rb_define_method(cSqlite3Statement, "database_name", database_name, 1);
+#endif
 }

data/lib/sqlite3/database.rb

@@ -104,13 +104,30 @@ module SQLite3
     #
     # See also #execute2, #query, and #execute_batch for additional ways of
     # executing statements.
-    def execute sql, *bind_vars, &block
+    def execute sql, bind_vars = [], *args, &block
       # FIXME: This is a terrible hack and should be removed but is required
       # for older versions of rails
       hack = Object.const_defined?(:ActiveRecord) && sql =~ /^PRAGMA index_list/
 
+      if bind_vars.nil? || !args.empty?
+        if args.empty?
+          bind_vars = []
+        else
+          bind_vars = [nil] + args
+        end
+
+        warn(<<-eowarn) if $VERBOSE
+#{caller[0]} is calling SQLite3::Database#execute with nil or multiple bind params
+without using an array.  Please switch to passing bind parameters as an array.
+        eowarn
+      end
+
       prepare( sql ) do |stmt|
-        stmt.bind_params( *bind_vars )
+        stmt.bind_params(bind_vars)
+        if type_translation
+          stmt = ResultSet.new(self, stmt).to_a
+        end
+
         if block_given?
           stmt.each do |row|
             if @results_as_hash
@@ -171,7 +188,31 @@ module SQLite3
     #
     # This always returns +nil+, making it unsuitable for queries that return
     # rows.
-    def execute_batch( sql, *bind_vars )
+    def execute_batch( sql, bind_vars = [], *args )
+      # FIXME: remove this stuff later
+      unless [Array, Hash].include?(bind_vars.class)
+        bind_vars = [bind_vars]
+        warn(<<-eowarn) if $VERBOSE
+#{caller[0]} is calling SQLite3::Database#execute_batch with bind parameters
+that are not a list of a hash.  Please switch to passing bind parameters as an
+array or hash.
+        eowarn
+      end
+
+      # FIXME: remove this stuff later
+      if bind_vars.nil? || !args.empty?
+        if args.empty?
+          bind_vars = []
+        else
+          bind_vars = [nil] + args
+        end
+
+        warn(<<-eowarn) if $VERBOSE
+#{caller[0]} is calling SQLite3::Database#execute_batch with nil or multiple bind params
+without using an array.  Please switch to passing bind parameters as an array.
+        eowarn
+      end
+
       sql = sql.strip
       until sql.empty? do
         prepare( sql ) do |stmt|
@@ -198,8 +239,22 @@ 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 )
+    def query( sql, bind_vars = [], *args )
+
+      if bind_vars.nil? || !args.empty?
+        if args.empty?
+          bind_vars = []
+        else
+          bind_vars = [nil] + args
+        end
+
+        warn(<<-eowarn) if $VERBOSE
+#{caller[0]} is calling SQLite3::Database#query with nil or multiple bind params
+without using an array.  Please switch to passing bind parameters as an array.
+        eowarn
+      end
+
+      result = prepare( sql ).execute( bind_vars )
       if block_given?
         begin
           yield result

data/lib/sqlite3/resultset.rb

@@ -94,7 +94,9 @@ module SQLite3
     # Required by the Enumerable mixin. Provides an internal iterator over the
     # rows of the result set.
     def each( &block )
-      @stmt.each(&block)
+      while node = self.next
+        yield node
+      end
     end
 
     # Closes the statement that spawned this result set.

data/lib/sqlite3/translator.rb

@@ -44,7 +44,12 @@ module SQLite3
     # 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 )
+        # FIXME: this is a hack to support Sequel
+        if type && %w{ datetime timestamp }.include?(type.downcase)
+          @translators[ type_name( type ) ].call( type, value.to_s )
+        else
+          @translators[ type_name( type ) ].call( type, value )
+        end
       end
     end
 

data/lib/sqlite3/version.rb

@@ -5,12 +5,12 @@ module SQLite3
     MAJOR = 1
     MINOR = 3
     TINY  = 0
-    BUILD = "beta.1"
+    BUILD = "beta.2"
 
     STRING = [ MAJOR, MINOR, TINY, BUILD ].compact.join( "." )
     #:beta-tag:
 
-    VERSION = '1.3.0.beta.1'
+    VERSION = '1.3.0.beta.2'
   end
 
 end

data/tasks/gem.rake

@@ -0,0 +1,31 @@
+begin
+  require 'hoe'
+rescue LoadError
+  # try with rubygems?
+  require 'rubygems'
+  require 'hoe'
+end
+
+Hoe.plugin :debugging, :doofus, :git
+
+HOE = Hoe.spec 'sqlite3-ruby' do
+  developer           'Jamis Buck', 'jamis@37signals.com'
+  developer           'Luis Lavena', 'luislavena@gmail.com'
+  developer           'Aaron Patterson', 'aaron@tenderlovemaking.com'
+
+  self.readme_file   = 'README.rdoc'
+  self.history_file  = 'CHANGELOG.rdoc'
+  self.extra_rdoc_files  = FileList['*.rdoc', 'ext/**/*.c']
+
+  spec_extras[:required_ruby_version]     = Gem::Requirement.new('>= 1.8.6')
+  spec_extras[:required_rubygems_version] = '>= 1.3.5'
+  spec_extras[:extensions]                = ["ext/sqlite3/extconf.rb"]
+
+  extra_dev_deps << ['rake-compiler', "~> 0.7.0"]
+
+  clean_globs.push('**/test.db')
+end
+
+Hoe.add_include_dirs '.'
+
+# vim: syntax=ruby

data/tasks/native.rake

@@ -20,7 +20,7 @@ Rake::ExtensionTask.new('sqlite3_native', HOE.spec) do |ext|
     ext.config_options << "--with-sqlite3-dir=#{sqlite3_lib}"
   else
     ext.cross_compile = true
-    ext.cross_platform = ['i386-mswin32', 'i386-mingw32']
+    ext.cross_platform = ['i386-mswin32-60', 'i386-mingw32']
     ext.cross_config_options << "--with-sqlite3-dir=#{sqlite3_lib}"
   end
 end

data/test/test_database.rb

@@ -7,6 +7,18 @@ module SQLite3
       @db = SQLite3::Database.new(':memory:')
     end
 
+    def test_changes
+      @db.execute("CREATE TABLE items (id integer PRIMARY KEY AUTOINCREMENT, number integer)")
+      assert_equal 0, @db.changes
+      @db.execute("INSERT INTO items (number) VALUES (10)")
+      assert_equal 1, @db.changes
+      @db.execute_batch(
+        "UPDATE items SET number = (number + :nn) WHERE (number = :n)",
+        {"nn" => 20, "n" => 10})
+      assert_equal 1, @db.changes
+      assert_equal [[30]], @db.execute("select number from items")
+    end
+
     def test_new
       db = SQLite3::Database.new(':memory:')
       assert db
@@ -263,5 +275,17 @@ module SQLite3
         @db.close
       end
     end
+
+    def test_execute_with_empty_bind_params
+      assert_equal [['foo']], @db.execute("select 'foo'", [])
+    end
+
+    def test_query_with_named_bind_params
+      assert_equal [['foo']], @db.query("select :n", {'n' => 'foo'}).to_a
+    end
+
+    def test_execute_with_named_bind_params
+      assert_equal [['foo']], @db.execute("select :n", {'n' => 'foo'})
+    end
   end
 end

data/test/test_deprecated.rb

@@ -0,0 +1,25 @@
+require 'helper'
+
+module SQLite3
+  class TestDeprecated < Test::Unit::TestCase
+    def setup
+      @db = SQLite3::Database.new(':memory:')
+    end
+
+    def test_query_with_many_bind_params
+      assert_equal [[nil, 1]], @db.query("select ?, ?", nil, 1).to_a
+    end
+
+    def test_query_with_nil_bind_params
+      assert_equal [['foo']], @db.query("select 'foo'", nil).to_a
+    end
+
+    def test_execute_with_many_bind_params
+      assert_equal [[nil, 1]], @db.execute("select ?, ?", nil, 1)
+    end
+
+    def test_execute_with_nil_bind_params
+      assert_equal [['foo']], @db.execute("select 'foo'", nil)
+    end
+  end
+end

data/test/test_integration_resultset.rb

@@ -71,6 +71,18 @@ class TC_ResultSet < Test::Unit::TestCase
     end
   end
 
+  def test_type_translation_execute
+    @db.type_translation = true
+    @db.execute "create table bar ( a integer, b america )"
+    @db.execute "insert into bar (a, b) values (NULL, '1974-07-25 14:39:00')"
+
+    @db.translator.add_translator('america') do |type, thing|
+      'america'
+    end
+
+    assert_equal [[nil, 'america']], @db.execute("select * from bar")
+  end
+
   def test_type_translation_with_null_column
     @db.type_translation = true
     @db.execute "create table bar ( a integer, b time, c string )"

data/test/test_statement.rb

@@ -7,11 +7,15 @@ module SQLite3
       @stmt = SQLite3::Statement.new(@db, "select 'foo'")
     end
 
+    ###
+    # This method may not exist depending on how sqlite3 was compiled
     def test_database_name
       @db.execute('create table foo(text BLOB)')
       @db.execute('insert into foo(text) values (?)',SQLite3::Blob.new('hello'))
       stmt = @db.prepare('select text from foo')
-      assert_equal 'main', stmt.database_name(0)
+      if stmt.respond_to?(:database_name)
+        assert_equal 'main', stmt.database_name(0)
+      end
     end
 
     def test_prepare_blob
@@ -189,5 +193,15 @@ module SQLite3
       stmt = SQLite3::Statement.new(@db, "select ?, ?, ?")
       assert_equal 3, stmt.bind_parameter_count
     end
+
+    def test_execute_with_varargs
+      stmt = @db.prepare('select ?, ?')
+      assert_equal [[nil, nil]], stmt.execute(nil, nil).to_a
+    end
+
+    def test_execute_with_hash
+      stmt = @db.prepare('select :n, :h')
+      assert_equal [[10, nil]], stmt.execute('n' => 10, 'h' => nil).to_a
+    end
   end
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 3
   - 0
   - beta
-  - 1
-  version: 1.3.0.beta.1
+  - 2
+  version: 1.3.0.beta.2
 platform: ruby
 authors: 
 - Jamis Buck
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 -03:00
+date: 2010-05-15 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,10 +117,13 @@ files:
 - lib/sqlite3/version.rb
 - setup.rb
 - tasks/faq.rake
+- tasks/gem.rake
 - tasks/native.rake
 - tasks/vendor_sqlite3.rake
 - test/helper.rb
 - test/test_database.rb
+- test/test_deprecated.rb
+- test/test_encoding.rb
 - test/test_integration.rb
 - test/test_integration_open_close.rb
 - test/test_integration_pending.rb
@@ -129,7 +132,7 @@ files:
 - test/test_sqlite3.rb
 - test/test_statement.rb
 has_rdoc: true
-homepage: http://sqlite3-ruby.rubyforge.org
+homepage: http://github.com/luislavena/sqlite3-ruby
 licenses: []
 
 post_install_message: 
@@ -170,6 +173,7 @@ test_files:
 - test/test_integration.rb
 - test/test_statement.rb
 - test/test_integration_pending.rb
+- test/test_deprecated.rb
 - test/test_integration_statement.rb
 - test/test_encoding.rb
 - test/test_integration_resultset.rb