sequel_core 1.3 → 1.4.0

data/CHANGELOG

@@ -1,3 +1,29 @@
+=== 1.4.0 (2008-04-08) 
+
+* Merge 3 mysql patches from the bugtracker (mvyver) (#200, #201, #202).
+
+* Merge 2 postgresql patches from the bugtracker (a...@mellowtone.co.jp) (#211, 212).
+
+* Allow overriding of default posgres spec database via ENV['SEQUEL_PG_SPEC_DB'] (jeremyevans).
+
+* Allow using the Sequel::Model as the first argument in a dataset join selection (jeremyevans) (#170).
+
+* Add simple callback mechanism to make model eager loading implementation easier (jeremyevans).
+
+* Added Sequel::Error::InvalidOperation class for invalid operations (#198).
+
+* Implemented MySQL::Database#server_version (#199).
+
+* Added spec configuration for MySQL socket file.
+
+* Fixed transform with array tuples in postgres adapter.
+
+* Changed spec configuration to Database objects instead of URIs in order to support custom options for spec databases.
+
+* Renamed schema files.
+
+* Fixed Dataset#from to work correctly with SQL functions (#193).
+
 === 1.3 (2008-03-08)
 
 * Added configuration file for running specs (#186).

data/README

@@ -7,18 +7,19 @@ Sequel makes it easy to deal with multiple records without having to break your
 == Resources
 
 * {Project page}[http://code.google.com/p/ruby-sequel/]
-* {Source code}[http://ruby-sequel.googlecode.com/svn/]
+* {Source code}[http://github.com/jeremyevans/sequel]
 * {Bug tracking}[http://code.google.com/p/ruby-sequel/issues/list]
 * {Google group}[http://groups.google.com/group/sequel-talk]
 * {RubyForge page}[http://rubyforge.org/projects/sequel/]
+* {API RDoc}[http://sequel.rubyforge.org]
 
 To check out the source code:
   
-  svn co http://ruby-sequel.googlecode.com/svn/trunk
+  git clone git://github.com/jeremyevans/sequel.git
   
 === Contact
 
-If you have any comments or suggestions please send an email to ciconia at gmail.com and I'll get back to you.
+If you have any comments or suggestions please post to the Google group.
 
 == Installation
 
@@ -208,7 +209,7 @@ Or calculate a sum:
   
 You can also specify descending order
 
-  posts.order(:stamp.DESC)
+  posts.order(:stamp.desc)
 
 === Deleting Records
 

data/Rakefile

@@ -9,7 +9,7 @@ include FileUtils
 # Configuration
 ##############################################################################
 NAME = "sequel_core"
-VERS = "1.3"
+VERS = "1.4.0"
 CLEAN.include ["**/.*.sw?", "pkg/*", ".config", "doc/*", "coverage/*"]
 RDOC_OPTS = [
   "--quiet", 
@@ -49,10 +49,10 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"]
   s.rdoc_options += RDOC_OPTS + 
     ["--exclude", "^(examples|extras)\/", "--exclude", "lib/sequel_core.rb"]
-  s.summary = "The Database Toolkit for Ruby"
+  s.summary = "The Database Toolkit for Ruby: Core Library and Adapters"
   s.description = s.summary
-  s.author = "Sharon Rosner"
-  s.email = "ciconia@gmail.com"
+  s.author = "Aman Gupta"
+  s.email = "themastermind1@gmail.com"
   s.homepage = "http://sequel.rubyforge.org"
   s.executables = ["sequel"]
   s.required_ruby_version = ">= 1.8.4"
@@ -99,14 +99,6 @@ task :uninstall => [:clean] do
   sh %{sudo gem uninstall #{NAME}}
 end
 
-task :tag do
-  cwd = FileUtils.pwd
-  sh %{rm -rf doc/*}
-  sh %{rm -rf pkg/*}
-  sh %{rm -rf coverage/*}
-  sh %{cd ../.. && svn copy #{cwd} tags/#{NAME}-#{VERS} && svn commit -m "#{NAME}-#{VERS} tag." tags}
-end
-
 ##############################################################################
 # gem and rdoc release
 ##############################################################################

data/lib/sequel_core/adapters/mysql.rb

@@ -75,6 +75,17 @@ module Sequel
     class Database < Sequel::Database
       set_adapter_scheme :mysql
 
+      def server_version
+        @server_version ||= pool.hold do |conn|
+          if conn.respond_to?(:server_version)
+            pool.hold {|c| c.server_version}
+          else
+            get(:version[]) =~ /(\d+)\.(\d+)\.(\d+)/
+            ($1.to_i * 10000) + ($2.to_i * 100) + $3.to_i
+          end
+        end
+      end
+      
       def serial_primary_key_options
         {:primary_key => true, :type => :integer, :auto_increment => true}
       end
@@ -213,8 +224,7 @@ module Sequel
       # Changes the database in use by issuing a USE statement.
       def use(db_name)
         disconnect
-        @opts[:database] = db_name
-        self << "USE #{db_name}"
+        @opts[:database] = db_name if self << "USE #{db_name}"
         self
       end
     end
@@ -225,6 +235,28 @@ module Sequel
       TRUE = '1'
       FALSE = '0'
 
+      # Join processing changed after MySQL v5.0.12. NATURAL
+      # joins are SQL:2003 consistent.
+      JOIN_TYPES  =  { :cross => 'INNER JOIN'.freeze,
+        :straight => 'STRAIGHT_JOIN'.freeze,
+        :natural_left => 'NATURAL LEFT JOIN'.freeze,
+        :natural_right => 'NATURAL RIGHT JOIN'.freeze,
+        :natural_left_outer => 'NATURAL LEFT OUTER JOIN'.freeze,
+        :natural_right_outer => 'NATURAL RIGHT OUTER JOIN'.freeze,
+        :left => 'LEFT JOIN'.freeze,
+        :right => 'RIGHT JOIN'.freeze,
+        :left_outer => 'LEFT OUTER JOIN'.freeze,
+        :right_outer => 'RIGHT OUTER JOIN'.freeze,
+        :natural_inner => 'NATURAL LEFT JOIN'.freeze,
+        # :full_outer => 'FULL OUTER JOIN'.freeze,
+        #
+        # A full outer join, nor a workaround implementation of
+        # :full_outer, is not yet possible in Sequel. See issue
+        # #195 which probably depends on issue #113 being
+        # resolved.
+        :inner => 'INNER JOIN'.freeze
+      }
+
       def literal(v)
         case v
         when LiteralString
@@ -240,6 +272,46 @@ module Sequel
         end
       end
 
+      # Returns a join clause based on the specified join type
+      # and condition.  MySQL's NATURAL join is 'semantically
+      # equivalent to a JOIN with a USING clause that names all
+      # columns that exist in both tables.  The constraint
+      # expression may be nil, so join expression can accept two
+      # arguments.
+      #
+      # === Note
+      # Full outer joins (:full_outer) are not implemented in
+      # MySQL (as of v6.0), nor is there currently a work around
+      # implementation in Sequel.  Straight joins with 'ON
+      # <condition>' are not yet implemented.
+      #
+      # === Example
+      #   @ds = MYSQL_DB[:nodes]
+      #   @ds.join_expr(:natural_left_outer, :nodes)
+      #   # 'NATURAL LEFT OUTER JOIN nodes'
+      #
+      def join_expr(type, table, expr = nil)
+        join_type = JOIN_TYPES[type || :inner]
+        unless join_type
+          raise Error::InvalidJoinType, "Invalid join type: #{type}"
+        end
+        @opts[:server_version] = @db.server_version unless @opts[:server_version]
+        type = :inner if type == :cross && !expr.nil?
+        if type.to_s =~ /natural|cross|straight/ &&  @opts[:server_version] >= 50014
+          tbl_factor = table.to_s
+          if table.is_a?(Dataset)
+            tbl_factor = table.sql << " AS t1"
+          end
+          if table.is_a?(Array)
+            tbl_factor = "( #{literal(table)} )"
+          end
+          join_string = "#{join_type} " << tbl_factor
+          return join_string
+        end
+
+        super
+      end
+
       def match_expr(l, r)
         case r
         when Regexp
@@ -452,4 +524,4 @@ module Sequel
       end
     end
   end
-end
+end

data/lib/sequel_core/adapters/postgres.rb

@@ -2,8 +2,8 @@ require 'postgres'
 
 class PGconn
   # the pure-ruby postgres adapter does not have a quote method.
-  TRUE = 't'.freeze
-  FALSE = 'f'.freeze
+  TRUE = 'true'.freeze
+  FALSE = 'false'.freeze
   NULL = 'NULL'.freeze
   
   unless methods.include?('quote')
@@ -47,6 +47,10 @@ class PGconn
     alias_method :async_exec, :exec
   end
   
+  unless instance_methods.include?('async_query')
+    alias_method :async_query, :query
+  end
+  
   def execute(sql, &block)
     q = nil
     begin
@@ -80,7 +84,7 @@ class PGconn
     end
     if seq = @table_sequences[table]
       r = async_query(SELECT_CURRVAL % seq)
-      return r[0][0].to_i unless r.nil? || r.empty?
+      return r[0][0].to_i unless r.nil? || (r.respond_to?(:empty?) && r.empty?)
     end
     nil # primary key sequence not found
   end
@@ -126,17 +130,17 @@ class PGconn
   
   def pkey_and_sequence(table)
     r = async_query(SELECT_PK_AND_SERIAL_SEQUENCE % table)
-    return [r[0].first, r[0].last] unless r.nil? or r.empty?
+    return [r[0].first, r[0].last] unless r.nil? || (r.respond_to?(:empty?) && r.empty?)
 
     r = async_query(SELECT_PK_AND_CUSTOM_SEQUENCE % table)
-    return [r[0].first, r[0].last] unless r.nil? or r.empty?
+    return [r[0].first, r[0].last] unless r.nil? || (r.respond_to?(:empty?) && r.empty?)
   rescue
     nil
   end
   
   def primary_key(table)
     r = async_query(SELECT_PK % table)
-    pkey = r[0].first unless r.nil? or r.empty?
+    pkey = r[0].first unless r.nil? || (r.respond_to?(:empty?) && r.empty?)
     return pkey.to_sym if pkey
   rescue
     nil
@@ -535,6 +539,23 @@ module Sequel
         end
         eval("lambda {|r| r.keys = columns; #{tr.join(';')}; r}")
       end
+
+      def array_tuples_transform_load(r)
+        a = []; a.keys = []
+        r.each_pair do |k, v|
+          a[k] = (tt = @transform[k]) ? tt[0][v] : v
+        end
+        a
+      end
+
+      # Applies the value transform for data saved to the database.
+      def array_tuples_transform_save(r)
+        a = []; a.keys = []
+        r.each_pair do |k, v|
+          a[k] = (tt = @transform[k]) ? tt[1][v] : v
+        end
+        a
+      end
     end
   end
 end

data/lib/sequel_core/dataset/callback.rb

@@ -0,0 +1,19 @@
+module Sequel
+  class Dataset
+    module Callback
+      # Add a symbol with the name of a method to the list of callbacks for name.
+      def add_callback(name, sym)
+        cbs = (@opts[:callbacks] ||= {})
+        cb = (cbs[name] ||= [])
+        cb.push(sym)
+      end
+      
+      # Run all callbacks for name with the given args
+      def run_callback(name, *args)
+        return unless cbs = @opts[:callbacks]
+        return unless cb = cbs[name]
+        cb.each{|sym| send(sym, *args)}
+      end
+    end
+  end
+end

data/lib/sequel_core/dataset/sql.rb

@@ -42,23 +42,33 @@ module Sequel
           m.join(COMMA_SEPARATOR)
         end
       end
-
+      
+      def table_ref(t)
+        case t
+        when Dataset
+          t.to_table_reference
+        when Hash
+          t.map {|k, v| "#{table_ref(k)} #{table_ref(v)}"}.join(COMMA_SEPARATOR)
+        when Symbol, String
+          t
+        else
+          literal(t)
+        end
+      end
+      
       # Converts an array of sources names into into a comma separated list.
       def source_list(source)
         if source.nil? || source.empty?
           raise Error, 'No source specified for query'
         end
         auto_alias_count = 0
-        m = source.map do |i|
-          case i
+        m = source.map do |s|
+          case s
           when Dataset
             auto_alias_count += 1
-            i.to_table_reference(auto_alias_count)
-          when Hash
-            i.map {|k, v| "#{k.is_a?(Dataset) ? k.to_table_reference : k} #{v}"}.
-              join(COMMA_SEPARATOR)
+            s.to_table_reference(auto_alias_count)
           else
-            i
+            table_ref(s)
           end
         end
         m.join(COMMA_SEPARATOR)
@@ -356,7 +366,7 @@ module Sequel
       # if the dataset has not been grouped. See also #filter
       def having(*cond, &block)
         unless @opts[:group]
-          raise Error, "Can only specify a HAVING clause on a grouped dataset"
+          raise Error::InvalidOperation, "Can only specify a HAVING clause on a grouped dataset"
         else
           @opts[:having] = {}
           filter(*cond, &block)
@@ -402,6 +412,8 @@ module Sequel
         unless join_type
           raise Error::InvalidJoinType, "Invalid join type: #{type}"
         end
+        
+        table = table.table_name if table.respond_to?(:table_name)
 
         join_conditions = {}
         expr.each do |k, v|
@@ -687,4 +699,4 @@ module Sequel
       end
     end
   end
-end
+end

data/lib/sequel_core/dataset.rb

@@ -6,6 +6,7 @@ require 'base64'
 require File.join(File.dirname(__FILE__), 'dataset/sql')
 require File.join(File.dirname(__FILE__), 'dataset/sequelizer')
 require File.join(File.dirname(__FILE__), 'dataset/convenience')
+require File.join(File.dirname(__FILE__), 'dataset/callback')
 
 module Sequel
   # A Dataset represents a view of a the data in a database, constrained by
@@ -69,6 +70,7 @@ module Sequel
     include Sequelizer
     include SQL
     include Convenience
+    include Callback
     
     attr_accessor :db
     attr_accessor :opts
@@ -80,6 +82,7 @@ module Sequel
     def all(opts = nil, &block)
       a = []
       each(opts) {|r| a << r}
+      run_callback(:post_load, a)
       a.each(&block) if block
       a
     end

data/lib/sequel_core/exceptions.rb

@@ -14,6 +14,9 @@ module Sequel
                                        
     # Represents an Invalid transform.
     class InvalidTransform < Error ; end
+    
+    # Raised on an invalid operation.
+    class InvalidOperation < Error; end
                                        
     # Represents an Invalid filter.    
     class InvalidFilter < Error ; end

data/lib/sequel_core/schema.rb

@@ -3,6 +3,6 @@ module Sequel
   end
 end
 
-require File.join(File.dirname(__FILE__), 'schema/schema_sql')
-require File.join(File.dirname(__FILE__), 'schema/schema_generator')
+require File.join(File.dirname(__FILE__), 'schema/sql')
+require File.join(File.dirname(__FILE__), 'schema/generator')
 

data/spec/adapters/informix_spec.rb

@@ -1,9 +1,10 @@
 require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
 require File.join(File.dirname(__FILE__), '../spec_helper.rb')
 
-unless defined?(INFORMIX_URL); INFORMIX_URL = 'informix://localhost/mydb' ;end
+unless defined?(INFORMIX_DB)
+  INFORMIX_DB = Sequel('informix://localhost/mydb')
+end
 
-INFORMIX_DB = Sequel(INFORMIX_URL)
 if INFORMIX_DB.table_exists?(:test)
   INFORMIX_DB.drop_table :test
 end

data/spec/adapters/mysql_spec.rb

@@ -2,9 +2,17 @@ require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
 require File.join(File.dirname(__FILE__), '../spec_helper.rb')
 require 'logger'
 
-unless defined?(MYSQL_URL); MYSQL_URL = 'mysql://root@localhost/sandbox' ;end
+unless defined?(MYSQL_DB)
+  MYSQL_URL = 'mysql://root@localhost/sandbox' unless defined? MYSQL_URL
+  MYSQL_DB = Sequel(MYSQL_URL)
+end
+unless defined?(MYSQL_SOCKET_FILE)
+  MYSQL_SOCKET_FILE = '/tmp/mysql.sock'
+end
+
+MYSQL_URI = URI.parse(MYSQL_DB.uri)
+MYSQL_DB_NAME = MYSQL_URI.path =~ /\/(.*)/ && $1
 
-MYSQL_DB = Sequel(MYSQL_URL)
 MYSQL_DB.drop_table(:items) if MYSQL_DB.table_exists?(:items)
 MYSQL_DB.drop_table(:test2) if MYSQL_DB.table_exists?(:test2)
 MYSQL_DB.create_table :items do
@@ -28,6 +36,10 @@ context "A MySQL database" do
     @db.pool.size.should == 0
   end
 
+  specify "should provide the server version" do
+    @db.server_version.should >= 40000
+  end
+
   specify "should support sequential primary keys" do
     @db.create_table!(:with_pk) {primary_key :id; text :name}
     @db[:with_pk] << {:name => 'abc'}
@@ -267,6 +279,53 @@ end
 #   end
 # end
 # 
+context "MySQL join expressions" do
+  setup do
+    @ds = MYSQL_DB[:nodes]
+    @ds.db.meta_def(:server_version) {50014}
+  end
+
+  specify "should raise error for :full_outer join requests." do
+    lambda{@ds.join_expr(:full_outer, :nodes)}.should raise_error(Sequel::Error::InvalidJoinType)
+  end
+  specify "should support natural left joins" do
+    @ds.join_expr(:natural_left, :nodes).should == \
+      'NATURAL LEFT JOIN nodes'
+  end
+  specify "should support natural right joins" do
+    @ds.join_expr(:natural_right, :nodes).should == \
+      'NATURAL RIGHT JOIN nodes'
+  end
+  specify "should support natural left outer joins" do
+    @ds.join_expr(:natural_left_outer, :nodes).should == \
+      'NATURAL LEFT OUTER JOIN nodes'
+  end
+  specify "should support natural right outer joins" do
+    @ds.join_expr(:natural_right_outer, :nodes).should == \
+      'NATURAL RIGHT OUTER JOIN nodes'
+  end
+  specify "should support natural inner joins" do
+    @ds.join_expr(:natural_inner, :nodes).should == \
+      'NATURAL LEFT JOIN nodes'
+  end
+  specify "should support cross joins (equivalent to inner join in MySQL, not in std SQL)" do
+    @ds.join_expr(:cross, :nodes).should == \
+      'INNER JOIN nodes'
+  end
+  specify "should support straight joins (force left table to be read before right)" do
+    @ds.join_expr(:straight, :nodes).should == \
+      'STRAIGHT_JOIN nodes'
+  end
+  specify "should support natural joins on multiple tables." do
+    @ds.join_expr(:natural_left_outer, [:nodes, :branches]).should == \
+      'NATURAL LEFT OUTER JOIN ( `nodes`, `branches` )'
+  end
+  specify "should support straight joins on multiple tables." do
+    @ds.join_expr(:straight, [:nodes,:branches]).should == \
+      'STRAIGHT_JOIN ( `nodes`, `branches` )'
+  end
+end
+
 context "Joined MySQL dataset" do
   setup do
     @ds = MYSQL_DB[:nodes].join(:attributes, :node_id => :id)
@@ -391,17 +450,17 @@ end
 
 context "A MySQL database" do
   specify "should accept a socket option" do
-    db = Sequel.mysql('sandbox', :host => 'localhost', :user => 'root', :socket => '/tmp/mysql.sock')
+    db = Sequel.mysql(MYSQL_DB_NAME, :host => 'localhost', :user => 'root', :socket => MYSQL_SOCKET_FILE)
     proc {db.test_connection}.should_not raise_error
   end
   
   specify "should accept a socket option without host option" do
-    db = Sequel.mysql('sandbox', :user => 'root', :socket => '/tmp/mysql.sock')
+    db = Sequel.mysql(MYSQL_DB_NAME, :user => 'root', :socket => MYSQL_SOCKET_FILE)
     proc {db.test_connection}.should_not raise_error
   end
   
   specify "should fail to connect with invalid socket" do
-    db = Sequel.mysql('sandbox', :host => 'localhost', :user => 'root', :socket => 'blah')
+    db = Sequel.mysql(MYSQL_DB_NAME, :host => 'localhost', :user => 'root', :socket => 'blah')
     proc {db.test_connection}.should raise_error
   end
 end
@@ -590,4 +649,4 @@ context "MySQL::Dataset#replace" do
     @d.replace(:id => 111, :value => 333)
     @d.all.should == [{:id => 111, :value => 333}]
   end
-end
+end

data/spec/adapters/oracle_spec.rb

@@ -1,9 +1,9 @@
 require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
 require File.join(File.dirname(__FILE__), '../spec_helper.rb')
 
-unless defined?(ORACLE_URL); ORACLE_URL = 'oracle://hr:hr@localhost/XE' ;end
-
-ORACLE_DB = Sequel(ORACLE_URL)
+unless defined?(ORACLE_DB)
+  ORACLE_DB = Sequel('oracle://hr:hr@localhost/XE')
+end
 
 if ORACLE_DB.table_exists?(:items)
   ORACLE_DB.drop_table :items

data/spec/adapters/postgres_spec.rb

@@ -1,25 +1,25 @@
 require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
 require File.join(File.dirname(__FILE__), '../spec_helper.rb')
 
-unless defined?(POSTGRES_URL); POSTGRES_URL = 'postgres://postgres:postgres@localhost:5432/reality_spec' ;end
-
+unless defined?(POSTGRES_DB)
+  POSTGRES_DB = Sequel(ENV['SEQUEL_PG_SPEC_DB']||'postgres://postgres:postgres@localhost:5432/reality_spec')
+end
 
-PGSQL_DB = Sequel(POSTGRES_URL)
-PGSQL_DB.drop_table(:test) if PGSQL_DB.table_exists?(:test)
-PGSQL_DB.drop_table(:test2) if PGSQL_DB.table_exists?(:test2)
+POSTGRES_DB.drop_table(:test) if POSTGRES_DB.table_exists?(:test)
+POSTGRES_DB.drop_table(:test2) if POSTGRES_DB.table_exists?(:test2)
   
-PGSQL_DB.create_table :test do
+POSTGRES_DB.create_table :test do
   text :name
   integer :value, :index => true
 end
-PGSQL_DB.create_table :test2 do
+POSTGRES_DB.create_table :test2 do
   text :name
   integer :value
 end
 
 context "A PostgreSQL database" do
   setup do
-    @db = PGSQL_DB
+    @db = POSTGRES_DB
   end
   
   specify "should provide disconnect functionality" do
@@ -36,7 +36,7 @@ end
 
 context "A PostgreSQL dataset" do
   setup do
-    @d = PGSQL_DB[:test]
+    @d = POSTGRES_DB[:test]
     @d.delete # remove all records
   end
   
@@ -147,7 +147,7 @@ context "A PostgreSQL dataset" do
   end
   
   specify "should support transactions" do
-    PGSQL_DB.transaction do
+    POSTGRES_DB.transaction do
       @d << {:name => 'abc', :value => 1}
     end
 
@@ -169,7 +169,7 @@ end
 
 context "A PostgreSQL dataset in array tuples mode" do
   setup do
-    @d = PGSQL_DB[:test]
+    @d = POSTGRES_DB[:test]
     @d.delete # remove all records
     Sequel.use_array_tuples
   end
@@ -215,7 +215,7 @@ end
 
 context "A PostgreSQL database" do
   setup do
-    @db = PGSQL_DB
+    @db = POSTGRES_DB
   end
 
   specify "should support add_column operations" do
@@ -259,44 +259,44 @@ context "A PostgreSQL database" do
   end
   
   specify "should support fulltext indexes" do
-    g = Sequel::Schema::Generator.new(PGSQL_DB) do
+    g = Sequel::Schema::Generator.new(POSTGRES_DB) do
       text :title
       text :body
       full_text_index [:title, :body]
     end
-    PGSQL_DB.create_table_sql_list(:posts, *g.create_info).should == [
+    POSTGRES_DB.create_table_sql_list(:posts, *g.create_info).should == [
       "CREATE TABLE posts (\"title\" text, \"body\" text)",
       "CREATE INDEX posts_title_body_index ON posts USING gin(to_tsvector(\"title\" || \"body\"))"
     ]
   end
   
   specify "should support fulltext indexes with a specific language" do
-    g = Sequel::Schema::Generator.new(PGSQL_DB) do
+    g = Sequel::Schema::Generator.new(POSTGRES_DB) do
       text :title
       text :body
       full_text_index [:title, :body], :language => 'french'
     end
-    PGSQL_DB.create_table_sql_list(:posts, *g.create_info).should == [
+    POSTGRES_DB.create_table_sql_list(:posts, *g.create_info).should == [
       "CREATE TABLE posts (\"title\" text, \"body\" text)",
       "CREATE INDEX posts_title_body_index ON posts USING gin(to_tsvector('french', \"title\" || \"body\"))"
     ]
   end
   
   specify "should support full_text_search" do
-    PGSQL_DB[:posts].full_text_search(:title, 'ruby').sql.should ==
+    POSTGRES_DB[:posts].full_text_search(:title, 'ruby').sql.should ==
       "SELECT * FROM posts WHERE (to_tsvector(\"title\") @@ to_tsquery('ruby'))"
     
-    PGSQL_DB[:posts].full_text_search([:title, :body], ['ruby', 'sequel']).sql.should ==
+    POSTGRES_DB[:posts].full_text_search([:title, :body], ['ruby', 'sequel']).sql.should ==
       "SELECT * FROM posts WHERE (to_tsvector(\"title\" || \"body\") @@ to_tsquery('ruby | sequel'))"
       
-    PGSQL_DB[:posts].full_text_search(:title, 'ruby', :language => 'french').sql.should ==
+    POSTGRES_DB[:posts].full_text_search(:title, 'ruby', :language => 'french').sql.should ==
       "SELECT * FROM posts WHERE (to_tsvector('french', \"title\") @@ to_tsquery('french', 'ruby'))"
   end
 end
 
 context "Postgres::Dataset#multi_insert_sql / #import" do
   setup do
-    @ds = PGSQL_DB[:test]
+    @ds = POSTGRES_DB[:test]
   end
   
   specify "should return separate insert statements if server_version < 80200" do
@@ -321,4 +321,4 @@ context "Postgres::Dataset#multi_insert_sql / #import" do
       'INSERT INTO test ("x", "y") VALUES (1, 2), (3, 4)'
     ]
   end
-end
+end

data/spec/adapters/sqlite_spec.rb

@@ -1,9 +1,10 @@
 require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
 require File.join(File.dirname(__FILE__), '../spec_helper.rb')
 
-unless defined?(SQLITE_URL); SQLITE_URL = 'sqlite:/' ;end
+unless defined?(SQLITE_DB)
+  SQLITE_DB = Sequel('sqlite:/')
+end
 
-SQLITE_DB = Sequel(SQLITE_URL)
 SQLITE_DB.create_table :items do
   integer :id, :primary_key => true, :auto_increment => true
   text :name

data/spec/dataset_spec.rb

@@ -199,11 +199,11 @@ context "A dataset with multiple tables in its FROM clause" do
   end
 
   specify "should raise on #update_sql" do
-    proc {@dataset.update_sql(:a=>1)}.should raise_error
+    proc {@dataset.update_sql(:a=>1)}.should raise_error(Sequel::Error::InvalidOperation)
   end
 
   specify "should raise on #delete_sql" do
-    proc {@dataset.delete_sql}.should raise_error
+    proc {@dataset.delete_sql}.should raise_error(Sequel::Error::InvalidOperation)
   end
 
   specify "should generate a select query FROM all specified tables" do
@@ -508,7 +508,7 @@ context "Dataset#having" do
   end
 
   specify "should raise if the dataset is not grouped" do
-    proc {@dataset.having('avg(gdp) > 10')}.should raise_error
+    proc {@dataset.having('avg(gdp) > 10')}.should raise_error(Sequel::Error::InvalidOperation)
   end
 
   specify "should affect select statements" do
@@ -665,6 +665,12 @@ context "Dataset#from" do
     @dataset.from(:a => :b).sql.should ==
       "SELECT * FROM a b"
       
+    @dataset.from(:a => 'b').sql.should ==
+      "SELECT * FROM a b"
+
+    @dataset.from(:a => :c[:d]).sql.should ==
+      "SELECT * FROM a c(d)"
+
     @dataset.from(@dataset.from(:a).group(:b) => :c).sql.should ==
       "SELECT * FROM (SELECT * FROM a GROUP BY b) c"
   end
@@ -677,6 +683,20 @@ context "Dataset#from" do
   specify "should raise if no source is given" do
     proc {@dataset.from(@dataset.from).select_sql}.should raise_error(Sequel::Error)
   end
+  
+  specify "should accept sql functions" do
+    @dataset.from(:abc[:def]).select_sql.should ==
+      "SELECT * FROM abc(def)"
+    
+    @dataset.from(:a|:i).select_sql.should ==
+      "SELECT * FROM a[i]"
+    
+    @dataset.from(:generate_series[1, 2].as(:a[:i])).select_sql.should ==
+      "SELECT * FROM generate_series(1, 2) AS a(i)"
+      
+    @dataset.from(:generate_series[1, 2] => :a[:i]).select_sql.should ==
+      "SELECT * FROM generate_series(1, 2) a(i)"
+  end
 end
 
 context "Dataset#select" do
@@ -1229,6 +1249,14 @@ context "Dataset#join_table" do
     @d.join_table(:left_outer, ds, :item_id => :id).sql.should ==
       'SELECT * FROM items LEFT OUTER JOIN (SELECT * FROM categories WHERE (active = \'t\')) t1 ON (t1.item_id = items.id)'
   end
+
+  specify "should support joining objects that respond to :table_name" do
+    ds = Object.new
+    def ds.table_name; :categories end
+    
+    @d.join(ds, :item_id => :id).sql.should ==
+      'SELECT * FROM items INNER JOIN categories ON (categories.item_id = items.id)'
+  end
 end
 
 context "Dataset#[]=" do
@@ -2943,4 +2971,4 @@ context "Dataset#grep" do
     @ds.grep(:title, [/^ruby/, 'ruby']).sql.should ==
       "SELECT * FROM posts WHERE ((title =~ '^ruby') OR (title LIKE 'ruby'))"
   end
-end
+end

data/spec/spec_config.rb.example

@@ -1,6 +1,7 @@
-# connection URL's for running adapter specs
-INFORMIX_URL    = 'informix://localhost/mydb'
-MYSQL_URL       = 'mysql://root@localhost/sandbox'
-ORACLE_URL      = 'oracle://hr:hr@localhost/XE'
-POSTGRES_URL    = 'postgres://postgres:postgres@localhost:5432/reality_spec'
-SQLITE_URL      = 'sqlite:/'
+# database objects for running adapter specs
+# INFORMIX_DB = Sequel('informix://localhost/mydb')
+# MYSQL_DB = Sequel('mysql://root@localhost/sandbox')
+# MYSQL_SOCKET_FILE = '/tmp/mysql.sock'
+# ORACLE_DB = Sequel('oracle://hr:hr@localhost/XE')
+# POSTGRES_DB = Sequel('postgres://postgres:postgres@localhost:5432/reality_spec')
+# SQLITE_DB = Sequel('sqlite:/')

metadata

@@ -1,83 +1,39 @@
 --- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.4
+specification_version: 1
 name: sequel_core
 version: !ruby/object:Gem::Version 
-  version: "1.3"
-platform: ruby
-authors: 
-- Sharon Rosner
+  version: 1.4.0
+date: 2008-04-08 00:00:00 -07:00
+summary: "The Database Toolkit for Ruby: Core Library and Adapters"
+require_paths: 
+- lib
+email: themastermind1@gmail.com
+homepage: http://sequel.rubyforge.org
+rubyforge_project: sequel
+description: "The Database Toolkit for Ruby: Core Library and Adapters"
 autorequire: 
-bindir: bin
-cert_chain: []
-
-date: 2008-03-08 00:00:00 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: metaid
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: assistance
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.1"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: RubyInline
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.6.6
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: ParseTree
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.1.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: ruby2ruby
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: The Database Toolkit for Ruby
-email: ciconia@gmail.com
-executables: 
-- sequel
-extensions: []
-
-extra_rdoc_files: 
-- README
-- CHANGELOG
-- COPYING
+bindir: bin
+has_rdoc: true
+required_ruby_version: !ruby/object:Gem::Version::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.4
+  version: 
+platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
+authors: 
+- Aman Gupta
 files: 
 - COPYING
 - README
 - 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/sqlite_spec.rb
 - spec/array_keys_spec.rb
 - spec/core_ext_spec.rb
 - spec/core_sql_spec.rb
@@ -93,8 +49,27 @@ files:
 - spec/spec_config.rb.example
 - spec/spec_helper.rb
 - spec/worker_spec.rb
+- spec/adapters/informix_spec.rb
+- spec/adapters/mysql_spec.rb
+- spec/adapters/oracle_spec.rb
+- spec/adapters/postgres_spec.rb
+- spec/adapters/sqlite_spec.rb
+- lib/sequel_core.rb
 - lib/sequel_core
 - lib/sequel_core/adapters
+- 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/dataset.rb
+- lib/sequel_core/dataset
+- lib/sequel_core/exceptions.rb
+- lib/sequel_core/migration.rb
+- lib/sequel_core/model.rb
+- lib/sequel_core/pretty_table.rb
+- lib/sequel_core/schema.rb
+- lib/sequel_core/schema
+- lib/sequel_core/worker.rb
 - lib/sequel_core/adapters/adapter_skeleton.rb
 - lib/sequel_core/adapters/ado.rb
 - lib/sequel_core/adapters/db2.rb
@@ -108,29 +83,15 @@ files:
 - 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/dataset
+- lib/sequel_core/dataset/callback.rb
 - 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/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/worker.rb
-- lib/sequel_core.rb
+- lib/sequel_core/schema/generator.rb
+- lib/sequel_core/schema/sql.rb
 - CHANGELOG
-has_rdoc: true
-homepage: http://sequel.rubyforge.org
-post_install_message: 
+test_files: []
+
 rdoc_options: 
 - --quiet
 - --title
@@ -145,26 +106,59 @@ rdoc_options:
 - ^(examples|extras)/
 - --exclude
 - lib/sequel_core.rb
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.4
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-requirements: []
+extra_rdoc_files: 
+- README
+- CHANGELOG
+- COPYING
+executables: 
+- sequel
+extensions: []
 
-rubyforge_project: sequel
-rubygems_version: 1.0.1
-signing_key: 
-specification_version: 2
-summary: The Database Toolkit for Ruby
-test_files: []
+requirements: []
 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: metaid
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: assistance
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.1"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: RubyInline
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.6.6
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ParseTree
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.1.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby2ruby
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: