sequel 3.17.0 → 3.18.0

data/spec/extensions/spec_helper.rb

@@ -8,7 +8,7 @@ unless Sequel.const_defined?('Model')
   require 'sequel/model'
 end
 
-Sequel.extension(*%w'string_date_time inflector pagination query pretty_table blank migration schema_dumper looser_typecasting sql_expr thread_local_timezones')
+Sequel.extension(*%w'string_date_time inflector pagination query pretty_table blank migration schema_dumper looser_typecasting sql_expr thread_local_timezones to_dot')
 {:hook_class_methods=>[], :schema=>[], :validation_class_methods=>[]}.each{|p, opts| Sequel::Model.plugin(p, *opts)}
 
 def skip_warn(s)

data/spec/extensions/to_dot_spec.rb

@@ -0,0 +1,152 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe Sequel::Model, "to_dot extension" do
+  def dot(ds)
+    a = []
+    ds.send(:_to_dot, a, "", 0, ds, 0)
+    a[2..-1]
+  end
+
+  before do
+    @db = MODEL_DB
+    @ds = @db.dataset
+  end
+
+  it "should output a string suitable for input to the graphviz dot program" do
+    @ds.to_dot.should == (<<END
+digraph G {
+0 [label="self"];
+0 -> 1 [label=""];
+1 [label="Dataset"];
+}
+END
+).strip
+  end
+
+  it "should handle an empty dataset" do
+    dot(@ds).should == []
+  end
+
+  it "should handle WITH" do
+    a = dot(@ds.with(:a, @ds))
+    a[0..3].should == ["1 -> 2 [label=\"with\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"Hash\"];"]
+    [["3 -> 4 [label=\"dataset\"];", "4 [label=\"Dataset\"];", "3 -> 5 [label=\"name\"];", "5 [label=\":a\"];"],
+     ["3 -> 4 [label=\"name\"];", "4 [label=\":a\"];", "3 -> 5 [label=\"dataset\"];", "5 [label=\"Dataset\"];"]].should include(a[4..-1])
+  end
+
+  it "should handle DISTINCT" do
+    dot(@ds.distinct).should == ["1 -> 2 [label=\"distinct\"];", "2 [label=\"Array\"];"]
+  end
+
+  it "should handle FROM" do
+    dot(@ds.from(:a)).should == ["1 -> 2 [label=\"from\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\":a\"];"]
+  end
+
+  it "should handle JOIN" do
+    dot(@ds.join(:a)).should == ["1 -> 2 [label=\"join\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"INNER JOIN\"];", "3 -> 4 [label=\"table\"];", "4 [label=\":a\"];"]
+  end
+
+  it "should handle WHERE" do
+    dot(@ds.filter(true)).should == ["1 -> 2 [label=\"where\"];", "2 [label=\"ComplexExpression: NOOP\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"true\"];"]
+  end
+
+  it "should handle GROUP" do
+    dot(@ds.group(:a)).should == ["1 -> 2 [label=\"group\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\":a\"];"]
+  end
+
+  it "should handle HAVING" do
+    dot(@ds.having(:a)).should == ["1 -> 2 [label=\"having\"];", "2 [label=\":a\"];"]
+  end
+
+  it "should handle UNION" do
+    dot(@ds.union(@ds)).should == ["1 -> 2 [label=\"from\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"AliasedExpression\"];", "3 -> 4 [label=\"expression\"];", "4 [label=\"Dataset\"];", "4 -> 5 [label=\"compounds\"];", "5 [label=\"Array\"];", "5 -> 6 [label=\"0\"];", "6 [label=\"Array\"];", "6 -> 7 [label=\"0\"];", "7 [label=\":union\"];", "6 -> 8 [label=\"1\"];", "8 [label=\"Dataset\"];", "6 -> 9 [label=\"2\"];", "9 [label=\"nil\"];", "3 -> 10 [label=\"alias\"];", "10 [label=\":t1\"];"]
+  end
+
+  it "should handle INTERSECT" do
+    dot(@ds.intersect(@ds)).should == ["1 -> 2 [label=\"from\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"AliasedExpression\"];", "3 -> 4 [label=\"expression\"];", "4 [label=\"Dataset\"];", "4 -> 5 [label=\"compounds\"];", "5 [label=\"Array\"];", "5 -> 6 [label=\"0\"];", "6 [label=\"Array\"];", "6 -> 7 [label=\"0\"];", "7 [label=\":intersect\"];", "6 -> 8 [label=\"1\"];", "8 [label=\"Dataset\"];", "6 -> 9 [label=\"2\"];", "9 [label=\"nil\"];", "3 -> 10 [label=\"alias\"];", "10 [label=\":t1\"];"]
+  end
+
+  it "should handle EXCEPT" do
+    dot(@ds.except(@ds)).should == ["1 -> 2 [label=\"from\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"AliasedExpression\"];", "3 -> 4 [label=\"expression\"];", "4 [label=\"Dataset\"];", "4 -> 5 [label=\"compounds\"];", "5 [label=\"Array\"];", "5 -> 6 [label=\"0\"];", "6 [label=\"Array\"];", "6 -> 7 [label=\"0\"];", "7 [label=\":except\"];", "6 -> 8 [label=\"1\"];", "8 [label=\"Dataset\"];", "6 -> 9 [label=\"2\"];", "9 [label=\"nil\"];", "3 -> 10 [label=\"alias\"];", "10 [label=\":t1\"];"]
+  end
+
+  it "should handle ORDER" do
+    dot(@ds.order(:a)).should == ["1 -> 2 [label=\"order\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\":a\"];"]
+  end
+
+  it "should handle LIMIT and OFFSET" do
+    dot(@ds.limit(1, 2)).should == ["1 -> 2 [label=\"limit\"];", "2 [label=\"1\"];", "1 -> 3 [label=\"offset\"];", "3 [label=\"2\"];"]
+  end
+
+  it "should handle FOR UPDATE" do
+    dot(@ds.for_update).should == ["1 -> 2 [label=\"lock\"];", "2 [label=\":update\"];"]
+  end
+
+  it "should handle LiteralStrings" do
+    dot(@ds.filter('a')).should == ["1 -> 2 [label=\"where\"];", "2 [label=\"\\\"(a)\\\".lit\"];"]
+  end
+
+  it "should handle true, false, nil" do
+    dot(@ds.select(true, false, nil)).should == ["1 -> 2 [label=\"select\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"true\"];", "2 -> 4 [label=\"1\"];", "4 [label=\"false\"];", "2 -> 5 [label=\"2\"];", "5 [label=\"nil\"];"]
+  end
+
+  it "should handle SQL::ComplexExpressions" do
+    dot(@ds.filter(:a=>:b)).should == ["1 -> 2 [label=\"where\"];", "2 [label=\"ComplexExpression: =\"];", "2 -> 3 [label=\"0\"];", "3 [label=\":a\"];", "2 -> 4 [label=\"1\"];", "4 [label=\":b\"];"]
+  end
+
+  it "should handle SQL::Identifiers" do
+    dot(@ds.select{a}).should == ["1 -> 2 [label=\"select\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"Identifier\"];", "3 -> 4 [label=\"value\"];", "4 [label=\":a\"];"]
+  end
+
+  it "should handle SQL::QualifiedIdentifiers" do
+    dot(@ds.select{a__b}).should == ["1 -> 2 [label=\"select\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"QualifiedIdentifier\"];", "3 -> 4 [label=\"table\"];", "4 [label=\"\\\"a\\\"\"];", "3 -> 5 [label=\"column\"];", "5 [label=\"\\\"b\\\"\"];"]
+  end
+
+  it "should handle SQL::OrderedExpressions" do
+    dot(@ds.order(:a.desc(:nulls=>:last))).should == ["1 -> 2 [label=\"order\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"OrderedExpression: DESC NULLS LAST\"];", "3 -> 4 [label=\"expression\"];", "4 [label=\":a\"];"]
+  end
+
+  it "should handle SQL::AliasedExpressions" do
+    dot(@ds.from(:a.as(:b))).should == ["1 -> 2 [label=\"from\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"AliasedExpression\"];", "3 -> 4 [label=\"expression\"];", "4 [label=\":a\"];", "3 -> 5 [label=\"alias\"];", "5 [label=\":b\"];"]
+  end
+
+  it "should handle SQL::CaseExpressions" do
+    dot(@ds.select({:a=>:b}.case(:c, :d))).should == ["1 -> 2 [label=\"select\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"CaseExpression\"];", "3 -> 4 [label=\"expression\"];", "4 [label=\":d\"];", "3 -> 5 [label=\"conditions\"];", "5 [label=\"Array\"];", "5 -> 6 [label=\"0\"];", "6 [label=\"Array\"];", "6 -> 7 [label=\"0\"];", "7 [label=\":a\"];", "6 -> 8 [label=\"1\"];", "8 [label=\":b\"];", "3 -> 9 [label=\"default\"];", "9 [label=\":c\"];"]
+  end
+
+  it "should handle SQL::Cast" do
+    dot(@ds.select(:a.cast(Integer))).should ==  ["1 -> 2 [label=\"select\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"Cast\"];", "3 -> 4 [label=\"expr\"];", "4 [label=\":a\"];", "3 -> 5 [label=\"type\"];", "5 [label=\"Integer\"];"]
+  end
+
+  it "should handle SQL::Function" do
+    dot(@ds.select{a(b)}).should == ["1 -> 2 [label=\"select\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"Function: a\"];", "3 -> 4 [label=\"0\"];", "4 [label=\"Identifier\"];", "4 -> 5 [label=\"value\"];", "5 [label=\":b\"];"]
+  end
+
+  it "should handle SQL::Subscript" do
+    dot(@ds.select(:a.sql_subscript(1))).should == ["1 -> 2 [label=\"select\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"Subscript: a\"];", "3 -> 4 [label=\"f\"];", "4 [label=\":a\"];", "3 -> 5 [label=\"sub\"];", "5 [label=\"Array\"];", "5 -> 6 [label=\"0\"];", "6 [label=\"1\"];"]
+  end
+
+  it "should handle SQL::WindowFunction" do
+    dot(@ds.select{sum(:over, :partition=>(:a)){}}).should == ["1 -> 2 [label=\"select\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"WindowFunction\"];", "3 -> 4 [label=\"function\"];", "4 [label=\"Function: sum\"];", "3 -> 5 [label=\"window\"];", "5 [label=\"Window\"];", "5 -> 6 [label=\"opts\"];", "6 [label=\"Hash\"];", "6 -> 7 [label=\"partition\"];", "7 [label=\":a\"];"]
+  end
+
+  it "should handle SQL::PlaceholderLiteralString" do
+    dot(@ds.where("?", true)).should == ["1 -> 2 [label=\"where\"];", "2 [label=\"PlaceholderLiteralString: \\\"(?)\\\"\"];", "2 -> 3 [label=\"args\"];", "3 [label=\"Array\"];", "3 -> 4 [label=\"0\"];", "4 [label=\"true\"];"]
+  end
+
+  it "should handle JOIN ON" do
+    dot(@ds.from(:a).join(:d, :b=>:c)).should == ["1 -> 2 [label=\"from\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\":a\"];", "1 -> 4 [label=\"join\"];", "4 [label=\"Array\"];", "4 -> 5 [label=\"0\"];", "5 [label=\"INNER JOIN ON\"];", "5 -> 6 [label=\"table\"];", "6 [label=\":d\"];", "5 -> 7 [label=\"on\"];", "7 [label=\"Array\"];", "7 -> 8 [label=\"0\"];", "8 [label=\"Array\"];", "8 -> 9 [label=\"0\"];", "9 [label=\"QualifiedIdentifier\"];", "9 -> 10 [label=\"table\"];", "10 [label=\"\\\"d\\\"\"];", "9 -> 11 [label=\"column\"];", "11 [label=\"\\\"b\\\"\"];", "8 -> 12 [label=\"1\"];", "12 [label=\"QualifiedIdentifier\"];", "12 -> 13 [label=\"table\"];", "13 [label=\"\\\"a\\\"\"];", "12 -> 14 [label=\"column\"];", "14 [label=\"\\\"c\\\"\"];"]
+  end
+
+  it "should handle JOIN USING" do
+    dot(@ds.from(:a).join(:d, [:c], :table_alias=>:c)).should == ["1 -> 2 [label=\"from\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\":a\"];", "1 -> 4 [label=\"join\"];", "4 [label=\"Array\"];", "4 -> 5 [label=\"0\"];", "5 [label=\"INNER JOIN USING\"];", "5 -> 6 [label=\"table\"];", "6 [label=\":d\"];", "5 -> 7 [label=\"alias\"];", "7 [label=\":c\"];", "5 -> 8 [label=\"using\"];", "8 [label=\"Array\"];", "8 -> 9 [label=\"0\"];", "9 [label=\":c\"];"]
+  end
+
+  it "should handle other types" do
+    o = Object.new
+    def o.inspect
+      "blah"
+    end
+    dot(@ds.select(o)).should == ["1 -> 2 [label=\"select\"];", "2 [label=\"Array\"];", "2 -> 3 [label=\"0\"];", "3 [label=\"Unhandled: blah\"];"]
+  end
+end

