sequel 4.46.0 → 4.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ecafb93f6c5af1a4ba3d659bbac127a7ee31e6d
-  data.tar.gz: 9e9a68697228e06a456cfd8ccefcbb9acff1dbef
+  metadata.gz: e4d1bdb365601ad2d67120764a7211a4c12ecff3
+  data.tar.gz: 1e1a3e0d8fb915792b66a91e96577ba0c522c9b6
 SHA512:
-  metadata.gz: 6a82addc13ea6af0d5259a621a12da38e992eb249e2f7f623ff50ec5224e16670c2517c073e2e9af596f8d903603770883974731ef8173ca1183bd3d58c91613
-  data.tar.gz: 708159da412ed6bc0e45fc2af49a344df092e1bad67b343481e0cf976b9d185d338f8643269997dc9b40a392084391c7ad1cde72284eb92c6bc33683d18dda20
+  metadata.gz: 47bd614656335d42c4d5f2dbe1fbf9ead5143975b2d57b06c982a26039e5d7bb359470e1ffead7993be9651bafb706a174cd99e26fff7786833d96d02b311275
+  data.tar.gz: 2ab2a499dc1cd2dd45fa7f9bf3a58e902742a4a087f297918b634f535c59953d26bee14aee90e8111142d38d703a5c8bc05966139d93f410f79ea236af5e0f11

data/CHANGELOG

@@ -1,3 +1,23 @@
+=== 4.47.0 (2017-06-01)
+
+* Deprecate pg_typecast_on_load plugin, only useful on deprecated do and swift adapters (jeremyevans)
+
+* Deprecate association_autoreloading and many_to_one_pk_lookup plugins, which were made the default model behavior in Sequel 4 (jeremyevans)
+
+* Deprecate setting invalid datasets for models unless required_valid_table = false (jeremyevans)
+
+* Make Model.require_valid_table = true not raise for datasets where Database#schema raises an error but Dataset#columns works (jeremyevans)
+
+* Make Database#with_server in the server_block extension accept a second argument for a different read_only shard (jeremyevans) (#1355)
+
+* Make schema_dumper extension handle Oracle 11g XE inclusion of not null in the db_type (StevenCregan, jeremyevans) (#1351)
+
+* Add Model.default_association_type_options for changing default association options per association type (jeremyevans)
+
+* Add :materialized option to Database#views on PostgreSQL to return materialized views (Blargel) (#1348)
+
+* Make defaults_setter plugin inherit custom default values when subclassing (jeremyevans)
+
 === 4.46.0 (2017-05-01)
 
 * Recognize additional disconnect error on MySQL (jeremyevans)

data/doc/release_notes/4.47.0.txt

@@ -0,0 +1,56 @@
+= Deprecated Features
+
+* Setting an invalid dataset for a model is now deprecated.
+  Historically, Sequel has swallowed exceptions for this to keep
+  backwards compatibility, but it generally just results in code
+  breaking later.  To allow invalid datasets to be used:
+
+    Sequel::Model.require_valid_table = false
+
+* The association_autoreloading and many_to_one_pk_lookup plugins
+  are now deprecated.  They were moved from plugins to standard
+  model behavior in Sequel 4.0, and have been no-ops since.
+
+* The pg_typecast_on_load plugin is now deprecated.  It is only useful
+  on the already deprecated do and swift adapters.
+
+= New Features
+
+* Database#with_server in the server_block extension now accepts an
+  optional second argument for the read only server to use.  This
+  allows for overriding the default server while providing a separate
+  default for read only queries:
+
+    DB.with_server(:server1, :server1ro) do
+      DB[:a].all       # Uses server1ro
+      DB[:b].insert(1) # Uses server1
+    end
+
+* Model.default_association_type_options has been added, allowing the
+  ability to set default options per association type.  This can be
+  used to make some association types read_only by default:
+
+    opts = Sequel::Model.default_association_type_options
+    opts[:one_to_many] = opts[:many_to_many] = {:read_only=>true}
+  
+* Database#views on PostgreSQL now accepts a :materialized option to
+  return materialized views instead of regular views.
+
+= Other Improvements
+
+* Setting Sequel::Model.require_valid_table = true no longer raises
+  an exception when using a valid dataset that selects from a subquery
+  or table returning function or uses a join.
+
+* The defaults_setter plugin now inherits any custom default
+  values when subclassing.
+
+* The schema_dumper extension now handles Oracle 11g XE behavior of
+  appending not null to the database type.
+
+= Backwards Compatibility
+
+* External callers of Database#check_non_connection_error (private
+  method) should update their code to call it with a true or false
+  argument specifying whether to raise an error for exceptions that
+  are not connection errors.

data/lib/sequel/adapters/jdbc/as400.rb

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-Sequel::Deprecation.deprecate("The jdbc/as400 adapter", "Please consider maintaining it yourself as an external gem if you want to continue using it")
+Sequel::Deprecation.deprecate("The jdbc/as400 adapter", "This gem will replace it: https://github.com/ecraft/sequel-jdbc-as400")
 
 Sequel::JDBC.load_driver('com.ibm.as400.access.AS400JDBCDriver')
 Sequel.require 'adapters/jdbc/transactions'

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

