sequel 2.9.0 → 2.10.0

data/lib/sequel_core/adapters/shared/sqlite.rb

@@ -5,6 +5,7 @@ module Sequel
       SYNCHRONOUS = {'0' => :off, '1' => :normal, '2' => :full}.freeze
       TABLES_FILTER = "type = 'table' AND NOT name = 'sqlite_sequence'"
       TEMP_STORE = {'0' => :default, '1' => :file, '2' => :memory}.freeze
+      TYPES = Sequel::Schema::SQL::TYPES.merge(Bignum=>'integer')
       
       # Run all alter_table commands in a transaction.  This is technically only
       # needed for drop column.
@@ -68,8 +69,15 @@ module Sequel
       end
       
       # Array of symbols specifying the table names in the current database.
-      def tables
-        self[:sqlite_master].filter(TABLES_FILTER).map {|r| r[:name].to_sym}
+      #
+      # Options:
+      # * :server - Set the server to use.
+      def tables(opts={})
+        ds = self[:sqlite_master].server(opts[:server]).filter(TABLES_FILTER)
+        ds.identifier_output_method = nil
+        ds.identifier_input_method = nil
+        ds2 = dataset
+        ds.map{|r| ds2.send(:output_identifier, r[:name])}
       end
       
       # A symbol signifying the value of the temp_store PRAGMA.
@@ -85,21 +93,22 @@ module Sequel
       
       private
       
-      # SQLite folds unquoted identifiers to lowercase, so it shouldn't need to upcase identifiers by default.
-      def upcase_identifiers_default
-        false
+      # SQLite folds unquoted identifiers to lowercase, so it shouldn't need to upcase identifiers on input.
+      def identifier_input_method_default
+        nil
       end
-
-      # SQLite supports schema parsing using the table_info PRAGMA, so
-      # parse the output of that into the format Sequel expects.
-      def schema_parse_table(table_name, opts)
-        parse_pragma(table_name, opts).map do |row|
-          [row.delete(:name).to_sym, row]
-        end
+      
+      # SQLite folds unquoted identifiers to lowercase, so it shouldn't need to upcase identifiers on output.
+      def identifier_output_method_default
+        nil
       end
 
+      # Parse the output of the table_info pragma
       def parse_pragma(table_name, opts)
-        self["PRAGMA table_info(?)", table_name].map do |row|
+        ds2 = dataset
+        ds = self["PRAGMA table_info(?)", ds2.send(:input_identifier, table_name)]
+        ds.identifier_output_method = nil
+        ds.map do |row|
           row.delete(:cid)
           row[:allow_null] = row.delete(:notnull).to_i == 0
           row[:default] = row.delete(:dflt_value)
@@ -110,6 +119,20 @@ module Sequel
           row
         end
       end
+      
+      # SQLite supports schema parsing using the table_info PRAGMA, so
+      # parse the output of that into the format Sequel expects.
+      def schema_parse_table(table_name, opts)
+        ds = dataset
+        parse_pragma(table_name, opts).map do |row|
+          [ds.send(:output_identifier, row.delete(:name)), row]
+        end
+      end
+      
+      # Override the standard type conversions with SQLite specific ones
+      def type_literal_base(column)
+        TYPES[column[:type]]
+      end
     end
     
     # Instance methods for datasets that connect to an SQLite database
@@ -132,20 +155,12 @@ module Sequel
       end
       
       # SQLite performs a TRUNCATE style DELETE if no filter is specified.
-      # Since we want to always return the count of records, do a specific
-      # count in the case of no filter.
+      # Since we want to always return the count of records, add a condition
+      # that is always true and then delete.
       def delete(opts = {})
         # check if no filter is specified
         opts = @opts.merge(opts)
-        unless opts[:where]
-          @db.transaction(opts[:server]) do
-            unfiltered_count = count
-            execute_dui(delete_sql(opts))
-            unfiltered_count
-          end
-        else
-          execute_dui(delete_sql(opts))
-        end
+        super(opts[:where] ? opts : opts.merge(:where=>{1=>1}))
       end
       
       # Insert the values into the database.

data/lib/sequel_core/adapters/sqlite.rb

@@ -46,6 +46,12 @@ module Sequel
         db.translator.add_translator("decimal", &prok)
         db.translator.add_translator("money", &prok)
         
+        # Handle floating point values with Float
+        prok = proc{|t,v| Float(v) rescue v}
+        db.translator.add_translator("float", &prok)
+        db.translator.add_translator("real", &prok)
+        db.translator.add_translator("double precision", &prok)
+        
         db
       end
       
