sqlite3-ruby 1.2.5-x86-mswin32 → 1.3.0.beta.1-x86-mswin32

data/lib/sqlite3/errors.rb

@@ -1,7 +1,6 @@
 require 'sqlite3/constants'
 
 module SQLite3
-
   class Exception < ::StandardError
     @code = 0
 
@@ -42,27 +41,4 @@ module SQLite3
   class FormatException < Exception; end
   class RangeException < Exception; end
   class NotADatabaseException < Exception; end
-
-  EXCEPTIONS = [
-    nil,
-    SQLException, InternalException, PermissionException,
-    AbortException, BusyException, LockedException, MemoryException,
-    ReadOnlyException, InterruptException, IOException, CorruptException,
-    NotFoundException, FullException, CantOpenException, ProtocolException,
-    EmptyException, SchemaChangedException, TooBigException,
-    ConstraintException, MismatchException, MisuseException,
-    UnsupportedException, AuthorizationException, FormatException,
-    RangeException, NotADatabaseException
-  ].each_with_index { |e,i| e.instance_variable_set( :@code, i ) if e }
-
-  module Error
-    def check( result, db=nil, msg=nil )
-      unless result == Constants::ErrorCode::OK
-        msg = ( msg ? msg + ": " : "" ) + db.errmsg if db
-        raise(( EXCEPTIONS[result] || SQLite3::Exception ), msg)
-      end
-    end
-    module_function :check
-  end
-
 end

data/lib/sqlite3/pragmas.rb

@@ -213,16 +213,24 @@ module SQLite3
       get_query_pragma "index_list", table, &block
     end
 
-    def table_info( table, &block ) # :yields: row
-      columns, *rows = execute2("PRAGMA table_info(#{table})")
+    ###
+    # Returns information about +table+.  Yields each row of table information
+    # if a block is provided.
+    def table_info table
+      stmt    = prepare "PRAGMA table_info(#{table})"
+      columns = stmt.columns
 
-      needs_tweak_default = version_compare(driver.libversion, "3.3.7") > 0
+      needs_tweak_default =
+        version_compare(SQLite3.libversion.to_s, "3.3.7") > 0
 
       result = [] unless block_given?
-      rows.each do |row|
-        new_row = {}
-        columns.each_with_index do |name, index|
-          new_row[name] = row[index]
+      stmt.each do |row|
+        new_row = Hash[*columns.zip(row).flatten]
+
+        # FIXME: This should be removed but is required for older versions
+        # of rails
+        if(Object.const_defined?(:ActiveRecord))
+          new_row['notnull'] = new_row['notnull'].to_s
         end
 
         tweak_default(new_row) if needs_tweak_default
@@ -233,6 +241,7 @@ module SQLite3
           result << new_row
         end
       end
+      stmt.close
 
       result
     end

data/lib/sqlite3/resultset.rb

@@ -31,46 +31,22 @@ module SQLite3
 
     # Create a new ResultSet attached to the given database, using the
     # given sql text.
-    def initialize( db, stmt )
-      @db = db
-      @driver = @db.driver
+    def initialize db, stmt
+      @db   = db
       @stmt = stmt
-      commence
     end
 
-    # A convenience method for compiling the virtual machine and stepping
-    # to the first row of the result set.
-    def commence
-      result = @driver.step( @stmt.handle )
-      if result == Constants::ErrorCode::ERROR
-        @driver.reset( @stmt.handle )
-      end
-      check result
-      @first_row = true
-    end
-    private :commence
-
-    def check( result )
-      @eof = ( result == Constants::ErrorCode::DONE )
-      found = ( result == Constants::ErrorCode::ROW )
-      Error.check( result, @db ) unless @eof || found
-    end
-    private :check
-
     # Reset the cursor, so that a result set which has reached end-of-file
     # can be rewound and reiterated.
     def reset( *bind_params )
-      @stmt.must_be_open!
-      @stmt.reset!(false)
-      @driver.reset( @stmt.handle )
+      @stmt.reset!
       @stmt.bind_params( *bind_params )
       @eof = false
