sequel 3.28.0 → 3.29.0

data/spec/core/schema_generator_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 describe Sequel::Schema::Generator do
   before do
-    @generator = Sequel::Schema::Generator.new(SchemaDummyDatabase.new) do
+    @generator = Sequel::Schema::Generator.new(Sequel.mock) do
       string :title
       column :body, :text
       foreign_key :parent_id
@@ -97,7 +97,7 @@ end
 
 describe Sequel::Schema::AlterTableGenerator do
   before do
-    @generator = Sequel::Schema::AlterTableGenerator.new(SchemaDummyDatabase.new) do
+    @generator = Sequel::Schema::AlterTableGenerator.new(Sequel.mock) do
       add_column :aaa, :text
       drop_column :bbb
       rename_column :ccc, :ho
@@ -147,7 +147,7 @@ end
 
 describe "Sequel::Schema::Generator generic type methods" do
   it "should store the type class in :type for each column" do
-    Sequel::Schema::Generator.new(SchemaDummyDatabase.new) do
+    Sequel::Schema::Generator.new(Sequel.mock) do
       String :a
       Integer :b
       Fixnum :c

data/spec/core/schema_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
 
 describe "DB#create_table" do
   before do
-    @db = SchemaDummyDatabase.new
+    @db = Sequel.mock
   end
   
   specify "should accept the table name" do
@@ -88,13 +88,11 @@ describe "DB#create_table" do
     end
     @db.sqls.should == ['CREATE TABLE cats (id integer PRIMARY KEY AUTOINCREMENT)']
 
-    @db.sqls.clear
     @db.create_table(:cats) do
       primary_key :id, :serial, :auto_increment => false
     end
     @db.sqls.should == ['CREATE TABLE cats (id serial PRIMARY KEY)']
 
-    @db.sqls.clear
     @db.create_table(:cats) do
       primary_key :id, :type => :serial, :auto_increment => false
     end
@@ -154,7 +152,6 @@ describe "DB#create_table" do
       varchar :name
     end
     @db.sqls.should == ["CREATE TABLE cats (name varchar(255))"]
-    @db.sqls.clear
     @db.create_table(:cats) do
       varchar :name, :size => 51
     end
@@ -199,7 +196,6 @@ describe "DB#create_table" do
     end
     @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects(id))"]
 
-    @db.sqls.clear
     @db.create_table(:cats) do
       foreign_key :project_id, :table => :projects, :key => :zzz
     end
@@ -212,32 +208,25 @@ describe "DB#create_table" do
     end
     @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON DELETE RESTRICT)"]
 
-    @db.sqls.clear
     @db.create_table(:cats) do
       foreign_key :project_id, :table => :projects, :on_delete => :cascade
     end
     @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON DELETE CASCADE)"]
 
-    @db.sqls.clear
     @db.create_table(:cats) do
       foreign_key :project_id, :table => :projects, :on_delete => :no_action
     end
     @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON DELETE NO ACTION)"]
-    @db.sqls.clear
 
-    @db.sqls.clear
     @db.create_table(:cats) do
       foreign_key :project_id, :table => :projects, :on_delete => :set_null
     end
     @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON DELETE SET NULL)"]
-    @db.sqls.clear
 
-    @db.sqls.clear
     @db.create_table(:cats) do
       foreign_key :project_id, :table => :projects, :on_delete => :set_default
     end
     @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON DELETE SET DEFAULT)"]
-    @db.sqls.clear
   end
 
   specify "should accept foreign keys with ON UPDATE clause" do
@@ -246,32 +235,25 @@ describe "DB#create_table" do
     end
     @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON UPDATE RESTRICT)"]
 
-    @db.sqls.clear
     @db.create_table(:cats) do
       foreign_key :project_id, :table => :projects, :on_update => :cascade
     end
     @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON UPDATE CASCADE)"]
 
-    @db.sqls.clear
     @db.create_table(:cats) do
       foreign_key :project_id, :table => :projects, :on_update => :no_action
     end
     @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON UPDATE NO ACTION)"]
-    @db.sqls.clear
 
