sequel 0.4.2.1 → 0.4.2.2

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 0.4.2.2 (2007-12-10)
+
+* Improved code coverage.
+
+* Fixed Dataset#count to work properly with datasets with fixed SQL (when using #fetch).
+
+* Added Model.create_with_params method that filters the given parameters accordring to the model's columns (thanks Aman Gupta). 
+
 === 0.4.2.1 (2007-12-09)
 
 * Refactored and fixed Dataset#reverse_order to work with field quoting (thanks Christian).

data/Rakefile

@@ -6,7 +6,7 @@ require 'fileutils'
 include FileUtils
 
 NAME = "sequel"
-VERS = "0.4.2.1"
+VERS = "0.4.2.2"
 CLEAN.include ['**/.*.sw?', 'pkg/*', '.config', 'doc/*', 'coverage/*']
 RDOC_OPTS = ['--quiet', '--title', "Sequel: Concise ORM for Ruby",
   "--opname", "index.html",

data/lib/sequel/database.rb

@@ -98,8 +98,7 @@ module Sequel
       if block
         ds.fetch_rows(sql, &block)
       else
-        ds.meta_def(:select_sql) {|*args| sql}
-        ds.meta_def(:sql) {|*args| sql}
+        ds.opts[:sql] = sql
         ds
       end
     end

data/lib/sequel/dataset/sql.rb

@@ -35,9 +35,10 @@ module Sequel
         if columns.empty?
           WILDCARD
         else
-          columns.map do |i|
+          m = columns.map do |i|
             i.is_a?(Hash) ? i.map {|kv| "#{literal(kv[0])} AS #{kv[1]}"} : literal(i)
-          end.join(COMMA_SEPARATOR)
+          end
+          m.join(COMMA_SEPARATOR)
         end
       end
 
@@ -47,7 +48,7 @@ module Sequel
           raise SequelError, 'No source specified for query'
         end
         auto_alias_count = 0
-        source.map do |i|
+        m = source.map do |i|
           case i
           when Dataset:
             auto_alias_count += 1
@@ -58,7 +59,8 @@ module Sequel
           else
             i
           end
-        end.join(COMMA_SEPARATOR)
+        end
+        m.join(COMMA_SEPARATOR)
       end
 
       NULL = "NULL".freeze
@@ -540,11 +542,15 @@ module Sequel
         end
       end
       
-      SELECT_COUNT = {:select => ["COUNT(*)".lit], :order => nil}.freeze
+      STOCK_COUNT_OPTS = {:select => ["COUNT(*)".lit], :order => nil}.freeze
 
       # Returns the number of records in the dataset.
       def count
-        single_value(SELECT_COUNT).to_i
+        opts = @opts[:sql] ? \
+          {:sql => "SELECT COUNT(*) FROM (#{@opts[:sql]}) AS c", :order => nil} : \
+          STOCK_COUNT_OPTS
+
+        single_value(opts).to_i
       end
     end
   end

data/lib/sequel/model.rb

@@ -250,8 +250,7 @@ module Sequel
     #   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)
@@ -273,8 +272,11 @@ module Sequel
 
     # 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

data/lib/sequel/model/record.rb

@@ -135,6 +135,13 @@ module Sequel
       end
     end
     
+    class << self
+      def create_with_params(params)
+        create(params.reject {|k, v| !columns.include?(k.to_sym)})
+      end
+      alias_method :create_with, :create_with_params
+    end
+    
     # Returns (naked) dataset bound to current instance.
     def this
       @this ||= self.class.dataset.filter(:id => @values[:id]).limit(1).naked

data/spec/core_sql_spec.rb

@@ -275,5 +275,9 @@ context "Symbol" do
   specify "should support cast function" do
     :abc.cast_as(:integer).to_s(@ds).should == "cast(abc AS integer)"
   end
+  
+  specify "should raise NoMethodError for non-uppercase invalid methods" do
+    proc {:abc.dfaxs}.should raise_error(NoMethodError)
+  end
 end
 

data/spec/dataset_spec.rb

@@ -902,6 +902,12 @@ context "Dataset#count" do
     @dataset.filter {:abc < 30}.count.should == 1
     @c.sql.should == 'SELECT COUNT(*) FROM test WHERE (abc < 30)'
   end
+  
+  specify "should count properly for datasets with fixed sql" do
+    @dataset.opts[:sql] = "select abc from xyz"
+    @dataset.count.should == 1
+    @c.sql.should == "SELECT COUNT(*) FROM (select abc from xyz) AS c"
+  end
 end
 
 
@@ -2018,6 +2024,8 @@ context "Dataset#transform" do
   specify "should change the dataset to transform values loaded from the database" do
     @ds.raw = {:x => Marshal.dump([1, 2, 3]), :y => 'hello'}
     @ds.first.should == {:x => [1, 2, 3], :y => 'hello'}
+    @ds.raw = {:x => Marshal.dump([1, 2, 3]), :y => 'hello'}
+    @ds.all.should == [{:x => [1, 2, 3], :y => 'hello'}]
   end
   
   specify "should change the dataset to transform values saved to the database" do

data/spec/model_spec.rb

@@ -312,7 +312,6 @@ context "Model#serialize" do
     ]
   end
   