@@ -82,10 +88,14 @@ module Sequel
           return yield(conn) if conn.transaction_active?
           begin
             result = nil
+            log_info('Transaction.begin')
             conn.transaction{result = yield(conn)}
             result
           rescue ::Exception => e
+            log_info('Transaction.rollback')
             transaction_error(e, SQLite3::Exception)
+          ensure
+            log_info('Transaction.commit') unless e
           end
         end
       end
@@ -191,7 +201,7 @@ module Sequel
       # Yield a hash for each row in the dataset.
       def fetch_rows(sql)
         execute(sql) do |result|
-          @columns = result.columns.map {|c| c.to_sym}
+          @columns = result.columns.map{|c| output_identifier(c)}
           column_count = @columns.size
           result.each do |values|
             row = {}

data/lib/sequel_core/connection_pool.rb

@@ -156,9 +156,17 @@ class Sequel::ConnectionPool
   # the server is less than the maximum size of the pool.
   def make_new(server)
     if @created_count[server] < @max_size
+      raise(Sequel::Error, "No connection proc specified") unless @connection_proc
+      begin
+        conn = @connection_proc.call(server)
+      rescue Exception=>exception
+        e = Sequel::DatabaseConnectionError.new("#{exception.class} #{exception.message}")
+        e.set_backtrace(exception.backtrace)
+        raise e
+      end
+      raise(Sequel::DatabaseConnectionError, "Connection parameters not valid") unless conn
       set_created_count(server, @created_count[server] + 1)
-      @connection_proc ? @connection_proc.call(server) : \
-        (raise Error, "No connection proc specified")
+      conn
     end
   end
   

data/lib/sequel_core/core_sql.rb

@@ -157,7 +157,14 @@ end
 class Symbol
   include Sequel::SQL::QualifyingMethods
   include Sequel::SQL::IdentifierMethods
-  include Sequel::SQL::GenericExpressionMethods
+  include Sequel::SQL::AliasMethods
+  include Sequel::SQL::CastMethods
+  include Sequel::SQL::OrderMethods
+  include Sequel::SQL::BooleanMethods
+  include Sequel::SQL::NumericMethods
+  include Sequel::SQL::StringMethods
+  include Sequel::SQL::ComplexExpressionMethods
+  include Sequel::SQL::InequalityMethods if RUBY_VERSION < '1.9.0'
 
   # If no argument is given, returns a Sequel::SQL::ColumnAll object specifying all
   # columns for this table.
@@ -169,10 +176,13 @@ class Symbol
   end
 
   # Returns a Sequel::SQL::Function  with this as the function name,
-  # and the given arguments.
-  def [](*args)
+  # and the given arguments. This is aliased as Symbol#[] if ruby 1.9
+  # is not being used.  ruby 1.9 includes Symbol#[], and Sequel
+  # doesn't override methods defined by ruby itself.
+  def sql_function(*args)
     Sequel::SQL::Function.new(self, *args)
   end
+  alias_method(:[], :sql_function) if RUBY_VERSION < '1.9.0'
 
   # If the given argument is an Integer or an array containing an Integer, returns
   # a Sequel::SQL::Subscript with this column and the given arg.

data/lib/sequel_core/database.rb

@@ -14,7 +14,7 @@ module Sequel
     include Schema::SQL
 
     # Array of supported database adapters
-    ADAPTERS = %w'ado db2 dbi informix jdbc mysql odbc openbase oracle postgres sqlite'.collect{|x| x.to_sym}
+    ADAPTERS = %w'ado db2 dbi do firebird informix jdbc mysql odbc openbase oracle postgres sqlite'.collect{|x| x.to_sym}
 
     SQL_BEGIN = 'BEGIN'.freeze
     SQL_COMMIT = 'COMMIT'.freeze
@@ -22,22 +22,25 @@ module Sequel
 
     # Hash of adapters that have been used
     @@adapters = Hash.new
+    
+    # The identifier input method to use by default
+    @@identifier_input_method = nil
+
+    # The identifier output method to use by default
+    @@identifier_output_method = nil
 
     # Whether to use the single threaded connection pool by default
     @@single_threaded = false
 
     # Whether to quote identifiers (columns and tables) by default
-    @@quote_identifiers = true
-
-    # Whether to upcase identifiers (columns and tables) by default
-    @@upcase_identifiers = nil
+    @@quote_identifiers = nil
 
     # The default schema to use
     attr_accessor :default_schema
 
     # Array of SQL loggers to use for this database
     attr_accessor :loggers
-
+    
     # The options for this database
     attr_reader :opts
     
@@ -46,12 +49,6 @@ module Sequel
 
     # The prepared statement objects for this database, keyed by name
     attr_reader :prepared_statements
