sequel 3.48.0 → 4.0.0

data/lib/sequel/plugins/xml_serializer.rb

@@ -103,9 +103,6 @@ module Sequel
     #
     #   album.from_xml(xml, :associations=>{:artist=>{:fields=>%w'id name', :associations=>:tags}})
     #
-    # If the xml is trusted and should be allowed to set all column and association
-    # values, you can use the :all_columns and :all_associations options.
-    #
     # Usage:
     #
     #   # Add XML output capability to all model subclass instances (called before loading subclasses)
@@ -130,10 +127,7 @@ module Sequel
 
         # Return an array of instances of this class based on
         # the provided XML.
-        def array_from_xml(xml, opts={})
-          if opts[:all_associations] || opts[:all_columns]
-            Sequel::Deprecation.deprecate("The array_from_xml :all_associations and :all_columns", 'You need to explicitly specify the associations and columns via the :associations and :fields options')
-          end
+        def array_from_xml(xml, opts=OPTS)
           node = Nokogiri::XML(xml).children.first
           unless node 
             raise Error, "Malformed XML used"
@@ -143,24 +137,21 @@ module Sequel
 
         # Return an instance of this class based on the provided
         # XML.
-        def from_xml(xml, opts={})
-          if opts[:all_associations] || opts[:all_columns]
-            Sequel::Deprecation.deprecate("The from_xml :all_associations and :all_columns", 'You need to explicitly specify the associations and columns via the :associations and :fields options')
-          end
+        def from_xml(xml, opts=OPTS)
           from_xml_node(Nokogiri::XML(xml).children.first, opts)
         end
 
         # Return an instance of this class based on the given
         # XML node, which should be Nokogiri::XML::Node instance.
         # This should probably not be used directly by user code.
-        def from_xml_node(parent, opts={})
+        def from_xml_node(parent, opts=OPTS)
           new.from_xml_node(parent, opts)
         end
 
         # Return an appropriate Nokogiri::XML::Builder instance
         # used to create the XML.  This should probably not be used
         # directly by user code.
-        def xml_builder(opts={})
+        def xml_builder(opts=OPTS)
           if opts[:builder]
             opts[:builder]
           else
@@ -177,7 +168,7 @@ module Sequel
         # Return a proc (or any other object that responds to []),
         # used for formatting XML tag names when serializing to XML.
         # This should probably not be used directly by user code.
-        def xml_deserialize_name_proc(opts={})
+        def xml_deserialize_name_proc(opts=OPTS)
           if opts[:name_proc]
             opts[:name_proc]
           elsif opts[:underscore]
@@ -190,7 +181,7 @@ module Sequel
         # Return a proc (or any other object that responds to []),
         # used for formatting XML tag names when serializing to XML.
         # This should probably not be used directly by user code.
-        def xml_serialize_name_proc(opts={})
+        def xml_serialize_name_proc(opts=OPTS)
           pr = if opts[:name_proc]
             opts[:name_proc]
           elsif opts[:dasherize]
@@ -216,10 +207,7 @@ module Sequel
         # :underscore :: Sets the :name_proc option to one that calls +underscore+
         #                on the input string.  Requires that you load the inflector
         #                extension or another library that adds String#underscore.
-        def from_xml(xml, opts={})
-          if opts[:all_associations] || opts[:all_columns]
-            Sequel::Deprecation.deprecate("The from_xml :all_associations and :all_columns", 'You need to explicitly specify the associations and columns via the :associations and :fields options')
-          end
+        def from_xml(xml, opts=OPTS)
           from_xml_node(Nokogiri::XML(xml).children.first, opts)
         end
 
@@ -228,22 +216,12 @@ module Sequel
         # By default, just calls set with a hash created from the content of the node.
         # 
         # Options:
-        # :all_associations :: Indicates that all associations supported by the model should be tried.
-        #                      This option also cascades to associations if used. It is better to use the
-        #                      :associations option instead of this option. This option only exists for
-        #                      backwards compatibility.
-        # :all_columns :: Overrides the setting logic allowing all setter methods be used,
-        #                 even if access to the setter method is restricted.
-        #                 This option cascades to associations if used, and can be reset in those associations
-        #                 using the :all_columns=>false or :fields options.  This option is considered a
-        #                 security risk, and only exists for backwards compatibility.  It is better to use
-        #                 the :fields option appropriately instead of this option, or no option at all.
         # :associations :: Indicates that the associations cache should be updated by creating
         #                  a new associated object using data from the hash.  Should be a Symbol
         #                  for a single association, an array of symbols for multiple associations,
         #                  or a hash with symbol keys and dependent association option hash values.
         # :fields :: Changes the behavior to call set_fields using the provided fields, instead of calling set.
