sequel 3.14.0 → 3.15.0

data/lib/sequel/adapters/shared/postgres.rb

@@ -157,7 +157,7 @@ module Sequel
     
     # Methods shared by Database instances that connect to PostgreSQL.
     module DatabaseMethods
-      EXCLUDE_SCHEMAS = %w[pg_catalog pg_toast pg_temp_1 pg_toast_temp_1 information_schema]
+      EXCLUDE_SCHEMAS = /pg_*|information_schema/i
       PREPARED_ARG_PLACEHOLDER = LiteralString.new('$').freeze
       RE_CURRVAL_ERROR = /currval of sequence "(.*)" is not yet defined in this session|relation "(.*)" does not exist/.freeze
       SYSTEM_TABLE_REGEXP = /^pg|sql/.freeze

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

@@ -181,6 +181,21 @@ module Sequel
         generator.is_a?(Schema::Generator) ? super : generator.map{|c| column_definition_sql(c)}.join(', ')
       end
 
+      # Array of PRAGMA SQL statements based on the Database options that should be applied to
+      # new connections.
+      def connection_pragmas
+        ps = []
+        v = typecast_value_boolean(opts.fetch(:foreign_keys, 1))
+        ps << "PRAGMA foreign_keys = #{v ? 1 : 0}"
+        [[:auto_vacuum, AUTO_VACUUM], [:synchronous, SYNCHRONOUS], [:temp_store, TEMP_STORE]].each do |prag, con|
+          if v = opts[prag]
+            raise(Error, "Value for PRAGMA #{prag} not supported, should be one of #{con.join(', ')}") unless v = con.index(v.to_sym)
+            ps << "PRAGMA #{prag} = #{v}"
+          end
+        end
+        ps
+      end
+
       # The array of column schema hashes, except for the ones given in opts[:except]
       def defined_columns_for(table, opts={})
         cols = parse_pragma(table, {})
@@ -192,9 +207,20 @@ module Sequel
           nono= Array(opts[:except]).compact.map{|n| n.to_s}
           cols.reject!{|c| nono.include? c[:name] }
         end
+
+        if foreign_keys
+          metadata_dataset.with_sql("PRAGMA foreign_key_list(?)", input_identifier_meth.call(table)).each do |row|
+            c = cols.find {|co| co[:name] == row[:from] } or next
+            c[:table] = row[:table]
+            c[:key] = row[:to]
+            c[:on_update] = on_delete_sql_to_sym(row[:on_update])
+            c[:on_delete] = on_delete_sql_to_sym(row[:on_delete])
+            # is there any way to get deferrable status?
+          end
+        end
         cols
       end
-      
+
       # Duplicate an existing table by creating a new table, copying all records
       # from the existing table into the new table, deleting the existing table
       # and renaming the new table to the existing table's name.
@@ -229,19 +255,21 @@ module Sequel
         nil
       end
       
-      # Array of PRAGMA SQL statements based on the Database options that should be applied to
-      # new connections.
-      def connection_pragmas
-        ps = []
-        v = typecast_value_boolean(opts.fetch(:foreign_keys, 1))
-        ps << "PRAGMA foreign_keys = #{v ? 1 : 0}"
-        [[:auto_vacuum, AUTO_VACUUM], [:synchronous, SYNCHRONOUS], [:temp_store, TEMP_STORE]].each do |prag, con|
-          if v = opts[prag]
-            raise(Error, "Value for PRAGMA #{prag} not supported, should be one of #{con.join(', ')}") unless v = con.index(v.to_sym)
-            ps << "PRAGMA #{prag} = #{v}"
-          end
+      # Does the reverse of on_delete_clause, eg. converts strings like +'SET NULL'+
+      # to symbols +:set_null+.
+      def on_delete_sql_to_sym str
+        case str
+        when 'RESTRICT'
+          :restrict
+        when 'CASCADE'
+          :cascade
+        when 'SET NULL'
+          :set_null
+        when 'SET DEFAULT'
+          :set_default
+        when 'NO ACTION'
+          :no_action
         end