-
-    # Whether to quote identifiers (columns and tables) for this database
-    attr_writer :quote_identifiers
-    
-    # Whether to upcase identifiers (columns and tables) for this database
-    attr_writer :upcase_identifiers
     
     # Constructs a new instance of a database connection with the specified
     # options hash.
@@ -61,21 +58,26 @@ module Sequel
     # Takes the following options:
     # * :default_schema : The default schema to use, should generally be nil
     # * :disconnection_proc: A proc used to disconnect the connection.
+    # * :identifier_input_method: A string method symbol to call on identifiers going into the database
+    # * :identifier_output_method: A string method symbol to call on identifiers coming from the database
     # * :loggers : An array of loggers to use.
     # * :quote_identifiers : Whether to quote identifiers
     # * :single_threaded : Whether to use a single-threaded connection pool
+    # * :upcase_identifiers : Whether to upcase identifiers going into the database
     #
     # All options given are also passed to the ConnectionPool.  If a block
     # is given, it is used as the connection_proc for the ConnectionPool.
     def initialize(opts = {}, &block)
-      @opts = opts
+      @opts ||= opts
       
-      @quote_identifiers = opts.include?(:quote_identifiers) ? opts[:quote_identifiers] : @@quote_identifiers
       @single_threaded = opts.include?(:single_threaded) ? opts[:single_threaded] : @@single_threaded
       @schemas = nil
-      @default_schema = opts[:default_schema]
+      @default_schema = opts.include?(:default_schema) ? opts[:default_schema] : default_schema_default
       @prepared_statements = {}
       @transactions = []
+      if opts.include?(:upcase_identifiers)
+        @identifier_input_method = opts[:upcase_identifiers] ? :upcase : ""
+      end
       @pool = (@single_threaded ? SingleThreadedPool : ConnectionPool).new(connection_pool_default_options.merge(opts), &block)
       @pool.connection_proc = proc{|server| connect(server)} unless block
       @pool.disconnection_proc = proc{|conn| disconnect_connection(conn)} unless opts[:disconnection_proc]
@@ -119,6 +121,9 @@ module Sequel
         if conn_string =~ /\Ajdbc:/
           c = adapter_class(:jdbc)
           opts = {:uri=>conn_string}.merge(opts)
+        elsif conn_string =~ /\Ado:/
+          c = adapter_class(:do)
+          opts = {:uri=>conn_string}.merge(opts)
         else
           uri = URI.parse(conn_string)
           scheme = uri.scheme
@@ -150,6 +155,26 @@ module Sequel
         c.new(opts)
       end
     end
+    
+    # The method to call on identifiers going into the database
+    def self.identifier_input_method
+      @@identifier_input_method
+    end
+    
+    # Set the method to call on identifiers going into the database
+    def self.identifier_input_method=(v)
+      @@identifier_input_method = v || ""
+    end
+    
+    # The method to call on identifiers coming from the database
+    def self.identifier_output_method
+      @@identifier_output_method
+    end
+    
+    # Set the method to call on identifiers coming from the database
+    def self.identifier_output_method=(v)
+      @@identifier_output_method = v || ""
+    end
 
     # Sets the default quote_identifiers mode for new databases.
     # See Sequel.quote_identifiers=.
@@ -166,7 +191,7 @@ module Sequel
     # Sets the default quote_identifiers mode for new databases.
     # See Sequel.quote_identifiers=.
     def self.upcase_identifiers=(value)
-      @@upcase_identifiers = value
+      self.identifier_input_method = value ? :upcase : nil
     end
 
     ### Private Class Methods ###
@@ -262,6 +287,12 @@ module Sequel
       execute(sql, opts, &block)
     end
 
+    # Method that should be used when issuing a INSERT
+    # statement.  By default, calls execute_dui.
+    def execute_insert(sql, opts={}, &block)
+      execute_dui(sql, opts, &block)
+    end
+
     # Fetches records for an arbitrary SQL statement. If a block is given,
     # it is used to iterate over the records:
     #
@@ -296,11 +327,49 @@ module Sequel
     #   DB.get(1) #=> 1 
     #
     #   # SELECT version()
-    #   DB.get(:version[]) #=> ...
+    #   DB.get(:version.sql_function) #=> ...
     def get(expr)
       dataset.get(expr)
     end
     