-
   specify "should support calling after the class is defined" do
     @c = Class.new(Sequel::Model(:items)) do
       no_primary_key
@@ -498,7 +497,8 @@ context "Model#save" do
     o = @c.new(:id => 3, :x => 1)
     o.save
     
-    MODEL_DB.sqls.first.should == "UPDATE items SET x = 1, id = 3 WHERE (id = 3)"
+    MODEL_DB.sqls.first.should =~ 
+      /UPDATE items SET (id = 3, x = 1|x = 1, id = 3) WHERE \(id = 3\)/
   end
   
   specify "should update only the given columns if given" do
@@ -725,6 +725,7 @@ context "Model.[]" do
 end
 
 context "Model.fetch" do
+
   setup do
     MODEL_DB.reset
     @c = Class.new(Sequel::Model(:items))
@@ -733,6 +734,12 @@ context "Model.fetch" do
   specify "should return instances of Model" do
     @c.fetch("SELECT * FROM items").first.should be_a_kind_of(@c)
   end
+
+  specify "should return true for .empty? and not raise an error on empty selection" do
+    rows = @c.fetch("SELECT * FROM items WHERE FALSE")
+    @c.class_def(:fetch_rows) {|sql| yield({:count => 0})}
+    proc {rows.empty?}.should_not raise_error
+  end
 end
 
 context "A cached model" do
@@ -1213,4 +1220,122 @@ context "A model using a plugin" do
     c.should respond_to(:deff)
     c.deff.should == {:a => 1, :b => 2}
   end