-    @db.sqls.clear
     @db.create_table(:cats) do
       foreign_key :project_id, :table => :projects, :on_update => :set_null
     end
     @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON UPDATE SET NULL)"]
-    @db.sqls.clear
 
-    @db.sqls.clear
     @db.create_table(:cats) do
       foreign_key :project_id, :table => :projects, :on_update => :set_default
     end
     @db.sqls.should == ["CREATE TABLE cats (project_id integer REFERENCES projects ON UPDATE SET DEFAULT)"]
-    @db.sqls.clear
   end
   
   specify "should accept foreign keys with deferrable option" do
@@ -368,7 +350,6 @@ describe "DB#create_table" do
     @db.meta_def(:execute_ddl){|*a| raise Sequel::DatabaseError if /blah/.match(a.first); super(*a)}
     lambda{@db.create_table(:cats){Integer :id; index :blah; index :id}}.should raise_error(Sequel::DatabaseError)
     @db.sqls.should == ['CREATE TABLE cats (id integer)']
-    @db.sqls.clear
     lambda{@db.create_table(:cats, :ignore_index_errors=>true){Integer :id; index :blah; index :id}}.should_not raise_error(Sequel::DatabaseError)
     @db.sqls.should == ['CREATE TABLE cats (id integer)', 'CREATE INDEX cats_id_index ON cats (id)']
   end
@@ -506,7 +487,6 @@ describe "DB#create_table" do
       foreign_key [:a, :b], :abc, :key => [:real_a, :real_b]
     end
     @db.sqls.should == ["CREATE TABLE cats (a integer, b integer, FOREIGN KEY (a, b) REFERENCES abc(real_a, real_b))"]
-    @db.sqls.clear
 
     @db.create_table(:cats) do
       integer :a
@@ -524,7 +504,6 @@ describe "DB#create_table" do
     end
     @db.sqls.should == ["CREATE TABLE cats (a integer, b integer, FOREIGN KEY (a, b) REFERENCES abc ON DELETE CASCADE)"]
 
-    @db.sqls.clear
     @db.create_table(:cats) do
       integer :a
       integer :b
@@ -532,7 +511,6 @@ describe "DB#create_table" do
     end
     @db.sqls.should == ["CREATE TABLE cats (a integer, b integer, FOREIGN KEY (a, b) REFERENCES abc ON UPDATE NO ACTION)"]
 
-    @db.sqls.clear
     @db.create_table(:cats) do
       integer :a
       integer :b
@@ -540,7 +518,6 @@ describe "DB#create_table" do
     end
     @db.sqls.should == ["CREATE TABLE cats (a integer, b integer, FOREIGN KEY (a, b) REFERENCES abc ON DELETE RESTRICT ON UPDATE SET DEFAULT)"]
 
-    @db.sqls.clear
     @db.create_table(:cats) do
       integer :a
       integer :b
@@ -552,7 +529,7 @@ end
 
 describe "DB#create_table!" do
   before do
-    @db = SchemaDummyDatabase.new
+    @db = Sequel.mock
   end
   
   specify "should create the table if it does not exist" do
@@ -570,13 +547,13 @@ end
 
 describe "DB#create_table?" do
   before do
-    @db = SchemaDummyDatabase.new
+    @db = Sequel.mock
   end
   
   specify "should not create the table if the table already exists" do
     @db.meta_def(:table_exists?){|a| true}
     @db.create_table?(:cats){|*a|}
-    @db.sqls.should == nil
+    @db.sqls.should == []
   end
   
   specify "should create the table if the table doesn't already exist" do
@@ -594,7 +571,7 @@ end
 
 describe "DB#drop_table" do
   before do
-    @db = SchemaDummyDatabase.new
+    @db = Sequel.mock
   end
 
   specify "should generate a DROP TABLE statement" do
@@ -615,7 +592,7 @@ end
 
 describe "DB#alter_table" do
   before do
-    @db = SchemaDummyDatabase.new
+    @db = Sequel.mock
   end
   
   specify "should allow adding not null constraint" do
@@ -659,7 +636,6 @@ describe "DB#alter_table" do
     end
     @db.sqls.should == ["ALTER TABLE cats ADD UNIQUE (a, b)"]
 
