luislavena-sqlite3-ruby 1.2.4.1 → 1.2.5

data/History.txt

@@ -1,4 +1,14 @@
-=== 1.2.4.1 / 5 Jul 2009
+=== 1.2.5 / 25 Jul 2009
+
+* Check for illegal nil before executing SQL [Erik Veenstra]
+* Switch to Hoe for gem task management and packaging.
+* Advertise rake-compiler as development dependency.
+* Build gem binaries for Windows.
+* Improved Ruby 1.9 support compatibility.
+* Taint returned values. Patch #20325.
+
+
+=== 1.2.4.1 (internal) / 5 Jul 2009
 
 * Check for illegal nil before executing SQL [Erik Veenstra]
 * Switch to Hoe for gem task management and packaging.

data/Manifest.txt

@@ -7,7 +7,6 @@ Rakefile
 ext/sqlite3_api/extconf.rb
 ext/sqlite3_api/sqlite3_api.i
 ext/sqlite3_api/sqlite3_api_wrap.c
-ext/sqlite3_api/win32/build.bat
 faq/faq.rb
 faq/faq.yml
 lib/sqlite3.rb

data/lib/sqlite3/database.rb

@@ -12,14 +12,12 @@ module SQLite3
   #
   #   require 'sqlite3'
   #
-  #   db = SQLite3::Database.new( "data.db" )
-  #
-  #   db.execute( "select * from table" ) do |row|
-  #     p row
+  #   SQLite3::Database.new( "data.db" ) do |db|
+  #     db.execute( "select * from table" ) do |row|
+  #       p row
+  #     end
   #   end
   #
-  #   db.close
-  #
   # It wraps the lower-level methods provides by the selected driver, and
   # includes the Pragmas module for access to various pragma convenience
   # methods.
@@ -69,7 +67,7 @@ module SQLite3
     #
     # By default, the new database will return result rows as arrays
     # (#results_as_hash) and has type translation disabled (#type_translation=).
-    def initialize( file_name, options={} )
+    def initialize( file_name, options={} ) # :yields: db
       utf16 = options.fetch(:utf16, false)
       load_driver( options[:driver] )
 
@@ -83,6 +81,14 @@ module SQLite3
       @type_translation = options.fetch(:type_translation,false)
       @translator = nil
       @transaction_active = false
+      
+      if block_given?
+        begin
+          yield self
+        ensure
+          self.close
+        end
+      end
     end
 
     # Return +true+ if the string is a valid (ie, parsable) SQL statement, and

data/lib/sqlite3/resultset.rb

@@ -122,7 +122,10 @@ module SQLite3
 
         if @db.results_as_hash
           new_row = HashWithTypes[ *( @stmt.columns.zip( row ).to_a.flatten ) ]
-          row.each_with_index { |value,idx| new_row[idx] = value }
+          row.each_with_index { |value,idx|
+            value.taint
+            new_row[idx] = value
+          }
           row = new_row
         else
           if row.respond_to?(:fields)
@@ -131,6 +134,7 @@ module SQLite3
             row = ArrayWithTypesAndFields.new(row)
           end
           row.fields = @stmt.columns
+          row.each { |column| column.taint }
         end
 
         row.types = @stmt.types

data/lib/sqlite3/statement.rb

@@ -194,8 +194,8 @@ module SQLite3
     # that this may execute the statement in order to obtain the metadata; this
     # makes it a (potentially) expensive operation.
     def types
-      get_metadata unless @types
-      return @types
+      get_metadata unless defined?(@types)
+      @types
     end
 
     # A convenience method for obtaining the metadata about the query. Note

data/lib/sqlite3/version.rb

@@ -4,13 +4,13 @@ module SQLite3
 
     MAJOR = 1
     MINOR = 2
-    TINY  = 4
-    BUILD = 1
+    TINY  = 5
+    BUILD = nil
 
-    STRING = [ MAJOR, MINOR, TINY, BUILD ].join( "." )
+    STRING = [ MAJOR, MINOR, TINY, BUILD ].compact.join( "." )
     #:beta-tag:
 