@@ -614,12 +614,14 @@ module Sequel
       # Array of symbols specifying view names in the current database.
       #
       # Options:
+      # :materialized :: Return materialized views
       # :qualify :: Return the views as Sequel::SQL::QualifiedIdentifier instances,
       #             using the schema the view is located in as the qualifier.
       # :schema :: The schema to search
       # :server :: The server to use
       def views(opts=OPTS)
-        pg_class_relname('v', opts)
+        relkind = opts[:materialized] ? 'm' : 'v'
+        pg_class_relname(relkind, opts)
       end
 
       private

data/lib/sequel/ast_transformer.rb

@@ -93,7 +93,7 @@ module Sequel
     def initialize(table, unused=nil)
       if unused
         # :nocov:
-        Sequel::Deprecation.deprecate("Passing two arguments to Sequel::Qualifier.new", 'Pass only the second arguument specifying the table used for qualification')
+        Sequel::Deprecation.deprecate("Passing two arguments to Sequel::Qualifier.new", 'Pass only the second argument specifying the table used for qualification')
         @table = unused
         # :nocov:
       else

data/lib/sequel/extensions/schema_dumper.rb

@@ -20,7 +20,11 @@ module Sequel
     # be :type.  The other options added should modify that type (e.g. :size).  If a
     # database type is not recognized, return it as a String type.
     def column_schema_to_ruby_type(schema)
-      case schema[:db_type].downcase
+      type = schema[:db_type].downcase
+      if database_type == :oracle
+        type = type.sub(/ not null\z/, '')
+      end
+      case type
       when /\A(medium|small)?int(?:eger)?(?:\((\d+)\))?( unsigned)?\z/o
         if !$1 && $2 && $2.to_i >= 10 && $3
           # Unsigned integer type with 10 digits can potentially contain values which
@@ -49,7 +53,7 @@ module Sequel
         {:type=>Time, :only_time=>true}
       when /\An?char(?:acter)?(?:\((\d+)\))?\z/o
         {:type=>String, :size=>($1.to_i if $1), :fixed=>true}
-      when /\A(?:n?varchar|character varying|bpchar|string)(?:\((\d+)\))?\z/o
+      when /\A(?:n?varchar2?|character varying|bpchar|string)(?:\((\d+)\))?\z/o
         {:type=>String, :size=>($1.to_i if $1)}
       when /\A(?:small)?money\z/o
         {:type=>BigDecimal, :size=>[19,2]}

data/lib/sequel/extensions/server_block.rb

@@ -16,7 +16,7 @@
 #   end
 #   DB[:a].all # Uses default
 #
-# You can even nest calls to with_server:
+# You can nest calls to with_server:
 #
 #   DB.with_server(:shard1) do
 #     DB[:a].all # Uses shard1
@@ -39,6 +39,19 @@
 #     DB[:a].server(:read_only).all # Uses shard1
 #   end
 #
+# If you pass two separate shards to with_server, the second shard will
+# be used instead of the :read_only shard, and the first shard will be
+# used instead of the :default shard:
+#
+#   DB.with_server(:shard1, :shard2) do
+#     DB[:a].all # Uses shard2
+#     DB[:a].delete # Uses shard1
+#     DB[:a].server(:shard3).all # Uses shard3
+#     DB[:a].server(:shard3).delete # Uses shard3
+#     DB[:a].server(:default).all # Uses shard1
+#     DB[:a].server(:read_only).delete # Uses shard2
+#   end
+#
 # Related modules: Sequel::ServerBlock, Sequel::UnthreadedServerBlock,
 # Sequel::ThreadedServerBlock
 
@@ -60,17 +73,17 @@ module Sequel
     end
 
     # Delegate to the connection pool
-    def with_server(server, &block)
-      pool.with_server(server, &block)
+    def with_server(default_server, read_only_server=default_server, &block)
+      pool.with_server(default_server, read_only_server, &block)
     end
   end
 
   # Adds with_server support for the sharded single connection pool.
   module UnthreadedServerBlock
     # Set a default server/shard to use inside the block.
-    def with_server(server)
+    def with_server(default_server, read_only_server=default_server)
       begin
-        set_default_server(server)
+        set_default_server(default_server, read_only_server)
         yield
       ensure
         clear_default_server
@@ -80,8 +93,8 @@ module Sequel
     private
 
     # Make the given server the new default server.
-    def set_default_server(server)
-      @default_servers << server
+    def set_default_server(default_server, read_only_server=default_server)
+      @default_servers << [default_server, read_only_server]
     end
 
     # Remove the current default server, restoring the
@@ -96,8 +109,10 @@ module Sequel
         super
       else
         case server
-        when :default, nil, :read_only
-          @default_servers.last
+        when :default, nil
+          @default_servers[-1][0]
+        when :read_only
+          @default_servers[-1][1]
         else
           super
         end
@@ -109,9 +124,9 @@ module Sequel
   module ThreadedServerBlock
     # Set a default server/shard to use inside the block for the current
     # thread.
-    def with_server(server)
+    def with_server(default_server, read_only_server=default_server)
       begin
-        set_default_server(server)
+        set_default_server(default_server, read_only_server)
         yield
       ensure
         clear_default_server
@@ -121,8 +136,8 @@ module Sequel
     private
 
     # Make the given server the new default server for the current thread.
-    def set_default_server(server)
-      sync{(@default_servers[Thread.current] ||= [])} << server
+    def set_default_server(default_server, read_only_server=default_server)
+      sync{(@default_servers[Thread.current] ||= [])} << [default_server, read_only_server]
     end
 
     # Remove the current default server for the current thread, restoring the
@@ -141,8 +156,10 @@ module Sequel
         super
       else
         case server
-        when :default, nil, :read_only
-          a.last
+        when :default, nil
+          a[-1][0]
+        when :read_only
+          a[-1][1]
         else
           super
         end

data/lib/sequel/model.rb

@@ -106,7 +106,7 @@ module Sequel
     @raise_on_save_failure = true
     @raise_on_typecast_failure = false
     @require_modification = nil
-    @require_valid_table = false
+    @require_valid_table = nil
     @restrict_primary_key = true
     @setter_methods = nil
     @simple_pk = nil

data/lib/sequel/model/associations.rb

@@ -15,6 +15,7 @@ module Sequel
           @autoreloading_associations = {}
           @cache_associations = true
           @default_association_options = {}
+          @default_association_type_options = {}
           @dataset_module_class = DatasetModule
         end
       end
@@ -1526,9 +1527,15 @@ module Sequel
         # the previous class.
         attr_accessor :cache_associations
 
-        # The default options to use for all associations.
+        # The default options to use for all associations.  This hash is merged into the association reflection hash for
+        # all association reflections.
         attr_accessor :default_association_options
 
+        # The default options to use for all associations of a given type.  This is a hash keyed by association type
+        # symbol.  If there is a value for the association type symbol key, the resulting hash will be merged into the
+        # association reflection hash for all association reflections of that type.
+        attr_accessor :default_association_type_options
+
         # The default :eager_limit_strategy option to use for limited or offset associations (default: true, causing Sequel
         # to use what it considers the most appropriate strategy).
         attr_accessor :default_eager_limit_strategy
@@ -1768,7 +1775,14 @@ module Sequel
             orig_opts = cloned_assoc[:orig_opts].merge(orig_opts)
           end
 
-          opts = default_association_options.merge(orig_opts).merge(:type => type, :name => name, :cache=>({} if cache_associations), :model => self)
+          opts = Hash[default_association_options]
+          if type_options = default_association_type_options[type]
+            opts.merge!(type_options)
+          end
+          opts.merge!(orig_opts)
+          opts.merge!(:type => type, :name => name, :cache=>({} if cache_associations), :model => self)
+
+          opts
           opts[:block] = block if block
           if !opts.has_key?(:instance_specific) && (block || orig_opts[:block] || orig_opts[:dataset])
             # It's possible the association is instance specific, in that it depends on
@@ -1832,6 +1846,8 @@ module Sequel
           @association_reflections.freeze.each_value(&:freeze)
           @autoreloading_associations.freeze.each_value(&:freeze)
           @default_association_options.freeze
+          @default_association_type_options.freeze
+          @default_association_type_options.each_value(&:freeze)
 
           super
         end
@@ -1869,7 +1885,7 @@ module Sequel
           associate(:one_to_one, name, opts, &block)
         end
 
-        Plugins.inherited_instance_variables(self, :@association_reflections=>:dup, :@autoreloading_associations=>:hash_dup, :@default_association_options=>:dup, :@cache_associations=>nil, :@default_eager_limit_strategy=>nil)
+        Plugins.inherited_instance_variables(self, :@association_reflections=>:dup, :@autoreloading_associations=>:hash_dup, :@default_association_options=>:dup, :@default_association_type_options=>:hash_dup, :@cache_associations=>nil, :@default_eager_limit_strategy=>nil)
         Plugins.def_dataset_methods(self, [:eager, :eager_graph, :eager_graph_with_options, :association_join, :association_full_join, :association_inner_join, :association_left_join, :association_right_join])
         
         private

data/lib/sequel/model/base.rb

@@ -981,13 +981,20 @@ module Sequel
       private
       
       # Yield to the passed block and swallow all errors other than DatabaseConnectionErrors.
-      def check_non_connection_error
+      def check_non_connection_error(do_raise=require_valid_table)
         begin
           db.transaction(:savepoint=>:only){yield}
         rescue Sequel::DatabaseConnectionError
           raise
         rescue Sequel::Error
