sequel 3.21.0 → 3.24.0

data/spec/integration/schema_test.rb

@@ -174,6 +174,15 @@ describe "Database schema modifiers" do
     @db.create_table!(:items, :temp=>true){Integer :number}
   end
   
+  specify "should have create_table? only create the table if it doesn't already exist" do
+    @db.create_table!(:items){String :a}
+    @db.create_table?(:items){String :b}
+    @db[:items].columns.should == [:a]
+    @db.drop_table(:items) rescue nil
+    @db.create_table?(:items){String :b}
+    @db[:items].columns.should == [:b]
+  end
+
   specify "should rename tables correctly" do
     @db.drop_table(:items) rescue nil
     @db.create_table!(:items2){Integer :number}
@@ -362,25 +371,74 @@ describe "Database#tables" do
         "xxxxx#{@@xxxxx += 1}"
       end
     end
-    @iom = INTEGRATION_DB.identifier_output_method
-    @iim = INTEGRATION_DB.identifier_input_method
+    @db = INTEGRATION_DB
+    @db.create_table(:sequel_test_table){Integer :a}
+    @db.create_view :sequel_test_view, @db[:sequel_test_table]
+    @iom = @db.identifier_output_method
+    @iim = @db.identifier_input_method
     clear_sqls
   end
   after do
-    INTEGRATION_DB.identifier_output_method = @iom
-    INTEGRATION_DB.identifier_input_method = @iim
+    @db.drop_view :sequel_test_view
+    @db.drop_table :sequel_test_table
+    @db.identifier_output_method = @iom
+    @db.identifier_input_method = @iim
+  end
+
+  specify "should return an array of symbols" do
+    ts = @db.tables
+    ts.should be_a_kind_of(Array)
+    ts.each{|t| t.should be_a_kind_of(Symbol)}
+    ts.should include(:sequel_test_table)
+    ts.should_not include(:sequel_test_view)
+  end
+
+  specify "should respect the database's identifier_output_method" do
+    @db.identifier_output_method = :xxxxx
+    @db.identifier_input_method = :xxxxx
+    @db.tables.each{|t| t.to_s.should =~ /\Ax{5}\d+\z/}
+  end
+end
+end
+
+begin
+  INTEGRATION_DB.views
+rescue Sequel::NotImplemented
+rescue
+describe "Database#views" do
+  before do
+    class ::String
+      @@xxxxx = 0
+      def xxxxx
+        "xxxxx#{@@xxxxx += 1}"
+      end
+    end
+    @db = INTEGRATION_DB
+    @db.create_table(:sequel_test_table){Integer :a}
+    @db.create_view :sequel_test_view, @db[:sequel_test_table]
+    @iom = @db.identifier_output_method
+    @iim = @db.identifier_input_method
+    clear_sqls
+  end
+  after do
+    @db.drop_view :sequel_test_view
+    @db.drop_table :sequel_test_table
+    @db.identifier_output_method = @iom
+    @db.identifier_input_method = @iim
   end
 
   specify "should return an array of symbols" do
-    ts = INTEGRATION_DB.tables
+    ts = @db.views
     ts.should be_a_kind_of(Array)
     ts.each{|t| t.should be_a_kind_of(Symbol)}
+    ts.should_not include(:sequel_test_table)
+    ts.should include(:sequel_test_view)
   end
 
   specify "should respect the database's identifier_output_method" do
-    INTEGRATION_DB.identifier_output_method = :xxxxx
-    INTEGRATION_DB.identifier_input_method = :xxxxx
-    INTEGRATION_DB.tables.each{|t| t.to_s.should =~ /\Ax{5}\d+\z/}
+    @db.identifier_output_method = :xxxxx
+    @db.identifier_input_method = :xxxxx
+    @db.views.each{|t| t.to_s.should =~ /\Ax{5}\d+\z/}
   end
 end
 end

data/spec/integration/spec_helper.rb

@@ -9,6 +9,11 @@ begin
 rescue LoadError
 end
 
+if ENV['SEQUEL_COLUMNS_INTROSPECTION']
+  Sequel.extension :columns_introspection
+  Sequel::Dataset.introspect_all_columns
+end
+
 Sequel::Model.use_transactions = false
 
 $sqls = []

data/spec/integration/transaction_test.rb

@@ -134,4 +134,44 @@ describe "Database transactions" do
       @d.count.should == i + 1
     end
   end
+
+if (! defined?(RUBY_ENGINE) or RUBY_ENGINE == 'ruby' or (RUBY_ENGINE == 'rbx' && ![[:do, :sqlite], [:tinytds, :mssql]].include?([INTEGRATION_DB.adapter_scheme, INTEGRATION_DB.database_type]))) and RUBY_VERSION < '1.9'
+  specify "should handle Thread#kill for transactions inside threads" do
+    q = Queue.new
+    q1 = Queue.new
+    t = Thread.new do
+      @db.transaction do
+        @d << {:name => 'abc', :value => 1}
+        q1.push nil
+        q.pop
+        @d << {:name => 'def', :value => 2}
+      end
+    end
+    q1.pop
+    t.kill
+    @d.count.should == 0
+  end
+
+if INTEGRATION_DB.supports_savepoints?
+  specify "should handle Thread#kill for transactions with savepoints inside threads" do
+    q = Queue.new
+    q1 = Queue.new
+    t = Thread.new do
+      @db.transaction do
+        @d << {:name => 'abc', :value => 1}
+        @db.transaction(:savepoint=>true) do
+          @d << {:name => 'def', :value => 2}
+          q1.push nil
+          q.pop
+          @d << {:name => 'ghi', :value => 3}
+        end
+        @d << {:name => 'jkl', :value => 4}
+      end
+    end
+    q1.pop
+    t.kill
+    @d.count.should == 0
+  end
+end
+end
 end

data/spec/integration/type_test.rb

@@ -68,6 +68,13 @@ describe "Supported types" do
     ds.first[:dat].to_s.should == d.to_s
   end
   
+  cspecify "should support generic time type", [:do], [:swift], [:odbc], [:jdbc, :mssql], [:tinytds] do
+    ds = create_items_table_with_column(:tim, Time, :only_time=>true)
+    t = Time.now
+    ds.insert(:tim => t)
+    ds.first[:tim].strftime('%H%M%S').should == t.strftime('%H%M%S')
+  end
+  
   cspecify "should support generic datetime type", [:do, :sqlite], [:jdbc, :sqlite] do
     ds = create_items_table_with_column(:tim, DateTime)
     t = DateTime.now