-    @db.sqls.clear
     @db.alter_table(:cats) do
       add_unique_constraint [:a, :b], :name => :ab_uniq
     end
@@ -679,19 +655,16 @@ describe "DB#alter_table" do
     end
     @db.sqls.should == ["ALTER TABLE cats ADD FOREIGN KEY (node_id, prop_id) REFERENCES nodes_props"]
 
-    @db.sqls.clear
     @db.alter_table(:cats) do
       add_foreign_key [:node_id, :prop_id], :nodes_props, :name => :cfk
     end
     @db.sqls.should == ["ALTER TABLE cats ADD CONSTRAINT cfk FOREIGN KEY (node_id, prop_id) REFERENCES nodes_props"]
 
-    @db.sqls.clear
     @db.alter_table(:cats) do
       add_foreign_key [:node_id, :prop_id], :nodes_props, :key => [:nid, :pid]
     end
     @db.sqls.should == ["ALTER TABLE cats ADD FOREIGN KEY (node_id, prop_id) REFERENCES nodes_props(nid, pid)"]
 
-    @db.sqls.clear
     @db.alter_table(:cats) do
       add_foreign_key [:node_id, :prop_id], :nodes_props, :on_delete => :restrict, :on_update => :cascade
     end
@@ -709,7 +682,7 @@ describe "DB#alter_table" do
     @db.meta_def(:execute_ddl){|*a| raise Sequel::DatabaseError}
     lambda{@db.add_index(:cats, :id)}.should raise_error(Sequel::DatabaseError)
     lambda{@db.add_index(:cats, :id, :ignore_errors=>true)}.should_not raise_error(Sequel::DatabaseError)
-    @db.sqls.should == nil
+    @db.sqls.should == []
   end
 
   specify "should support add_primary_key" do
@@ -725,7 +698,6 @@ describe "DB#alter_table" do
     end
     @db.sqls.should == ["ALTER TABLE cats ADD PRIMARY KEY (id, type)"]
 
-    @db.sqls.clear
     @db.alter_table(:cats) do
       add_primary_key [:id, :type], :name => :cpk
     end
@@ -809,7 +781,7 @@ end
 
 describe "Database#create_table" do
   before do
-    @db = DummyDatabase.new
+    @db = Sequel.mock
   end
   
   specify "should construct proper SQL" do
@@ -818,10 +790,8 @@ describe "Database#create_table" do
       column :name, :text
       index :name, :unique => true
     end
-    @db.sqls.should == [
-      'CREATE TABLE test (id integer NOT NULL PRIMARY KEY AUTOINCREMENT, name text)',
-      'CREATE UNIQUE INDEX test_name_index ON test (name)'
-    ]
+    @db.sqls.should == ['CREATE TABLE test (id integer NOT NULL PRIMARY KEY AUTOINCREMENT, name text)',
+      'CREATE UNIQUE INDEX test_name_index ON test (name)']
   end
   
   specify "should create a temporary table" do
@@ -831,10 +801,8 @@ describe "Database#create_table" do
       index :name, :unique => true
     end
     
-    @db.sqls.should == [
-      'CREATE TEMPORARY TABLE test_tmp (id integer NOT NULL PRIMARY KEY AUTOINCREMENT, name text)',
-      'CREATE UNIQUE INDEX test_tmp_name_index ON test_tmp (name)'
-    ]
+    @db.sqls.should == ['CREATE TEMPORARY TABLE test_tmp (id integer NOT NULL PRIMARY KEY AUTOINCREMENT, name text)',
+      'CREATE UNIQUE INDEX test_tmp_name_index ON test_tmp (name)']
   end
 
   specify "should not use default schema when creating a temporary table" do
@@ -848,7 +816,7 @@ end
 
 describe "Database#alter_table" do
   before do
-    @db = DummyDatabase.new
+    @db = Sequel.mock
   end
   
   specify "should construct proper SQL" do
@@ -858,40 +826,31 @@ describe "Database#alter_table" do
       rename_column :ccc, :ddd
       set_column_type :eee, :integer
       set_column_default :hhh, 'abcd'
-      
       add_index :fff, :unique => true
       drop_index :ggg
     end
     