-        def from_xml_node(parent, opts={})
+        def from_xml_node(parent, opts=OPTS)
           unless parent
             raise Error, "Malformed XML used"
           end
@@ -251,14 +229,7 @@ module Sequel
             raise Error, "XML consisting of just text nodes used"
           end
 
-          unless assocs = opts[:associations]
-            if opts[:all_associations]
-              assocs = {}
-              model.associations.each{|v| assocs[v] = {:all_associations=>true}}
-            end
-          end
-
-          if assocs
+          if assocs = opts[:associations]
             assocs = case assocs
             when Symbol
               {assocs=>{}}
@@ -272,18 +243,13 @@ module Sequel
               raise Error, ":associations should be Symbol, Array, or Hash if present"
             end
 
-            if opts[:all_columns]
-              assocs.each_value do |assoc_opts|
-                assoc_opts[:all_columns] = true unless assoc_opts.has_key?(:fields) || assoc_opts.has_key?(:all_columns)
-              end
-            end
-
             assocs_hash = {}
             assocs.each{|k,v| assocs_hash[k.to_s] = v}
             assocs_present = []
           end
 
           hash = {}
+          populate_associations = {}
           name_proc = model.xml_deserialize_name_proc(opts)
           parent.children.each do |node|
             next if node.is_a?(Nokogiri::XML::Text)
@@ -303,7 +269,7 @@ module Sequel
                 raise Error, "Association #{assoc} is not defined for #{model}"
               end
 
-              associations[assoc] = if r.returns_array?
+              populate_associations[assoc] = if r.returns_array?
                 node.children.reject{|c| c.is_a?(Nokogiri::XML::Text)}.map{|c| r.associated_class.from_xml_node(c, assoc_opts)}
               else
                 r.associated_class.from_xml_node(node, assoc_opts)
@@ -313,19 +279,14 @@ module Sequel
 
           if fields = opts[:fields]
             set_fields(hash, fields, opts)
-          elsif opts[:all_columns]
-            meths = methods.collect{|x| x.to_s}.grep(Model::SETTER_METHOD_REGEXP) - Model::RESTRICTED_SETTER_METHODS
-            hash.each do |k, v|
-              if meths.include?(setter_meth = "#{k}=")
-                send(setter_meth, v)
-              else
-                raise Error, "Entry in XML does not have a matching setter method: #{k}"
-              end
-            end
           else
             set(hash)
           end
 
+          populate_associations.each do |assoc, values|
+            associations[assoc] = values
+          end
+
           self
         end
 
@@ -367,7 +328,7 @@ module Sequel
         #               an array of objects using Model.to_xml or Dataset#to_xml.
         # :types :: Set to true to include type information for
         #           all of the columns, pulled from the db_schema.
-        def to_xml(opts={})
+        def to_xml(opts=OPTS)
           vals = values
           types = opts[:types]
           inc = opts[:include]
@@ -406,7 +367,7 @@ module Sequel
 
         # Handle associated objects and virtual attributes when creating
         # the xml.
-        def to_xml_include(node, i, opts={})
+        def to_xml_include(node, i, opts=OPTS)
           name_proc = model.xml_serialize_name_proc(opts)
           objs = send(i)
           if objs.is_a?(Array) && objs.all?{|x| x.is_a?(Sequel::Model)}
@@ -426,7 +387,7 @@ module Sequel
         # this dataset.  Takes all of the options available to Model#to_xml,
         # as well as the :array_root_name option for specifying the name of
         # the root node that contains the nodes for all of the instances.
-        def to_xml(opts={})
+        def to_xml(opts=OPTS)
           raise(Sequel::Error, "Dataset#to_xml") unless row_proc
           x = model.xml_builder(opts)
           name_proc = model.xml_serialize_name_proc(opts)

data/lib/sequel/sql.rb

@@ -93,15 +93,6 @@ module Sequel
         # Do not call this method with untrusted input, as that can result in
         # arbitrary code execution.
         def to_s_method(meth, args=:self) # :nodoc:
-          # REMOVE40
-          class_eval(<<-END, __FILE__, __LINE__+1)
-            def to_s(ds)
-              Sequel::Deprecation.deprecate('SQL::Expression#to_s', "Please switch to using Dataset#literal to literalize expressions")
-              s = ''
-              to_s_append(ds, s)
-              s
-            end
-          END
           class_eval("def to_s_append(ds, sql) ds.#{meth}_append(sql, #{args}) end", __FILE__, __LINE__)
         end
       end
