sequel 3.10.0 → 3.11.0

data/lib/sequel/dataset/features.rb

@@ -1,10 +1,26 @@
 module Sequel
   class Dataset
+    # ---------------------
+    # :section: Methods that describe what the dataset supports
+    # These methods all return booleans, with most describing whether or not the
+    # dataset supports a feature.
+    # ---------------------
+    
+    # Method used to check if WITH is supported
+    WITH_SUPPORTED=:select_with_sql
+    
     # Whether this dataset quotes identifiers.
     def quote_identifiers?
       @quote_identifiers
     end
     
+    # Whether this dataset will provide accurate number of rows matched for
+    # delete and update statements.  Accurate in this case is the number of
+    # rows matched by the dataset's filter.
+    def provides_accurate_rows_matched?
+      true
+    end
+    
     # Whether the dataset requires SQL standard datetimes (false by default,
     # as most allow strings with ISO 8601 format.
     def requires_sql_standard_datetimes?
@@ -16,9 +32,9 @@ module Sequel
       select_clause_methods.include?(WITH_SUPPORTED)
     end
 
-    # Whether the dataset supports the DISTINCT ON clause, true by default.
+    # Whether the dataset supports the DISTINCT ON clause, false by default.
     def supports_distinct_on?
-      true
+      false
     end
 
     # Whether the dataset supports the INTERSECT and EXCEPT compound operations, true by default.

data/lib/sequel/dataset/graph.rb

@@ -1,5 +1,12 @@
 module Sequel
   class Dataset
+    # ---------------------
+    # :section: Methods related to dataset graphing
+    # Dataset graphing changes the dataset to yield hashes where keys are table
+    # name symbols and columns are hashes representing the values related to
+    # that table.  All of these methods return modified copies of the receiver.
+    # ---------------------
+    
     # Adds the given graph aliases to the list of graph aliases to use,
     # unlike #set_graph_aliases, which replaces the list.  See
     # #set_graph_aliases.

data/lib/sequel/dataset/misc.rb

@@ -0,0 +1,119 @@
+module Sequel
+  class Dataset
+    # ---------------------
+    # :section: Miscellaneous methods
+    # These methods don't fit cleanly into another section.
+    # ---------------------
+    
+    NOTIMPL_MSG = "This method must be overridden in Sequel adapters".freeze
+    ARRAY_ACCESS_ERROR_MSG = 'You cannot call Dataset#[] with an integer or with no arguments.'.freeze
+    ARG_BLOCK_ERROR_MSG = 'Must use either an argument or a block, not both'.freeze
+    IMPORT_ERROR_MSG = 'Using Sequel::Dataset#import an empty column array is not allowed'.freeze
+    
+    # The database that corresponds to this dataset
+    attr_accessor :db
+
+    # The hash of options for this dataset, keys are symbols.
+    attr_accessor :opts
+    
+    # Constructs a new Dataset instance with an associated database and 
+    # options. Datasets are usually constructed by invoking the Database#[] method:
+    #
+    #   DB[:posts]
+    #
+    # Sequel::Dataset is an abstract class that is not useful by itself. Each
+    # database adaptor should provide a subclass of Sequel::Dataset, and have
+    # the Database#dataset method return an instance of that class.
+    def initialize(db, opts = nil)
+      @db = db
+      @quote_identifiers = db.quote_identifiers? if db.respond_to?(:quote_identifiers?)
+      @identifier_input_method = db.identifier_input_method if db.respond_to?(:identifier_input_method)
+      @identifier_output_method = db.identifier_output_method if db.respond_to?(:identifier_output_method)
+      @opts = opts || {}
+      @row_proc = nil
+    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.
+    def as(aliaz)
+      ::Sequel::SQL::AliasedExpression.new(self, aliaz)
+    end
+    
+    # Yield a dataset for each server in the connection pool that is tied to that server.
+    # Intended for use in sharded environments where all servers need to be modified
+    # with the same data:
+    #
+    #   DB[:configs].where(:key=>'setting').each_server{|ds| ds.update(:value=>'new_value')}
+    def each_server
+      db.servers.each{|s| yield server(s)}
+    end
+   
+    # The first source (primary table) for this dataset.  If the dataset doesn't
+    # have a table, raises an error.  If the table is aliased, returns the aliased name.
+    def first_source_alias
+      source = @opts[:from]
+      if source.nil? || source.empty?
+        raise Error, 'No source specified for query'
+      end
+      case s = source.first
+      when SQL::AliasedExpression
+        s.aliaz
+      when Symbol
+        sch, table, aliaz = split_symbol(s)
+        aliaz ? aliaz.to_sym : s
+      else
+        s
+      end
+    end
+    alias first_source first_source_alias
+    
+    # The first source (primary table) for this dataset.  If the dataset doesn't
+    # have a table, raises an error.  If the table is aliased, returns the original
+    # table, not the alias
+    def first_source_table
+      source = @opts[:from]
+      if source.nil? || source.empty?
+        raise Error, 'No source specified for query'
+      end
+      case s = source.first
+      when SQL::AliasedExpression
+        s.expression
+      when Symbol
+        sch, table, aliaz = split_symbol(s)
+        aliaz ? (sch ? SQL::QualifiedIdentifier.new(sch, table) : table.to_sym) : s
+      else
+        s
+      end
+    end
+    
+    # Returns a string representation of the dataset including the class name 
+    # and the corresponding SQL select statement.
+    def inspect
+      "#<#{self.class}: #{sql.inspect}>"
+    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,
+    # possibly appended with "_N" if the implicit alias has already been
+    # used, where N is an integer starting at 0 and increasing until an
+    # unused one is found.
+    def unused_table_alias(table_alias)
+      table_alias = alias_symbol(table_alias)
+      used_aliases = []
+      used_aliases += opts[:from].map{|t| alias_symbol(t)} if opts[:from]
+      used_aliases += opts[:join].map{|j| j.table_alias ? alias_alias_symbol(j.table_alias) : alias_symbol(j.table)} if opts[:join]
+      if used_aliases.include?(table_alias)
+        i = 0
+        loop do
+          ta = :"#{table_alias}_#{i}"
+          return ta unless used_aliases.include?(ta)
+          i += 1 
+        end
+      else
+        table_alias
+      end
+    end
+  end
+end