-          raise if require_valid_table
+          case do_raise
+          when nil
+            Sequel::Deprecation.deprecate("Setting a model class dataset to an invalid dataset", "Either use a valid dataset or set require_valid_table = false for the model class")
+          when false
+            # nothing
+          else
+            raise
+          end
         end
       end
 
@@ -1097,7 +1104,7 @@ module Sequel
         schema_hash = {}
         ds_opts = dataset.opts
         get_columns = proc{check_non_connection_error{columns} || []}
-        schema_array = check_non_connection_error{db.schema(dataset, :reload=>reload)} if db.supports_schema_parsing?
+        schema_array = check_non_connection_error(false){db.schema(dataset, :reload=>reload)} if db.supports_schema_parsing?
         if schema_array
           schema_array.each{|k,v| schema_hash[k] = v}
 

data/lib/sequel/plugins/association_autoreloading.rb

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+Sequel::Deprecation.deprecate("The association_autoreloading plugin", "This plugin was integrated into the default model behavior in Sequel 4.0, and no longer has an effect")
+
 module Sequel
   module Plugins
     # Empty plugin module for backwards compatibility

data/lib/sequel/plugins/association_dependencies.rb

@@ -6,9 +6,9 @@ module Sequel
     # for destroying, deleting, or nullifying associated model objects.  The following
     # association types support the following dependency actions:
     # 
-    # * :many_to_many - :nullify (removes all related entries in join table)
-    # * :many_to_one - :delete, :destroy
-    # * :one_to_many, one_to_one - :delete, :destroy, :nullify (sets foreign key to NULL for all associated objects)
+    # :many_to_many :: :nullify (removes all related entries in join table)
+    # :many_to_one :: :delete, :destroy
+    # :one_to_many, one_to_one :: :delete, :destroy, :nullify (sets foreign key to NULL for all associated objects)
     #
     # This plugin works directly with the association datasets and does not use any cached association values.
     # The :delete action will delete all associated objects from the database in a single SQL call.

data/lib/sequel/plugins/boolean_readers.rb

@@ -49,7 +49,7 @@ module Sequel
         # Add attribute? methods for all of the boolean attributes for this model.
         def create_boolean_readers
           im = instance_methods.collect(&:to_s)
-          if cs = check_non_connection_error{columns}
+          if cs = check_non_connection_error(false){columns}
             cs.each{|c| create_boolean_reader(c) if boolean_attribute?(c) && !im.include?("#{c}?")}
           end
         end

data/lib/sequel/plugins/boolean_subsets.rb

@@ -48,7 +48,7 @@ module Sequel
 
         # Add subset methods for all of the boolean columns in this model.
         def create_boolean_subsets
-          if cs = check_non_connection_error{columns}
+          if cs = check_non_connection_error(false){columns}
             cs = cs.select{|c| db_schema[c][:type] == :boolean}.map{|c| boolean_subset_args(c)}
             dataset_module do
               cs.each{|c| where(*c)}

data/lib/sequel/plugins/class_table_inheritance.rb

@@ -281,7 +281,7 @@ module Sequel
               columns = db.from(table).columns
             else
               table = subclass.implicit_table_name
-              columns = check_non_connection_error{db.from(table).columns}
+              columns = check_non_connection_error(false){db.from(table).columns}
               table = nil if !columns || columns.empty?
             end
           end
@@ -295,8 +295,9 @@ module Sequel
               ds = ds.select(*self.columns.map{|cc| Sequel.qualify(cti_table_name, Sequel.identifier(cc))})
             end
             cols = columns - [pk]
-            unless (cols & ds.columns).empty?
-              Sequel::Deprecation.deprecate('Using class_table_inheritance with duplicate column names in subclass tables (other than the primary key column)', 'Make sure all tables used have unique column names, or implement support for handling duplicate column names in the class_table_inheritance plugin')
+            dup_cols = cols & ds.columns
+            unless dup_cols.empty?
+              Sequel::Deprecation.deprecate("Using class_table_inheritance with duplicate column names (#{n} => #{dup_cols}) in subclass tables (other than the primary key column)', 'Make sure all tables used have unique column names, or implement support for handling duplicate column names in the class_table_inheritance plugin")
             end
             sel_app = cols.map{|cc| Sequel.qualify(table, Sequel.identifier(cc))}
             @sti_dataset = ds = ds.join(table, pk=>pk).select_append(*sel_app)

data/lib/sequel/plugins/column_select.rb

@@ -43,13 +43,13 @@ module Sequel
           ds = super
           if !ds.opts[:select] && (from = ds.opts[:from]) && from.length == 1 && !ds.opts[:join]
             if db.supports_schema_parsing?
-              cols = check_non_connection_error{db.schema(ds)}
+              cols = check_non_connection_error(false){db.schema(ds)}
               if cols
                 cols = cols.map{|c, _| c}
               end
             end
 
-            if cols ||= check_non_connection_error{ds.columns}
+            if cols ||= check_non_connection_error(false){ds.columns}
               ds = ds.select(*cols.map{|c| Sequel.qualify(ds.first_source, Sequel.identifier(c))})
             end
           end

