sequel_core 2.0.1 → 2.1.0

data/lib/sequel_core.rb

@@ -2,7 +2,7 @@
   require f
 end
 %w"core_ext sql core_sql connection_pool exceptions pretty_table
-  dataset migration schema database worker object_graph".each do |f|
+  dataset migration schema database worker object_graph deprecated".each do |f|
   require "sequel_core/#{f}"
 end
 
@@ -17,18 +17,30 @@ end
 #          :password=>'password', :host=>'host', :port=>5432, \
 #          :max_connections=>10)
 #
-# If a block is given to these meethods, it is passed the opened Database
-# object, which is closed when the block exits.  For example:
+# If a block is given to these methods, it is passed the opened Database
+# object, which is closed (disconnected) when the block exits.  For example:
 #
 #   Sequel.sqlite('blog.db'){|db| puts db.users.count}  
 #
 # Sequel can use either Time or DateTime for times returned from the
 # database.  It defaults to Time.  To change it to DateTime, use:
 #
-#   Sequel.time_class = DateTime
+#   Sequel.datetime_class = DateTime
+#
+# Sequel can either use ParseTree for block filters (deprecated but works),
+# or it can use the block filter syntax inside block filters (which will
+# be the only behavior allowed in Sequel 2.2). To set it not to use
+# ParseTree filters:
+#
+#   Sequel.use_parse_tree = false
 module Sequel
-  @time_class = Time
-  metaattr_accessor :time_class
+  @datetime_class = Time
+  @use_parse_tree = !defined?(SEQUEL_NO_PARSE_TREE)
+
+  metaattr_accessor :datetime_class
+  metaattr_accessor :use_parse_tree
+
+  Deprecation.deprecation_message_stream = $stderr
 
   # Creates a new database object based on the supplied connection string
   # and optional arguments.  The specified scheme determines the database
@@ -45,6 +57,8 @@ module Sequel
   # closed when the block exits.  For example:
   #
   #   Sequel.connect('sqlite://blog.db'){|db| puts db.users.count}  
+  #
+  # This is also aliased as Sequel.open.
   def self.connect(*args, &block)
     Database.connect(*args, &block)
   end
@@ -107,7 +121,8 @@ module Sequel
       instance_eval("def #{adapter}(*args, &block); adapter_method('#{adapter}', *args, &block) end")
     end
   end
-  metaprivate :adapter_method, :def_adapter_method
+
+  private_class_method :adapter_method, :def_adapter_method
   
   # Add the database adapter class methods to Sequel via metaprogramming
   def_adapter_method(*Database::ADAPTERS)

data/spec/adapters/mysql_spec.rb

@@ -179,13 +179,13 @@ context "A MySQL dataset" do
       'SELECT * FROM `items` ORDER BY `name` DESC'
 
     @d.reverse_order(:name.desc).sql.should == \
-      'SELECT * FROM `items` ORDER BY `name`'
+      'SELECT * FROM `items` ORDER BY `name` ASC'
 
     @d.reverse_order(:name, :test.desc).sql.should == \
-      'SELECT * FROM `items` ORDER BY `name` DESC, `test`'
+      'SELECT * FROM `items` ORDER BY `name` DESC, `test` ASC'
 
     @d.reverse_order(:name.desc, :test).sql.should == \
-      'SELECT * FROM `items` ORDER BY `name`, `test` DESC'
+      'SELECT * FROM `items` ORDER BY `name` ASC, `test` DESC'
   end
   
   specify "should support ORDER clause in UPDATE statements" do
@@ -318,9 +318,13 @@ context "MySQL join expressions" do
     @ds.join_table(:natural_inner, :nodes).sql.should == \
       'SELECT * FROM nodes NATURAL LEFT JOIN nodes'
   end
-  specify "should support cross joins (equivalent to inner join in MySQL, not in std SQL)" do
+  specify "should support cross joins" do
     @ds.join_table(:cross, :nodes).sql.should == \
-      'SELECT * FROM nodes INNER JOIN nodes'
+      'SELECT * FROM nodes CROSS JOIN nodes'
+  end
+  specify "should support cross joins as inner joins if conditions are used" do
+    @ds.join_table(:cross, :nodes, :id=>:id).sql.should == \
+      'SELECT * FROM nodes INNER JOIN nodes ON (nodes.id = nodes.id)'
   end
   specify "should support straight joins (force left table to be read before right)" do
     @ds.join_table(:straight, :nodes).sql.should == \
@@ -328,11 +332,11 @@ context "MySQL join expressions" do
   end
   specify "should support natural joins on multiple tables." do
     @ds.join_table(:natural_left_outer, [:nodes, :branches]).sql.should == \
-      'SELECT * FROM nodes NATURAL LEFT OUTER JOIN ( nodes, branches )'
+      'SELECT * FROM nodes NATURAL LEFT OUTER JOIN (nodes, branches)'
   end
   specify "should support straight joins on multiple tables." do
     @ds.join_table(:straight, [:nodes,:branches]).sql.should == \
-      'SELECT * FROM nodes STRAIGHT_JOIN ( nodes, branches )'
+      'SELECT * FROM nodes STRAIGHT_JOIN (nodes, branches)'
   end
 end
 

data/spec/adapters/postgres_spec.rb

@@ -39,7 +39,10 @@ context "A PostgreSQL database" do
   end
 
   specify "should correctly parse the schema" do
-    @db.schema(:test3, :reload=>true).should == [[:value, {:type=>:integer, :allow_null=>true, :max_chars=>0, :default=>nil, :db_type=>"integer", :numeric_precision=>32}], [:time, {:type=>:datetime, :allow_null=>true, :max_chars=>0, :default=>nil, :db_type=>"timestamp without time zone", :numeric_precision=>0}]]
+    @db.schema(:test3, :reload=>true).should == [
+      [:value, {:type=>:integer, :allow_null=>true, :max_chars=>nil, :default=>nil, :db_type=>"integer", :numeric_precision=>32}],
+      [:time, {:type=>:datetime, :allow_null=>true, :max_chars=>nil, :default=>nil, :db_type=>"timestamp without time zone", :numeric_precision=>nil}]
+    ]
   end
 
   specify "should get the schema all database tables if no table name is used" do
@@ -152,13 +155,13 @@ context "A PostgreSQL dataset" do
       'SELECT * FROM "test" ORDER BY "name" DESC'
 
     @d.reverse_order(:name.desc).sql.should == \
-      'SELECT * FROM "test" ORDER BY "name"'
+      'SELECT * FROM "test" ORDER BY "name" ASC'
 
     @d.reverse_order(:name, :test.desc).sql.should == \
-      'SELECT * FROM "test" ORDER BY "name" DESC, "test"'
+      'SELECT * FROM "test" ORDER BY "name" DESC, "test" ASC'
 
     @d.reverse_order(:name.desc, :test).sql.should == \
-      'SELECT * FROM "test" ORDER BY "name", "test" DESC'
+      'SELECT * FROM "test" ORDER BY "name" ASC, "test" DESC'
   end
   
   specify "should support transactions" do
@@ -202,6 +205,31 @@ context "A PostgreSQL dataset" do
     @d.count.should == 2
   end
 
+  specify "should support nested transactions through savepoints" do
+    POSTGRES_DB.transaction do
+      @d << {:name => '1'}
+      POSTGRES_DB.transaction do
+        @d << {:name => '2'}
+        POSTGRES_DB.transaction do
+          @d << {:name => '3'}
+          raise Sequel::Error::Rollback
+        end
+        @d << {:name => '4'}
+        POSTGRES_DB.transaction do
+          @d << {:name => '6'}
+          POSTGRES_DB.transaction do
+            @d << {:name => '7'}
+          end
+          raise Sequel::Error::Rollback
+        end
+        @d << {:name => '5'}
+      end
+    end
+
+    @d.count.should == 4
+    @d.order(:name).map(:name).should == %w{1 2 4 5}
+  end
+
   specify "should support regexps" do
     @d << {:name => 'abc', :value => 1}
     @d << {:name => 'bcd', :value => 2}

data/spec/blockless_filters_spec.rb