data/lib/sequel/dataset/mutation.rb

@@ -0,0 +1,64 @@
+module Sequel
+  class Dataset
+    # ---------------------
+    # :section: Mutation methods
+    # These methods modify the receiving dataset and should be used with care.
+    # ---------------------
+    
+    # All methods that should have a ! method added that modifies
+    # the receiver.
+    MUTATION_METHODS = %w'add_graph_aliases and cross_join distinct except exclude
+    filter for_update from from_self full_join full_outer_join graph
+    group group_and_count group_by having inner_join intersect invert join join_table left_join
+    left_outer_join limit lock_style naked natural_full_join natural_join
+    natural_left_join natural_right_join or order order_by order_more paginate qualify query
+    reverse reverse_order right_join right_outer_join select select_all select_append select_more server
+    set_defaults set_graph_aliases set_overrides unfiltered ungraphed ungrouped union
+    unlimited unordered where with with_recursive with_sql'.collect{|x| x.to_sym}
+    
+    # Setup mutation (e.g. filter!) methods.  These operate the same as the
+    # non-! methods, but replace the options of the current dataset with the
+    # options of the resulting dataset.
+    def self.def_mutation_method(*meths)
+      meths.each do |meth|
+        class_eval("def #{meth}!(*args, &block); mutation_method(:#{meth}, *args, &block) end", __FILE__, __LINE__)
+      end
+    end
+    
+    # Add the mutation methods via metaprogramming
+    def_mutation_method(*MUTATION_METHODS)
+    
+    
+    # Set the method to call on identifiers going into the database for this dataset
+    attr_accessor :identifier_input_method
+    
+    # Set the method to call on identifiers coming the database for this dataset
+    attr_accessor :identifier_output_method
+
+    # Whether to quote identifiers for this dataset
+    attr_writer :quote_identifiers
+    
+    # The row_proc for this database, should be a Proc that takes
+    # a single hash argument and returns the object you want
+    # each to return.
+    attr_accessor :row_proc
+    
+    # Add a mutation method to this dataset instance.
+    def def_mutation_method(*meths)
+      meths.each do |meth|
+        instance_eval("def #{meth}!(*args, &block); mutation_method(:#{meth}, *args, &block) end", __FILE__, __LINE__)
+      end
+    end
+    
+    private
+    
+    # Modify the receiver with the results of sending the meth, args, and block
+    # to the receiver and merging the options of the resulting dataset into
+    # the receiver's options.
+    def mutation_method(meth, *args, &block)
+      copy = send(meth, *args, &block)
+      @opts.merge!(copy.opts)
+      self
+    end
+  end
+end