data/spec/files/reversible_migrations/001_reversible.rb

@@ -0,0 +1,5 @@
+Sequel.migration do
+  change do
+    create_table(:a){Integer :a}
+  end
+end

data/spec/files/reversible_migrations/002_reversible.rb

@@ -0,0 +1,5 @@
+Sequel.migration do
+  change do
+    add_column :a, :b, String
+  end
+end

data/spec/files/reversible_migrations/003_reversible.rb

@@ -0,0 +1,5 @@
+Sequel.migration do
+  change do
+    rename_column :a, :b, :c
+  end
+end

data/spec/files/reversible_migrations/004_reversible.rb

@@ -0,0 +1,5 @@
+Sequel.migration do
+  change do
+    rename_table :a, :b
+  end
+end

data/spec/files/reversible_migrations/005_reversible.rb

@@ -0,0 +1,10 @@
+Sequel.migration do
+  change do
+    alter_table(:b) do
+      add_column :d, String
+    end
+    alter_table(:b) do
+      rename_column :d, :e
+    end
+  end
+end

data/spec/integration/migrator_test.rb

@@ -184,4 +184,58 @@ describe Sequel::Migrator do
     [:schema_info, :sm1111, :sm2222, :schema_migrations, :sm3333, :sm1122, :sm2233].each{|n| @db.table_exists?(n).should be_true}
     @db[:schema_migrations].select_order_map(:filename).should == %w'001_create_sessions.rb 002_create_nodes.rb 003_3_create_users.rb 1273253850_create_artists.rb 1273253852_create_albums.rb'
   end
