sequel 0.4.2.2 → 0.4.3

data/CHANGELOG

@@ -1,3 +1,25 @@
+=== 0.4.3 (2007-12-15)
+
+* Fixed Dataset#update to accept strings (#98).
+
+* Fixed Model.[] to raise for boolean argument (#97).
+
+* Added Database#add_index method (thanks coda.hale).
+
+* Added error reporting for filtering on comparison not in a block (thanks Jim Morris).
+
+* Added support for inline index definition (thanks Dado).
+
+* Added Database#create_table! method for forcibly creating a table (thanks Dado).
+
+* Added support for using Dataset#update with block.
+
+* Changed subscript access to use | operator.
+
+* Fixed subscript access in sequelizer.
+
+* Added support for subscript access using Symbol#/ operator.
+
 === 0.4.2.2 (2007-12-10)
 
 * Improved code coverage.

data/Rakefile

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

data/lib/sequel/adapters/adapter_skeleton.rb

@@ -55,8 +55,8 @@ module Sequel
         @db.do insert_sql(*values)
       end
     
-      def update(values, opts = nil)
-        @db.do update_sql(values, opts)
+      def update(*args, &block)
+        @db.do update_sql(*args, &block)
       end
     
       def delete(opts = nil)

data/lib/sequel/adapters/ado.rb

@@ -87,9 +87,8 @@ module Sequel
         @db.do insert_sql(*values)
       end
     
-      def update(values, opts = nil)
-        @db.do update_sql(values, opts)
-        self
+      def update(*args, &block)
+        @db.do update_sql(*args, &block)
       end
     
       def delete(opts = nil)

data/lib/sequel/adapters/db2.rb

@@ -144,8 +144,8 @@ module Sequel
         @db.do insert_sql(*values)
       end
     
-      def update(values, opts = nil)
-        @db.do update_sql(values, opts)
+      def update(*args, &block)
+        @db.do update_sql(*args, &block)
       end
     
       def delete(opts = nil)

data/lib/sequel/adapters/dbi.rb

@@ -113,9 +113,8 @@ module Sequel
         @db.do insert_sql(*values)
       end
     
-      def update(values, opts = nil)
-        @db.do update_sql(values, opts)
-        self
+      def update(*args, &block)
+        @db.do update_sql(*args, &block)
       end
     
       def delete(opts = nil)

data/lib/sequel/adapters/informix.rb

@@ -74,8 +74,8 @@ module Sequel
         @db.do insert_sql(*values)
       end
     
-      def update(values, opts = nil)
-        @db.do update_sql(values, opts)
+      def update(*args, &block)
+        @db.do update_sql(*args, &block)
       end
     
       def delete(opts = nil)

data/lib/sequel/adapters/jdbc.rb

@@ -95,8 +95,8 @@ module Sequel
         @db.execute_and_forget insert_sql(*values)
       end
     
-      def update(values, opts = nil)
-        @db.execute_and_forget update_sql(values, opts)
+      def update(*args, &block)
+        @db.execute_and_forget update_sql(*args, &block)
       end
     
       def delete(opts = nil)

data/lib/sequel/adapters/mysql.rb

@@ -214,8 +214,8 @@ module Sequel
         @db.execute_insert(insert_sql(*values))
       end
     
-      def update(values, opts = nil)
-        @db.execute_affected(update_sql(values, opts))
+      def update(*args, &block)
+        @db.execute_affected(update_sql(*args, &block))
       end
     
       def delete(opts = nil)

data/lib/sequel/adapters/odbc.rb

@@ -127,8 +127,8 @@ module Sequel
         @db.do insert_sql(*values)
       end
     
-      def update(values, opts = nil)
-        @db.do update_sql(values, opts)
+      def update(*args, &block)
+        @db.do update_sql(*args, &block)
         self
       end
     

data/lib/sequel/adapters/openbase.rb

@@ -77,8 +77,8 @@ module Sequel
         @db.do insert_sql(*values)
       end
     
-      def update(values, opts = nil)
-        @db.do update_sql(values, opts)
+      def update(*args, &block)
+        @db.do update_sql(*args, &block)
       end
     
       def delete(opts = nil)

data/lib/sequel/adapters/oracle.rb

@@ -86,8 +86,8 @@ module Sequel
         @db.do insert_sql(*values)
       end
     
-      def update(values, opts = nil)
-        @db.do update_sql(values, opts)
+      def update(*args, &block)
+        @db.do update_sql(*args, &block)
       end
     
       def delete(opts = nil)

data/lib/sequel/adapters/postgres.rb

@@ -391,9 +391,9 @@ module Sequel
           values.size == 1 ? values.first : values)
       end
     
