sequel_core 1.4.0 → 1.5.0

data/lib/sequel_core/schema/generator.rb

@@ -59,12 +59,15 @@ module Sequel
       end
       
       def full_text_index(columns, opts = {})
-        columns = [columns] unless columns.is_a?(Array)
-        @indexes << {:columns => columns, :full_text => true}.merge(opts)
+        index(columns, opts.merge(:type => :full_text))
       end
       
+      def spatial_index(columns, opts = {})
+        index(columns, opts.merge(:type => :spatial))
+      end
+
       def unique(columns, opts = {})
-        index(columns, {:unique => true}.merge(opts))
+        index(columns, opts.merge(:unique => true))
       end
       
       def create_info
@@ -136,7 +139,16 @@ module Sequel
         @operations << { \
           :op => :add_index, \
           :columns => columns, \
-          :full_text => true \
+          :type => :full_text \
+        }.merge(opts)
+      end
+      
+      def add_spatial_index(columns, opts = {})
+        columns = [columns] unless columns.is_a?(Array)
+        @operations << { \
+          :op => :add_index, \
+          :columns => columns, \
+          :type => :spatial \
         }.merge(opts)
       end
       

data/lib/sequel_core/schema/sql.rb

@@ -51,7 +51,7 @@ module Sequel
       end
       
       def expression_list(*args, &block)
-        schema_utility_dataset.expression_list(*args, &block)
+        schema_utility_dataset.send(:expression_list, *args, &block)
       end
 
       def column_definition_sql(column)
@@ -96,8 +96,10 @@ module Sequel
     
       def index_definition_sql(table_name, index)
         index_name = index[:name] || default_index_name(table_name, index[:columns])
-        if index[:full_text]
-          raise Error, "Full-text indexes are not supported for this database"
+        if index[:type]
+          raise Error, "Index types are not supported for this database"
+        elsif index[:where]
+          raise Error, "Partial indexes are not supported for this database"
         elsif index[:unique]
           "CREATE UNIQUE INDEX #{index_name} ON #{table_name} (#{literal(index[:columns])})"
         else

data/lib/sequel_core/worker.rb

@@ -20,7 +20,7 @@ module Sequel
       loop {next_job}
     rescue Sequel::Error::WorkerStop # signals the worker thread to stop
     ensure
-      rollback! if @transaction && !@errors.empty?
+      raise Sequel::Error::Rollback if @transaction && !@errors.empty?
     end
     
     def busy?

data/spec/adapters/informix_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
 require File.join(File.dirname(__FILE__), '../spec_helper.rb')
 
 unless defined?(INFORMIX_DB)
-  INFORMIX_DB = Sequel('informix://localhost/mydb')
+  INFORMIX_DB = Sequel.connect('informix://localhost/mydb')
 end
 
 if INFORMIX_DB.table_exists?(:test)
@@ -95,49 +95,3 @@ context "A Informix dataset" do
     @d.order(:value).last.should == {:name => 'def', :value => 789}
   end
 end
-
-context "A Informix dataset in array tuples mode" do
-  setup do
-    @d = INFORMIX_DB[:test]
-    @d.delete # remove all records
-    Sequel.use_array_tuples
-  end
-  
-  teardown do
-    Sequel.use_hash_tuples
-  end
-  
-  specify "should return the correct records" do
-    @d.to_a.should == []
-    @d << {:name => 'abc', :value => 123}
-    @d << {:name => 'abc', :value => 456}
-    @d << {:name => 'def', :value => 789}
-
-    @d.order(:value).select(:name, :value).to_a.should == [
-      ['abc', 123],
-      ['abc', 456],
-      ['def', 789]
-    ]
-  end
-  
-  specify "should work correctly with transforms" do
-    @d.transform(:value => [proc {|v| v.to_s}, proc {|v| v.to_i}])
-
-    @d.to_a.should == []
-    @d << {:name => 'abc', :value => 123}
-    @d << {:name => 'abc', :value => 456}
-    @d << {:name => 'def', :value => 789}
-
-    @d.order(:value).select(:name, :value).to_a.should == [
-      ['abc', '123'],
-      ['abc', '456'],
-      ['def', '789']
-    ]
-    
-    a = @d.order(:value).first
-    a.values.should == ['abc', '123']
-    a.keys.should == [:name, :value]
-    a[:name].should == 'abc'
-    a[:value].should == '123'
-  end
-end