+
+  specify "should handle reversible migrations" do
+    @dir = 'spec/files/reversible_migrations'
+    @db.drop_table(:a) rescue nil
+    @db.drop_table(:b) rescue nil
+    @m.apply(@db, @dir, 1)
+    [:schema_info, :a].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should be_false}
+    @db[:a].columns.should == [:a]
+
+    @m.apply(@db, @dir, 2)
+    [:schema_info, :a].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should be_false}
+    @db[:a].columns.should == [:a, :b]
+
+    @m.apply(@db, @dir, 3)
+    [:schema_info, :a].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should be_false}
+    @db[:a].columns.should == [:a, :c]
+
+    @m.apply(@db, @dir, 4)
+    [:schema_info, :b].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_migrations, :a].each{|n| @db.table_exists?(n).should be_false}
+    @db[:b].columns.should == [:a, :c]
+
+    @m.apply(@db, @dir, 5)
+    [:schema_info, :b].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_migrations, :a].each{|n| @db.table_exists?(n).should be_false}
+    @db[:b].columns.should == [:a, :c, :e]
+
+    @m.apply(@db, @dir, 4)
+    [:schema_info, :b].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_migrations, :a].each{|n| @db.table_exists?(n).should be_false}
+    @db[:b].columns.should == [:a, :c]
+
+    @m.apply(@db, @dir, 3)
+    [:schema_info, :a].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should be_false}
+    @db[:a].columns.should == [:a, :c]
+
+    @m.apply(@db, @dir, 2)
+    [:schema_info, :a].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should be_false}
+    @db[:a].columns.should == [:a, :b]
+
+    @m.apply(@db, @dir, 1)
+    [:schema_info, :a].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_migrations, :b].each{|n| @db.table_exists?(n).should be_false}
+    @db[:a].columns.should == [:a]
+
+    @m.apply(@db, @dir, 0)
+    [:schema_info].each{|n| @db.table_exists?(n).should be_true}
+    [:schema_migrations, :a, :b].each{|n| @db.table_exists?(n).should be_false}
+  end
 end