@@ -331,7 +322,7 @@ module Sequel
       #
       #   Sequel.asc(:a) # a ASC
       #   Sequel.asc(:b, :nulls=>:last) # b ASC NULLS LAST
-      def asc(arg, opts={})
+      def asc(arg, opts=OPTS)
         SQL::OrderedExpression.new(arg, false, opts)
       end
 
@@ -392,6 +383,16 @@ module Sequel
         SQL::EmulatedFunction.new(:char_length, arg)
       end
 
+      # Do a deep qualification of the argument using the qualifier.  This recurses into
+      # nested structures.
+      #
+      #   Sequel.deep_qualify(:table, :column) # "table"."column"
+      #   Sequel.deep_qualify(:table, Sequel.+(:column, 1)) # "table"."column" + 1
+      #   Sequel.deep_qualify(:table, Sequel.like(:a, 'b')) # "table"."a" LIKE 'b' ESCAPE '\'
+      def deep_qualify(qualifier, expr)
+        Sequel::Qualifier.new(Sequel, qualifier).transform(expr)
+      end
+
       # Return a delayed evaluation that uses the passed block. This is used
       # to delay evaluations of the code to runtime.  For example, with
       # the following code:
@@ -422,7 +423,7 @@ module Sequel
       #
       #   Sequel.desc(:a) # b DESC
       #   Sequel.desc(:b, :nulls=>:first) # b DESC NULLS FIRST
-      def desc(arg, opts={})
+      def desc(arg, opts=OPTS)
         SQL::OrderedExpression.new(arg, true, opts)
       end
 
@@ -624,6 +625,8 @@ module Sequel
       #   Sequel.subscript(:array, 1) # array[1]
       #   Sequel.subscript(:array, 1, 2) # array[1, 2]
       #   Sequel.subscript(:array, [1, 2]) # array[1, 2]
+      #   Sequel.subscript(:array, 1..2) # array[1:2]
+      #   Sequel.subscript(:array, 1...3) # array[1:2]
       def subscript(exp, *subs)
         SQL::Subscript.new(exp, subs.flatten)
       end
@@ -743,10 +746,6 @@ module Sequel
       end
     end
 
-    # Only exists for backwards compatibility, ignore it.
-    module NoBooleanInputMethods
-    end
-
     # This module includes the standard mathematical methods (+, -, *, and /)
     # that are defined on objects that can be used in a numeric context in SQL
     # (+Symbol+, +LiteralString+, and +SQL::GenericExpression+).
@@ -828,7 +827,7 @@ module Sequel
       # :nulls :: Set to :first to use NULLS FIRST (so NULL values are ordered
       #           before other values), or :last to use NULLS LAST (so NULL values
       #           are ordered after other values).
-      def asc(opts={})
+      def asc(opts=OPTS)
         OrderedExpression.new(self, false, opts)
       end
       
@@ -838,7 +837,7 @@ module Sequel
       # :nulls :: Set to :first to use NULLS FIRST (so NULL values are ordered
       #           before other values), or :last to use NULLS LAST (so NULL values
       #           are ordered after other values).
-      def desc(opts={})
+      def desc(opts=OPTS)
         OrderedExpression.new(self, true, opts)
       end
     end
@@ -908,6 +907,8 @@ module Sequel
       #   :array.sql_subscript(1) # array[1]
       #   :array.sql_subscript(1, 2) # array[1, 2]
       #   :array.sql_subscript([1, 2]) # array[1, 2]
+      #   :array.sql_subscript(:array, 1..2) # array[1:2]
+      #   :array.sql_subscript(:array, 1...3) # array[1:2]
       def sql_subscript(*sub)
         Subscript.new(self, sub.flatten)
       end
@@ -1361,7 +1362,7 @@ module Sequel
       # Options:
       #
       # :nulls :: Can be :first/:last for NULLS FIRST/LAST.
-      def initialize(expression, descending = true, opts={})
+      def initialize(expression, descending = true, opts=OPTS)
         @expression, @descending, @nulls = expression, descending, opts[:nulls]
       end
 
@@ -1502,9 +1503,6 @@ module Sequel
     class ValueList < ::Array
     end
 
-    # Deprecated name for +ValueList+, used for backwards compatibility
-    SQLArray = ValueList
-
     # The purpose of the +VirtualRow+ class is to allow the easy creation of SQL identifiers and functions
     # without relying on methods defined on +Symbol+.  This is useful if another library defines
     # the methods defined by Sequel, if you are running on ruby 1.9, or if you are not using the
