colincasey-sequel 2.10.1 → 2.10.2

data/CHANGELOG

@@ -1,5 +1,15 @@
 === HEAD
 
+* Optimize Model.[] by using static sql when possible, for a 30-40% speed increase (jeremyevans)
+
+* Add Dataset#with_sql, which returns a clone of the datatset with static SQL (jeremyevans)
+
+* Refactor Dataset#literal so it doesn't need to be overridden in subadapters, for a 20-25% performance increase (jeremyevans)
+
+* Remove SQL::IrregularFunction, no longer used internally (jeremyevans)
+
+* Allow String#lit to take arguments and return a SQL::PlaceholderLiteralString (jeremyevans)
+
 * Add Model#set_associated_object, used by the many_to_one setter method, for easier overriding (jeremyevans)
 
 * Allow use of database independent types when casting (jeremyevans)

data/lib/sequel_core/adapters/ado.rb

@@ -1,3 +1,4 @@
+require 'sequel_core/adapters/utils/date_format'
 require 'win32ole'
 
 module Sequel
@@ -61,6 +62,8 @@ module Sequel
     end
     
     class Dataset < Sequel::Dataset
+      include Dataset::SQLStandardDateFormat
+
       def fetch_rows(sql)
         execute(sql) do |s|
           @columns = s.Fields.extend(Enumerable).map do |column|

data/lib/sequel_core/adapters/db2.rb

@@ -75,17 +75,6 @@ module Sequel
     class Dataset < Sequel::Dataset
       MAX_COL_SIZE = 256
       
-      def literal(v)
-        case v
-        when Time
-          literal(v.iso8601)
-        when Date, DateTime
-          literal(v.to_s)
-        else
-          super
-        end
-      end
-
       def fetch_rows(sql)
         execute(sql) do |sth|
           @column_info = get_column_info(sth)

data/lib/sequel_core/adapters/dbi.rb

@@ -76,17 +76,6 @@ module Sequel
     end
     
     class Dataset < Sequel::Dataset
-      def literal(v)
-        case v
-        when Time
-          literal(v.iso8601)
-        when Date, DateTime
-          literal(v.to_s)
-        else
-          super
-        end
-      end
-
       def fetch_rows(sql, &block)
         execute(sql) do |s|
           begin

data/lib/sequel_core/adapters/do.rb

@@ -175,18 +175,6 @@ module Sequel
     
     # Dataset class for Sequel::DataObjects::Database objects.
     class Dataset < Sequel::Dataset
-      # Handle the usual time class overrides.
-      def literal(v)
-        case v
-        when Time
-          literal(v.iso8601)
-        when Date, DateTime
-          literal(v.to_s)
-        else
-          super
-        end
-      end
-      
       # Execute the SQL on the database and yield the rows as hashes
       # with symbol keys.
       def fetch_rows(sql)

data/lib/sequel_core/adapters/firebird.rb

@@ -1,4 +1,5 @@
 require 'fb'
+require 'sequel_core/adapters/utils/unsupported'
 
 module Sequel
   # The Sequel Firebird adapter requires the ruby fb driver located at
@@ -214,6 +215,7 @@ module Sequel
 
       BOOL_TRUE = '1'.freeze
       BOOL_FALSE = '0'.freeze
+      NULL = LiteralString.new('NULL').freeze
       COMMA_SEPARATOR = ', '.freeze
       FIREBIRD_TIMESTAMP_FORMAT = "TIMESTAMP '%Y-%m-%d %H:%M:%S".freeze
       SELECT_CLAUSE_ORDER = %w'distinct limit columns from join where group having compounds order'.freeze
@@ -249,7 +251,7 @@ module Sequel
       # Use the RETURNING clause to return the primary key of the inserted record, if it exists
       def insert_returning_pk_sql(*values)
         pk = db.primary_key(opts[:from].first)
-        insert_returning_sql(pk ? Sequel::SQL::Identifier.new(pk) : 'NULL'.lit, *values)
+        insert_returning_sql(pk ? Sequel::SQL::Identifier.new(pk) : NULL, *values)
       end
 
       # Use the RETURNING clause to return the columns listed in returning.