-      def update(values, opts = nil)
+      def update(*args, &block)
         @db.synchronize do
-          result = @db.execute(update_sql(values))
+          result = @db.execute(update_sql(*args, &block))
           begin
             affected = result.cmdtuples
           ensure

data/lib/sequel/adapters/sqlite.rb

@@ -153,8 +153,8 @@ module Sequel
         @db.execute_insert insert_sql(*values)
       end
     
-      def update(values, opts = nil)
-        @db.execute update_sql(values, opts)
+      def update(*args, &block)
+        @db.execute update_sql(*args, &block)
       end
     
       def delete(opts = nil)

data/lib/sequel/core_sql.rb

@@ -86,6 +86,22 @@ module Sequel
       end
     end
     
+    class Subscript < Expression
+      def initialize(f, sub); @f, @sub = f, sub; end
+      def |(sub)
+        unless Array === sub
+          sub = [sub]
+        end
+        Subscript.new(@f, @sub << sub)
+      end
+      
+      COMMA_SEPARATOR = ", ".freeze
+      
+      def to_s(ds)
+        "#{@f}[#{@sub.join(COMMA_SEPARATOR)}]"
+      end
+    end
+    
     class ColumnAll < Expression
       def initialize(t); @t = t; end
       def to_s(ds); "#{@t}.*"; end
@@ -124,6 +140,12 @@ end
 
 class Symbol
   def [](*args); Sequel::SQL::Function.new(self, *args); end
+  def |(sub)
+    unless Array === sub
+      sub = [sub]
+    end
+    Sequel::SQL::Subscript.new(self, sub)
+  end
   
   COLUMN_REF_RE1 = /^(\w+)__(\w+)___(\w+)/.freeze
   COLUMN_REF_RE2 = /^(\w+)___(\w+)$/.freeze

data/lib/sequel/database.rb

@@ -177,11 +177,25 @@ module Sequel
       create_table_sql_list(*g.create_info).each {|sta| execute(sta)}
     end
     
+    # Forcibly creates a table. If the table already exists it is dropped.
+    def create_table!(name, &block)
+      drop_table(name) rescue nil
+      create_table(name, &block)
+    end
+    
     # Drops one or more tables corresponding to the given table names.
     def drop_table(*names)
       names.each {|n| execute(drop_table_sql(n))}
     end
     
+    # Adds an index to a table for the given columns:
+    # 
+    #   DB.add_index(:posts, :title)
+    #   DB.add_index(:posts, [:author, :title], :unique => true)
+    def add_index(table, columns, options = {})
+      execute(index_definition_sql(table, options.update(:columns => [columns])))
+    end
+    
     # Returns true if the given table exists.
     def table_exists?(name)
       if respond_to?(:tables)

data/lib/sequel/dataset.rb

@@ -51,9 +51,9 @@ module Sequel
   #   end
   #
   #   # Update records.
-  #   def update(values, opts = nil)
+  #   def update(*args, &block)
   #     @db.synchronize do
-  #       @db.execute(update_sql(values, opts)).affected_rows
+  #       @db.execute(update_sql(*args, &block)).affected_rows
   #     end
   #   end
   #
@@ -154,8 +154,8 @@ module Sequel
     end
   
     # Updates the dataset with the given values.
-    def set(*args)
-      update(*args)
+    def set(*args, &block)
+      update(*args, &block)
     end
     
     # Iterates over the records in the dataset

data/lib/sequel/dataset/convenience.rb

@@ -22,10 +22,12 @@ module Sequel
       NAKED_HASH = {:naked => true}.freeze
 
       # Returns the first value of the first reecord in the dataset.
+      # Returns nill if dataset is empty.
       def single_value(opts = nil)
         opts = opts ? NAKED_HASH.merge(opts) : NAKED_HASH
         # reset the columns cache so it won't fuck subsequent calls to columns
         each(opts) {|r| @columns = nil; return r.values.first}
+        nil
       end
 
       # Returns the first record in the dataset. If the num argument is specified,

data/lib/sequel/dataset/sequelizer.rb

@@ -122,7 +122,7 @@ class Sequel::Dataset
         l = eval_expr(e[1], b)
         r = eval_expr(e[3][1], b)
         match_expr(l, r)