@@ -1654,7 +1652,7 @@ module Sequel
       attr_reader :opts
 
       # Set the options to the options given
-      def initialize(opts={})
+      def initialize(opts=OPTS)
         @opts = opts
       end
 

data/lib/sequel/version.rb

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

data/spec/adapters/db2_spec.rb

@@ -1,23 +1,14 @@
-#!/usr/bin/env ruby
-#Author: Roy L Zuo (roylzuo at gmail dot com)
-#Description: 
+SEQUEL_ADAPTER_TEST = :db2
 
 require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
-require ENV['SEQUEL_DB2_SPEC_REQUIRE'] if ENV['SEQUEL_DB2_SPEC_REQUIRE']
-
-unless defined?(DB2_DB)
-  DB2_DB = Sequel.connect(ENV['SEQUEL_DB2_SPEC_DB']||DB2_URL)
-end
-
-if DB2_DB.table_exists?(:test)
-  DB2_DB.drop_table :test
+if DB.table_exists?(:test)
+  DB.drop_table(:test)
 end
-INTEGRATION_DB = DB2_DB unless defined?(INTEGRATION_DB)
 
 describe Sequel::Database do
   before do
-    @db = DB2_DB
+    @db = DB
     @db.create_table(:test){String :a}
     @ds = @db[:test]
   end
@@ -40,20 +31,20 @@ end
 describe "Simple Dataset operations" do
   before(:all) do
     Sequel::DB2.use_clob_as_blob = false
-    DB2_DB.create_table!(:items) do
+    DB.create_table!(:items) do
       Integer :id, :primary_key => true
       Integer :number
       column  :bin_string, 'varchar(20) for bit data'
       column  :bin_blob, 'blob'
     end
-    @ds = DB2_DB[:items]
+    @ds = DB[:items]
   end
   after(:each) do
     @ds.delete
   end
   after(:all) do
     Sequel::DB2.use_clob_as_blob = true
-    DB2_DB.drop_table(:items)
+    DB.drop_table(:items)
   end
 
   specify "should insert with a primary key specified" do
@@ -70,7 +61,7 @@ end
 
 describe Sequel::Database do
   before do
-    @db = DB2_DB
+    @db = DB
   end
   after do
     @db.drop_table(:items)
@@ -87,7 +78,7 @@ end
 
 describe "Sequel::IBMDB.convert_smallint_to_bool" do
   before do
-    @db = DB2_DB
+    @db = DB
     @db.create_table!(:booltest){column :b, 'smallint'; column :i, 'integer'}
     @ds = @db[:booltest]
   end
@@ -133,22 +124,22 @@ describe "Sequel::IBMDB.convert_smallint_to_bool" do
     @ds << {:b=>0, :i=>0}
     @ds.all.should == [{:b=>0, :i=>0}]
   end
-end if DB2_DB.adapter_scheme == :ibmdb
+end if DB.adapter_scheme == :ibmdb
 
 describe "Simple Dataset operations in transactions" do
   before do
-    DB2_DB.create_table!(:items_insert_in_transaction) do
+    DB.create_table!(:items_insert_in_transaction) do
       Integer :id, :primary_key => true
       integer :number
     end
-    @ds = DB2_DB[:items_insert_in_transaction]
+    @ds = DB[:items_insert_in_transaction]
   end
   after do
-    DB2_DB.drop_table(:items_insert_in_transaction)
+    DB.drop_table(:items_insert_in_transaction)
   end
 
   specify "should insert correctly with a primary key specified inside a transaction" do
-    DB2_DB.transaction do
+    DB.transaction do
       @ds.insert(:id=>100, :number=>20)
       @ds.count.should == 1
       @ds.order(:id).all.should == [{:id=>100, :number=>20}]

data/spec/adapters/firebird_spec.rb

@@ -1,41 +1,37 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+SEQUEL_ADAPTER_TEST = :firebird
 
-unless defined?(FIREBIRD_DB)
-  FIREBIRD_URL = 'firebird://sysdba:masterkey@localhost/reality_spec' unless defined? FIREBIRD_URL
-  FIREBIRD_DB = Sequel.connect(ENV['SEQUEL_FB_SPEC_DB']||FIREBIRD_URL)
-end
-INTEGRATION_DB = FIREBIRD_DB unless defined?(INTEGRATION_DB)
+require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
-def FIREBIRD_DB.sqls
+def DB.sqls
   (@sqls ||= [])
 end
 logger = Object.new
 def logger.method_missing(m, msg)