@@ -262,19 +264,6 @@ module Sequel
         single_record(default_server_opts(:naked=>true, :sql=>insert_returning_sql(nil, *values)))
       end
 
-      def literal(v)
-        case v
-        when Time, DateTime
-          "#{v.strftime(FIREBIRD_TIMESTAMP_FORMAT)}.#{sprintf("%04d",v.usec / 100)}'"
-        when TrueClass
-          BOOL_TRUE
-        when FalseClass
-          BOOL_FALSE
-        else
-          super
-        end
-      end
-
       # The order of clauses in the SELECT SQL statement
       def select_clause_order
         SELECT_CLAUSE_ORDER
@@ -293,6 +282,22 @@ module Sequel
           m
         end
       end
+
+      def literal_datetime(v)
+        "#{v.strftime(FIREBIRD_TIMESTAMP_FORMAT)}.#{sprintf("%04d",(v.sec_fraction * 864000000))}'"
+      end
+
+      def literal_false
+        BOOL_FALSE
+      end
+
+      def literal_time(v)
+        "#{v.strftime(FIREBIRD_TIMESTAMP_FORMAT)}.#{sprintf("%04d",v.usec / 100)}'"
+      end
+
+      def literal_true
+        BOOL_TRUE
+      end
     end
   end
 end

data/lib/sequel_core/adapters/informix.rb

@@ -1,3 +1,4 @@
+require 'sequel_core/adapters/utils/unsupported'
 require 'informix'
 
 module Sequel
@@ -39,17 +40,6 @@ module Sequel
 
       SELECT_CLAUSE_ORDER = %w'limit distinct columns from join where having group compounds order'.freeze
 
-      def literal(v)
-        case v
-        when Time
-          literal(v.iso8601)
-        when Date, DateTime
-          literal(v.to_s)
-        else
-          super
-        end
-      end
-
       def fetch_rows(sql, &block)
         execute(sql) do |cursor|
           begin

data/lib/sequel_core/adapters/jdbc/h2.rb

@@ -1,3 +1,5 @@
+require 'sequel_core/adapters/utils/date_format'
+
 module Sequel
   module JDBC
     # Database and Dataset support for H2 databases accessed via JDBC.
@@ -52,17 +54,7 @@ module Sequel
       
       # Dataset class for H2 datasets accessed via JDBC.
       class Dataset < JDBC::Dataset
-        # Use H2 syntax for Date, DateTime, and Time types.
-        def literal(v)
-          case v
-          when Date
-            v.strftime("DATE '%Y-%m-%d'") 
-          when DateTime, Time
-            v.strftime("TIMESTAMP '%Y-%m-%d %H:%M:%S'")
-          else
-            super
-          end
-        end
+        include Dataset::SQLStandardDateFormat
       end
     end
   end

data/lib/sequel_core/adapters/jdbc/mysql.rb

@@ -46,16 +46,6 @@ module Sequel
           execute_insert(insert_sql(*values))
         end
         
-        # Handle time types correctly
-        def literal(v)
-          case v
-          when Time, DateTime
-            v.strftime("'%Y-%m-%d %H:%M:%S'")
-          else
-            super
-          end
-        end
-        
         # Use execute_insert to execute the replace_sql.
         def replace(*args)
           execute_insert(replace_sql(*args))

data/lib/sequel_core/adapters/jdbc/postgresql.rb

@@ -91,21 +91,9 @@ module Sequel
           ps
         end
         
-        # Convert Java::JavaSql::Timestamps correctly, and handle Strings
-        # similar to the native postgres adapter.
-        def literal(v)
-          case v
-          when LiteralString
-            v
-          when SQL::Blob
-            super
-          when String
-            db.synchronize{|c| "'#{c.escape_string(v)}'"}
-          when Java::JavaSql::Timestamp
-            "TIMESTAMP #{literal(v.to_s)}"
-          else
-            super
-          end
+        # Literalize strings similar to the native postgres adapter
+        def literal_string(v)
+          db.synchronize{|c| "'#{c.escape_string(v)}'"}
         end
       end
     end