@@ -5,13 +5,21 @@ context "Blockless Ruby Filters" do
     db = Sequel::Database.new
     db.quote_identifiers = false
     @d = db[:items]
-    def @d.l(*args)
-      literal(filter_expr(*args))
+    def @d.l(*args, &block)
+      if block_given?
+        literal(filter_expr(Proc.new(&block)))
+      else
+        literal(filter_expr(*args))
+      end
     end
     def @d.lit(*args)
       literal(*args)
     end
   end
+
+  after do
+    Sequel.use_parse_tree = true
+  end
   
   it "should support boolean columns directly" do
     @d.l(:x).should == 'x'
@@ -130,11 +138,8 @@ context "Blockless Ruby Filters" do
     @d.l(~((((:x - :y)/(:x + :y))*:z) <= 100)).should == '((((x - y) / (x + y)) * z) > 100)'
   end
   
-  it "should not allow negation of non-boolean expressions" do
-    proc{~(:x + 1 > 100)}.should_not raise_error 
-    proc{~(:x + 1)}.should raise_error
+  it "should not allow negation of string expressions" do
     proc{~:x.sql_string}.should raise_error
-    proc{~:x.sql_number}.should raise_error
     proc{~([:x, :y].sql_string_join)}.should raise_error
   end
 
@@ -294,4 +299,26 @@ context "Blockless Ruby Filters" do
     @d.lit([:x].sql_string_join + :y).should == '((x) || y)'
     @d.lit([:x, :z].sql_string_join(' ') + :y).should == "((x || ' ' || z) || y)"
   end
+
+  it "should be supported inside blocks if Sequel.use_parse_tree = false" do
+    @d.l{[[:x, nil], [:y, [1,2,3]]].sql_or}.should == '((x IS NULL) OR (y IN (1, 2, 3)))'
+    @d.l{~[[:x, nil], [:y, [1,2,3]]]}.should == '((x IS NOT NULL) OR (y NOT IN (1, 2, 3)))'
+    @d.l{~(((('x'.lit - :y)/(:x + :y))*:z) <= 100)}.should == '((((x - y) / (x + y)) * z) > 100)'
+    @d.l{{:x => :a} & {:y => :z}}.should == '((x = a) AND (y = z))'
+  end
+
+  it "should support &, |, ^, ~, <<, and >> for NumericExpressions" do
+    @d.l(:x.sql_number & 1 > 100).should == '((x & 1) > 100)'
+    @d.l(:x.sql_number | 1 > 100).should == '((x | 1) > 100)'
+    @d.l(:x.sql_number ^ 1 > 100).should == '((x ^ 1) > 100)'
+    @d.l(~:x.sql_number > 100).should == '(~x > 100)'
+    @d.l(:x.sql_number << 1 > 100).should == '((x << 1) > 100)'
+    @d.l(:x.sql_number >> 1 > 100).should == '((x >> 1) > 100)'
+    @d.l((:x + 1) & 1 > 100).should == '(((x + 1) & 1) > 100)'
+    @d.l((:x + 1) | 1 > 100).should == '(((x + 1) | 1) > 100)'
+    @d.l((:x + 1) ^ 1 > 100).should == '(((x + 1) ^ 1) > 100)'
+    @d.l(~(:x + 1) > 100).should == '(~(x + 1) > 100)'
+    @d.l((:x + 1) << 1 > 100).should == '(((x + 1) << 1) > 100)'
+    @d.l((:x + 1) >> 1 > 100).should == '(((x + 1) >> 1) > 100)'
+  end
 end

data/spec/connection_pool_spec.rb