-  FIREBIRD_DB.sqls.push(msg)
+  DB.sqls.push(msg)
 end
-FIREBIRD_DB.loggers = [logger]
+DB.loggers = [logger]
 
-FIREBIRD_DB.create_table! :test do
+DB.create_table! :test do
   varchar :name,  :size => 50
   integer :val,   :index => true
 end
 
-FIREBIRD_DB.create_table! :test2 do
+DB.create_table! :test2 do
   integer :val
   timestamp :time_stamp
 end
 
-FIREBIRD_DB.create_table! :test3 do
+DB.create_table! :test3 do
   integer :val
   timestamp :time_stamp
 end
 
-FIREBIRD_DB.create_table! :test5 do
+DB.create_table! :test5 do
   primary_key :xid
   integer :val
 end
 
-FIREBIRD_DB.create_table! :test6 do
+DB.create_table! :test6 do
   primary_key :xid
   blob :val
   String :val2
@@ -45,7 +41,7 @@ end
 
 describe "A Firebird database" do
   before do
-    @db = FIREBIRD_DB
+    @db = DB
   end
 
   specify "should provide disconnect functionality" do
@@ -62,7 +58,7 @@ end
 
 describe "A Firebird dataset" do
   before do
-    @d = FIREBIRD_DB[:test]
+    @d = DB[:test]
     @d.delete # remove all records
     @d.quote_identifiers = true
   end
@@ -176,7 +172,7 @@ describe "A Firebird dataset" do
   end
 
   specify "should support transactions" do
-    FIREBIRD_DB.transaction do
+    DB.transaction do
       @d << {:name => 'abc', :val => 1}
     end
 
@@ -184,14 +180,14 @@ describe "A Firebird dataset" do
   end
 
   specify "should have #transaction yield the connection" do
-    FIREBIRD_DB.transaction do |conn|
+    DB.transaction do |conn|
       conn.should_not == nil
     end
   end
 
   specify "should correctly rollback transactions" do
     proc do
-      FIREBIRD_DB.transaction do
+      DB.transaction do
         @d << {:name => 'abc', :val => 1}
         raise RuntimeError, 'asdf'
       end
@@ -201,7 +197,7 @@ describe "A Firebird dataset" do
   end
 
   specify "should handle returning inside of the block by committing" do
-    def FIREBIRD_DB.ret_commit
+    def DB.ret_commit
       transaction do
         self[:test] << {:name => 'abc'}
         return
@@ -209,12 +205,12 @@ describe "A Firebird dataset" do
       end
     end
     @d.count.should == 0
-    FIREBIRD_DB.ret_commit
+    DB.ret_commit
     @d.count.should == 1
-    FIREBIRD_DB.ret_commit
+    DB.ret_commit
     @d.count.should == 2
     proc do
-      FIREBIRD_DB.transaction do
+      DB.transaction do
         raise RuntimeError, 'asdf'
       end
     end.should raise_error(RuntimeError)
@@ -223,7 +219,7 @@ describe "A Firebird dataset" do
   end
 
   specify "should quote and upcase reserved keywords" do
-    @d = FIREBIRD_DB[:testing]
+    @d = DB[:testing]
     @d.quote_identifiers = true
     @d.select(:select).sql.should == \
       'SELECT "SELECT" FROM "TESTING"'
@@ -232,7 +228,7 @@ end
 
 describe "A Firebird dataset with a timestamp field" do
   before do
-    @d = FIREBIRD_DB[:test3]
+    @d = DB[:test3]
     @d.delete
   end
 
@@ -246,7 +242,7 @@ end
 
 describe "A Firebird database" do
   before do
-    @db = FIREBIRD_DB
+    @db = DB
     @db.drop_table?(:posts)
     @db.sqls.clear
   end
@@ -369,7 +365,7 @@ end
 
 describe "Postgres::Dataset#insert" do
   before do
-    @ds = FIREBIRD_DB[:test5]
+    @ds = DB[:test5]
     @ds.delete
   end
 
@@ -395,7 +391,7 @@ describe "Postgres::Dataset#insert" do
   end
 
   specify "should return nil if the table has no primary key" do
-    ds = FIREBIRD_DB[:test]
+    ds = DB[:test]
     ds.delete
     ds.insert(:name=>'a').should == nil
   end
@@ -403,7 +399,7 @@ end
 
 describe "Postgres::Dataset#insert" do
   before do
-    @ds = FIREBIRD_DB[:test6]
+    @ds = DB[:test6]
     @ds.delete
   end