data/lib/sequel/dataset/prepared_statements.rb

@@ -1,5 +1,11 @@
 module Sequel 
   class Dataset
+    # ---------------------
+    # :section: Methods related to prepared statements or bound variables
+    # On some adapters, these use native prepared statements and bound variables, on others
+    # support is emulated.  For details, see the {"Prepared Statements/Bound Variables" guide}[link:files/doc/prepared_statements_rdoc.html].
+    # ---------------------
+    
     PREPARED_ARG_PLACEHOLDER = LiteralString.new('?').freeze
     
     # Default implementation of the argument mapper to allow

data/lib/sequel/dataset/query.rb

@@ -1,5 +1,28 @@
 module Sequel
   class Dataset
+    # ---------------------
+    # :section: Methods that return modified datasets
+    # These methods all return modified copies of the receiver.
+    # ---------------------
+    # The dataset options that require the removal of cached columns
+    # if changed.
+    COLUMN_CHANGE_OPTS = [:select, :sql, :from, :join].freeze
+
+    # Which options don't affect the SQL generation.  Used by simple_select_all?
+    # to determine if this is a simple SELECT * FROM table.
+    NON_SQL_OPTIONS = [:server, :defaults, :overrides, :graph, :eager_graph, :graph_aliases]
+    
+    # These symbols have _join methods created (e.g. inner_join) that
+    # call join_table with the symbol, passing along the arguments and
+    # block from the method call.
+    CONDITIONED_JOIN_TYPES = [:inner, :full_outer, :right_outer, :left_outer, :full, :right, :left]
+
+    # These symbols have _join methods created (e.g. natural_join) that
+    # call join_table with the symbol.  They only accept a single table
+    # argument which is passed to join_table, and they raise an error
+    # if called with a block.
+    UNCONDITIONED_JOIN_TYPES = [:natural, :natural_left, :natural_right, :natural_full, :cross]
+    
     # Adds an further filter to an existing filter using AND. If no filter 
     # exists an error is raised. This method is identical to #filter except
     # it expects an existing filter.
@@ -9,6 +32,16 @@ module Sequel
       raise(InvalidOperation, "No existing filter found.") unless @opts[:having] || @opts[:where]
       filter(*cond, &block)
     end
+    
+    # Returns a new clone of the dataset with with the given options merged.
+    # If the options changed include options in COLUMN_CHANGE_OPTS, the cached
+    # columns are deleted.
+    def clone(opts = {})
+      c = super()
+      c.opts = @opts.merge(opts)
+      c.instance_variable_set(:@columns, nil) if opts.keys.any?{|o| COLUMN_CHANGE_OPTS.include?(o)}
+      c
+    end
 
     # Returns a copy of the dataset with the SQL DISTINCT clause.
     # The DISTINCT clause is used to remove duplicate rows from the
@@ -74,7 +107,8 @@ module Sequel
     #
     # filter also takes a block, which should return one of the above argument
     # types, and is treated the same way.  This block yields a virtual row object,
-    # which is easy to use to create identifiers and functions.
+    # which is easy to use to create identifiers and functions.  For more details
+    # on the virtual row support, see the {"Virtual Rows" guide}[link:files/doc/virtual_rows_rdoc.html]
     #
     # If both a block and regular argument
     # are provided, they get ANDed together.
@@ -100,7 +134,7 @@ module Sequel
     #   software.filter{|o| o.price < 100}.sql #=>
     #     "SELECT * FROM items WHERE ((category = 'software') AND (price < 100))"
     #
-    # See doc/dataset_filtering.rdoc for more examples and details.
+    # See the the {"Dataset Filtering" guide}[link:files/doc/dataset_filtering_rdoc.html] for more examples and details.
     def filter(*cond, &block)
       _filter(@opts[:having] ? :having : :where, *cond, &block)
     end
@@ -175,6 +209,19 @@ module Sequel
       clone(:group => (columns.compact.empty? ? nil : columns))
     end
     alias group_by group
