sequel_core 1.0.5 → 1.0.6

data/CHANGELOG

@@ -1,3 +1,17 @@
+=== 1.0.6 (2008-02-05)
+
+* Removed code pollution introduced in revs 814, 817 (really bad patch, IMO).
+
+* Fixed joining datasets using aliased tables (#140).
+
+* Added support additional field types in postgresql adapter (#146).
+
+* Added support for date field types in postgresql adapter (#145).
+
+* Fixed Dataset#count to work correctly for grouped datasets (#144).
+
+* Added Dataset#select_more, Dataset#order_more methods (#129).
+
 === 1.0.5 (2008-01-25)
 
 * Added support for instantiating models by using the load constructor method.

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2008 Sharon Rosner
+Copyright (c) 2007-2008 Sharon Rosner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/Rakefile

@@ -9,7 +9,7 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "sequel_core"
-VERS = "1.0.5"
+VERS = "1.0.6"
 CLEAN.include ["**/.*.sw?", "pkg/*", ".config", "doc/*", "coverage/*"]
 RDOC_OPTS = [
   "--quiet", 

data/lib/sequel_core/adapters/postgres.rb

@@ -160,9 +160,15 @@ module Sequel
       21 => :to_i,
       22 => :to_i,
       23 => :to_i,
+      26 => :to_i,
       700 => :to_f,
       701 => :to_f,
-      1114 => :to_time
+      790 => :to_f,
+      1082 => :to_date,
+      1083 => :to_time,
+      1114 => :to_time,
+      1184 => :to_time,
+      1186 => :to_i
     }
 
     if PGconn.respond_to?(:translate_results=)

data/lib/sequel_core/dataset/sql.rb

@@ -22,7 +22,6 @@ module Sequel
             table = $2
           end
           Sequel::SQL::QualifiedColumnRef.new(table, column)
-          # "#{table}.#{column}"
         end
       end
 
@@ -62,6 +61,19 @@ module Sequel
         end
         m.join(COMMA_SEPARATOR)
       end
+      
+      def first_source
+        source = @opts[:from]
+        if source.nil? || source.empty?
+          raise Error, 'No source specified for query'
+        end
+        case s = source.first
+        when Hash
+          s.values.first
+        else
+          s
+        end
+      end
 
       NULL = "NULL".freeze
       TIMESTAMP_FORMAT = "TIMESTAMP '%Y-%m-%d %H:%M:%S'".freeze
@@ -147,9 +159,12 @@ module Sequel
       #
       #   ds = DB[:items].order(:name)
       #   ds.sql #=> "SELECT * FROM items ORDER BY name"
-      #   ds.from_self #=> "SELECT * FROM (SELECT * FROM items ORDER BY name)"
+      #   ds.from_self.sql #=> "SELECT * FROM (SELECT * FROM items ORDER BY name)"
       def from_self
-        clone_merge(:sql => nil, :from => [self])
+        clone_merge(:from => [self], :select => nil, :group => nil, 
+          :sql => nil, :distinct => nil, :join => nil, :where => nil,
+          :order => nil, :having => nil, :limit => nil, :offset => nil,
+          :union => nil)
       end
 
       # Returns a copy of the dataset with the selected columns changed.
@@ -157,6 +172,15 @@ module Sequel
         clone_merge(:select => columns)
       end
       
+      # Returns a copy of the dataset with additional selected columns.
+      def select_more(*columns)
+        if @opts[:select]
+          clone_merge(:select => @opts[:select] + columns)
+        else
+          clone_merge(:select => columns)
+        end
+      end
+      
       # Returns a copy of the dataset selecting the wildcard.
       def select_all
         clone_merge(:select => nil)
@@ -172,9 +196,17 @@ module Sequel
       def order(*order)
         clone_merge(:order => order)
       end
-      
       alias_method :order_by, :order
-
+      
+      # Returns a copy of the dataset with the order changed.
+      def order_more(*order)
+        if @opts[:order]
+          clone_merge(:order => @opts[:order] + order)
+        else
+          clone_merge(:order => order)
+        end
+      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)
@@ -340,7 +372,7 @@ module Sequel
         join_conditions = {}
         expr.each do |k, v|
           k = qualified_column_name(k, table) if k.is_a?(Symbol)
-          v = qualified_column_name(v, @opts[:last_joined_table] || @opts[:from].first) if v.is_a?(Symbol)
+          v = qualified_column_name(v, @opts[:last_joined_table] || first_source) if v.is_a?(Symbol)
           join_conditions[k] = v
         end
         " #{join_type} #{table} ON #{expression_list(join_conditions)}"
@@ -592,7 +624,7 @@ module Sequel
 
       # Returns the number of records in the dataset.
       def count
-        if @opts[:sql]
+        if @opts[:sql] || @opts[:group]
           from_self.count
         else
           single_value(STOCK_COUNT_OPTS).to_i

data/lib/sequel_core/dataset.rb

@@ -72,8 +72,8 @@ module Sequel
     attr_reader :db
     attr_accessor :opts
     
-    alias all to_a
-    alias size count
+    alias_method :all, :to_a
+    alias_method :size, :count
   
     # Constructs a new instance of a dataset with a database instance, initial
     # options and an optional record class. Datasets are usually constructed by

data/spec/adapters/mysql_spec.rb

@@ -379,4 +379,26 @@ context "A MySQL database" do
     db = Sequel.mysql('sandbox', :host => 'localhost', :user => 'root', :socket => 'blah')
     proc {db.test_connection}.should raise_error
   end
+end
+
+context "A grouped MySQL dataset" do
+  setup do
+    MYSQL_DB[:test2].delete
+    MYSQL_DB[:test2] << {:name => '11', :value => 10}
+    MYSQL_DB[:test2] << {:name => '11', :value => 20}
+    MYSQL_DB[:test2] << {:name => '11', :value => 30}
+    MYSQL_DB[:test2] << {:name => '12', :value => 10}
+    MYSQL_DB[:test2] << {:name => '12', :value => 20}
+    MYSQL_DB[:test2] << {:name => '13', :value => 10}
+  end
+  
+  specify "should return the correct count for raw sql query" do
+    ds = MYSQL_DB["select name FROM test2 WHERE name = '11' GROUP BY name"]
+    ds.count.should == 1
+  end
+  
+  specify "should return the correct count for a normal dataset" do
+    ds = MYSQL_DB[:test2].select(:name).where(:name => '11').group(:name)
+    ds.count.should == 1
+  end
 end

data/spec/database_spec.rb

@@ -732,6 +732,7 @@ context "Database#fetch" do
   end
 end
 
+
 context "Database#[]" do
   setup do
     @db = Sequel::Database.new

data/spec/dataset_spec.rb

@@ -523,6 +523,12 @@ context "a grouped dataset" do
     @dataset.select_sql.should ==
       "SELECT * FROM test GROUP BY type_id"
   end
+  
+  specify "should format the right statement for counting (as a subquery)" do
+    db = MockDatabase.new
+    db[:test].select(:name).group(:name).count
+    db.sqls.should == ["SELECT COUNT(*) FROM (SELECT name FROM test GROUP BY name) t1"]
+  end
 end
 
 context "Dataset#group_by" do
@@ -716,6 +722,22 @@ context "Dataset#select_all" do
   end
 end
 
+context "Dataset#select_more" do
+  setup do
+    @d = Sequel::Dataset.new(nil).from(:test)
+  end
+  
+  specify "should act like #select for datasets with no selection" do
+    @d.select_more(:a, :b).sql.should == 'SELECT a, b FROM test'
+    @d.select_all.select_more(:a, :b).sql.should == 'SELECT a, b FROM test'
+    @d.select(:blah).select_all.select_more(:a, :b).sql.should == 'SELECT a, b FROM test'
+  end
+
+  specify "should add to the currently selected columns" do
+    @d.select(:a).select_more(:b).sql.should == 'SELECT a, b FROM test'
+    @d.select(:a.all).select_more(:b.all).sql.should == 'SELECT a.*, b.* FROM test'
+  end
+end
 
 context "Dataset#order" do
   setup do
@@ -769,6 +791,22 @@ context "Dataset#order_by" do
   end
 end
 
+context "Dataset#order_more" do
+  setup do
+    @dataset = Sequel::Dataset.new(nil).from(:test)
+  end
+  
+  specify "should include an ORDER BY clause in the select statement" do
+    @dataset.order_more(:name).sql.should == 
+      'SELECT * FROM test ORDER BY name'
+  end
+  
+  specify "should add to a previous ordering" do
+    @dataset.order(:name).order_more(:stamp.DESC).sql.should ==
+      'SELECT * FROM test ORDER BY name, stamp DESC'
+  end
+end
+
 context "Dataset#reverse_order" do
   setup do
     @dataset = Sequel::Dataset.new(nil).from(:test)
@@ -1094,6 +1132,12 @@ context "Dataset#join_table" do
     @d.join_table(:left_outer, :categories, :status => [1, 2, 3]).sql.should ==
       "SELECT * FROM items LEFT OUTER JOIN categories ON (categories.status IN (1, 2, 3))"
   end
+  
+  specify "should support aliased tables" do
+    ds = Sequel::Dataset.new(nil).from(:foo => :f). \
+      join_table(:inner, :bar, :id => :bar_id).sql.should ==
+      'SELECT * FROM foo f INNER JOIN bar ON (bar.id = f.bar_id)'
+  end
 end
 
 context "Dataset#[]=" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel_core
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Sharon Rosner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-25 00:00:00 +02:00
+date: 2008-02-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,59 +73,59 @@ files:
 - Rakefile
 - bin/sequel
 - spec/adapters
-- spec/adapters/informix_spec.rb
 - spec/adapters/mysql_spec.rb
 - spec/adapters/oracle_spec.rb
 - spec/adapters/postgres_spec.rb
+- spec/adapters/informix_spec.rb
 - spec/adapters/sqlite_spec.rb
-- spec/array_keys_spec.rb
-- spec/core_ext_spec.rb
-- spec/core_sql_spec.rb
 - spec/database_spec.rb
+- spec/schema_generator_spec.rb
+- spec/core_sql_spec.rb
+- spec/core_ext_spec.rb
+- spec/array_keys_spec.rb
+- spec/worker_spec.rb
+- spec/spec_helper.rb
+- spec/rcov.opts
 - spec/dataset_spec.rb
+- spec/sequelizer_spec.rb
 - spec/migration_spec.rb
 - spec/pretty_table_spec.rb
-- spec/rcov.opts
-- spec/schema_generator_spec.rb
 - spec/schema_spec.rb
-- spec/sequelizer_spec.rb
 - spec/spec.opts
-- spec/spec_helper.rb
-- spec/worker_spec.rb
+- lib/sequel_core.rb
 - lib/sequel_core
+- lib/sequel_core/schema
+- lib/sequel_core/schema/schema_sql.rb
+- lib/sequel_core/schema/schema_generator.rb
 - lib/sequel_core/adapters
-- lib/sequel_core/adapters/adapter_skeleton.rb
-- lib/sequel_core/adapters/ado.rb
-- lib/sequel_core/adapters/db2.rb
 - lib/sequel_core/adapters/dbi.rb
-- lib/sequel_core/adapters/informix.rb
+- lib/sequel_core/adapters/sqlite.rb
 - lib/sequel_core/adapters/jdbc.rb
+- lib/sequel_core/adapters/ado.rb
+- lib/sequel_core/adapters/adapter_skeleton.rb
 - lib/sequel_core/adapters/mysql.rb
-- lib/sequel_core/adapters/odbc.rb
-- lib/sequel_core/adapters/odbc_mssql.rb
-- lib/sequel_core/adapters/openbase.rb
 - lib/sequel_core/adapters/oracle.rb
 - lib/sequel_core/adapters/postgres.rb
-- lib/sequel_core/adapters/sqlite.rb
-- lib/sequel_core/array_keys.rb
-- lib/sequel_core/core_ext.rb
-- lib/sequel_core/core_sql.rb
-- lib/sequel_core/database.rb
+- lib/sequel_core/adapters/odbc_mssql.rb
+- lib/sequel_core/adapters/db2.rb
+- lib/sequel_core/adapters/odbc.rb
+- lib/sequel_core/adapters/informix.rb
+- lib/sequel_core/adapters/openbase.rb
 - lib/sequel_core/dataset
-- lib/sequel_core/dataset/convenience.rb
-- lib/sequel_core/dataset/sequelizer.rb
 - lib/sequel_core/dataset/sql.rb
-- lib/sequel_core/dataset.rb
-- lib/sequel_core/exceptions.rb
-- lib/sequel_core/migration.rb
-- lib/sequel_core/model.rb
+- lib/sequel_core/dataset/sequelizer.rb
+- lib/sequel_core/dataset/convenience.rb
 - lib/sequel_core/pretty_table.rb
-- lib/sequel_core/schema
-- lib/sequel_core/schema/schema_generator.rb
-- lib/sequel_core/schema/schema_sql.rb
 - lib/sequel_core/schema.rb
+- lib/sequel_core/model.rb
+- lib/sequel_core/exceptions.rb
+- lib/sequel_core/database.rb
+- lib/sequel_core/dataset.rb
+- lib/sequel_core/core_sql.rb
+- lib/sequel_core/core_ext.rb
+- lib/sequel_core/migration.rb
 - lib/sequel_core/worker.rb
-- lib/sequel_core.rb
+- lib/sequel_core/array_keys.rb
 - CHANGELOG
 has_rdoc: true
 homepage: http://sequel.rubyforge.org