-      when :+, :-, :*, :/, :%
+      when :+, :-, :*, :%, :/
         l = eval_expr(e[1], b)
         r = eval_expr(e[3][1], b)
         if l.is_one_of?(Symbol, Sequel::LiteralString, Sequel::SQL::Expression) || \
@@ -131,6 +131,21 @@ class Sequel::Dataset
         else
           ext_expr(e, b)
         end
+      when :<<
+        l = eval_expr(e[1], b)
+        r = eval_expr(e[3][1], b)
+        "#{literal(l)} = #{literal(r)}".lit
+      when :|
+        l = eval_expr(e[1], b)
+        r = eval_expr(e[3][1], b)
+        if l.is_one_of?(Symbol, Sequel::SQL::Subscript)
+          l|r
+        elsif l.is_one_of?(Symbol, Sequel::LiteralString, Sequel::SQL::Expression) || \
+          r.is_one_of?(Symbol, Sequel::LiteralString, Sequel::SQL::Expression)
+          "(#{literal(l)} #{op} #{literal(r)})".lit
+        else
+          ext_expr(e, b)
+        end
       when :in, :in?
         # in/in? operators are supported using two forms:
         #   :x.in([1, 2, 3])
@@ -229,21 +244,30 @@ class Sequel::Dataset
       end
     end
     
-    def pt_expr(e, b) #:nodoc:
+    JOIN_AND = " AND ".freeze
+    JOIN_COMMA = ", ".freeze
+    
+    def pt_expr(e, b, comma_separated = false) #:nodoc:
       case e[0]
       when :not # negation: !x, (x != y), (x !~ y)
         if (e[1][0] == :lit) && (Symbol === e[1][1])
           # translate (!:x) into (x = 'f')
           compare_expr(e[1][1], false)
         else
-          "(NOT #{pt_expr(e[1], b)})"
+          "(NOT #{pt_expr(e[1], b, comma_separated)})"
         end
-      when :block, :and # block of statements, x && y
-        "(#{e[1..-1].map {|i| pt_expr(i, b)}.join(" AND ")})"
+      when :and # x && y
+        "(#{e[1..-1].map {|i| pt_expr(i, b, comma_separated)}.join(JOIN_AND)})"
       when :or # x || y
-        "(#{pt_expr(e[1], b)} OR #{pt_expr(e[2], b)})"
+        "(#{pt_expr(e[1], b, comma_separated)} OR #{pt_expr(e[2], b, comma_separated)})"
       when :call, :vcall, :iter, :match3 # method calls, blocks
         eval_expr(e, b)
+      when :block # block of statements
+        if comma_separated
+          "#{e[1..-1].map {|i| pt_expr(i, b, comma_separated)}.join(JOIN_COMMA)}"
+        else
+          "(#{e[1..-1].map {|i| pt_expr(i, b, comma_separated)}.join(JOIN_AND)})"
+        end
       else # literals
         if e == [:lvar, :block]
           eval_expr(e, b)
@@ -254,9 +278,9 @@ class Sequel::Dataset
     end
 
     # Translates a Ruby block into an SQL expression.
-    def proc_to_sql(proc)
+    def proc_to_sql(proc, comma_separated = false)
       c = Class.new {define_method(:m, &proc)}
-      pt_expr(ParseTree.translate(c, :m)[2][2], proc.binding)
+      pt_expr(ParseTree.translate(c, :m)[2][2], proc.binding, comma_separated)
     end
   end
 end

data/lib/sequel/dataset/sql.rb

@@ -203,6 +203,9 @@ module Sequel
       def filter(*cond, &block)
         clause = (@opts[:group] ? :having : :where)
         cond = cond.first if cond.size == 1
+        if cond === true || cond === false
+          raise SequelError, "Invalid filter specified. Did you mean to supply a block?"
+        end
         parenthesize = !(cond.is_a?(Hash) || cond.is_a?(Array))
         filter = cond.is_a?(Hash) && cond
         if @opts[clause]
@@ -464,7 +467,7 @@ module Sequel
       #
       #   dataset.update_sql(:price => 100, :category => 'software') #=>
       #     "UPDATE items SET price = 100, category = 'software'"
-      def update_sql(values, opts = nil)
+      def update_sql(values = {}, opts = nil, &block)
         opts = opts ? @opts.merge(opts) : @opts
 
         if opts[:group]
