mack-data_mapper/lib/mack-data_mapper/database_migrations.rb mack-data_mapper/spec/lib/db_create_drop_spec.rb mack-data_mapper/spec/lib/db_migrations_spec.rb mack-data_mapper/spec/lib/db_structure_spec.rb mack-orm/README mack-orm/Rakefile mack-orm/lib/mack-orm.rb mack-orm/lib/mack-orm/database.rb mack-orm/lib/mack-orm/database_migrations.rb mack-orm/lib/mack-orm/tasks/db_create_drop_tasks.rake mack-orm/lib/mack-orm/tasks/db_migration_tasks.rake mack-orm/lib/mack-orm/tasks/test_tasks.rake mack-orm/lib/mack-orm_tasks.rb mack-orm/spec/spec_helper.rb @@ -16,6 +16,7 @@ require File.join(crt, "rake_task_requires") s.require_paths << 'lib' s.add_dependency("activerecord", "2.1.0") + s.add_dependency("mack-orm", GEM_VERSION) s.extra_rdoc_files = ["README"] s.has_rdoc = true s.required_ruby_version = ">= 1.8.6" mack-active_record/Rakefile @@ -1,6 +1,6 @@ require 'rubygems' require 'genosaurus' - +require 'mack-orm' require 'activerecord' module ActiveRecord # :nodoc: mack-active_record/lib/mack-active_record.rb @@ -1,3 +1,4 @@ +require 'mack-orm_tasks' Dir.glob(File.join(File.dirname(__FILE__), "mack-active_record", "tasks", "*.rake")).each do |f| load(f) end \ No newline at end of file mack-active_record/lib/mack-active_record_tasks.rb @@ -18,6 +18,7 @@ require File.join(crt, "rake_task_requires") [:core, :aggregates, :migrations, :serializer, :timestamps, :validations, :observer, :types].each do |g| s.add_dependency("dm-#{g}", "0.9.3") end + s.add_dependency("mack-orm", GEM_VERSION) s.extra_rdoc_files = ["README"] s.has_rdoc = true mack-data_mapper/Rakefile @@ -1,6 +1,6 @@ require 'rubygems' require 'genosaurus' - +require 'mack-orm' fl = File.join(File.dirname(__FILE__), "mack-data_mapper") $: << File.expand_path(File.join(fl, "dm_patches")) @@ -12,6 +12,7 @@ end require File.join(fl, "database") +require File.join(fl, "database_migrations") require File.join(fl, "helpers", "orm_helpers") require File.join(fl, "resource") require File.join(fl, "runner") mack-data_mapper/lib/mack-data_mapper.rb @@ -48,7 +48,7 @@ module Mack adapter = repository(repis).adapter uri = adapter.uri structure = "" - output_file = File.join(Mack.root, "db", "#{env}_#{repis}_schema_structure.sql") + output_file = File.join(Mack.root, "db", "#{env}_schema_structure.sql") case adapter.class.name when /Mysql/ sql = "SHOW TABLES" mack-data_mapper/lib/mack-data_mapper/database.rb @@ -1,3 +1,4 @@ +require 'mack-orm_tasks' Dir.glob(File.join(File.dirname(__FILE__), "mack-data_mapper", "tasks", "*.rake")).each do |f| load(f) end \ No newline at end of file mack-data_mapper/lib/mack-data_mapper_tasks.rb @@ -1,11 +1,23 @@ development: - adapter: sqlite3 - database: <%= File.join(Mack.root, "db", "fake_application.db") %> - + default: + adapter: mysql + database: mack_data_mapper_development + host: localhost + username: root + password: + test: - adapter: sqlite3 - database: <%= File.join(Mack.root, "db", "fake_application.db") %> - + default: + adapter: mysql + database: mack_data_mapper_test + host: localhost + username: root + password: + production: - adapter: sqlite3 - database: <%= File.join(Mack.root, "db", "fake_application.db") %> + default: + adapter: mysql + database: mack_data_mapper_production + host: localhost + username: root + password: mack-data_mapper/spec/fake_application/config/database.yml @@ -1,7 +1,7 @@ development: default: adapter: mysql - database: mack_data_mapper_development + database: mack_data_mapper2_development host: localhost username: root password: @@ -9,7 +9,7 @@ development: test: default: adapter: mysql - database: mack_data_mapper_test + database: mack_data_mapper2_test host: localhost username: root password: @@ -17,7 +17,7 @@ test: production: default: adapter: mysql - database: mack_data_mapper_production + database: mack_data_mapper2_production host: localhost username: root password: \ No newline at end of file mack-data_mapper/spec/fixtures/mysql_database.yml.fixture mack-data_mapper/lib/mack-data_mapper/tasks/db_create_drop_tasks.rake mack-data_mapper/lib/mack-data_mapper/tasks/db_migration_tasks.rake mack-data_mapper/lib/mack-data_mapper/tasks/test_tasks.rake mack-data_mapper/spec/lib/database_spec.rb mack-data_mapper/spec/lib/tasks/db_create_drop_tasks_spec.rb mack-data_mapper/spec/lib/tasks/db_migration_tasks_spec.rb 5b2d5db9aeea49c0b4fe749a139b74c7f9cfb874 Mark Bates mark@markbates.com http://github.com/markbates/mack-more/commit/80324859b13764c03c7525a6811affbec0667381 80324859b13764c03c7525a6811affbec0667381 2008-08-12T11:45:17-07:00 2008-08-12T11:45:17-07:00 Beginnings of refactoring orm code into mack-orm [#87] f8bcb2d741766ab537dbbdadf054375e371501d0 Mark Bates mark@markbates.com