data/spec/adapters/mysql_spec.rb

@@ -3,8 +3,8 @@ require File.join(File.dirname(__FILE__), '../spec_helper.rb')
 require 'logger'
 
 unless defined?(MYSQL_DB)
-  MYSQL_URL = 'mysql://root@localhost/sandbox' unless defined? MYSQL_URL
-  MYSQL_DB = Sequel(MYSQL_URL)
+  MYSQL_URL = (ENV['SEQUEL_MY_SPEC_DB']||'mysql://root@localhost/sandbox') unless defined? MYSQL_URL
+  MYSQL_DB = Sequel.connect(MYSQL_URL)
 end
 unless defined?(MYSQL_SOCKET_FILE)
   MYSQL_SOCKET_FILE = '/tmp/mysql.sock'
@@ -114,16 +114,16 @@ context "A MySQL dataset" do
     @d.select('COUNT(*)'.lit).sql.should == \
       'SELECT COUNT(*) FROM items'
 
-    @d.select(:value.MAX).sql.should == \
+    @d.select(:max[:value]).sql.should == \
       'SELECT max(`value`) FROM items'
       
     @d.select(:NOW[]).sql.should == \
     'SELECT NOW() FROM items'
 
-    @d.select(:items__value.MAX).sql.should == \
+    @d.select(:max[:items__value]).sql.should == \
       'SELECT max(items.`value`) FROM items'
 
-    @d.order(:name.DESC).sql.should == \
+    @d.order(:name.desc).sql.should == \
       'SELECT * FROM items ORDER BY `name` DESC'
 
     @d.select('items.name AS item_name'.lit).sql.should == \
@@ -155,13 +155,13 @@ context "A MySQL dataset" do
     @d.reverse_order(:name).sql.should == \
       'SELECT * FROM items ORDER BY `name` DESC'
 
-    @d.reverse_order(:name.DESC).sql.should == \
+    @d.reverse_order(:name.desc).sql.should == \
       'SELECT * FROM items ORDER BY `name`'
 
-    @d.reverse_order(:name, :test.DESC).sql.should == \
+    @d.reverse_order(:name, :test.desc).sql.should == \
       'SELECT * FROM items ORDER BY `name` DESC, `test`'
 
-    @d.reverse_order(:name.DESC, :test).sql.should == \
+    @d.reverse_order(:name.desc, :test).sql.should == \
       'SELECT * FROM items ORDER BY `name`, `test` DESC'
   end
   
@@ -198,52 +198,6 @@ context "A MySQL dataset" do
   end
 end
 
-context "A MySQL dataset in array tuples mode" do
-  setup do
-    @d = MYSQL_DB[:items]
-    @d.delete # remove all records
-    Sequel.use_array_tuples
-  end
-  
-  teardown do
-    Sequel.use_hash_tuples
-  end
-  
-  specify "should return the correct records" do
-    @d.to_a.should == []
-    @d << {:name => 'abc', :value => 123}
-    @d << {:name => 'abc', :value => 456}
-    @d << {:name => 'def', :value => 789}
-
-    @d.order(:value).select(:name, :value).to_a.should == [
-      ['abc', 123],
-      ['abc', 456],
-      ['def', 789]
-    ]
-  end
-  
-  specify "should work correctly with transforms" do
-    @d.transform(:value => [proc {|v| v.to_s}, proc {|v| v.to_i}])
-
-    @d.to_a.should == []
-    @d << {:name => 'abc', :value => 123}
-    @d << {:name => 'abc', :value => 456}
-    @d << {:name => 'def', :value => 789}
-
-    @d.order(:value).select(:name, :value).to_a.should == [
-      ['abc', '123'],
-      ['abc', '456'],
-      ['def', '789']
-    ]
-    
-    a = @d.order(:value).first
-    a.values.should == ['abc', '123']
-    a.keys.should == [:name, :value]
-    a[:name].should == 'abc'
-    a[:value].should == '123'
-  end
-end
-
 context "MySQL datasets" do
   setup do
     @d = MYSQL_DB[:orders]