data/lib/sequel_core/adapters/jdbc.rb

@@ -1,5 +1,5 @@
 require 'java'
-require 'sequel_core/dataset/stored_procedures'
+require 'sequel_core/adapters/utils/stored_procedures'
 
 module Sequel
   # Houses Sequel's JDBC support when running on JRuby.
@@ -414,18 +414,6 @@ module Sequel
         self
       end
       
-      # Use the ISO values for dates and times.
-      def literal(v)
-        case v
-        when Time
-          literal(v.iso8601)
-        when Date, DateTime, Java::JavaSql::Timestamp, Java::JavaSql::Date
-          literal(v.to_s)
-        else
-          super
-        end
-      end
-      
       # Create a named prepared statement that is stored in the
       # database (and connection) for reuse.
       def prepare(type, name=nil, values=nil)

data/lib/sequel_core/adapters/mysql.rb

@@ -1,6 +1,6 @@
 require 'mysql'
 require 'sequel_core/adapters/shared/mysql'
-require 'sequel_core/dataset/stored_procedures'
+require 'sequel_core/adapters/utils/stored_procedures'
 
 module Sequel
   # Module for holding all MySQL-related classes and modules for Sequel.
@@ -299,18 +299,6 @@ module Sequel
         execute_dui(insert_sql(*values)){|c| c.insert_id}
       end
       
-      # Handle correct quoting of strings using ::MySQL.quote.
-      def literal(v)
-        case v
-        when LiteralString
-          v
-        when String
-          "'#{::Mysql.quote(v)}'"
-        else
-          super
-        end
-      end
-      
       # Store the given type of prepared statement in the associated database
       # with the given name.
       def prepare(type, name=nil, values=nil)
@@ -360,6 +348,11 @@ module Sequel
         super(sql, {:type=>:dui}.merge(opts), &block)
       end
       
+      # Handle correct quoting of strings using ::MySQL.quote.
+      def literal_string(v)
+        "'#{::Mysql.quote(v)}'"
+      end
+      
       # Extend the dataset with the MySQL stored procedure methods.
       def prepare_extend_sproc(ds)
         ds.extend(StoredProcedureMethods)

data/lib/sequel_core/adapters/odbc.rb

@@ -100,25 +100,6 @@ module Sequel
       ODBC_TIMESTAMP_AFTER_SECONDS =
         ODBC_TIMESTAMP_FORMAT.index( '%S' ).succ - ODBC_TIMESTAMP_FORMAT.length
       ODBC_DATE_FORMAT = "{d '%Y-%m-%d'}".freeze
-      
-      def literal(v)
-        case v
-        when true
-          BOOL_TRUE
-        when false
-          BOOL_FALSE
-        when Time, DateTime
-          formatted = v.strftime(ODBC_TIMESTAMP_FORMAT)
-          usec = (Time === v ? v.usec : (v.sec_fraction * 86400000000))
-          formatted.insert(ODBC_TIMESTAMP_AFTER_SECONDS, ".#{(usec.to_f/1000).round}") if usec >= 1000
-          formatted
-        when Date
-          v.strftime(ODBC_DATE_FORMAT)
-        else
-          super
-        end
-      end
-
       UNTITLED_COLUMN = 'untitled_%d'.freeze
 
       def fetch_rows(sql, &block)
@@ -141,15 +122,7 @@ module Sequel
       end
       
       private
-      
-      def hash_row(row)
-        hash = {}
-        row.each_with_index do |v, idx|
-          hash[@columns[idx]] = convert_odbc_value(v)
-        end
-        hash
-      end
-      
+
       def convert_odbc_value(v)
         # When fetching a result set, the Ruby ODBC driver converts all ODBC 
         # SQL types to an equivalent Ruby type; with the exception of
@@ -169,6 +142,39 @@ module Sequel
           v
         end
       end