data/spec/model/association_reflection_spec.rb

@@ -173,3 +173,22 @@ describe Sequel::Model::Associations::AssociationReflection, "#associated_object
   end
 end
 
+describe Sequel::Model::Associations::AssociationReflection, "#remove_before_destroy?" do
+  before do
+    @c = Class.new(Sequel::Model)
+  end
+
+  it "should be true for many_to_one and many_to_many associations" do
+    @c.many_to_one :c, :class=>@c
+    @c.association_reflection(:c).remove_before_destroy?.should be_true
+    @c.many_to_many :cs, :class=>@c
+    @c.association_reflection(:cs).remove_before_destroy?.should be_true
+  end
+  it "should be false for one_to_one and one_to_many associations" do
+    @c.one_to_one :c, :class=>@c
+    @c.association_reflection(:c).remove_before_destroy?.should be_false
+    @c.one_to_many :cs, :class=>@c
+    @c.association_reflection(:cs).remove_before_destroy?.should be_false
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  hash: 67
+  hash: 79
   prerelease: false
   segments: 
   - 3
-  - 17
+  - 18
   - 0
-  version: 3.17.0
+  version: 3.18.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 -07:00
+date: 2010-12-01 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -81,6 +81,7 @@ extra_rdoc_files:
 - doc/release_notes/3.15.0.txt
 - doc/release_notes/3.16.0.txt
 - doc/release_notes/3.17.0.txt