+    # The method to call on identifiers going into the database
+    def identifier_input_method
+      case @identifier_input_method
+      when nil
+        @identifier_input_method = @opts.include?(:identifier_input_method) ? @opts[:identifier_input_method] : (@@identifier_input_method.nil? ? identifier_input_method_default : @@identifier_input_method)
+        @identifier_input_method == "" ? nil : @identifier_input_method
+      when ""
+        nil
+      else
+        @identifier_input_method
+      end
+    end
+    
+    # Set the method to call on identifiers going into the database
+    def identifier_input_method=(v)
+      reset_schema_utility_dataset
+      @identifier_input_method = v || ""
+    end
+    
+    # The method to call on identifiers coming from the database
+    def identifier_output_method
+      case @identifier_output_method
+      when nil
+        @identifier_output_method = @opts.include?(:identifier_output_method) ? @opts[:identifier_output_method] : (@@identifier_output_method.nil? ? identifier_output_method_default : @@identifier_output_method)
+        @identifier_output_method == "" ? nil : @identifier_output_method
+      when ""
+        nil
+      else
+        @identifier_output_method
+      end
+    end
+    
+    # Set the method to call on identifiers coming from the database
+    def identifier_output_method=(v)
+      reset_schema_utility_dataset
+      @identifier_output_method = v || ""
+    end
+    
     # Returns a string representation of the database object including the
     # class name and the connection URI (or the opts if the URI
     # cannot be constructed).
@@ -336,9 +405,16 @@ module Sequel
       dataset.query(&block)
     end
     
+    # Whether to quote identifiers (columns and tables) for this database
+    def quote_identifiers=(v)
+      reset_schema_utility_dataset
+      @quote_identifiers = v
+    end
+    
     # Returns true if the database quotes identifiers.
     def quote_identifiers?
-      @quote_identifiers
+      return @quote_identifiers unless @quote_identifiers.nil?
+      @quote_identifiers = @opts.include?(:quote_identifiers) ? @opts[:quote_identifiers] : (@@quote_identifiers.nil? ? quote_identifiers_default : @@quote_identifiers)
     end
     
     # Returns a new dataset with the select method invoked.
@@ -348,7 +424,7 @@ module Sequel
     
     # Default serial primary key options.
     def serial_primary_key_options
-      {:primary_key => true, :type => :integer, :auto_increment => true}
+      {:primary_key => true, :type => Integer, :auto_increment => true}
     end
     
     # Returns true if the database is using a single-threaded connection pool.
@@ -485,11 +561,15 @@ module Sequel
         value
       end
     end
+    
+    # Set whether to upcase identifiers going into the database.
+    def upcase_identifiers=(v)
+      self.identifier_input_method = v ? :upcase : nil
+    end
 
     # Returns true if the database upcases identifiers.
     def upcase_identifiers?
-      return @upcase_identifiers unless @upcase_identifiers.nil?
-      @upcase_identifiers = @opts.include?(:upcase_identifiers) ? @opts[:upcase_identifiers] : (@@upcase_identifiers.nil? ? upcase_identifiers_default : @@upcase_identifiers)
+      identifier_input_method == :upcase
     end
     
     # Returns the URI identifying the database.
@@ -511,7 +591,11 @@ module Sequel
       uri.password = @opts[:password] if uri.user
       uri.to_s
     end
-    alias_method :url, :uri
+    
+    # Explicit alias of uri for easier subclassing.
+    def url
+      uri
+    end
     
     private
     
@@ -530,6 +614,31 @@ module Sequel
       {}
     end
     
+    # The default value for default_schema.
+    def default_schema_default
+      nil
+    end
+
+    # The method to apply to identifiers going into the database by default.
+    # Should be overridden in subclasses for databases that fold unquoted
+    # identifiers to lower case instead of uppercase, such as
+    # MySQL, PostgreSQL, and SQLite.
+    def identifier_input_method_default
+      :upcase
+    end
+    
+    # The method to apply to identifiers coming the database by default.
+    # Should be overridden in subclasses for databases that fold unquoted
+    # identifiers to lower case instead of uppercase, such as
+    # MySQL, PostgreSQL, and SQLite.
+    def identifier_output_method_default
+      :downcase
+    end
+    
+    def quote_identifiers_default
+      true
+    end
+
     # SQL to ROLLBACK a transaction.
     def rollback_transaction_sql
       SQL_ROLLBACK
@@ -576,14 +685,6 @@ module Sequel
     def transaction_error(e, *classes)
       raise_error(e, :classes=>classes) unless Error::Rollback === e
     end
-
-    # Sets whether to upcase identifiers by default.  Should be
-    # overridden in subclasses for databases that fold unquoted
-    # identifiers to lower case instead of uppercase, such as
-    # MySQL, PostgreSQL, and SQLite.
-    def upcase_identifiers_default
-      true
-    end
   end
 end