+      
+      def hash_row(row)
+        hash = {}
+        row.each_with_index do |v, idx|
+          hash[@columns[idx]] = convert_odbc_value(v)
+        end
+        hash
+      end
+      
+      def literal_date(v)
+        v.strftime(ODBC_DATE_FORMAT)
+      end
+      
+      def literal_datetime(v)
+        formatted = v.strftime(ODBC_TIMESTAMP_FORMAT)
+        usec = v.sec_fraction * 86400000000
+        formatted.insert(ODBC_TIMESTAMP_AFTER_SECONDS, ".#{(usec.to_f/1000).round}") if usec >= 1000
+        formatted
+      end
+      
+      def literal_false
+        BOOL_FALSE
+      end
+      
+      def literal_true
+        BOOL_TRUE
+      end
+
+      def literal_time(v)
+        formatted = v.strftime(ODBC_TIMESTAMP_FORMAT)
+        formatted.insert(ODBC_TIMESTAMP_AFTER_SECONDS, ".#{(v.usec.to_f/1000).round}") if usec >= 1000
+        formatted
+      end
     end
   end
 end

data/lib/sequel_core/adapters/openbase.rb

@@ -37,17 +37,6 @@ module Sequel
     end
     
     class Dataset < Sequel::Dataset
-      def literal(v)
-        case v
-        when Time
-          literal(v.iso8601)
-        when Date, DateTime
-          literal(v.to_s)
-        else
-          super
-        end
-      end
-
       def fetch_rows(sql)
         execute(sql) do |result|
           begin

data/lib/sequel_core/adapters/oracle.rb

@@ -78,15 +78,6 @@ module Sequel
     class Dataset < Sequel::Dataset
       include DatasetMethods
 
-      def literal(v)
-        case v
-        when OraDate
-          literal(Time.local(*v.to_a))
-        else
-          super
-        end
-      end
-
       def fetch_rows(sql, &block)
         execute(sql) do |cursor|
           begin
@@ -102,6 +93,17 @@ module Sequel
         end
         self
       end
+
+      private
+
+      def literal_other(v)
+        case v
+        when OraDate
+          literal_time(Time.local(*v.to_a))
+        else
+          super
+        end
+      end
     end
   end
 end

data/lib/sequel_core/adapters/postgres.rb

@@ -326,23 +326,9 @@ module Sequel
         end
       end
 
-      # Literalize strings and blobs using code from the native adapter.
-      def literal(v)
-        case v
-        when LiteralString
-          v
-        when SQL::Blob
-          db.synchronize{|c| "'#{c.escape_bytea(v)}'"}
-        when String
-          db.synchronize{|c| "'#{c.escape_string(v)}'"}
-        else
-          super
-        end
-      end
-      
       if SEQUEL_POSTGRES_USES_PG
         
-        PREPARED_ARG_PLACEHOLDER = '$'.lit.freeze
+        PREPARED_ARG_PLACEHOLDER = LiteralString.new('$').freeze
         
         # PostgreSQL specific argument mapper used for mapping the named
         # argument hash to a array with numbered arguments.  Only used with
@@ -373,7 +359,7 @@ module Sequel
               @prepared_args << y
               i = @prepared_args.length
             end