@@ -513,6 +467,39 @@ context "A MySQL database" do
     MYSQL_DB[:posts].full_text_search(:title, '+ruby -rails', :boolean => true).sql.should ==
       "SELECT * FROM posts WHERE (MATCH (`title`) AGAINST ('+ruby -rails' IN BOOLEAN MODE))"
   end
+
+  specify "should support spatial indexes" do
+    g = Sequel::Schema::Generator.new(MYSQL_DB) do
+      point :geom
+      spatial_index [:geom]
+    end
+    MYSQL_DB.create_table_sql_list(:posts, *g.create_info).should == [
+      "CREATE TABLE posts (`geom` point)",
+      "CREATE SPATIAL INDEX posts_geom_index ON posts (`geom`)"
+    ]
+  end
+
+  specify "should support indexes with index type" do
+    g = Sequel::Schema::Generator.new(MYSQL_DB) do
+      text :title
+      index :title, :type => :hash
+    end
+    MYSQL_DB.create_table_sql_list(:posts, *g.create_info).should == [
+      "CREATE TABLE posts (`title` text)",
+      "CREATE INDEX posts_title_index ON posts (`title`) USING hash"
+    ]
+  end
+
+  specify "should support unique indexes with index type" do
+    g = Sequel::Schema::Generator.new(MYSQL_DB) do
+      text :title
+      index :title, :type => :hash, :unique => true
+    end
+    MYSQL_DB.create_table_sql_list(:posts, *g.create_info).should == [
+      "CREATE TABLE posts (`title` text)",
+      "CREATE UNIQUE INDEX posts_title_index ON posts (`title`) USING hash"
+    ]
+  end
 end
 
 class Sequel::MySQL::Database
@@ -548,6 +535,50 @@ class Sequel::MySQL::Database
   end
 end
 
+context "MySQL::Dataset#insert" do
+  setup do
+    @d = MYSQL_DB[:items]
+    @d.delete # remove all records
+    MYSQL_DB.sqls.clear
+  end
+
+  specify "should insert record with default values when no arguments given" do
+    @d.insert
+    
+    MYSQL_DB.sqls.should == [
+      "INSERT INTO items () VALUES ()"
+    ]
+    
+    @d.all.should == [
+      {:name => nil, :value => nil}
+    ]
+  end
+
+  specify "should insert record with default values when empty hash given" do
+    @d.insert {}
+    
+    MYSQL_DB.sqls.should == [
+      "INSERT INTO items () VALUES ()"
+    ]
+    
+    @d.all.should == [
+      {:name => nil, :value => nil}
+    ]
+  end
+
+  specify "should insert record with default values when empty array given" do
+    @d.insert []
+    
+    MYSQL_DB.sqls.should == [
+      "INSERT INTO items () VALUES ()"
+    ]
+    
+    @d.all.should == [
+      {:name => nil, :value => nil}
+    ]
+  end
+end
+
 context "MySQL::Dataset#multi_insert" do
   setup do
     @d = MYSQL_DB[:items]

data/spec/adapters/oracle_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
 require File.join(File.dirname(__FILE__), '../spec_helper.rb')
 
 unless defined?(ORACLE_DB)
-  ORACLE_DB = Sequel('oracle://hr:hr@localhost/XE')
+  ORACLE_DB = Sequel.connect('oracle://hr:hr@localhost/XE')
 end
 
 if ORACLE_DB.table_exists?(:items)
@@ -221,59 +221,3 @@ context "Joined Oracle dataset" do
     ]      
   end  
 end