-        ps
       end
 
       # Parse the output of the table_info pragma

data/lib/sequel/core.rb

@@ -44,6 +44,14 @@ module Sequel
     # database.  It defaults to +Time+.  To change it to +DateTime+:
     #
     #   Sequel.datetime_class = DateTime
+    #
+    # For ruby versions less than 1.9.2, +Time+ has a limited range (1901 to
+    # 2038), so if you use datetimes out of that range, you need to switch
+    # to +DateTime+.  Also, before 1.9.2, +Time+ can only handle local and UTC
+    # times, not other timezones.  Note that +Time+ and +DateTime+ objects
+    # have a different API, and in cases where they implement the same methods,
+    # they often implement them differently (e.g. + using seconds on +Time+ and
+    # days on +DateTime+).
     attr_accessor :datetime_class
 
     # For backwards compatibility, has no effect.

data/lib/sequel/database/connecting.rb

@@ -6,7 +6,7 @@ module Sequel
     # ---------------------
 
     # Array of supported database adapters
-    ADAPTERS = %w'ado amalgalite db2 dbi do firebird informix jdbc mysql odbc openbase oracle postgres sqlite'.collect{|x| x.to_sym}
+    ADAPTERS = %w'ado amalgalite db2 dbi do firebird informix jdbc mysql mysql2 odbc openbase oracle postgres sqlite'.collect{|x| x.to_sym}
 
     # Whether to use the single threaded connection pool by default
     @@single_threaded = false

data/lib/sequel/dataset/actions.rb

@@ -587,7 +587,7 @@ module Sequel
       case c
       when Symbol
         c_table, column, _ = split_symbol(c)
-        c_table ? column.to_sym.qualify(c_table) : column.to_sym
+        c_table ? SQL::QualifiedIdentifier.new(c_table, column.to_sym) : column.to_sym
       when SQL::AliasedExpression
         c.expression
       else

data/lib/sequel/dataset/misc.rb

@@ -34,6 +34,17 @@ module Sequel
       @row_proc = nil
     end
     
+    # Define a hash value such that datasets with the same DB, opts, and SQL
+    # will be consider equal.
+    def ==(o)
+      o.is_a?(self.class) && db == o.db  && opts == o.opts && sql == o.sql
+    end
+
+    # Alias for ==
+    def eql?(o)
+      self == o
+    end
+    
     # Return the dataset as an aliased expression with the given alias. You can
     # use this as a FROM or JOIN dataset, or as a column if this dataset
     # returns a single row and column.
@@ -105,6 +116,12 @@ module Sequel
         s
       end
     end
+
+    # Define a hash value such that datasets with the same DB, opts, and SQL
+    # will have the same hash value
+    def hash
+      [db, opts.sort_by{|k| k.to_s}, sql].hash
+    end
     
     # Returns a string representation of the dataset including the class name 
     # and the corresponding SQL select statement.
@@ -112,6 +129,21 @@ module Sequel
       "#<#{self.class}: #{sql.inspect}>"
     end
     
+    # Splits a possible implicit alias in C, handling both SQL::AliasedExpressions
+    # and Symbols.  Returns an array of two elements, with the first being the
+    # main expression, and the second being the alias.
+    def split_alias(c)
+      case c
+      when Symbol
+        c_table, column, aliaz = split_symbol(c)
+        [c_table ? SQL::QualifiedIdentifier.new(c_table, column.to_sym) : column.to_sym, aliaz]
+      when SQL::AliasedExpression
+        [c.expression, c.aliaz]
+      else
+        [c, nil]
+      end
+    end
+
     # Creates a unique table alias that hasn't already been used in the dataset.
     # table_alias can be any type of object accepted by alias_symbol.
     # The symbol returned will be the implicit alias in the argument,

data/lib/sequel/dataset/query.rb

