@@ -27,6 +27,19 @@ module DataMapper self.class.type_map end + # + # Returns whether the storage_name exists in this adapter. + # + # ==== Parameters + # storage_name<String>:: A String defining the name of a storage, for example a table name. + # + # ==== Returns + # <Boolean>:: true if the storage exists. + # + def exists?(storage_name) + raise NotImplementedError + end + # methods dealing with transactions # lib/data_mapper/adapters/abstract_adapter.rb @@ -241,7 +241,7 @@ module DataMapper close_connection(connection) if connection end - def table_exists?(table_name) + def exists?(table_name) raise NotImplementedError end @@ -251,7 +251,7 @@ module DataMapper def upgrade_model_storage(repository, model) table_name = model.storage_name(name) - if table_exists?(model.storage_name(name)) + if exists?(model.storage_name(name)) rval = [] begin connection = create_connection lib/data_mapper/adapters/data_objects_adapter.rb @@ -28,7 +28,7 @@ module DataMapper query("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? AND COLUMN_NAME = ?", db_name, table_name, column_name).size > 0 end - def table_exists?(table_name) + def exists?(table_name) query_table(table_name).size > 0 end lib/data_mapper/adapters/mysql_adapter.rb @@ -18,7 +18,7 @@ module DataMapper end end - def table_exists?(table_name) + def exists?(table_name) query_table(table_name).size > 0 end lib/data_mapper/adapters/postgres_adapter.rb @@ -17,7 +17,7 @@ module DataMapper end end - def table_exists?(table_name) + def exists?(table_name) query_table(table_name).size > 0 end lib/data_mapper/adapters/sqlite3_adapter.rb @@ -20,13 +20,14 @@ if HAS_MYSQL @result = mock("result") end it "#upgrade_model should work" do - !!@adapter.table_exists?("sputniks").should == false + @adapter.destroy_model_storage(nil, Sputnik) + @adapter.exists?("sputniks").should == false Sputnik.auto_migrate!(:mysql) - !!@adapter.table_exists?("sputniks").should == true - !!@adapter.column_exists?("sputniks", "new_prop").should == false + @adapter.exists?("sputniks").should == true + @adapter.column_exists?("sputniks", "new_prop").should == false Sputnik.property :new_prop, Integer Sputnik.auto_upgrade!(:mysql) - !!@adapter.column_exists?("sputniks", "new_prop").should == true + @adapter.column_exists?("sputniks", "new_prop").should == true end end @@ -41,16 +42,16 @@ if HAS_MYSQL Sputnik.auto_migrate!(:mysql) end - it "#table_exists? should return true for tables that exist" do - @adapter.table_exists?("sputniks").should == true + it "#exists? should return true for tables that exist" do + @adapter.exists?("sputniks").should == true end - it "#table_exists? should return false for tables that don't exist" do - @adapter.table_exists?("space turds").should == false + it "#exists? should return false for tables that don't exist" do + @adapter.exists?("space turds").should == false end it "#column_exists? should return true for columns that exist" do @adapter.column_exists?("sputniks", "name").should == true end - it "#table_exists? should return false for tables that don't exist" do + it "#exists? should return false for tables that don't exist" do @adapter.column_exists?("sputniks", "plur").should == false end end spec/integration/mysql_adapter_spec.rb @@ -20,19 +20,20 @@ if HAS_POSTGRES @result = mock("result") end it "#upgrade_model should work" do - !!@adapter.table_exists?("sputniks").should == false + @adapter.destroy_model_storage(nil, Sputnik) + @adapter.exists?("sputniks").should == false Sputnik.auto_migrate!(:postgres) - !!@adapter.table_exists?("sputniks").should == true - !!@adapter.column_exists?("sputniks", "new_prop").should == false + @adapter.exists?("sputniks").should == true + @adapter.column_exists?("sputniks", "new_prop").should == false Sputnik.property :new_prop, Integer, :serial => true @adapter.drop_sequence_column(@adapter.create_connection, Sputnik, Sputnik.new_prop) rescue nil Sputnik.auto_upgrade!(:postgres) - !!@adapter.column_exists?("sputniks", "new_prop").should == true + @adapter.column_exists?("sputniks", "new_prop").should == true end it "#upgrade_model_storage should create sequences and then call super" do @adapter.should_receive(:create_connection).at_least(1).times.and_return(@connection) @connection.should_receive(:close).at_least(1).times - @adapter.should_receive(:table_exists?).at_least(1).times.with("sputniks").and_return(true) + @adapter.should_receive(:exists?).at_least(1).times.with("sputniks").and_return(true) @adapter.should_receive(:column_exists?).at_least(1).times.with("sputniks", "id").and_return(false) @adapter.should_receive(:column_exists?).at_least(1).times.with("sputniks", "name").and_return(false) @adapter.should_receive(:create_sequence_column).at_least(1).times.with(@connection, Sputnik, Sputnik.properties(:default)[:id]) @@ -73,16 +74,16 @@ if HAS_POSTGRES Sputnik.auto_migrate!(:postgres) end - it "#table_exists? should return true for tables that exist" do - @adapter.table_exists?("sputniks").should == true + it "#exists? should return true for tables that exist" do + @adapter.exists?("sputniks").should == true end - it "#table_exists? should return false for tables that don't exist" do - @adapter.table_exists?("space turds").should == false + it "#exists? should return false for tables that don't exist" do + @adapter.exists?("space turds").should == false end it "#column_exists? should return true for columns that exist" do @adapter.column_exists?("sputniks", "name").should == true end - it "#table_exists? should return false for tables that don't exist" do + it "#exists? should return false for tables that don't exist" do @adapter.column_exists?("sputniks", "plur").should == false end end spec/integration/postgres_adapter_spec.rb @@ -27,13 +27,14 @@ if HAS_SQLITE3 @result = mock("result") end it "#upgrade_model should work" do - !!@adapter.table_exists?("sputniks").should == false + @adapter.destroy_model_storage(nil, Sputnik) + @adapter.exists?("sputniks").should == false Sputnik.auto_migrate!(:sqlite3_file) - !!@adapter.table_exists?("sputniks").should == true - !!@adapter.column_exists?("sputniks", "new_prop").should == false + @adapter.exists?("sputniks").should == true + @adapter.column_exists?("sputniks", "new_prop").should == false Sputnik.property :new_prop, Integer Sputnik.auto_upgrade!(:sqlite3_file) - !!@adapter.column_exists?("sputniks", "new_prop").should == true + @adapter.column_exists?("sputniks", "new_prop").should == true end end describe "querying metadata" do @@ -47,16 +48,16 @@ if HAS_SQLITE3 Sputnik.auto_migrate!(:sqlite3_file) end - it "#table_exists? should return true for tables that exist" do - @adapter.table_exists?("sputniks").should == true + it "#exists? should return true for tables that exist" do + @adapter.exists?("sputniks").should == true end - it "#table_exists? should return false for tables that don't exist" do - @adapter.table_exists?("space turds").should == false + it "#exists? should return false for tables that don't exist" do + @adapter.exists?("space turds").should == false end it "#column_exists? should return true for columns that exist" do @adapter.column_exists?("sputniks", "name").should == true end - it "#table_exists? should return false for tables that don't exist" do + it "#exists? should return false for tables that don't exist" do @adapter.column_exists?("sputniks", "plur").should == false end end spec/integration/sqlite3_adapter_spec.rb @@ -93,11 +93,15 @@ describe DataMapper::Adapters::AbstractAdapter do it "should raise NotImplementedError when #delete_set is called" do lambda { @adapter.delete_set(:repository, :query) }.should raise_error(NotImplementedError) end - + it "should raise NotImplementedError when #upgrade_model_storage is called" do lambda { @adapter.upgrade_model_storage(:repository, :resource) }.should raise_error(NotImplementedError) end + it "should raise NotImplementedError when #exists? is called" do + lambda { @adapter.exists?("hehu") }.should raise_error(NotImplementedError) + end + it "should raise NotImplementedError when #create_model_storage is called" do lambda { @adapter.create_model_storage(:repository, :resource) }.should raise_error(NotImplementedError) end spec/unit/adapters/abstract_adapter_spec.rb @@ -290,15 +290,15 @@ describe DataMapper::Adapters::DataObjectsAdapter::SQL, "creating, reading, upda end describe "when upgrading tables" do - it "should raise NotImplementedError when #table_exists? is called" do - lambda { @adapter.table_exists?("cheeses") }.should raise_error(NotImplementedError) + it "should raise NotImplementedError when #exists? is called" do + lambda { @adapter.exists?("cheeses") }.should raise_error(NotImplementedError) end it "should raise NotImplementedError when #columns_exists? is called" do lambda { @adapter.column_exists?("cheeses", "name") }.should raise_error(NotImplementedError) end describe "#upgrade_model_storage" do it "should call #create_model_storage unless the model storage alread exists" do - @adapter.should_receive(:table_exists?).once.with("cheeses").and_return(false) + @adapter.should_receive(:exists?).once.with("cheeses").and_return(false) @adapter.should_receive(:create_model_storage).once.with(nil, Cheese).and_return(true) @adapter.upgrade_model_storage(nil, Cheese).should == Cheese end @@ -307,7 +307,7 @@ describe DataMapper::Adapters::DataObjectsAdapter::SQL, "creating, reading, upda @adapter.should_receive(:column_exists?).once.with("cheeses", "name").and_return(true) @adapter.should_receive(:column_exists?).once.with("cheeses", "color").and_return(true) @adapter.should_receive(:column_exists?).once.with("cheeses", "notes").and_return(true) - @adapter.should_receive(:table_exists?).once.with("cheeses").and_return(true) + @adapter.should_receive(:exists?).once.with("cheeses").and_return(true) connection = mock("connection") connection.should_receive(:close).once @adapter.should_receive(:create_connection).once.and_return(connection) @@ -318,7 +318,7 @@ describe DataMapper::Adapters::DataObjectsAdapter::SQL, "creating, reading, upda @adapter.should_receive(:column_exists?).once.with("cheeses", "name").and_return(true) @adapter.should_receive(:column_exists?).once.with("cheeses", "color").and_return(true) @adapter.should_receive(:column_exists?).once.with("cheeses", "notes").and_return(false) - @adapter.should_receive(:table_exists?).once.with("cheeses").and_return(true) + @adapter.should_receive(:exists?).once.with("cheeses").and_return(true) connection = mock("connection") connection.should_receive(:close).once @adapter.should_receive(:create_connection).once.and_return(connection) spec/unit/adapters/data_objects_adapter_spec.rb 75dc92e1d6012ff5378154b68abe449c0a95f8d9 Martin Kihlgren zond@cthulhu.rlyeh http://github.com/sam/dm-core/commit/0f57b64a8a8b0d036dd9cee602ceb448ac6a4e88 0f57b64a8a8b0d036dd9cee602ceb448ac6a4e88 2008-05-13T09:53:27-07:00 2008-05-13T09:53:27-07:00 Renamed #table_exists? back to #exists? (to fix the breakage I caused in dm-migrations) and added it to AbstractAdapter. e89be5da09b417b6548ee3960e5507b59a8aa45f Martin Kihlgren zond@cthulhu.rlyeh