-      commence
     end
 
     # Query whether the cursor has reached the end of the result set or not.
     def eof?
-      @eof
+      @stmt.done?
     end
 
     # Obtain the next row from the cursor. If there are no more rows to be
@@ -87,70 +63,38 @@ module SQLite3
     # For hashes, the column names are the keys of the hash, and the column
     # types are accessible via the +types+ property.
     def next
-      return nil if @eof
-
-      @stmt.must_be_open!
-
-      unless @first_row
-        result = @driver.step( @stmt.handle )
-        check result
-      end
-
-      @first_row = false
-
-      unless @eof
-        row = []
-        @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
-            row << nil
-          elsif type == Constants::ColumnType::BLOB
-            row << @driver.column_blob( @stmt.handle, column )
-          else
-            row << @driver.column_text( @stmt.handle, column )
-          end
-        end
+      row = @stmt.step
+      return nil if @stmt.done?
 
-        if @db.type_translation
-          row = @stmt.types.zip( row ).map do |type, value|
-            @db.translator.translate( type, value )
-          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 ) ]
-          row.each_with_index { |value,idx|
-            value.taint
-            new_row[idx] = value
-          }
-          row = new_row
+      if @db.results_as_hash
+        new_row = HashWithTypes[*@stmt.columns.zip(row).flatten]
+        row.each_with_index { |value,idx|
+          new_row[idx] = value
+        }
+        row = new_row
+      else
+        if row.respond_to?(:fields)
+          row = ArrayWithTypes.new(row)
         else
-          if row.respond_to?(:fields)
-            row = ArrayWithTypes.new(row)
-          else
-            row = ArrayWithTypesAndFields.new(row)
-          end
-          row.fields = @stmt.columns
-          row.each { |column| column.taint }
+          row = ArrayWithTypesAndFields.new(row)
         end
-
-        row.types = @stmt.types
-
-        return row
+        row.fields = @stmt.columns
       end
 
-      nil
+      row.types = @stmt.types
+      row
     end
 
     # Required by the Enumerable mixin. Provides an internal iterator over the
     # rows of the result set.
-    def each
-      while row=self.next
-        yield row
-      end
+    def each( &block )
+      @stmt.each(&block)
     end
 
     # Closes the statement that spawned this result set.

data/lib/sqlite3/statement.rb

@@ -8,51 +8,17 @@ class String
 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.
   class Statement
+    include Enumerable
 
     # This is any text that followed the first valid SQL statement in the text
     # with which the statement was initialized. If there was no trailing text,
     # this will be the empty string.
     attr_reader :remainder
 
-    # The underlying opaque handle used to access the SQLite @driver.
-    attr_reader :handle
-
-    # Create a new statement attached to the given Database instance, and which
-    # 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 )
-      raise ArgumentError, "nil argument passed as sql text" unless sql
-      @db = db
-      @driver = @db.driver
-      @closed = false
-      @results = @columns = nil
-      result, @handle, @remainder = @driver.prepare( @db.handle, sql )
-      Error.check( result, @db )
-    end
-
-    # Closes the statement by finalizing the underlying statement
-    # handle. The statement must not be used after being closed.
-    def close
-      must_be_open!
-      @closed = true
-      @driver.finalize( @handle )
-    end
-
-    # Returns true if the underlying statement has been closed.
-    def closed?
-      @closed
-    end
-
     # Binds the given variables to the corresponding placeholders in the SQL
     # text.
     #
@@ -78,42 +44,6 @@ module SQLite3
       end
     end
 
