lib/sequel/model.rb in sequel-0.4.2.1 vs lib/sequel/model.rb in sequel-0.4.2.2
- old
+ new
@@ -248,12 +248,11 @@
#
# Ticket.find :author => 'Sharon' # => record
# Ticket.find {:price == 17} # => Dataset
#
def self.find(*args, &block)
- dataset.filter(*args, &block).limit(1).first
- # dataset[cond.is_a?(Hash) ? cond : primary_key_hash(cond)]
+ dataset.filter(*args, &block).first
end
def self.[](*args)
args = args.first if (args.size == 1)
dataset[(Hash === args) ? args : primary_key_hash(args)]
@@ -271,11 +270,14 @@
############################################################################
# Like delete_all, but invokes before_destroy and after_destroy hooks if used.
def self.destroy_all
- has_hooks?(:before_destroy) || has_hooks?(:after_destroy) ? \
- dataset.destroy : dataset.delete
+ if has_hooks?(:before_destroy) || has_hooks?(:after_destroy)
+ dataset.destroy
+ else
+ dataset.delete
+ end
end
# Deletes all records.
def self.delete_all
dataset.delete
end