mack-active_record/lib/mack-active_record/tasks/test_tasks.rake mack-active_record/spec/create_and_drop_task_helper.rb mack-active_record/spec/fixtures/002_create_zoos.fixture mack-active_record/spec/fixtures/003_create_animals.fixture mack-active_record/spec/fixtures/mig_create_zoos_empty.fixture mack-active_record/spec/fixtures/mig_create_zoos_full.fixture mack-active_record/spec/fixtures/mysql.fixture mack-active_record/spec/fixtures/mysql_schema_structure.sql.fixture mack-active_record/spec/fixtures/partial_single_model_error.html.erb.fixture mack-active_record/spec/fixtures/postgres_schema_structure.sql.fixture mack-active_record/spec/fixtures/postgresql.fixture mack-active_record/spec/fixtures/sqlite3_schema_structure.sql.fixture mack-active_record/spec/lib/database_spec.rb @@ -15,7 +15,7 @@ require File.join(crt, "rake_task_requires") s.files = FileList['lib/**/*.*', 'README', 'doc/**/*.*', 'bin/**/*.*'] s.require_paths << 'lib' - s.add_dependency("activerecord", "2.0.2") + s.add_dependency("activerecord", "2.1.0") s.extra_rdoc_files = ["README"] s.has_rdoc = true s.required_ruby_version = ">= 1.8.6" mack-active_record/Rakefile @@ -67,6 +67,38 @@ module Mack FileUtils.rm_rf(dbs[:database]) if mode == :drop or mode == :drop_and_create end end + + def self.load_structure(file, env = Mack.env) + Mack::Database.establish_connection(env) + dbs = db_settings(env) + sql = File.read(file) + case dbs[:adapter] + when "mysql" + sql.split(";").each do |s| + s.strip! + ActiveRecord::Base.connection.execute(s) unless s.blank? + end + else + ActiveRecord::Base.connection.execute(sql) unless sql.blank? + end + end + + def self.dump_structure(env = Mack.env) + Mack::Database.establish_connection(env) + dbs = db_settings(env) + structure = "" + output_file = File.join(Mack.root, "db", "#{env}_schema_structure.sql") + case dbs[:adapter] + when "mysql" + File.open(output_file, "w") {|f| f.puts ActiveRecord::Base.connection.structure_dump} + when "postgresql" + `pg_dump -i -U "#{dbs[:username]}" -s -x -O -n #{ENV["SCHEMA"] ||= "public"} -f #{output_file} #{dbs[:database]}` + when "sqlite3" + `sqlite3 #{dbs[:database]} .schema > #{output_file}` + else + raise "Task not supported for '#{dbs[:adapter]}'" + end + end private mack-active_record/lib/mack-active_record/database.rb @@ -1,6 +1,5 @@ require 'pathname' require Pathname(__FILE__).dirname.expand_path.parent.parent + 'spec_helper' -require Pathname(__FILE__).dirname.expand_path + 'create_and_drop_task_helper' describe "rake" do mack-active_record/spec/lib/tasks/db_create_drop_tasks_spec.rb @@ -1,6 +1,5 @@ require 'pathname' require Pathname(__FILE__).dirname.expand_path.parent.parent + 'spec_helper' -require Pathname(__FILE__).dirname.expand_path + 'create_and_drop_task_helper' describe "rake" do mack-active_record/spec/lib/tasks/db_migration_tasks_spec.rb @@ -15,6 +15,7 @@ $genosaurus_output_directory = Mack.root require File.join(File.dirname(__FILE__), "..", "..", "mack-paths", "lib", "mack-paths") +require File.join(File.dirname(__FILE__), 'create_and_drop_task_helper') def migrations_directory File.join(Mack.root, "db", "migrations") @@ -24,6 +25,10 @@ def cleanup(file) File.delete(file) if !file.nil? and File.exists?(file) end -def fixture(file) - File.read(File.join(File.dirname(__FILE__), "lib", "fixtures", file + ".fixtures")) +def fixture(name) + File.read(fixture_location(name)) +end + +def fixture_location(name) + File.join(File.dirname(__FILE__), "fixtures", "#{name}.fixture") end mack-active_record/spec/spec_helper.rb @@ -51,7 +51,6 @@ module Mack output_file = File.join(Mack.root, "db", "#{env}_#{repis}_schema_structure.sql") case adapter.class.name when /Mysql/ - sql = "SHOW FULL TABLES WHERE Table_type = 'BASE TABLE'" sql = "SHOW TABLES" adapter.query(sql).each do |res| show = adapter.query("SHOW CREATE TABLE #{res}").first mack-data_mapper/lib/mack-data_mapper/database.rb mack-active_record/spec/lib/fixtures/002_create_zoos.fixtures mack-active_record/spec/lib/fixtures/003_create_animals.fixtures mack-active_record/spec/lib/fixtures/mig_create_zoos_empty.fixtures mack-active_record/spec/lib/fixtures/mig_create_zoos_full.fixtures mack-active_record/spec/lib/fixtures/mysql.fixtures mack-active_record/spec/lib/fixtures/partial_single_model_error.html.erb.fixtures mack-active_record/spec/lib/fixtures/postgresql.fixtures mack-active_record/spec/lib/tasks/create_and_drop_task_helper.rb 7a172b53d81204a5afe56ec67926eb5a3e9e362e Mark Bates mark@markbates.com http://github.com/markbates/mack-more/commit/5b2d5db9aeea49c0b4fe749a139b74c7f9cfb874 5b2d5db9aeea49c0b4fe749a139b74c7f9cfb874 2008-08-12T10:08:59-07:00 2008-08-12T10:08:59-07:00 Added 'proper' test:setup tasks for data_mapper and active_record. [#67 state:resolved] 4251450dda7aaedd0b3b0380a12fb641f09c220b Mark Bates mark@markbates.com