-    # Binds value to the named (or positional) placeholder. If +param+ is a
-    # Fixnum, it is treated as an index for a positional placeholder.
-    # Otherwise it is used as the name of the placeholder to bind to.
-    #
-    # See also #bind_params.
-    def bind_param( param, value )
-      must_be_open!
-      reset! if active?
-      if Fixnum === param
-        case value
-          when Bignum then
-            @driver.bind_int64( @handle, param, value )
-          when Integer then
-            if value >= (2 ** 31)
-              @driver.bind_int64( @handle, param, value )
-            else
-              @driver.bind_int( @handle, param, value )
-            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 )
-        end
-      else
-        param = param.to_s
-        param = ":#{param}" unless param[0] == ?:
-        index = @driver.bind_parameter_index( @handle, param )
-        raise Exception, "no such bind parameter '#{param}'" if index == 0
-        bind_param index, value
-      end
-    end
-
     # Execute the statement. This creates a new ResultSet object for the
     # statement's virtual machine. If a block was given, the new ResultSet will
     # be yielded to it; otherwise, the ResultSet will be returned.
@@ -129,17 +59,13 @@ module SQLite3
     #
     # See also #bind_params, #execute!.
     def execute( *bind_vars )
-      must_be_open!
-      reset! if active?
+      reset! if active? || done?
 
       bind_params(*bind_vars) unless bind_vars.empty?
-      @results = ResultSet.new( @db, self )
+      @results = ResultSet.new(@connection, self)
 
-      if block_given?
-        yield @results
-      else
-        return @results
-      end
+      yield @results if block_given?
+      @results
     end
 
     # Execute the statement. If no block was given, this returns an array of
@@ -156,30 +82,15 @@ module SQLite3
     #   end
     #
     # See also #bind_params, #execute.
-    def execute!( *bind_vars )
-      result = execute( *bind_vars )
-      rows = [] unless block_given?
-      while row = result.next
-        if block_given?
-          yield row
-        else
-          rows << row
-        end
-      end
-      rows
-    end
-
-    # Resets the statement. This is typically done internally, though it might
-    # occassionally be necessary to manually reset the statement.
-    def reset!(clear_result=true)
-      @driver.reset(@handle)
-      @results = nil if clear_result
+    def execute!( *bind_vars, &block )
+      execute(*bind_vars)
+      block_given? ? each(&block) : to_a
     end
 
     # Returns true if the statement is currently active, meaning it has an
     # open result set.
     def active?
-      not @results.nil?
+      !done?
     end
 
     # Return an array of the column names for this statement. Note that this
@@ -190,11 +101,20 @@ module SQLite3
       return @columns
     end
 
+    def each
+      loop do
+        val = step
+        break self if done?
+        yield val
+      end
+    end
+
     # Return an array of the data types for each column in this statement. Note
     # that this may execute the statement in order to obtain the metadata; this
     # makes it a (potentially) expensive operation.
     def types
-      get_metadata unless defined?(@types)
+      must_be_open!
+      get_metadata unless @types
       @types
     end
 
@@ -202,15 +122,12 @@ module SQLite3
     # that this will actually execute the SQL, which means it can be a
     # (potentially) expensive operation.
     def get_metadata
-      must_be_open!
-
       @columns = []
       @types = []
 
-      column_count = @driver.column_count( @handle )
       column_count.times do |column|
-        @columns << @driver.column_name( @handle, column )
-        @types << @driver.column_decltype( @handle, column )
+        @columns << column_name(column)
+        @types << column_decltype(column)
       end
 
       @columns.freeze
@@ -221,11 +138,9 @@ module SQLite3
     # Performs a sanity check to ensure that the statement is not
     # closed. If it is, an exception is raised.
     def must_be_open! # :nodoc:
-      if @closed
+      if closed?
         raise SQLite3::Exception, "cannot use a closed statement"
       end
     end
-
   end
-
 end

data/lib/sqlite3/version.rb

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

data/setup.rb

@@ -481,7 +481,7 @@ module FileOperations
   end
 
   def extdir?(dir)
-    File.exist?(dir + '/MANIFEST')
+    File.exist?(dir + '/MANIFEST') or File.exist?("#{dir}/extconf.rb")
   end
 
   def all_files_in(dirname)
@@ -1149,7 +1149,7 @@ class Installer
   def install_dir_ext(rel)
     return unless extdir?(curr_srcdir())
     install_files ruby_extentions('.'),
-                  "#{config('so-dir')}/#{File.dirname(rel)}",
+                  "#{config('so-dir')}/#{rel}",
                   0555
   end