-    @db.sqls.should == [
-      'ALTER TABLE xyz ADD COLUMN aaa text NOT NULL UNIQUE',
+    @db.sqls.should == ['ALTER TABLE xyz ADD COLUMN aaa text NOT NULL UNIQUE',
       'ALTER TABLE xyz DROP COLUMN bbb',
       'ALTER TABLE xyz RENAME COLUMN ccc TO ddd',
       'ALTER TABLE xyz ALTER COLUMN eee TYPE integer',
       "ALTER TABLE xyz ALTER COLUMN hhh SET DEFAULT 'abcd'",
-      
       'CREATE UNIQUE INDEX xyz_fff_index ON xyz (fff)',
-      'DROP INDEX xyz_ggg_index'
-    ]
+      'DROP INDEX xyz_ggg_index']
   end
 end
 
 describe "Database#add_column" do
-  before do
-    @db = DummyDatabase.new
-  end
-  
   specify "should construct proper SQL" do
-    @db.add_column :test, :name, :text, :unique => true
-    @db.sqls.should == [
-      'ALTER TABLE test ADD COLUMN name text UNIQUE'
-    ]
+    db = Sequel.mock
+    db.add_column :test, :name, :text, :unique => true
+    db.sqls.should == ['ALTER TABLE test ADD COLUMN name text UNIQUE']
   end
 end
 
 describe "Database#drop_column" do
   before do
-    @db = DummyDatabase.new
+    @db = Sequel.mock
   end
   
   specify "should construct proper SQL" do
@@ -907,80 +866,68 @@ end
 
 describe "Database#rename_column" do
   before do
-    @db = DummyDatabase.new
+    @db = Sequel.mock
   end
   
   specify "should construct proper SQL" do
     @db.rename_column :test, :abc, :def
-    @db.sqls.should == [
-      'ALTER TABLE test RENAME COLUMN abc TO def'
-    ]
+    @db.sqls.should == ['ALTER TABLE test RENAME COLUMN abc TO def']
   end
 end
 
 describe "Database#set_column_type" do
   before do
-    @db = DummyDatabase.new
+    @db = Sequel.mock
   end
   
   specify "should construct proper SQL" do
     @db.set_column_type :test, :name, :integer
-    @db.sqls.should == [
-      'ALTER TABLE test ALTER COLUMN name TYPE integer'
-    ]
+    @db.sqls.should == ['ALTER TABLE test ALTER COLUMN name TYPE integer']
   end
 end
 
 describe "Database#set_column_default" do
   before do
-    @db = DummyDatabase.new
+    @db = Sequel.mock
   end
   
   specify "should construct proper SQL" do
     @db.set_column_default :test, :name, 'zyx'
-    @db.sqls.should == [
-      "ALTER TABLE test ALTER COLUMN name SET DEFAULT 'zyx'"
-    ]
+    @db.sqls.should == ["ALTER TABLE test ALTER COLUMN name SET DEFAULT 'zyx'"]
   end
 end
 
 describe "Database#add_index" do
   before do
-    @db = DummyDatabase.new
+    @db = Sequel.mock
   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)'
-    ]
+    @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)'
-    ]
+    @db.sqls.should == ['CREATE INDEX test_one_two_index ON test (one, two)']
   end
 end
 
 describe "Database#drop_index" do
   before do
-    @db = DummyDatabase.new
+    @db = Sequel.mock
   end
   
   specify "should construct proper SQL" do
     @db.drop_index :test, :name
-    @db.sqls.should == [
-      'DROP INDEX test_name_index'
-    ]
+    @db.sqls.should == ['DROP INDEX test_name_index']
   end
   
 end
 
 describe "Database#drop_table" do
   before do
-    @db = DummyDatabase.new
+    @db = Sequel.mock
   end
   
   specify "should construct proper SQL" do
@@ -990,17 +937,13 @@ describe "Database#drop_table" do
   
   specify "should accept multiple table names" do
     @db.drop_table :a, :bb, :ccc
-    @db.sqls.should == [
-      'DROP TABLE a',
-      'DROP TABLE bb',
-      'DROP TABLE ccc'
-    ]
+    @db.sqls.should == ['DROP TABLE a', 'DROP TABLE bb', 'DROP TABLE ccc']
   end
 end
 
 describe "Database#rename_table" do
   before do