-
-
-context "An Oracle dataset in array tuples mode" do
-  setup do
-    @d = ORACLE_DB[:items]
-    @d.delete # remove all records
-    Sequel.use_array_tuples
-  end
-  
-  teardown do
-    Sequel.use_hash_tuples
-  end
-  
-  specify "should return the correct records" do
-    @d.to_a.should == []
-    @d << {:name => 'abc', :value => 123}
-    @d << {:name => 'abc', :value => 456}
-    @d << {:name => 'def', :value => 789}
-
-    @d.order(:value).select(:name, :value).to_a.should == [
-      ['abc', 123],
-      ['abc', 456],
-      ['def', 789]
-    ]
-
-    @d.order(:value).select(:name, :value).limit(1).to_a.should == [
-      ['abc',123]                                                               
-    ]                                                                                                                  
-
-    @d.order(:value).select(:name, :value).limit(2,1).to_a.should == [
-      ['abc',456],                                                               
-      ['def',789]
-    ]
-  end
-  
-  specify "should work correctly with transforms" do
-    @d.transform(:value => [proc {|v| v.to_s}, proc {|v| v.to_i}])
-
-    @d.to_a.should == []
-    @d << {:name => 'abc', :value => 123}
-    @d << {:name => 'abc', :value => 456}
-    @d << {:name => 'def', :value => 789}
-
-    @d.order(:value).select(:name, :value).to_a.should == [
-      ['abc', '123'],
-      ['abc', '456'],
-      ['def', '789']
-    ]
-    
-    a = @d.order(:value).first
-    a.values.should == ['abc', '123']
-    a.keys.should == [:name, :value]
-    a[:name].should == 'abc'
-    a[:value].should == '123'
-  end
-end

data/spec/adapters/postgres_spec.rb

@@ -2,11 +2,12 @@ require File.join(File.dirname(__FILE__), '../../lib/sequel_core')
 require File.join(File.dirname(__FILE__), '../spec_helper.rb')
 
 unless defined?(POSTGRES_DB)
-  POSTGRES_DB = Sequel(ENV['SEQUEL_PG_SPEC_DB']||'postgres://postgres:postgres@localhost:5432/reality_spec')
+  POSTGRES_DB = Sequel.connect(ENV['SEQUEL_PG_SPEC_DB']||'postgres://postgres:postgres@localhost:5432/reality_spec')
 end
 
 POSTGRES_DB.drop_table(:test) if POSTGRES_DB.table_exists?(:test)
 POSTGRES_DB.drop_table(:test2) if POSTGRES_DB.table_exists?(:test2)
+POSTGRES_DB.drop_table(:test3) if POSTGRES_DB.table_exists?(:test3)
   
 POSTGRES_DB.create_table :test do
   text :name
@@ -16,6 +17,10 @@ POSTGRES_DB.create_table :test2 do
   text :name
   integer :value
 end
+POSTGRES_DB.create_table :test3 do
+  integer :value
+  timestamp :time
+end
 
 context "A PostgreSQL database" do
   setup do
@@ -95,16 +100,16 @@ context "A PostgreSQL dataset" do
     @d.select('COUNT(*)'.lit).sql.should == \
       'SELECT COUNT(*) FROM test'
 
-    @d.select(:value.MAX).sql.should == \
+    @d.select(:max[:value]).sql.should == \
       'SELECT max("value") FROM test'
       
     @d.select(:NOW[]).sql.should == \
     'SELECT NOW() FROM test'
 
-    @d.select(:items__value.MAX).sql.should == \
+    @d.select(:max[:items__value]).sql.should == \
       'SELECT max(items."value") FROM test'
 
-    @d.order(:name.DESC).sql.should == \
+    @d.order(:name.desc).sql.should == \
       'SELECT * FROM test ORDER BY "name" DESC'
 
     @d.select('test.name AS item_name'.lit).sql.should == \
@@ -136,13 +141,13 @@ context "A PostgreSQL dataset" do
     @d.reverse_order(:name).sql.should == \
       'SELECT * FROM test ORDER BY "name" DESC'
 
-    @d.reverse_order(:name.DESC).sql.should == \
+    @d.reverse_order(:name.desc).sql.should == \
       'SELECT * FROM test ORDER BY "name"'
 
-    @d.reverse_order(:name, :test.DESC).sql.should == \
+    @d.reverse_order(:name, :test.desc).sql.should == \
       'SELECT * FROM test ORDER BY "name" DESC, "test"'
 
-    @d.reverse_order(:name.DESC, :test).sql.should == \
+    @d.reverse_order(:name.desc, :test).sql.should == \
       'SELECT * FROM test ORDER BY "name", "test" DESC'
   end
   
@@ -167,49 +172,17 @@ context "A PostgreSQL dataset" do
   end
 end
 
-context "A PostgreSQL dataset in array tuples mode" do
+context "A PostgreSQL dataaset with a timestamp field" do
   setup do