@@ -472,15 +475,23 @@ module Sequel
         elsif (opts[:from].size > 1) or opts[:join]
           raise SequelError, "Can't update a joined dataset"
         end
-
-        if values.is_a?(Array) && values.keys
-          values = values.to_hash
+        
+        sql = "UPDATE #{@opts[:from]} SET "
+        if block
+          sql << proc_to_sql(block, true)
+        else
+          # check if array with keys
+          values = values.to_hash if values.is_a?(Array) && values.keys
+          if values.is_a?(Hash)
+            # get values from hash
+            values = transform_save(values) if @transform
+            set = values.map {|k, v| "#{literal(k)} = #{literal(v)}"}.join(COMMA_SEPARATOR)
+          else
+            # copy values verbatim
+            set = values
+          end
+          sql << set
         end
-        values = transform_save(values) if @transform
-        set_list = values.map {|k, v| "#{literal(k)} = #{literal(v)}"}.
-          join(COMMA_SEPARATOR)
-        sql = "UPDATE #{@opts[:from]} SET #{set_list}"
-
         if where = opts[:where]
           sql << " WHERE #{where}"
         end

data/lib/sequel/model.rb

@@ -255,6 +255,9 @@ module Sequel
     
     def self.[](*args)
       args = args.first if (args.size == 1)
+      if args === true || args === false
+        raise SequelError, "Invalid filter specified. Did you mean to supply a hash?"
+      end
       dataset[(Hash === args) ? args : primary_key_hash(args)]
     end
     

data/lib/sequel/schema/schema_generator.rb

@@ -10,7 +10,7 @@ module Sequel
         instance_eval(&block)
       end
       
-      def method_missing(type, name = nil, opts = nil)
+      def method_missing(type, name = nil, opts = {})
         name ? column(name, type, opts) : super
       end
       
@@ -19,9 +19,7 @@ module Sequel
       end
       
       def primary_key(name, *args)
-        @primary_key = @db.serial_primary_key_options.merge({
-          :name => name
-        })
+        @primary_key = @db.serial_primary_key_options.merge({:name => name})
         
         if opts = args.pop
           opts = {:type => opts} unless opts.is_a?(Hash)
@@ -33,12 +31,14 @@ module Sequel
         @primary_key
       end
       
-      def column(name, type, opts = nil)
-        @columns << {:name => name, :type => type}.merge(opts || {})
+      def column(name, type, opts = {})
+        @columns << {:name => name, :type => type}.merge(opts)
+        index(name) if opts[:index]
       end
       
-      def foreign_key(name, opts = nil)
-        @columns << {:name => name, :type => :integer}.merge(opts || {})
+      def foreign_key(name, opts = {})
+        @columns << {:name => name, :type => :integer}.merge(opts)
+        index(name) if opts[:index]
       end
       
       def has_column?(name)
@@ -46,9 +46,9 @@ module Sequel
         false
       end
       
-      def index(columns, opts = nil)
+      def index(columns, opts = {})
         columns = [columns] unless columns.is_a?(Array)
-        @indexes << {:columns => columns}.merge(opts || {})
+        @indexes << {:columns => columns}.merge(opts)
       end
       
       def create_info

data/spec/core_sql_spec.rb

@@ -279,5 +279,12 @@ context "Symbol" do
   specify "should raise NoMethodError for non-uppercase invalid methods" do
     proc {:abc.dfaxs}.should raise_error(NoMethodError)
   end
+  
+  specify "should support subscript access using | operator" do
+    (:abc|1).to_s(@ds).should == 'abc[1]'
+    (:abc|[1]).to_s(@ds).should == 'abc[1]'
+    (:abc|[1, 2]).to_s(@ds).should == 'abc[1, 2]'
+    (:abc|1|2).to_s(@ds).should == 'abc[1, 2]'
+  end
 end
 

data/spec/database_spec.rb

@@ -229,6 +229,26 @@ context "Database#create_table" do
   end
 end
 
+context "Database#add_index" do
+  setup do
+    @db = DummyDatabase.new
+  end
+  
+  specify "should construct proper SQL" do
+    @db.add_index :test, :name, :unique => true
+    @db.sqls.should == [
+      'CREATE UNIQUE INDEX test_name_index ON test (name)'
+    ]
+  end
+  
+  specify "should accept multiple columns" do
+    @db.add_index :test, [:one, :two]
+    @db.sqls.should == [
+      'CREATE INDEX test_one_two_index ON test (one, two)'
+    ]
+  end
+end
+
 class Dummy2Database < Sequel::Database
   attr_reader :sql
   def execute(sql); @sql = sql; end