@@ -413,6 +413,8 @@ module Sequel
         table_name = table_alias
       else
         table = table.table_name if table.respond_to?(:table_name)
+        table, implicit_table_alias = split_alias(table)
+        table_alias ||= implicit_table_alias
         table_name = table_alias || table
       end
 
@@ -816,7 +818,7 @@ module Sequel
     # Whether this dataset is a simple SELECT * FROM table.
     def simple_select_all?
       o = @opts.reject{|k,v| v.nil? || NON_SQL_OPTIONS.include?(k)}
-      o.length == 1 && (f = o[:from]) && f.length == 1 && f.first.is_a?(Symbol)
+      o.length == 1 && (f = o[:from]) && f.length == 1 && (f.first.is_a?(Symbol) || f.first.is_a?(SQL::AliasedExpression))
     end
 
     private

data/lib/sequel/extensions/named_timezones.rb

@@ -50,8 +50,7 @@ module Sequel
       (v - local_offset).new_offset(local_offset)
     end
     
-    # Convert the timezone setter argument.  Returns argument given by default,
-    # exists for easier overriding in extensions.
+    # Returns TZInfo::Timezone instance if given a String.
     def convert_timezone_setter_arg(tz)
       tz.is_a?(String) ? TZInfo::Timezone.get(tz) : super
     end

data/lib/sequel/model.rb

@@ -96,7 +96,7 @@ module Sequel
       :@restricted_columns=>:dup, :@restrict_primary_key=>nil,
       :@simple_pk=>nil, :@simple_table=>nil, :@strict_param_setting=>nil,
       :@typecast_empty_string_to_nil=>nil, :@typecast_on_assignment=>nil,
-      :@raise_on_typecast_failure=>nil, :@plugins=>:dup}
+      :@raise_on_typecast_failure=>nil, :@plugins=>:dup, :@setter_methods=>nil}
 
     # Regular expression that determines if a method name is normal in the sense that
     # it could be used literally in ruby code without using send.  Used to
@@ -120,6 +120,7 @@ module Sequel
     @require_modification = nil
     @restrict_primary_key = true
     @restricted_columns = nil
+    @setter_methods = nil
     @simple_pk = nil
     @simple_table = nil
     @strict_param_setting = true

data/lib/sequel/model/associations.rb

@@ -307,7 +307,9 @@ module Sequel
 
         # The table containing the column to use for the associated key when eagerly loading
         def associated_key_table
-          self[:join_table]
+          self[:associated_key_table] ||= (
+          syms = associated_class.dataset.split_alias(self[:join_table]);
+          syms[1] || syms[0])
         end
         
         # Alias of right_primary_keys

data/lib/sequel/model/base.rb

@@ -100,6 +100,11 @@ module Sequel
         args.is_a?(Hash) ? dataset[args] : primary_key_lookup(args)
       end
       
+      # Clear the setter_methods cache
+      def clear_setter_methods_cache
+        @setter_methods = nil
+      end
+  
       # Returns the columns in the result set in their original order.
       # Generally, this will use the columns determined via the database
       # schema, but in certain cases (e.g. models that are based on a joined
@@ -286,6 +291,12 @@ module Sequel
       def load(values)
         new(values, true)
       end
+
+      # Clear the setter_methods cache when a setter method is added
+      def method_added(meth)
+        clear_setter_methods_cache if meth.to_s =~ SETTER_METHOD_REGEXP
+        super
+      end
   
       # Mark the model as not having a primary key. Not having a primary key
       # can cause issues, among which is that you won't be able to update records.
@@ -294,6 +305,7 @@ module Sequel
       #   Artist.no_primary_key
       #   Artist.primary_key # => nil
       def no_primary_key
+        clear_setter_methods_cache
         @simple_pk = @primary_key = nil
       end
   
@@ -334,6 +346,7 @@ module Sequel
       # this is the default, this only make sense to use in a subclass where the
       # parent class has used +unrestrict_primary_key+.
       def restrict_primary_key
+        clear_setter_methods_cache
         @restrict_primary_key = true
       end
   