+    
+    # Returns a dataset grouped by the given column with count by group,
+    # order by the count of records. Column aliases may be supplied, and will
+    # be included in the select clause.
+    #
+    # Examples:
+    #
+    #   ds.group_and_count(:name).all => [{:name=>'a', :count=>1}, ...]
+    #   ds.group_and_count(:first_name, :last_name).all => [{:first_name=>'a', :last_name=>'b', :count=>1}, ...]
+    #   ds.group_and_count(:first_name___name).all => [{:name=>'a', :count=>1}, ...]
+    def group_and_count(*columns)
+      group(*columns.map{|c| unaliased_identifier(c)}).select(*(columns + [COUNT_OF_ALL_AS_COUNT]))
+    end
 
     # Returns a copy of the dataset with the HAVING conditions changed. See #filter for argument types.
     #
@@ -213,6 +260,100 @@ module Sequel
       clone(o)
     end
 
+    # Returns a joined dataset.  Uses the following arguments:
+    #
+    # * type - The type of join to do (e.g. :inner)
+    # * table - Depends on type:
+    #   * Dataset - a subselect is performed with an alias of tN for some value of N
+    #   * Model (or anything responding to :table_name) - table.table_name
+    #   * String, Symbol: table
+    # * expr - specifies conditions, depends on type:
+    #   * Hash, Array with all two pairs - Assumes key (1st arg) is column of joined table (unless already
+    #     qualified), and value (2nd arg) is column of the last joined or primary table (or the
+    #     :implicit_qualifier option).
+    #     To specify multiple conditions on a single joined table column, you must use an array.
+    #     Uses a JOIN with an ON clause.
+    #   * Array - If all members of the array are symbols, considers them as columns and 
+    #     uses a JOIN with a USING clause.  Most databases will remove duplicate columns from
+    #     the result set if this is used.
+    #   * nil - If a block is not given, doesn't use ON or USING, so the JOIN should be a NATURAL
+    #     or CROSS join. If a block is given, uses a ON clause based on the block, see below.
+    #   * Everything else - pretty much the same as a using the argument in a call to filter,
+    #     so strings are considered literal, symbols specify boolean columns, and blockless
+    #     filter expressions can be used. Uses a JOIN with an ON clause.
+    # * options - a hash of options, with any of the following keys:
+    #   * :table_alias - the name of the table's alias when joining, necessary for joining
+    #     to the same table more than once.  No alias is used by default.
+    #   * :implicit_qualifier - The name to use for qualifying implicit conditions.  By default,
+    #     the last joined or primary table is used.
+    # * block - The block argument should only be given if a JOIN with an ON clause is used,
+    #   in which case it yields the table alias/name for the table currently being joined,
+    #   the table alias/name for the last joined (or first table), and an array of previous
+    #   SQL::JoinClause.
+    def join_table(type, table, expr=nil, options={}, &block)
+      using_join = expr.is_a?(Array) && !expr.empty? && expr.all?{|x| x.is_a?(Symbol)}
+      if using_join && !supports_join_using?
+        h = {}
+        expr.each{|s| h[s] = s}
+        return join_table(type, table, h, options)
+      end
+
+      case options
+      when Hash
+        table_alias = options[:table_alias]
+        last_alias = options[:implicit_qualifier]
+      when Symbol, String, SQL::Identifier
+        table_alias = options
+        last_alias = nil 
+      else
+        raise Error, "invalid options format for join_table: #{options.inspect}"
+      end
+
+      if Dataset === table
+        if table_alias.nil?
+          table_alias_num = (@opts[:num_dataset_sources] || 0) + 1
+          table_alias = dataset_alias(table_alias_num)
+        end
+        table_name = table_alias
+      else
+        table = table.table_name if table.respond_to?(:table_name)
+        table_name = table_alias || table
+      end
+
+      join = if expr.nil? and !block_given?
+        SQL::JoinClause.new(type, table, table_alias)
+      elsif using_join
+        raise(Sequel::Error, "can't use a block if providing an array of symbols as expr") if block_given?
+        SQL::JoinUsingClause.new(expr, type, table, table_alias)
+      else
+        last_alias ||= @opts[:last_joined_table] || first_source_alias
+        if Sequel.condition_specifier?(expr)
+          expr = expr.collect do |k, v|
+            k = qualified_column_name(k, table_name) if k.is_a?(Symbol)
+            v = qualified_column_name(v, last_alias) if v.is_a?(Symbol)
+            [k,v]
+          end
+        end
+        if block_given?
+          expr2 = yield(table_name, last_alias, @opts[:join] || [])
+          expr = expr ? SQL::BooleanExpression.new(:AND, expr, expr2) : expr2
+        end
+        SQL::JoinOnClause.new(expr, type, table, table_alias)
+      end
+
+      opts = {:join => (@opts[:join] || []) + [join], :last_joined_table => table_name}
+      opts[:num_dataset_sources] = table_alias_num if table_alias_num
+      clone(opts)
+    end
+    
+    CONDITIONED_JOIN_TYPES.each do |jtype|
+      class_eval("def #{jtype}_join(*args, &block); join_table(:#{jtype}, *args, &block) end", __FILE__, __LINE__)
+    end
+    UNCONDITIONED_JOIN_TYPES.each do |jtype|
+      class_eval("def #{jtype}_join(table); raise(Sequel::Error, '#{jtype}_join does not accept join table blocks') if block_given?; join_table(:#{jtype}, table) end", __FILE__, __LINE__)
+    end
+    alias join inner_join
+
     # If given an integer, the dataset will contain only the first l results.
     # If given a range, it will contain only those at offsets within that
     # range. If a second argument is given, it is used as an offset.
