@@ -15,10 +15,7 @@ require File.join(crt, "rake_task_requires") s.files = FileList['lib/**/*.*', 'README', 'doc/**/*.*', 'bin/**/*.*'] s.require_paths << 'lib' - # s.add_dependency("dm-core", "0.9.2") - # s.add_dependency("dm-migrations", "0.9.2") - # s.add_dependency("dm-validations", "0.9.2") - s.add_dependency("data_mapper", "0.9.2") + s.add_dependency("data_mapper", "0.9.3") s.extra_rdoc_files = ["README"] s.has_rdoc = true s.required_ruby_version = ">= 1.8.6" mack-data_mapper/Rakefile @@ -1,23 +1,9 @@ module DataMapper # :nodoc: module MigrationRunner # :nodoc: - def reset! + def self.reset! @@migrations = [] end end -end - -module SQL # :nodoc: - class TableCreator # :nodoc: - class Column # :nodoc: - - def build_type(type_class) - schema = {:name => @name, :quote_column_name => quoted_name}.merge(@opts) - schema = @adapter.class.type_map[type_class].merge(schema) - @adapter.property_schema_statement(schema) - end - - end - end -end +end \ No newline at end of file mack-data_mapper/lib/dm_patches/migrations.rb @@ -2,6 +2,4 @@ whiny_config_missing: false mack::session_id: _fake_application_session_id -orm: data_mapper - mack::testing_framework: rspec \ No newline at end of file mack-data_mapper/spec/fake_application/config/app_config/default.yml @@ -10,3 +10,5 @@ require_gems do |gem| # gem.add :termios # gem.add :rubyzip, :source => "http://gems.rubyforge.org" end + +require File.join(Mack.root, "..", "..", "lib", "mack-data_mapper") mack-data_mapper/spec/fake_application/config/initializers/gems.rb @@ -33,40 +33,34 @@ describe "rake" do it "should create a db for the current environment" do repository(:mysql_test_tmp) do |repo| - repo.adapter.query("show databases;").should_not include("mack_data_mapper_test") + repository(:mysql_test_tmp).adapter.query("show databases;").should_not include("mack_data_mapper_test") rake_task("db:recreate") - repo.adapter.query("show databases;").should include("mack_data_mapper_test") + repository(:mysql_test_tmp).adapter.query("show databases;").should include("mack_data_mapper_test") end end it "should drop/create a db if it already exists for the current environment" do - repository(:mysql_test_tmp) do |repo| - rake_task("db:recreate") - Zombie.should_not be_storage_exists - Zombie.auto_migrate! - Zombie.should be_storage_exist - rake_task("db:recreate") - Zombie.should_not be_storage_exists - end + rake_task("db:recreate") + Zombie.should_not be_storage_exists + Zombie.auto_migrate! + Zombie.should be_storage_exist + rake_task("db:recreate") + Zombie.should_not be_storage_exists end it "should create a db for the specified environment" do - repository(:mysql_test_tmp) do |repo| - repo.adapter.query("show databases;").should_not include("mack_data_mapper_production") - rake_task("db:recreate", "MACK_ENV" => "production") - repo.adapter.query("show databases;").should include("mack_data_mapper_production") - end + repository(:mysql_test_tmp).adapter.query("show databases;").should_not include("mack_data_mapper_production") + rake_task("db:recreate", "MACK_ENV" => "production") + repository(:mysql_test_tmp).adapter.query("show databases;").should include("mack_data_mapper_production") end it "should drop/create a db if it already exists for the specified environment" do - repository(:mysql_test_tmp) do |repo| - rake_task("db:recreate", "MACK_ENV" => "production") - Zombie.should_not be_storage_exists - Zombie.auto_migrate! - Zombie.should be_storage_exist - rake_task("db:recreate", "MACK_ENV" => "production") - Zombie.should_not be_storage_exists - end + rake_task("db:recreate", "MACK_ENV" => "production") + Zombie.should_not be_storage_exists + Zombie.auto_migrate! + Zombie.should be_storage_exist + rake_task("db:recreate", "MACK_ENV" => "production") + Zombie.should_not be_storage_exists end end mack-data_mapper/spec/lib/tasks/db_create_drop_tasks_spec.rb mack-data_mapper/lib/dm_patches/confirmation_validation.rb mack-data_mapper/lib/dm_patches/dm-cli.rb mack-data_mapper/lib/dm_patches/pooling.rb 4e1f5603135a852b59a3e1fbb1ae8259cdf4f40a Mark Bates mark@markbates.com http://github.com/markbates/mack-more/commit/08d20fb232d80b962e085007603d3f573ee7c3bd 08d20fb232d80b962e085007603d3f573ee7c3bd 2008-07-25T08:29:56-07:00 2008-07-25T08:29:56-07:00 Feature: DataMapper 0.9.3 Support [#54 state:resolved] 4b117c96598058e15501d09224d647dbc2f6124c Mark Bates mark@markbates.com