data/spec/dataset_spec.rb

@@ -1,4 +1,12 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.dirname(__FILE__), "spec_helper")
+
+SQLITE_DB = Sequel("sqlite:/")
+SQLITE_DB.create_table :items do
+  integer :id, :primary_key => true, :auto_increment => true
+  text    :name
+  float   :value
+end
+SQLITE_DB.create_table(:time) {timestamp :t}
 
 context "Dataset" do
   setup do
@@ -6,7 +14,7 @@ context "Dataset" do
   end
   
   specify "should accept database and opts in initialize" do
-    db = 'db'
+    db = "db"
     opts = {:from => :test}
     d = Sequel::Dataset.new(db, opts)
     d.db.should be(db)
@@ -158,6 +166,9 @@ context "A simple dataset" do
   specify "should format an update statement" do
     @dataset.update_sql(:name => 'abc').should ==
       "UPDATE test SET name = 'abc'"
+
+    @dataset.update_sql {:x << :y}.should ==
+      "UPDATE test SET x = y"
   end
   
   specify "should format an update statement with array with keys" do
@@ -352,6 +363,14 @@ context "Dataset#where" do
     @dataset.filter {:c.like? 'ABC%'}.sql.should ==
       "SELECT * FROM test WHERE (c LIKE 'ABC%')"
   end
+  
+  specify "should raise if receiving a single boolean value" do
+    # the result of erroneous use of comparison not in a block
+    # so instead of filter{:x == y} someone writes filter(:x == y)
+    
+    proc {@dataset.filter(:a == 1)}.should raise_error(SequelError)
+    proc {@dataset.filter(:a != 1)}.should raise_error(SequelError)
+  end
 end
 
 context "Dataset#or" do
@@ -1073,17 +1092,23 @@ context "Dataset#set" do
         @@last_sql
       end
       
-      def update(*args)
-        @@last_sql = update_sql(*args)
+      def update(*args, &block)
+        @@last_sql = update_sql(*args, &block)
       end
     end
     
     @d = c.new(nil).from(:items)
   end
   
-  specify "should act as alis to #update" do
+  specify "should act as alias to #update" do
     @d.set({:x => 3})
     @d.last_sql.should == 'UPDATE items SET x = 3'
+
+    @d.set {:x << :x + 1}
+    @d.last_sql.should == 'UPDATE items SET x = (x + 1)'
+
+    @d.set {(:x|1) << (:x|2) + 1}
+    @d.last_sql.should == 'UPDATE items SET x[1] = (x[2] + 1)'
   end
 end
 
@@ -1398,8 +1423,13 @@ context "Dataset#single_record" do
     @cc = Class.new(@c) do
       def fetch_rows(sql); end
     end
+    
     @d = @c.new(nil).from(:test)
     @e = @cc.new(nil).from(:test)
+
+    @d_empty = SQLITE_DB[:items]
+    @d_empty.delete # remove all records
+    
   end
   
   specify "should call each and return the first record" do
@@ -1411,7 +1441,7 @@ context "Dataset#single_record" do
   end
   
   specify "should return nil if no record is present" do
-    @e.single_record.should be_nil
+    @d_empty.single_record.should be_nil
   end
 end
 
@@ -1423,6 +1453,8 @@ context "Dataset#single_value" do
       end
     end
     @d = @c.new(nil).from(:test)
+    @d_empty = SQLITE_DB[:items]
+    @d_empty.delete # remove all records
   end
   
   specify "should call each and return the first value of the first record" do
@@ -1432,6 +1464,11 @@ context "Dataset#single_value" do
   specify "should pass opts to each" do
     @d.single_value(:limit => 3).should == 'SELECT * FROM test LIMIT 3'
   end
+  
+  specify "should return nil" do
+    @d_empty.single_value.should be_nil
+  end
+
 end
 
 context "Dataset#set_row_proc" do
@@ -2330,3 +2367,12 @@ context "Dataset#create_or_replace_view" do
   end
 end
 
+context "Dataset#update_sql" do
+  setup do
+    @ds = Sequel::Dataset.new(nil).from(:items)
+  end
+  
+  specify "should accept strings" do
+    @ds.update_sql("a = b").should == "UPDATE items SET a = b"
+  end
+end

data/spec/model_spec.rb