-    @d = POSTGRES_DB[:test]
-    @d.delete # remove all records
-    Sequel.use_array_tuples
-  end
-  
-  teardown do
-    Sequel.use_hash_tuples
-  end
-  
-  specify "should return the correct records" do
-    @d.to_a.should == []
-    @d << {:name => 'abc', :value => 123}
-    @d << {:name => 'abc', :value => 456}
-    @d << {:name => 'def', :value => 789}
-
-    @d.order(:value).select(:name, :value).to_a.should == [
-      ['abc', 123],
-      ['abc', 456],
-      ['def', 789]
-    ]
+    @d = POSTGRES_DB[:test3]
+    @d.delete
   end
-  
-  specify "should work correctly with transforms" do
-    @d.transform(:value => [proc {|v| v.to_s}, proc {|v| v.to_i}])
-
-    @d.to_a.should == []
-    @d << {:name => 'abc', :value => 123}
-    @d << {:name => 'abc', :value => 456}
-    @d << {:name => 'def', :value => 789}
 
-    @d.order(:value).select(:name, :value).to_a.should == [
-      ['abc', '123'],
-      ['abc', '456'],
-      ['def', '789']
-    ]
-    
-    a = @d.order(:value).first
-    a.values.should == ['abc', '123']
-    a.keys.should == [:name, :value]
-    a[:name].should == 'abc'
-    a[:value].should == '123'
+  specify "should store milliseconds in time fields" do
+    t = Time.now
+    @d << {:value=>1, :time=>t}
+    @d[:value =>'1'][:time].should == t
+    @d[:value=>'1'][:time].usec.should == t.usec
   end
 end
 
@@ -266,7 +239,7 @@ context "A PostgreSQL database" do
     end
     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\"))"
+      "CREATE INDEX posts_title_body_index ON posts USING gin (to_tsvector(\"title\" || \"body\"))"
     ]
   end
   
@@ -278,7 +251,7 @@ context "A PostgreSQL database" do
     end
     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\"))"
+      "CREATE INDEX posts_title_body_index ON posts USING gin (to_tsvector('french', \"title\" || \"body\"))"
     ]
   end
   
@@ -292,6 +265,50 @@ context "A PostgreSQL database" do
     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
+
+  specify "should support spatial indexes" do
+    g = Sequel::Schema::Generator.new(POSTGRES_DB) do
+      geometry :geom
+      spatial_index [:geom]
+    end
+    POSTGRES_DB.create_table_sql_list(:posts, *g.create_info).should == [
+      "CREATE TABLE posts (\"geom\" geometry)",
+      "CREATE INDEX posts_geom_index ON posts USING gist (\"geom\")"
+    ]
+  end
+  
+  specify "should support indexes with index type" do
+    g = Sequel::Schema::Generator.new(POSTGRES_DB) do
+      varchar :title, :size => 5
+      index :title, :type => 'hash'
+    end
+    POSTGRES_DB.create_table_sql_list(:posts, *g.create_info).should == [
+      "CREATE TABLE posts (\"title\" varchar(5))",
+      "CREATE INDEX posts_title_index ON posts USING hash (\"title\")"
+    ]
+  end
+  
+  specify "should support unique indexes with index type" do
+    g = Sequel::Schema::Generator.new(POSTGRES_DB) do
+      varchar :title, :size => 5
+      index :title, :type => 'hash', :unique => true
+    end
+    POSTGRES_DB.create_table_sql_list(:posts, *g.create_info).should == [
+      "CREATE TABLE posts (\"title\" varchar(5))",
+      "CREATE UNIQUE INDEX posts_title_index ON posts USING hash (\"title\")"
+    ]
+  end
+  
+  specify "should support partial indexes" do
+    g = Sequel::Schema::Generator.new(POSTGRES_DB) do
+      varchar :title, :size => 5
+      index :title, :where => {:something => 5}
+    end
+    POSTGRES_DB.create_table_sql_list(:posts, *g.create_info).should == [
+      "CREATE TABLE posts (\"title\" varchar(5))",
+      "CREATE INDEX posts_title_index ON posts (\"title\") WHERE (\"something\" = 5)"
+    ]
+  end
 end
 
 context "Postgres::Dataset#multi_insert_sql / #import" do