@@ -355,6 +368,7 @@ module Sequel
       #   Artist.set(:name=>'Bob', :hometown=>'Sactown') # No Error
       #   Artist.set(:name=>'Bob', :records_sold=>30000) # Error
       def set_allowed_columns(*cols)
+        clear_setter_methods_cache
         @allowed_columns = cols
       end
   
@@ -414,6 +428,7 @@ module Sequel
       #     set_primary_key [:taggable_id, :tag_id]
       #   end
       def set_primary_key(*key)
+        clear_setter_methods_cache
         key = key.flatten
         @simple_pk = key.length == 1 ? db.literal(key.first) : nil 
         @primary_key = (key.length == 1) ? key[0] : key
@@ -434,8 +449,21 @@ module Sequel
       #   Artist.set(:name=>'Bob', :hometown=>'Sactown') # No Error
       #   Artist.set(:name=>'Bob', :records_sold=>30000) # Error
       def set_restricted_columns(*cols)
+        clear_setter_methods_cache
         @restricted_columns = cols
       end
+
+      # Cache of setter methods to allow by default, in order to speed up new/set/update instance methods.
+      def setter_methods
+        @setter_methods ||= if allowed_columns
+          allowed_columns.map{|x| "#{x}="}
+        else
+          meths = instance_methods.collect{|x| x.to_s}.grep(SETTER_METHOD_REGEXP) - RESTRICTED_SETTER_METHODS
+          meths -= Array(primary_key).map{|x| "#{x}="} if primary_key && restrict_primary_key?
+          meths -= restricted_columns.map{|x| "#{x}="} if restricted_columns
+          meths
+        end
+      end
   
       # Shortcut for +def_dataset_method+ that is restricted to modifying the
       # dataset's filter. Sometimes thought of as a scope, and like most dataset methods,
@@ -475,6 +503,7 @@ module Sequel
       #   Artist.unrestrict_primary_key
       #   Artist.set(:id=>1) # No Error
       def unrestrict_primary_key
+        clear_setter_methods_cache
         @restrict_primary_key = false
       end
   
@@ -502,6 +531,7 @@ module Sequel
       # Create the column accessors.  For columns that can be used as method names directly in ruby code,
       # use a string to define the method for speed.  For other columns names, use a block.
       def def_column_accessor(*columns)
+        clear_setter_methods_cache
         columns, bad_columns = columns.partition{|x| NORMAL_METHOD_NAME_REGEXP.match(x.to_s)}
         bad_columns.each{|x| def_bad_column_accessor(x)}
         im = instance_methods.collect{|x| x.to_s}
@@ -526,10 +556,10 @@ module Sequel
         if single_table && (schema_array = (db.schema(table_name, :reload=>reload) rescue nil))
           schema_array.each{|k,v| schema_hash[k] = v}
           if ds_opts.include?(:select)
-            # Dataset only selects certain columns, delete the other
-            # columns from the schema
+            # We don't remove the columns from the schema_hash,
+            # as it's possible they will be used for typecasting
+            # even if they are not selected.
             cols = get_columns.call
-            schema_hash.delete_if{|k,v| !cols.include?(k)}
             cols.each{|c| schema_hash[c] ||= {}}
           else
             # Dataset is for a single table with all columns,
@@ -1029,6 +1059,12 @@ module Sequel
         set_restricted(hash, only.flatten, false)
       end
   
+      # Clear the setter_methods cache when a method is added
+      def singleton_method_added(meth)
+        @singleton_setter_added = true if meth.to_s =~ SETTER_METHOD_REGEXP
+        super
+      end
+  
       # Returns (naked) dataset that should return only this instance.
       #
       #   Artist[1].this
@@ -1282,7 +1318,11 @@ module Sequel
   
       # Set the columns, filtered by the only and except arrays.
       def set_restricted(hash, only, except)