-    @db = DummyDatabase.new
+    @db = Sequel.mock
   end
   
   specify "should construct proper SQL" do
@@ -1011,13 +954,12 @@ end
 
 describe "Database#create_view" do
   before do
-    @db = DummyDatabase.new
+    @db = Sequel.mock
   end
   
   specify "should construct proper SQL with raw SQL" do
     @db.create_view :test, "SELECT * FROM xyz"
     @db.sqls.should == ['CREATE VIEW test AS SELECT * FROM xyz']
-    @db.sqls.clear
     @db.create_view :test.identifier, "SELECT * FROM xyz"
     @db.sqls.should == ['CREATE VIEW test AS SELECT * FROM xyz']
   end
@@ -1025,21 +967,6 @@ describe "Database#create_view" do
   specify "should construct proper SQL with dataset" do
     @db.create_view :test, @db[:items].select(:a, :b).order(:c)
     @db.sqls.should == ['CREATE VIEW test AS SELECT a, b FROM items ORDER BY c']
-    @db.sqls.clear
-    @db.create_view :test.qualify(:sch), @db[:items].select(:a, :b).order(:c)
-    @db.sqls.should == ['CREATE VIEW sch.test AS SELECT a, b FROM items ORDER BY c']
-  end
-end
-
-describe "Database#create_or_replace_view" do
-  before do
-    @db = DummyDatabase.new
-  end
-  
-  specify "should construct proper SQL with raw SQL" do
-    @db.create_or_replace_view :test, "SELECT * FROM xyz"
-    @db.sqls.should == ['CREATE OR REPLACE VIEW test AS SELECT * FROM xyz']
-    @db.sqls.clear
     @db.create_or_replace_view :sch__test, "SELECT * FROM xyz"
     @db.sqls.should == ['CREATE OR REPLACE VIEW sch.test AS SELECT * FROM xyz']
   end
@@ -1047,7 +974,6 @@ describe "Database#create_or_replace_view" do
   specify "should construct proper SQL with dataset" do
     @db.create_or_replace_view :test, @db[:items].select(:a, :b).order(:c)
     @db.sqls.should == ['CREATE OR REPLACE VIEW test AS SELECT a, b FROM items ORDER BY c']
-    @db.sqls.clear
     @db.create_or_replace_view :test.identifier, @db[:items].select(:a, :b).order(:c)
     @db.sqls.should == ['CREATE OR REPLACE VIEW test AS SELECT a, b FROM items ORDER BY c']
   end
@@ -1055,7 +981,7 @@ end
 
 describe "Database#drop_view" do
   before do
-    @db = DummyDatabase.new
+    @db = Sequel.mock
   end
   
   specify "should construct proper SQL" do
@@ -1078,12 +1004,8 @@ describe "Database#drop_view" do
 end
 
 describe "Database#alter_table_sql" do
-  before do
-    @db = DummyDatabase.new
-  end
-  
   specify "should raise error for an invalid op" do
-    proc {@db.send(:alter_table_sql, :mau, :op => :blah)}.should raise_error(Sequel::Error)
+    proc {Sequel.mock.send(:alter_table_sql, :mau, :op => :blah)}.should raise_error(Sequel::Error)
   end
 end
 
@@ -1100,6 +1022,21 @@ describe "Schema Parser" do
     proc{@db.schema(:x)}.should raise_error(Sequel::Error)
   end
 
+  specify "should provide options if given a table name" do
+    c = nil
+    @db.meta_def(:schema_parse_table) do |t, opts|
+      c = [t, opts]
+      [[:a, {:db_type=>t.to_s}]]
+    end
+    @db.schema(:x)
+    c.should == ["x", {}]
+    @db.schema(:s__x)
+    c.should == ["x", {:schema=>"s"}]
+    ds = @db[:s__y]
+    @db.schema(ds)
+    c.should == ["y", {:schema=>"s", :dataset=>ds}]
+  end
+
   specify "should parse the schema correctly for a single table" do
     sqls = @sqls
     proc{@db.schema(:x)}.should raise_error(Sequel::Error)