+- doc/release_notes/3.18.0.txt
 files: 
 - COPYING
 - CHANGELOG
@@ -129,6 +130,7 @@ files:
 - doc/release_notes/3.15.0.txt
 - doc/release_notes/3.16.0.txt
 - doc/release_notes/3.17.0.txt
+- doc/release_notes/3.18.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/virtual_rows.rdoc
@@ -206,6 +208,7 @@ files:
 - spec/extensions/list_spec.rb
 - spec/extensions/tree_spec.rb
 - spec/extensions/xml_serializer_spec.rb
+- spec/extensions/to_dot_spec.rb
 - spec/integration/associations_test.rb
 - spec/integration/database_test.rb
 - spec/integration/dataset_test.rb
@@ -269,6 +272,11 @@ files:
 - spec/files/uppercase_timestamped_migrations/1273253849_CREATE_SESSIONS.RB
 - spec/files/uppercase_timestamped_migrations/1273253851_CREATE_NODES.RB
 - spec/files/uppercase_timestamped_migrations/1273253853_3_CREATE_USERS.RB
+- spec/files/reversible_migrations/001_reversible.rb
+- spec/files/reversible_migrations/002_reversible.rb
+- spec/files/reversible_migrations/003_reversible.rb
+- spec/files/reversible_migrations/004_reversible.rb
+- spec/files/reversible_migrations/005_reversible.rb
 - lib/sequel.rb
 - lib/sequel/adapters/ado.rb
 - lib/sequel/adapters/ado/mssql.rb
@@ -345,6 +353,7 @@ files:
 - lib/sequel/extensions/sql_expr.rb
 - lib/sequel/extensions/string_date_time.rb
 - lib/sequel/extensions/thread_local_timezones.rb
+- lib/sequel/extensions/to_dot.rb
 - lib/sequel/metaprogramming.rb
 - lib/sequel/model.rb
 - lib/sequel/model/associations.rb