-        meths = setter_methods(only, except)
+        meths = if only.nil? && except.nil? && !@singleton_setter_added
+          model.setter_methods
+        else
+          setter_methods(only, except)
+        end
         strict = strict_param_setting
         hash.each do |k,v|
           m = "#{k}="

data/lib/sequel/plugins/active_model.rb

@@ -36,8 +36,10 @@ module Sequel
         
         # An array of primary key values, or nil if the object is not persisted.
         def to_key
-          if persisted?
-            primary_key.is_a?(Symbol) ? [pk] : pk
+          if primary_key.is_a?(Symbol)
+            [pk] if pk
+          else
+            pk if pk.all?
           end
         end
 
@@ -50,7 +52,7 @@ module Sequel
         # An string representing the object's primary key.  For composite
         # primary keys, joins them with to_param_joiner.
         def to_param
-          if k = to_key
+          if persisted? and k = to_key
             k.join(to_param_joiner)
           end
         end

data/lib/sequel/plugins/class_table_inheritance.rb

@@ -180,8 +180,8 @@ module Sequel
       module InstanceMethods
         # Set the cti_key column to the name of the model.
         def before_create
-          return false if super == false
           send("#{model.cti_key}=", model.name.to_s) if model.cti_key
+          super
         end
         
         # Delete the row from all backing tables, starting from the
@@ -200,11 +200,11 @@ module Sequel
         # in each table.  
         def _insert
           return super if model == model.cti_base_model
-          iid = nil
+          iid = @values[primary_key] 
           m = model
           m.cti_tables.each do |table|
             h = {}
-            h[m.primary_key] = iid if iid
+            h[m.primary_key] ||= iid if iid
             m.cti_columns[table].each{|c| h[c] = @values[c] if @values.include?(c)}
             nid = m.db.from(table).insert(h)
             iid ||= nid

data/lib/sequel/version.rb

@@ -3,7 +3,7 @@ module Sequel
   MAJOR = 3
   # The minor version of Sequel.  Bumped for every non-patch level
   # release, generally around once a month.
-  MINOR = 14
+  MINOR = 15
   # The tiny version of Sequel.  Usually 0, only bumped for bugfix
   # releases that fix regressions from previous versions.
   TINY  = 0

data/spec/adapters/mysql_spec.rb

@@ -73,6 +73,15 @@ context "MySQL", '#create_table' do
     end
     @db.schema(:dolls).map{|k, v| v[:db_type]}.should == %w"blob tinyblob mediumblob longblob blob"
   end
+
+  specify "should include an :auto_increment schema attribute if auto incrementing" do
+    @db.create_table(:dolls) do
+      Integer :n2
+      String :n3
+      Integer :n4, :auto_increment=>true, :unique=>true
+    end
+    @db.schema(:dolls).map{|k, v| v[:auto_increment]}.should == [nil, nil, true]
+  end
 end
 
 context "A MySQL database" do
@@ -421,7 +430,7 @@ context "A MySQL database with table options" do
     
     Sequel::MySQL.default_engine = 'InnoDB'
     Sequel::MySQL.default_charset = 'utf8'
-    Sequel::MySQL.default_collate = 'utf8_general_ci'    
+    Sequel::MySQL.default_collate = 'utf8_general_ci'
     
     @db = MYSQL_DB
     @db.drop_table(:items) rescue nil
@@ -430,6 +439,7 @@ context "A MySQL database with table options" do
   end
   after do
     @db.drop_table(:items) rescue nil
+
     Sequel::MySQL.default_engine = nil
     Sequel::MySQL.default_charset = nil
     Sequel::MySQL.default_collate = nil
@@ -895,7 +905,7 @@ context "MySQL::Dataset#complex_expression_sql" do
   end
 end
 
-unless MYSQL_DB.adapter_scheme == :do
+unless MYSQL_DB.adapter_scheme == :do or MYSQL_DB.adapter_scheme == :mysql2
   context "MySQL Stored Procedures" do
     before do
       MYSQL_DB.create_table(:items){Integer :id; Integer :value}