-            "#{prepared_arg_placeholder}#{i}#{"::#{type}" if type}".lit
+            LiteralString.new("#{prepared_arg_placeholder}#{i}#{"::#{type}" if type}")
           end
         end
 
@@ -451,6 +437,17 @@ module Sequel
           PREPARED_ARG_PLACEHOLDER
         end
       end
+      
+      private
+
+      def literal_blob(v)
+        db.synchronize{|c| "'#{c.escape_bytea(v)}'"}
+      end
+
+      def literal_string(v)
+        db.synchronize{|c| "'#{c.escape_string(v)}'"}
+      end
+
     end
   end
 end

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

@@ -24,8 +24,11 @@ module Sequel
         false
       end
 
-      private
+      def identifier_output_method
+        nil
+      end
 
+      private
       # SQL to BEGIN a transaction.
       def begin_transaction_sql
         SQL_BEGIN
@@ -90,7 +93,6 @@ module Sequel
       end
 
       private
-
       def select_clause_order
         SELECT_CLAUSE_ORDER
       end
@@ -105,6 +107,10 @@ module Sequel
       def select_with_sql(sql, opts)
         sql << " WITH #{opts[:with]}" if opts[:with]
       end
+
+      def select_union_sql(sql, opts)
+        sql << " UNION #{opts[:union]}" if opts[:union]
+      end
     end
   end
 end

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

@@ -1,3 +1,5 @@
+require 'sequel_core/adapters/utils/unsupported'
+
 module Sequel
   module MSSQL
     module DatabaseMethods
@@ -52,21 +54,6 @@ module Sequel
         filter("CONTAINS (#{literal(cols)}, #{literal(terms)})")
       end
       
-      def literal(v)
-        case v
-        when LiteralString
-          v
-        when String
-          "N#{super}"
-        when Time
-          literal(v.iso8601)
-        when Date, DateTime
-          literal(v.to_s)
-        else
-          super
-        end
-      end
-
       def multi_insert_sql(columns, values)
         values = values.map {|r| "SELECT #{expression_list(r)}" }.join(" UNION ALL ")
         ["INSERT INTO #{source_list(@opts[:from])} (#{identifier_list(columns)}) #{values}"]
@@ -83,6 +70,10 @@ module Sequel
 
       private
 
+      def literal_string(v)
+        "N#{super}"
+      end
+
       def select_clause_order
         SELECT_CLAUSE_ORDER
       end

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

@@ -1,3 +1,5 @@
+require 'sequel_core/adapters/utils/unsupported'
+
 module Sequel
   module Schema
     module SQL
@@ -147,6 +149,7 @@ module Sequel
       BOOL_TRUE = '1'.freeze
       BOOL_FALSE = '0'.freeze
       CAST_TYPES = {String=>:CHAR, Integer=>:SIGNED, Time=>:DATETIME, DateTime=>:DATETIME, Numeric=>:DECIMAL, BigDecimal=>:DECIMAL, File=>:BINARY}
+      TIMESTAMP_FORMAT = "'%Y-%m-%d %H:%M:%S'".freeze
       COMMA_SEPARATOR = ', '.freeze
       
       # MySQL can't use the varchar type in a cast.
@@ -230,20 +233,6 @@ module Sequel
         end
       end
       
-      # Override the default boolean values.
-      def literal(v)
-        case v
-        when true
-          BOOL_TRUE
-        when false
-          BOOL_FALSE
-        when DateTime, Time
-          v.strftime("'%Y-%m-%d %H:%M:%S'")
-        else
-          super
-        end
-      end
-      
       # MySQL specific syntax for inserting multiple values at once.
       def multi_insert_sql(columns, values)
         values = values.map {|r| literal(Array(r))}.join(COMMA_SEPARATOR)
@@ -313,6 +302,26 @@ module Sequel
 
       private
 
+      # Use MySQL Timestamp format
+      def literal_datetime(v)
+        v.strftime(TIMESTAMP_FORMAT)
+      end
+
+      # Use 0 for false on MySQL
+      def literal_false
+        BOOL_FALSE
+      end
+
+      # Use MySQL Timestamp format
+      def literal_time(v)
+        v.strftime(TIMESTAMP_FORMAT)
+      end
+
+      # Use 1 for true on MySQL
+      def literal_true
+        BOOL_TRUE
+      end
+      
       # MySQL doesn't support DISTINCT ON
       def select_distinct_sql(sql, opts)
         if opts[:distinct]

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

@@ -1,3 +1,6 @@
+require 'sequel_core/adapters/utils/date_format'
+require 'sequel_core/adapters/utils/unsupported'
+
 module Sequel
   module Oracle
     module DatabaseMethods
@@ -13,6 +16,7 @@ module Sequel
     
     module DatasetMethods
       include Dataset::UnsupportedIntersectExceptAll
+      include Dataset::SQLStandardDateFormat
 
       SELECT_CLAUSE_ORDER = %w'distinct columns from join where group having compounds order limit'.freeze