data/lib/sequel/plugins/defaults_setter.rb

@@ -36,6 +36,8 @@ module Sequel
         
         Plugins.after_set_dataset(self, :set_default_values)
 
+        Plugins.inherited_instance_variables(self, :@default_values=>:dup)
+
         # Freeze default values when freezing model class
         def freeze
           @default_values.freeze
@@ -48,7 +50,7 @@ module Sequel
         def set_default_values
           h = {}
           @db_schema.each{|k, v| h[k] = convert_default_value(v[:ruby_default]) unless v[:ruby_default].nil?} if @db_schema
-          @default_values = h
+          @default_values = h.merge!(@default_values || {})
         end
 
         # Handle the CURRENT_DATE and CURRENT_TIMESTAMP values specially by returning an appropriate Date or

data/lib/sequel/plugins/many_to_one_pk_lookup.rb

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+Sequel::Deprecation.deprecate("The many_to_one_pk_lookup plugin", "This plugin was integrated into the default model behavior in Sequel 4.0, and no longer has an effect")
+
 module Sequel
   module Plugins
     # Empty plugin module for backwards compatibility

data/lib/sequel/plugins/nested_attributes.rb

@@ -70,7 +70,7 @@ module Sequel
     #
     # Then you can do:
     #
-    #   artist.update(params[:artist])
+    #   artist.update_fields(params[:artist], [:name, :albums_artists])
     #
     # To save changes to the artist, create the first album and associate it to the artist,
     # and update the other existing associated album.

data/lib/sequel/plugins/pg_typecast_on_load.rb

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+Sequel::Deprecation.deprecate("The pg_typecast_on_load plugin", "This plugin is only useful on the deprecated do and switch adapters")
+
 module Sequel
   module Plugins
     # The PgTypecastOnLoad plugin exists because when you connect to PostgreSQL

data/lib/sequel/plugins/rcte_tree.rb

@@ -12,26 +12,6 @@ module Sequel
     # level (where level 1 is children, level 2 is children and grandchildren
     # etc.) in a single query.
     #
-    # = Background
-    # 
-    # There are two types of common models for storing tree structured data
-    # in an SQL database, the adjacency list model and the nested set model.
-    # Before recursive common table expressions (or similar capabilities such
-    # as CONNECT BY for Oracle), the nested set model was the only easy way
-    # to retrieve all ancestors and descendants in a single query.  However,
-    # it has significant performance corner cases.
-    #
-    # On PostgreSQL 8.4, with a significant number of rows, the nested set
-    # model is almost 500 times slower than using a recursive common table
-    # expression with the adjacency list model to get all descendants, and
-    # almost 24,000 times slower to get all descendants to a given level.
-    #
-    # Considering that the nested set model requires more difficult management
-    # than the adjacency list model, it's almost always better to use the
-    # adjacency list model if your database supports common table expressions.
-    # See http://explainextended.com/2009/09/24/adjacency-list-vs-nested-sets-postgresql/
-    # for detailed analysis.
-    #
     # = Usage
     #
     # The rcte_tree plugin adds four associations to the model: parent, children, ancestors, and

data/lib/sequel/plugins/serialization.rb

@@ -7,11 +7,11 @@ module Sequel
     # when you call an accessor.
     #
     # This plugin works by keeping the serialized value in the values, and
-    # adding a @deserialized_values hash.  The reader method for serialized columns
-    # will check the @deserialized_values for the value, return it if present,
-    # or deserialized the entry in @values and return it.  The writer method will
-    # set the @deserialized_values entry.  This plugin adds a before_save hook
-    # that serializes all @deserialized_values to @values.
+    # adding a deserialized_values hash.  The reader method for serialized columns
+    # will check the deserialized_values for the value, return it if present,
+    # or deserialized the entry in values and return it.  The writer method will
+    # set the deserialized_values entry.  This plugin adds a before_save hook
+    # that serializes all deserialized_values to values.
     #
     # You can specify the serialization format as a pair of serializer/deserializer
     # callable objects.  You can also specify the serialization format as a single

data/lib/sequel/plugins/validation_helpers.rb

@@ -2,8 +2,8 @@
 
 module Sequel
   module Plugins
-    # The validation_helpers plugin contains instance method equivalents for most of the legacy
-    # class-level validations.  The names and APIs are different, though. Example:
+    # The validation_helpers plugin contains validate_* methods designed to be called inside Model#validate
+    # to perform validations:
     #
     #   Sequel::Model.plugin :validation_helpers
     #   class Album < Sequel::Model

data/lib/sequel/version.rb

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

data/spec/adapters/postgres_spec.rb

@@ -168,6 +168,8 @@ describe "PostgreSQL views" do
     @db[:items_view].select_order_map(:number).must_equal [10, 20]
     @db.refresh_view(:items_view)
     @db[:items_view].select_order_map(:number).must_equal [10, 15, 20]