@@ -702,6 +702,12 @@ context "Model.[]" do
     $sqls.last.should == "SELECT * FROM items WHERE (id = 9999) LIMIT 1"
   end
   
+  specify "should raise for boolean argument (mistaken comparison)" do
+    # This in order to prevent stuff like Model[:a == 'b']
+    proc {@c[:a == 1]}.should raise_error(SequelError)
+    proc {@c[:a != 1]}.should raise_error(SequelError)
+  end
+  
   specify "should work correctly for custom primary key" do
     @c.set_primary_key :name
     @c['sharon'].should be_a_kind_of(@c)

data/spec/schema_spec.rb

@@ -151,6 +151,21 @@ context "DB#create_table" do
     @db.sqls.clear
   end
   
+  specify "should accept inline index definition" do
+    @db.create_table(:cats) do
+      integer :id, :index => true
+    end
+    @db.sqls.should == ["CREATE TABLE cats (id integer)", "CREATE INDEX cats_id_index ON cats (id)"]
+  end
+  
+  specify "should accept inline index definition for foreign keys" do
+    @db.create_table(:cats) do
+      foreign_key :project_id, :table => :projects, :on_delete => :cascade, :index => true
+    end
+    @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON DELETE CASCADE)",
+      "CREATE INDEX cats_project_id_index ON cats (project_id)"]
+  end
+  
   specify "should accept index definitions" do
     @db.create_table(:cats) do
       integer :id
@@ -184,7 +199,7 @@ context "DB#create_table" do
     @db.sqls.should == ["CREATE TABLE cats (id integer)", "CREATE UNIQUE INDEX cats_id_index ON cats (id)"]
   end
   
-  specify "should accept compound index definitions" do
+  specify "should accept composite index definitions" do
     @db.create_table(:cats) do
       integer :id
       index [:id, :name], :unique => true
@@ -193,6 +208,17 @@ context "DB#create_table" do
   end
 end
 
+context "DB#create_table!" do
+  setup do
+    @db = SchemaDummyDatabase.new
+  end
+  
+  specify "should drop the table and then create it" do
+    @db.create_table!(:cats) {}
+    @db.sqls.should == ['DROP TABLE cats', 'CREATE TABLE cats ()']
+  end
+end
+
 context "DB#drop_table" do
   setup do
     @db = SchemaDummyDatabase.new

data/spec/sequelizer_spec.rb

@@ -8,6 +8,10 @@ context "Proc#to_sql" do
     def to_sql
       DS.proc_to_sql(self)
     end
+    
+    def to_sql_comma_separated
+      DS.proc_to_sql(self, true)
+    end
   end
   
   def DS.match_expr(l, r)
@@ -64,6 +68,12 @@ context "Proc#to_sql" do
     proc {:x == y2}.to_sql.should == "(x = 111)"
   end
   
+  specify "sould support subscript access on symbols" do
+    proc {:x|1 > 0}.to_sql.should == "(x[1] > 0)"
+    proc {:x|2|3 > 0}.to_sql.should == "(x[2, 3] > 0)"
+    proc {:x|[4, 5] > 0}.to_sql.should == "(x[4, 5] > 0)"
+  end
+  
   specify "should support constants" do
     ZZZ = 444
     proc {:x == ZZZ}.to_sql.should == "(x = 444)"
@@ -117,12 +127,22 @@ context "Proc#to_sql" do
     proc {:x && :y && :z}.to_sql.should == "(x AND (y AND z))"
   end
   
+  specify "should support << operator for assignment" do
+    proc {:x << 1}.to_sql.should == "x = 1"
+  end
+  
   specify "should concatenate separate statements using AND" do
     proc {:x == 20; :y == 30}.to_sql.should == "((x = 20) AND (y = 30))"
     proc {:x != 1; :y != 2; :z != 3}.to_sql.should == \
       "((NOT (x = 1)) AND (NOT (y = 2)) AND (NOT (z = 3)))"
   end
   
+  specify "should concatenate separate statements using custom join argument" do
+    proc {:x << 20; :y << 30}.to_sql_comma_separated.should == "x = 20, y = 30"
+    z = 333
+    proc {:x << :x + 1; :y << z}.to_sql_comma_separated.should == "x = (x + 1), y = 333"
+  end
+  
   specify "should support || operator" do
     proc {1 || 2}.to_sql.should == "(1 OR 2)"
     proc {:x > 100 || :y < 100}.to_sql.should == "((x > 100) OR (y < 100))"

metadata

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