@@ -4,7 +4,7 @@ CONNECTION_POOL_DEFAULTS = {:pool_timeout=>5, :pool_sleep_time=>0.001,
 
 context "An empty ConnectionPool" do
   setup do
-    @cpool = ConnectionPool.new(CONNECTION_POOL_DEFAULTS)
+    @cpool = Sequel::ConnectionPool.new(CONNECTION_POOL_DEFAULTS)
   end
 
   specify "should have no available connections" do
@@ -12,7 +12,7 @@ context "An empty ConnectionPool" do
   end
 
   specify "should have no allocated connections" do
-    @cpool.allocated.should == []
+    @cpool.allocated.should == {}
   end
 
   specify "should have a created_count of zero" do
@@ -23,14 +23,14 @@ end
 context "A connection pool handling connections" do
   setup do
     @max_size = 2
-    @cpool = ConnectionPool.new(CONNECTION_POOL_DEFAULTS.merge(:max_connections=>@max_size)) {:got_connection}
+    @cpool = Sequel::ConnectionPool.new(CONNECTION_POOL_DEFAULTS.merge(:max_connections=>@max_size)) {:got_connection}
   end
 
   specify "#hold should increment #created_count" do
     @cpool.hold do
       @cpool.created_count.should == 1
-      @cpool.hold {@cpool.created_count.should == 2}
-      @cpool.hold {@cpool.hold {@cpool.created_count.should == 2}}
+      @cpool.hold {@cpool.hold {@cpool.created_count.should == 1}}
+      Thread.new{@cpool.hold {@cpool.created_count.should == 2}}.join
     end
   end
 
@@ -38,7 +38,7 @@ context "A connection pool handling connections" do
     @cpool.hold do
       @cpool.allocated.size.should == 1
   
-      @cpool.allocated.should == [[Thread.current, :got_connection]]
+      @cpool.allocated.should == {Thread.current=>:got_connection}
     end
   end
 
@@ -76,7 +76,7 @@ end
 
 context "ConnectionPool#hold" do
   setup do
-    @pool = ConnectionPool.new(CONNECTION_POOL_DEFAULTS) {DummyConnection.new}
+    @pool = Sequel::ConnectionPool.new(CONNECTION_POOL_DEFAULTS) {DummyConnection.new}
   end
   
   specify "should pass the result of the connection maker proc to the supplied block" do
@@ -112,7 +112,7 @@ end
 
 context "ConnectionPool#connection_proc" do
   setup do
-    @pool = ConnectionPool.new(CONNECTION_POOL_DEFAULTS)
+    @pool = Sequel::ConnectionPool.new(CONNECTION_POOL_DEFAULTS)
   end
   
   specify "should be nil if no block is supplied to the pool" do
@@ -131,7 +131,7 @@ end
 context "A connection pool with a max size of 1" do
   setup do
     @invoked_count = 0
-    @pool = ConnectionPool.new(CONNECTION_POOL_DEFAULTS.merge(:max_connections=>1)) {@invoked_count += 1; 'herro'}
+    @pool = Sequel::ConnectionPool.new(CONNECTION_POOL_DEFAULTS.merge(:max_connections=>1)) {@invoked_count += 1; 'herro'}
   end
   
   specify "should let only one thread access the connection at any time" do
@@ -154,7 +154,7 @@ context "A connection pool with a max size of 1" do
     c2.should be_nil
     
     @pool.available_connections.should be_empty
-    @pool.allocated.should == [[t1, cc]]
+    @pool.allocated.should == {t1=>cc}
     
     cc.gsub!('rr', 'll')
     sleep 0.5
@@ -166,7 +166,7 @@ context "A connection pool with a max size of 1" do
     c2.should == 'hello'
 
     @pool.available_connections.should be_empty
-    @pool.allocated.should == [[t2, cc]]
+    @pool.allocated.should == {t2=>cc}
     
     cc.gsub!('ll', 'rr')
     sleep 0.5
@@ -207,7 +207,7 @@ end
 context "A connection pool with a max size of 5" do
   setup do
     @invoked_count = 0
-    @pool = ConnectionPool.new(CONNECTION_POOL_DEFAULTS.merge(:max_connections=>5)) {@invoked_count += 1}
+    @pool = Sequel::ConnectionPool.new(CONNECTION_POOL_DEFAULTS.merge(:max_connections=>5)) {@invoked_count += 1}
   end
   
   specify "should let five threads simultaneously access separate connections" do
@@ -223,7 +223,9 @@ context "A connection pool with a max size of 5" do
     @pool.size.should == 5
     @pool.available_connections.should be_empty
     i = 0
-    @pool.allocated.should == threads.collect{|t| [t,i+=1]}
+    h = {}
+    threads.each{|t| h[t] = (i+=1)}
+    @pool.allocated.should == h
     
     threads[0].raise "your'e dead"
     sleep 0.1
@@ -232,7 +234,7 @@ context "A connection pool with a max size of 5" do
     sleep 0.1
     
     @pool.available_connections.should == [1, 4]
-    @pool.allocated.should == [[threads[1], 2], [threads[2], 3], [threads[4], 5]]
+    @pool.allocated.should == {threads[1]=>2, threads[2]=>3, threads[4]=>5}
     
     stop = true
     sleep 0.2
@@ -277,7 +279,7 @@ end
 context "ConnectionPool#disconnect" do
   setup do
     @count = 0
-    @pool = ConnectionPool.new(CONNECTION_POOL_DEFAULTS.merge(:max_connections=>5)) {{:id => @count += 1}}
+    @pool = Sequel::ConnectionPool.new(CONNECTION_POOL_DEFAULTS.merge(:max_connections=>5)) {{:id => @count += 1}}
   end
   
   specify "should invoke the given block for each available connection" do
@@ -341,7 +343,7 @@ end
 
 context "SingleThreadedPool" do
   setup do
-    @pool = SingleThreadedPool.new(CONNECTION_POOL_DEFAULTS){1234}
+    @pool = Sequel::SingleThreadedPool.new(CONNECTION_POOL_DEFAULTS){1234}
   end
   
   specify "should provide a #hold method" do

data/spec/core_ext_spec.rb

@@ -76,19 +76,6 @@ context "Module#metaattr_reader" do
   end
 end
 
-context "Module#metaprivate" do
-  specify "it should create aliases of singleton/class methods" do
-    @c = Class.new do
-      def self.x; 1; end
-    end
-    @c.x.should == 1
-    @c.class_eval do
-      metaprivate :x
-    end
-    proc{@c.x}.should raise_error(NoMethodError)
-  end
-end
-
 context "Object#is_one_of?" do
   specify "it should be true if the object is one of the classes" do
     1.is_one_of?(Numeric, Array).should == true

data/spec/core_sql_spec.rb

@@ -23,6 +23,31 @@ context "Array#all_two_pairs?" do
   end
 end
   
+context "Array#case and Hash#case" do
+  setup do
+    @d = Sequel::Dataset.new(nil)
+  end
+
+  specify "should return SQL CASE expression" do
+    @d.literal({:x=>:y}.case(:z)).should == '(CASE WHEN x THEN y ELSE z END)'
+    ['(CASE WHEN x THEN y WHEN a THEN b ELSE z END)',
+     '(CASE WHEN a THEN b WHEN x THEN y ELSE z END)'].should(include(@d.literal({:x=>:y, :a=>:b}.case(:z))))
+    @d.literal([[:x, :y]].case(:z)).should == '(CASE WHEN x THEN y ELSE z END)'
+    @d.literal([[:x, :y], [:a, :b]].case(:z)).should == '(CASE WHEN x THEN y WHEN a THEN b ELSE z END)'
+  end
+
+  specify "should raise an error if an array that isn't all two pairs is used" do
+    proc{[:b].case(:a)}.should raise_error(Sequel::Error)
+    proc{[:b, :c].case(:a)}.should raise_error(Sequel::Error)
+    proc{[[:b, :c], :d].case(:a)}.should raise_error(Sequel::Error)
+  end
+
+  specify "should raise an error if an empty array/hash is used" do
+    proc{[].case(:a)}.should raise_error(Sequel::Error)
+    proc{{}.case(:a)}.should raise_error(Sequel::Error)
+  end
+end
+
 context "Array#to_sql" do
   specify "should concatenate multiple lines into a single string" do
     "SELECT * \r\nFROM items\r\n WHERE a = 1".split.to_sql. \
@@ -112,10 +137,6 @@ context "#desc" do
   specify "should format a DESC clause for a function" do
     :avg[:test].desc.to_s(@ds).should == 'avg(test) DESC'
   end
-  
-  specify "should format a DESC clause for a literal value" do
-    'abc'.desc.to_s(@ds).should == "'abc' DESC"
-  end
 end
 
 context "#asc" do
@@ -132,10 +153,6 @@ context "#asc" do
   specify "should format a ASC clause for a function" do
     :avg[:test].asc.to_s(@ds).should == 'avg(test) ASC'
   end
-  
-  specify "should format a ASC clause for a literal value" do
-    'abc'.asc.to_s(@ds).should == "'abc' ASC"
-  end
 end
 
 context "#as" do
@@ -191,7 +208,7 @@ context "Column references" do
   
   specify "should be quoted properly in a cast function" do
     @ds.literal(:x.cast_as(:integer)).should == "cast(`x` AS integer)"
-    @ds.literal(:x__y.cast_as(:varchar[20])).should == "cast(`x`.`y` AS varchar(20))"
+    @ds.literal(:x__y.cast_as('varchar(20)')).should == "cast(`x`.`y` AS varchar(20))"
   end
 end
 
@@ -211,6 +228,12 @@ context "Symbol#*" do
   end
 end
 
+context "Symbol#qualify" do
+  specify "should format a qualified column" do
+    :xyz.qualify(:abc).to_s(Sequel::Dataset.new(nil)).should == 'abc.xyz'
+  end
+end
+
 context "Symbol#to_column_ref" do
   setup do
     @ds = MockDataset.new(nil)
@@ -262,8 +285,27 @@ context "Symbol" do
     ds.select(:COUNT['1']).sql.should == "SELECT COUNT('1') FROM t"
   end
   
-  specify "should support cast function" do
+  specify "should support cast method and its cast_as alias" do
     :abc.cast_as(:integer).to_s(@ds).should == "cast(abc AS integer)"
+    :abc.cast(:integer).to_s(@ds).should == "cast(abc AS integer)"
+  end
+  
+  specify "should support cast_numeric and cast_string" do
+    x = :abc.cast_numeric
+    x.should be_a_kind_of(Sequel::SQL::NumericExpression)
+    x.to_s(@ds).should == "cast(abc AS integer)"
+
+    x = :abc.cast_numeric(:real)
+    x.should be_a_kind_of(Sequel::SQL::NumericExpression)
+    x.to_s(@ds).should == "cast(abc AS real)"
+
+    x = :abc.cast_string
+    x.should be_a_kind_of(Sequel::SQL::StringExpression)
+    x.to_s(@ds).should == "cast(abc AS text)"
+
+    x = :abc.cast_string(:varchar)
+    x.should be_a_kind_of(Sequel::SQL::StringExpression)
+    x.to_s(@ds).should == "cast(abc AS varchar)"
   end
   
   specify "should support subscript access using | operator" do
@@ -272,6 +314,10 @@ context "Symbol" do
     (:abc|[1, 2]).to_s(@ds).should == 'abc[1, 2]'
     (:abc|1|2).to_s(@ds).should == 'abc[1, 2]'
   end
+
+  specify "should support SQL EXTRACT function via #extract " do
+    :abc.extract(:year).to_s(@ds).should == "extract(year FROM abc)"
+  end
 end
 
 context "String#to_time" do
@@ -307,7 +353,7 @@ end
 
 context "String#to_sequel_time" do
   after do
-    Sequel.time_class = Time
+    Sequel.datetime_class = Time
   end
 
   specify "should convert the string into a Time object by default" do
@@ -316,14 +362,14 @@ context "String#to_sequel_time" do
   end
   
   specify "should convert the string into a DateTime object if that is set" do
-    Sequel.time_class = DateTime
+    Sequel.datetime_class = DateTime
     "2007-07-11 10:11:12a".to_sequel_time.class.should == DateTime
     "2007-07-11 10:11:12a".to_sequel_time.should == DateTime.parse("2007-07-11 10:11:12a")
   end
   
   specify "should raise Error::InvalidValue for an invalid time" do
     proc {'0000-00-00'.to_sequel_time}.should raise_error(Sequel::Error::InvalidValue)
-    Sequel.time_class = DateTime
+    Sequel.datetime_class = DateTime
     proc {'0000-00-00'.to_sequel_time}.should raise_error(Sequel::Error::InvalidValue)
   end
 end