+end
+
+context "Model#create_with_params" do
+  setup do
+    MODEL_DB.reset
+    
+    @c = Class.new(Sequel::Model(:items)) do
+      def self.columns; [:x, :y]; end
+    end
+  end
+  
+  specify "should filter the given params using the model columns" do
+    @c.create_with_params(:x => 1, :z => 2)
+    MODEL_DB.sqls.first.should == "INSERT INTO items (x) VALUES (1)"
+
+    MODEL_DB.reset
+    @c.create_with_params(:y => 1, :abc => 2)
+    MODEL_DB.sqls.first.should == "INSERT INTO items (y) VALUES (1)"
+  end
+  
+  specify "should be aliased by create_with" do
+    @c.create_with(:x => 1, :z => 2)
+    MODEL_DB.sqls.first.should == "INSERT INTO items (x) VALUES (1)"
+
+    MODEL_DB.reset
+    @c.create_with(:y => 1, :abc => 2)
+    MODEL_DB.sqls.first.should == "INSERT INTO items (y) VALUES (1)"
+  end
+end
+
+context "Model.find_or_create" do
+  setup do
+    MODEL_DB.reset
+    @c = Class.new(Sequel::Model(:items)) do
+      no_primary_key
+    end
+  end
+
+  specify "should find the record" do
+    @c.find_or_create(:x => 1)
+    MODEL_DB.sqls.should == ["SELECT * FROM items WHERE (x = 1) LIMIT 1"]
+    
+    MODEL_DB.reset
+  end
+  
+  specify "should create the record if not found" do
+    @c.meta_def(:find) do |*args|
+      dataset.filter(*args).first
+      nil
+    end
+    
+    @c.find_or_create(:x => 1)
+    MODEL_DB.sqls.should == [
+      "SELECT * FROM items WHERE (x = 1) LIMIT 1",
+      "INSERT INTO items (x) VALUES (1)"
+    ]
+  end
+end
+
+context "Model.delete_all" do
+  setup do
+    MODEL_DB.reset
+    @c = Class.new(Sequel::Model(:items)) do
+      no_primary_key
+    end
+    
+    @c.dataset.meta_def(:delete) {MODEL_DB << delete_sql}
+  end
+
+  specify "should delete all records in the dataset" do
+    @c.delete_all
+    MODEL_DB.sqls.should == ["DELETE FROM items"]
+  end
+end
+
+context "Model.destroy_all" do
+  setup do
+    MODEL_DB.reset
+    @c = Class.new(Sequel::Model(:items)) do
+      no_primary_key
+    end
+
+    @c.dataset.meta_def(:delete) {MODEL_DB << delete_sql}
+  end
+
+  specify "should delete all records in the dataset" do
+    @c.destroy_all
+    MODEL_DB.sqls.should == ["DELETE FROM items"]
+  end
+end
+
+context "Model.join" do
+  setup do
+    MODEL_DB.reset
+    @c = Class.new(Sequel::Model(:items)) do
+      no_primary_key
+    end
+  end
+  
+  specify "should format proper SQL" do
+    @c.join(:atts, :item_id => :id).sql.should == \
+      "SELECT items.* FROM items INNER JOIN atts ON (atts.item_id = items.id)"
+  end
+end
+
+context "Model.all" do
+  setup do
+    MODEL_DB.reset
+    @c = Class.new(Sequel::Model(:items)) do
+      no_primary_key
+    end
+    
+    @c.dataset.meta_def(:all) {1234}
+  end
+  
+  specify "should return all records in the dataset" do
+    @c.all.should == 1234
+  end
 end

data/spec/sequelizer_spec.rb

@@ -326,3 +326,14 @@ context "Proc#to_sql" do
     proc {:x == ("%d" % prod).lit}.to_sql.should == "(x = 1)"
   end
 end
+
+context "Proc#to_sql stock" do
+  specify "should not support regexps" do
+    db = Sequel::Database.new
+    ds = db[:items]
+
+    p = proc {:x =~ /abc/}
+    proc {ds.proc_to_sql(p)}.should raise_error(SequelError)
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 0.4.2.1
+  version: 0.4.2.2
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-09 00:00:00 +02:00
+date: 2007-12-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,78 +54,77 @@ files:
 - README
 - Rakefile
 - bin/sequel
-- doc/rdoc
+- spec/dataset_spec.rb
+- spec/connection_pool_spec.rb
+- spec/database_spec.rb
+- spec/core_ext_spec.rb
 - spec/adapters
-- spec/adapters/informix_spec.rb
+- spec/adapters/sqlite_spec.rb
 - spec/adapters/mysql_spec.rb
-- spec/adapters/oracle_spec.rb
 - spec/adapters/postgres_spec.rb
-- spec/adapters/sqlite_spec.rb
-- spec/array_keys_spec.rb
-- spec/connection_pool_spec.rb
-- spec/core_ext_spec.rb
-- spec/core_sql_spec.rb
-- spec/database_spec.rb
-- spec/dataset_spec.rb
+- spec/adapters/oracle_spec.rb
+- spec/adapters/informix_spec.rb
 - spec/migration_spec.rb
-- spec/model_spec.rb
-- spec/pretty_table_spec.rb
-- spec/schema_generator_spec.rb
 - spec/schema_spec.rb
-- spec/sequelizer_spec.rb
+- spec/schema_generator_spec.rb
+- spec/pretty_table_spec.rb
 - spec/spec_helper.rb
+- spec/model_spec.rb
+- spec/sequelizer_spec.rb
+- spec/array_keys_spec.rb
 - spec/worker_spec.rb