@@ -249,6 +390,14 @@ module Sequel
       clone(:lock => style)
     end
     
+    # Returns a naked dataset clone - i.e. a dataset that returns records as
+    # hashes instead of calling the row proc.
+    def naked
+      ds = clone
+      ds.row_proc = nil
+      ds
+    end
+    
     # Adds an alternate filter to an existing filter using OR. If no filter 
     # exists an error is raised.
     #
@@ -289,6 +438,35 @@ module Sequel
       order(*columns, &block)
     end
     
+    # Qualify to the given table, or first source if not table is given.
+    def qualify(table=first_source)
+      qualify_to(table)
+    end
+
+    # Return a copy of the dataset with unqualified identifiers in the
+    # SELECT, WHERE, GROUP, HAVING, and ORDER clauses qualified by the
+    # given table. If no columns are currently selected, select all
+    # columns of the given table.
+    def qualify_to(table)
+      o = @opts
+      return clone if o[:sql]
+      h = {}
+      (o.keys & QUALIFY_KEYS).each do |k|
+        h[k] = qualified_expression(o[k], table)
+      end
+      h[:select] = [SQL::ColumnAll.new(table)] if !o[:select] || o[:select].empty?
+      clone(h)
+    end
+    
+    # Qualify the dataset to its current first source.  This is useful
+    # if you have unqualified identifiers in the query that all refer to
+    # the first source, and you want to join to another table which
+    # has columns with the same name as columns in the current dataset.
+    # See qualify_to.
+    def qualify_to_first_source
+      qualify_to(first_source)
+    end
+    
     # Returns a copy of the dataset with the order reversed. If no order is
     # given, the existing order is inverted.
     def reverse_order(*order)
@@ -318,17 +496,51 @@ module Sequel
     def select_all
       clone(:select => nil)
     end
+    
+    # Returns a copy of the dataset with the given columns added
+    # to the existing selected columns.  If no columns are currently selected
+    # it will select the columns given in addition to *.
+    #
+    #   dataset.select(:a).select(:b) # SELECT b FROM items
+    #   dataset.select(:a).select_append(:b) # SELECT a, b FROM items
+    #   dataset.select_append(:b) # SELECT *, b FROM items
+    def select_append(*columns, &block)
+      cur_sel = @opts[:select]
+      cur_sel = [WILDCARD] if !cur_sel || cur_sel.empty?
+      select(*(cur_sel + columns), &block)
+    end
 
     # Returns a copy of the dataset with the given columns added
-    # to the existing selected columns.
+    # to the existing selected columns. If no columns are currently selected
+    # it will just select the columns given. 
     #
     #   dataset.select(:a).select(:b) # SELECT b FROM items
     #   dataset.select(:a).select_more(:b) # SELECT a, b FROM items