-    VERSION = '1.2.4.1'
+    VERSION = '1.2.5'
   end
 
 end

data/tasks/gem.rake

@@ -23,7 +23,7 @@ HOE = Hoe.spec 'sqlite3-ruby' do
   clean_globs.push('**/test.db')
 end
 
-file "#{HOE.spec.name}.gemspec" => ['Rakefile', 'tasks/gem.rake'] do |t|
+file "#{HOE.spec.name}.gemspec" => ['Rakefile', 'tasks/gem.rake', 'lib/sqlite3/version.rb'] do |t|
   puts "Generating #{t.name}"
   File.open(t.name, 'w') { |f| f.puts HOE.spec.to_yaml }
 end

data/test/test_database.rb

@@ -11,6 +11,18 @@ class TC_Database_Init < Test::Unit::TestCase
     assert !db.results_as_hash
     assert !db.type_translation
   end
+  
+  def test_new_with_block
+    driver = Driver.new
+    driver.expects(:open).once.with('foo.db', false).returns([0, 'cookie'])
+    Driver.stubs(:new).returns(driver)
+    returned_db = SQLite3::Database.new( "foo.db", :driver => Driver ) do |db|
+      assert !db.closed?
+      assert !db.results_as_hash
+      assert !db.type_translation
+    end
+    assert returned_db.closed?
+  end
 
   def test_open
     driver = Driver.new
@@ -22,6 +34,18 @@ class TC_Database_Init < Test::Unit::TestCase
     assert !db.type_translation
   end
   
+  def test_open_with_block
+    driver = Driver.new
+    driver.expects(:open).once.with('foo.db', false).returns([0, 'cookie'])
+    Driver.stubs(:new).returns(driver)
+    returned_db = SQLite3::Database.open( "foo.db", :driver => Driver ) do |db|
+      assert !db.closed?
+      assert !db.results_as_hash
+      assert !db.type_translation
+    end
+    assert returned_db.closed?
+  end
+  
   def test_with_type_translation
     db = SQLite3::Database.open( "foo.db", :driver => Driver,
       :type_translation => true )

data/test/test_integration_resultset.rb

@@ -105,6 +105,23 @@ class TC_ResultSet < Test::Unit::TestCase
       @result.next )
   end
 
+  def test_tainted_results_as_hash
+    @db.results_as_hash = true
+    @result.reset( 1 )
+    row = @result.next
+    row.each do |_, v|
+      assert_equal true, v.tainted?
+    end
+  end
+
+  def test_tainted_row_values
+    @result.reset( 1 )
+    row = @result.next
+    row.each do |v|
+      assert_equal true, v.tainted?
+    end
+  end
+
   def test_each
     called = 0
     @result.reset( 1, 2 )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: luislavena-sqlite3-ruby
 version: !ruby/object:Gem::Version 
-  version: 1.2.4.1
+  version: 1.2.5
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-04 20:00:00 -07:00
+date: 2009-07-24 20:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,7 +68,6 @@ files:
 - ext/sqlite3_api/extconf.rb
 - ext/sqlite3_api/sqlite3_api.i
 - ext/sqlite3_api/sqlite3_api_wrap.c
-- ext/sqlite3_api/win32/build.bat
 - faq/faq.rb
 - faq/faq.yml
 - lib/sqlite3.rb

data/ext/sqlite3_api/win32/build.bat

@@ -1,7 +0,0 @@
-REM This is not guaranteed to work, ever. It's just a little helper
-REM script that I threw together to help me build the win32 version of
-REM the library. If someone with more win32-fu than I wants to make
-REM something more robust, please feel free! I'd love to include it.
-REM -- Jamis Buck
-
-cl /LD /Ie:\WinSDK\Include /Ic:\ruby\lib\ruby\1.8\i386-mswin32 /Ic:\ruby\sqlite3 /Ic:\ruby\src\ruby-1.8.4_2006-04-14 sqlite3_api_wrap.c /link /LIBPATH:c:\ruby\sqlite3 /LIBPATH:e:\WinSDK\Lib /LIBPATH:c:\ruby\lib sqlite3.lib msvcrt-ruby18.lib