+- spec/core_sql_spec.rb
 - lib/sequel
-- lib/sequel/adapters
-- lib/sequel/adapters/adapter_skeleton.rb
-- lib/sequel/adapters/ado.rb
-- lib/sequel/adapters/db2.rb
-- lib/sequel/adapters/dbi.rb
-- lib/sequel/adapters/informix.rb
-- lib/sequel/adapters/jdbc.rb
-- lib/sequel/adapters/mysql.rb
-- lib/sequel/adapters/odbc.rb
-- lib/sequel/adapters/odbc_mssql.rb
-- lib/sequel/adapters/openbase.rb
-- lib/sequel/adapters/oracle.rb
-- lib/sequel/adapters/postgres.rb
-- lib/sequel/adapters/sqlite.rb
-- lib/sequel/ado.rb
-- lib/sequel/array_keys.rb
+- lib/sequel/pretty_table.rb
+- lib/sequel/model.rb
+- lib/sequel/schema.rb
+- lib/sequel/database.rb
+- lib/sequel/dataset.rb
 - lib/sequel/connection_pool.rb
 - lib/sequel/core_ext.rb
-- lib/sequel/core_sql.rb
-- lib/sequel/database.rb
+- lib/sequel/error.rb
 - lib/sequel/dataset
-- lib/sequel/dataset/convenience.rb
-- lib/sequel/dataset/sequelizer.rb
 - lib/sequel/dataset/sql.rb
-- lib/sequel/dataset.rb
-- lib/sequel/db2.rb
-- lib/sequel/dbi.rb
-- lib/sequel/error.rb
-- lib/sequel/informix.rb
+- lib/sequel/dataset/sequelizer.rb
+- lib/sequel/dataset/convenience.rb
 - lib/sequel/migration.rb
+- lib/sequel/schema
+- lib/sequel/schema/schema_sql.rb
+- lib/sequel/schema/schema_generator.rb
 - lib/sequel/model
-- lib/sequel/model/base.rb
-- lib/sequel/model/caching.rb
-- lib/sequel/model/hooks.rb
-- lib/sequel/model/plugins.rb
 - lib/sequel/model/record.rb
 - lib/sequel/model/relations.rb
 - lib/sequel/model/schema.rb
-- lib/sequel/model.rb
-- lib/sequel/mysql.rb
-- lib/sequel/odbc.rb
+- lib/sequel/model/hooks.rb
+- lib/sequel/model/base.rb
+- lib/sequel/model/caching.rb
+- lib/sequel/model/plugins.rb
+- lib/sequel/array_keys.rb
+- lib/sequel/worker.rb
+- lib/sequel/core_sql.rb
+- lib/sequel/informix.rb
+- lib/sequel/adapters
+- lib/sequel/adapters/dbi.rb
+- lib/sequel/adapters/sqlite.rb
+- lib/sequel/adapters/ado.rb
+- lib/sequel/adapters/mysql.rb
+- lib/sequel/adapters/oracle.rb
+- lib/sequel/adapters/postgres.rb
+- lib/sequel/adapters/db2.rb
+- lib/sequel/adapters/odbc.rb
+- lib/sequel/adapters/informix.rb
+- lib/sequel/adapters/odbc_mssql.rb
+- lib/sequel/adapters/openbase.rb
+- lib/sequel/adapters/jdbc.rb
+- lib/sequel/adapters/adapter_skeleton.rb
+- lib/sequel/dbi.rb
+- lib/sequel/sqlite.rb
+- lib/sequel/ado.rb
 - lib/sequel/oracle.rb
+- lib/sequel/mysql.rb
 - lib/sequel/postgres.rb
-- lib/sequel/pretty_table.rb
-- lib/sequel/schema
-- lib/sequel/schema/schema_generator.rb
-- lib/sequel/schema/schema_sql.rb
-- lib/sequel/schema.rb
-- lib/sequel/sqlite.rb
-- lib/sequel/worker.rb
+- lib/sequel/odbc.rb
+- lib/sequel/db2.rb
 - lib/sequel.rb
 - CHANGELOG
 has_rdoc: true