+    #   dataset.select_more(:b) # SELECT b FROM items
     def select_more(*columns, &block)
       columns = @opts[:select] + columns if @opts[:select]
       select(*columns, &block)
     end
     
+    # Set the server for this dataset to use.  Used to pick a specific database
+    # shard to run a query against, or to override the default (which is SELECT uses
+    # :read_only database and all other queries use the :default database).
+    def server(servr)
+      clone(:server=>servr)
+    end
+
+    # Set the default values for insert and update statements.  The values hash passed
+    # to insert or update are merged into this hash.
+    def set_defaults(hash)
+      clone(:defaults=>(@opts[:defaults]||{}).merge(hash))
+    end
+
+    # Set values that override hash arguments given to insert and update statements.
+    # This hash is merged into the hash provided to insert or update.
+    def set_overrides(hash)
+      clone(:overrides=>hash.merge(@opts[:overrides]||{}))
+    end
+    
     # Returns a copy of the dataset with no filters (HAVING or WHERE clause) applied.
     # 
     #   dataset.group(:a).having(:a=>1).where(:b).unfiltered # SELECT * FROM items GROUP BY a
@@ -370,15 +582,69 @@ module Sequel
     def unordered
       order(nil)
     end
+    
+    # Add a condition to the WHERE clause.  See #filter for argument types.
+    #
+    #   dataset.group(:a).having(:a).filter(:b) # SELECT * FROM items GROUP BY a HAVING a AND b
+    #   dataset.group(:a).having(:a).where(:b) # SELECT * FROM items WHERE b GROUP BY a HAVING a
+    def where(*cond, &block)
+      _filter(:where, *cond, &block)
+    end
+    
+    # Add a simple common table expression (CTE) with the given name and a dataset that defines the CTE.
+    # A common table expression acts as an inline view for the query.
+    # Options:
+    # * :args - Specify the arguments/columns for the CTE, should be an array of symbols.
+    # * :recursive - Specify that this is a recursive CTE
+    def with(name, dataset, opts={})
+      raise(Error, 'This datatset does not support common table expressions') unless supports_cte?
+      clone(:with=>(@opts[:with]||[]) + [opts.merge(:name=>name, :dataset=>dataset)])
+    end
+
+    # Add a recursive common table expression (CTE) with the given name, a dataset that
+    # defines the nonrecursive part of the CTE, and a dataset that defines the recursive part
+    # of the CTE.  Options:
+    # * :args - Specify the arguments/columns for the CTE, should be an array of symbols.
+    # * :union_all - Set to false to use UNION instead of UNION ALL combining the nonrecursive and recursive parts.
+    def with_recursive(name, nonrecursive, recursive, opts={})
+      raise(Error, 'This datatset does not support common table expressions') unless supports_cte?
+      clone(:with=>(@opts[:with]||[]) + [opts.merge(:recursive=>true, :name=>name, :dataset=>nonrecursive.union(recursive, {:all=>opts[:union_all] != false, :from_self=>false}))])
+    end
+    
+    # Returns a copy of the dataset with the static SQL used.  This is useful if you want
+    # to keep the same row_proc/graph, but change the SQL used to custom SQL.
+    #
+    #   dataset.with_sql('SELECT * FROM foo') # SELECT * FROM foo
+    def with_sql(sql, *args)
+      sql = SQL::PlaceholderLiteralString.new(sql, args) unless args.empty?
+      clone(:sql=>sql)
+    end
+    
+    protected
+
+    # Return true if the dataset has a non-nil value for any key in opts.
+    def options_overlap(opts)
+      !(@opts.collect{|k,v| k unless v.nil?}.compact & opts).empty?
+    end
+
+    # 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)
+    end
 
     private
 
     # Internal filter method so it works on either the having or where clauses.
     def _filter(clause, *cond, &block)
       cond = cond.first if cond.size == 1
-      cond = filter_expr(cond, &block)
-      cond = SQL::BooleanExpression.new(:AND, @opts[clause], cond) if @opts[clause]
-      clone(clause => cond)
+      if cond.respond_to?(:empty?) && cond.empty? && !block
+        clone
+      else
+        cond = filter_expr(cond, &block)
+        cond = SQL::BooleanExpression.new(:AND, @opts[clause], cond) if @opts[clause]
+        clone(clause => cond)
+      end
     end
     
     # Add the dataset to the list of compounds