+    @db.views.wont_include :items_view
+    @db.views(@opts).must_include :items_view
   end if DB.server_version >= 90300
 
   it "should support refreshing materialized views concurrently" do

data/spec/extensions/column_select_spec.rb

@@ -114,6 +114,7 @@ describe "Sequel::Plugins::ColumnSelect" do
     def @db.supports_schema_parsing?() true end
     def @db.schema_parse_table(t, *) [] end
     @db.extend_datasets{def columns; raise Sequel::DatabaseError; end}
+    @Album.require_valid_table = false
     @Album.plugin :column_select
     @Album.dataset.sql.must_equal 'SELECT * FROM albums'
   end

data/spec/extensions/defaults_setter_spec.rb

@@ -72,6 +72,7 @@ describe "Sequel::Plugins::DefaultsSetter" do
 
   it "should contain the default values in default_values" do
     @pr.call(2).default_values.must_equal(:a=>2)
+    @c.default_values.clear
     @pr.call(nil).default_values.must_equal({})
   end
 
@@ -93,6 +94,19 @@ describe "Sequel::Plugins::DefaultsSetter" do
     @c.new.a.must_be_nil
   end
 
+  it "should work in subclasses" do
+    @pr.call(2)
+    @c.default_values[:a] = proc{1}
+    c = Class.new(@c)
+
+    @c.new.a.must_equal 1
+    c.new.a.must_equal 1
+
+    c.default_values[:a] = proc{2}
+    @c.new.a.must_equal 1
+    c.new.a.must_equal 2
+  end
+
   it "should work correctly on a model without a dataset" do
     @pr.call(2)
     c = Class.new(Sequel::Model(@db[:bar]))

data/spec/extensions/pg_typecast_on_load_spec.rb

@@ -7,28 +7,30 @@ describe Sequel::Model, "PgTypecastOnLoad plugin" do
       [[:id, {}], [:b, {:type=>:boolean, :oid=>16}], [:y, {:type=>:integer, :oid=>20}]]
     end
     @c = Class.new(Sequel::Model(@db[:items]))
-    @c.plugin :pg_typecast_on_load, :b, :y
+    deprecated do
+      @c.plugin :pg_typecast_on_load, :b, :y
+    end
   end 
 
-  it "should call the database conversion proc for all given columns" do
+  deprecated "should call the database conversion proc for all given columns" do
     @c.first.values.must_equal(:id=>1, :b=>true, :y=>0)
   end
 
-  it "should call the database conversion proc with value when reloading the object, for all given columns" do
+  deprecated "should call the database conversion proc with value when reloading the object, for all given columns" do
     @c.first.refresh.values.must_equal(:id=>1, :b=>true, :y=>0)
   end
 
-  it "should not fail if schema oid does not have a related conversion proc" do
+  deprecated "should not fail if schema oid does not have a related conversion proc" do
     @c.db_schema[:b][:oid] = 0
     @c.first.refresh.values.must_equal(:id=>1, :b=>"t", :y=>0)
   end
 
-  it "should call the database conversion proc with value when automatically reloading the object on creation via insert_select" do
+  deprecated "should call the database conversion proc with value when automatically reloading the object on creation via insert_select" do
     @c.dataset = @c.dataset.with_extend{def insert_select(h) insert(h); first end}
     @c.create.values.must_equal(:id=>1, :b=>true, :y=>0)
   end
 
-  it "should allowing setting columns separately via add_pg_typecast_on_load_columns" do
+  deprecated "should allowing setting columns separately via add_pg_typecast_on_load_columns" do
     @c = Class.new(Sequel::Model(@db[:items]))
     @c.plugin :pg_typecast_on_load
     @c.first.values.must_equal(:id=>1, :b=>"t", :y=>"0")
@@ -38,7 +40,7 @@ describe Sequel::Model, "PgTypecastOnLoad plugin" do
     @c.first.values.must_equal(:id=>1, :b=>true, :y=>0)
   end
 
-  it "should work with subclasses" do
+  deprecated "should work with subclasses" do
     @c = Class.new(Sequel::Model(@db[:items]))
     @c.plugin :pg_typecast_on_load
     @c.first.values.must_equal(:id=>1, :b=>"t", :y=>"0")
@@ -57,11 +59,11 @@ describe Sequel::Model, "PgTypecastOnLoad plugin" do
     c1.first.values.must_equal(:id=>1, :b=>"t", :y=>0)
   end
 
-  it "should not mark the object as modified" do
+  deprecated "should not mark the object as modified" do
     @c.first.modified?.must_equal false
   end
 
-  it "should freeze pg_typecast_on_load_columns" do
+  deprecated "should freeze pg_typecast_on_load_columns" do
     @c.freeze
     @c.pg_typecast_on_load_columns.frozen?.must_equal true
   end

data/spec/extensions/schema_dumper_spec.rb

@@ -802,6 +802,22 @@ end
 END_MIG
   end
 
+  it "should convert oracle special types to ruby types" do
+    @d.meta_def(:database_type){:oracle}
+    types = ['number not null', 'date not null', 'varchar2(4 byte) not null']
+    @d.meta_def(:schema) do |t, *o|
+      i = 0
+      types.map{|x| [:"c#{i+=1}", {:db_type=>x, :allow_null=>false}]}
+    end
+    @d.dump_table_schema(:x).must_equal((<<END_MIG).chomp)
+create_table(:x) do
+  BigDecimal :c1, :null=>false
+  Date :c2, :null=>false
+  String :c3, :null=>false
+end
+END_MIG
+  end
+
   it "should force specify :null option for MySQL timestamp columns when using :same_db" do
     @d.meta_def(:database_type){:mysql}
     @d.meta_def(:schema){|*s| [[:c1, {:db_type=>'timestamp', :primary_key=>true, :allow_null=>true}]]}

data/spec/extensions/server_block_spec.rb

@@ -8,6 +8,13 @@ with_server_specs = shared_description do
     @db.sqls.must_equal ["SELECT * FROM t -- b"]
   end
 
+  it "should set the default server to use in the block" do
+    @db.with_server(:a, :b){@db[:t].all}
+    @db.sqls.must_equal ["SELECT * FROM t -- b"]
+    @db.with_server(:a, :b){@db[:t].insert}
+    @db.sqls.must_equal ["INSERT INTO t DEFAULT VALUES -- a"]
+  end
+
   it "should have no affect after the block" do
     @db.with_server(:a){@db[:t].all}
     @db.sqls.must_equal ["SELECT * FROM t -- a"]

data/spec/integration/model_test.rb

@@ -49,7 +49,7 @@ describe "Sequel::Model basic support" do
     Item.all.must_equal [Item.load(:id=>1, :name=>'J')]
   end
 
-  it "should not raise an error if the implied database table doesn't exist " do
+  deprecated "should not raise an error if the implied database table doesn't exist" do
     class ::Item::Thing < Sequel::Model(@db)
       set_dataset :items
     end
@@ -57,6 +57,26 @@ describe "Sequel::Model basic support" do
     Item::Thing.first.must_equal Item::Thing.load(:id=>1, :name=>'J')
   end
 
+  it "should raise an error if the implied database table doesn't exist if require_valid_table is true" do
+    proc do
+      c = Sequel::Model(@db)
+      c.require_valid_table = true
+      class ::Item::Thing < c
+        set_dataset :items
+      end
+    end.must_raise Sequel::Error
+  end
+
+  it "should not raise an error if the implied database table doesn't exist if require_valid_table is false" do
+    c = Sequel::Model(@db)
+    c.require_valid_table = false
+    class ::Item::Thing < c
+      set_dataset :items
+    end
+    Item.create(:name=>'J')
+    Item::Thing.first.must_equal Item::Thing.load(:id=>1, :name=>'J')
+  end
+
   it "should create accessors for all table columns even if all dataset columns aren't selected" do
     c = Class.new(Sequel::Model(@db[:items].select(:id)))
     o = c.new
@@ -219,14 +239,43 @@ describe "Sequel::Model basic support" do
 end
 
 describe "Sequel::Model with no existing table" do 
-  it "should not raise an error when setting the dataset" do
+  deprecated "should not raise an error when setting the dataset" do
     db = DB
     db.drop_table?(:items)
-    class ::Item < Sequel::Model(db); end; Object.send(:remove_const, :Item)
-    c = Class.new(Sequel::Model); c.set_dataset(db[:items])
+    c = Class.new(Sequel::Model)
+    c.set_dataset(db[:items])
     db.transaction do
       c = Class.new(Sequel::Model(db[:items]))
       db.get(Sequel.cast(1, Integer)).must_equal 1
     end
   end
+
+  it "should not raise an error when setting the dataset when require_valid_table is true" do
+    db = DB
+    db.drop_table?(:items)
+    c1 = Sequel::Model(db);
+    c = Class.new(Sequel::Model)
+    c.require_valid_table = true
+    proc{c.set_dataset(db[:items])}.must_raise Sequel::Error
+    db.transaction do
+      c = Class.new(Sequel::Model)
+      c.require_valid_table = true
+      proc{c.dataset = db[:items]}.must_raise Sequel::Error
+      db.get(Sequel.cast(1, Integer)).must_equal 1
+    end
+  end
+
+  it "should not raise an error when setting the dataset when require_valid_table is false" do
+    db = DB
+    db.drop_table?(:items)
+    c = Class.new(Sequel::Model)
+    c.require_valid_table = false
+    c.set_dataset(db[:items])
+    db.transaction do
+      c = Class.new(Sequel::Model)
+      c.require_valid_table = false
+      c.dataset = db[:items]
+      db.get(Sequel.cast(1, Integer)).must_equal 1
+    end
+  end
 end

data/spec/integration/plugin_test.rb

@@ -1937,7 +1937,6 @@ describe "Caching plugins" do
   end
   before do
     @Album = Class.new(Sequel::Model(@db[:albums]))
-    @Album.plugin :many_to_one_pk_lookup
   end
   after(:all) do
     @db.drop_table?(:albums, :artists)

data/spec/model/association_reflection_spec.rb

@@ -586,6 +586,48 @@ describe Sequel::Model::Associations::AssociationReflection, "with default assoc
     r[:foo].must_equal 3
     r[:bar].must_equal 2
   end
+
+  it "should have default_association_type_options take precedence over default_association_options" do
+    @c.default_association_options = {:foo=>2, :bar=>3}
+    @c.default_association_type_options[:many_to_one] = {:foo=>1, :bar=>2}
+    @c.many_to_one :c, :class=>@c, :foo=>3
+    r = @c.association_reflection(:c)
+    r[:foo].must_equal 3
+    r[:bar].must_equal 2
+  end
+
+  it "should use default_association_type_options as defaults" do
+    @c.default_association_type_options[:many_to_one] = {:foo=>1, :bar=>2}
+    @c.many_to_one :c, :class=>@c, :foo=>3
+    r = @c.association_reflection(:c)
+    r[:foo].must_equal 3
+    r[:bar].must_equal 2
+
+    @c.one_to_many :cs, :class=>@c, :foo=>3
+    r = @c.association_reflection(:cs)
+    r[:foo].must_equal 3
+    r[:bar].must_be_nil
+  end
+
+  it "should inherit default_association_type_options" do
+    @c.default_association_type_options[:many_to_one] = {:foo=>1, :bar=>2}
+    c = Class.new(@c)
+    c.many_to_one :c, :class=>c, :foo=>3
+    r = c.association_reflection(:c)
+    r[:foo].must_equal 3
+    r[:bar].must_equal 2
+
+    @c.default_association_type_options[:many_to_one][:bar] = 4
+    c.many_to_one :d, :class=>c, :foo=>3
+    r = c.association_reflection(:d)
+    r[:foo].must_equal 3
+    r[:bar].must_equal 2
+
+    c.one_to_many :ds, :class=>c, :foo=>3
+    r = c.association_reflection(:ds)
+    r[:foo].must_equal 3
+    r[:bar].must_be_nil
+  end
 end
 
 describe "Sequel::Model.freeze" do

data/spec/model/model_spec.rb

@@ -1114,7 +1114,43 @@ describe "Model.db_schema" do
     @c.db_schema.must_equal(:x=>{:type=>:integer}, :z=>{}, :y=>{:type=>:string})
   end
 
-  it "should fallback to fetching records if schema raises an error" do
+  deprecated "should not raise error if setting dataset where getting schema and columns raises an error" do
+    def @db.schema(table, opts={})
+      raise Sequel::Error
+    end
+    @c.dataset = @dataset.join(:x, :id).from_self.columns(:id, :x)
+    @c.db_schema.must_equal(:x=>{}, :id=>{})
+  end
+  
+  it "should not raise error if setting dataset where getting schema and columns raises an error and require_valid_table is false" do
+    @c.require_valid_table = false
+    def @db.schema(table, opts={})
+      raise Sequel::Error
+    end
+    @c.dataset = @dataset.join(:x, :id).from_self.columns(:id, :x)
+    @c.db_schema.must_equal(:x=>{}, :id=>{})
+  end
+  
+  it "should raise error if setting dataset where getting schema and columns raises an error and require_valid_table is true" do
+    @c.require_valid_table = true
+    def @db.schema(table, opts={})
+      raise Sequel::Error
+    end
+    @c.dataset = @dataset.join(:x, :id).from_self.columns(:id, :x)
+    @c.db_schema.must_equal(:x=>{}, :id=>{})
+  end
+  
+  it "should use dataset columns if getting schema raises an error and require_valid_table is false" do
+    @c.require_valid_table = false
+    def @db.schema(table, opts={})
+      raise Sequel::Error
+    end
+    @c.dataset = @dataset.join(:x, :id).from_self.columns(:id, :x)
+    @c.db_schema.must_equal(:x=>{}, :id=>{})
+  end
+  
+  it "should use dataset columns if getting schema raises an error and require_valid_table is true" do
+    @c.require_valid_table = true
     def @db.schema(table, opts={})
       raise Sequel::Error
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.46.0
+  version: 4.47.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -248,6 +248,7 @@ extra_rdoc_files:
 - doc/release_notes/4.44.0.txt
 - doc/release_notes/4.45.0.txt
 - doc/release_notes/4.46.0.txt
+- doc/release_notes/4.47.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -385,6 +386,7 @@ files:
 - doc/release_notes/4.44.0.txt
 - doc/release_notes/4.45.0.txt
 - doc/release_notes/4.46.0.txt
+- doc/release_notes/4.47.0.txt
 - doc/release_notes/4.5.0.txt
 - doc/release_notes/4.6.0.txt
 - doc/release_notes/4.7.0.txt