0
@@ -16,6 +16,7 @@ require File.join(crt, "rake_task_requires")
0
   s.require_paths << 'lib'
0
 
0
   s.add_dependency("activerecord", "2.1.0")
0
+  s.add_dependency("mack-orm", GEM_VERSION)
0
   s.extra_rdoc_files = ["README"]
0
   s.has_rdoc = true
0
   s.required_ruby_version = ">= 1.8.6"

0
@@ -1,6 +1,6 @@
0
 require 'rubygems'
0
 require 'genosaurus'
0
-
0
+require 'mack-orm'
0
 require 'activerecord'
0
 
0
 module ActiveRecord # :nodoc:

0
@@ -1,3 +1,4 @@
0
+require 'mack-orm_tasks'
0
 Dir.glob(File.join(File.dirname(__FILE__), "mack-active_record", "tasks", "*.rake")).each do |f|
0
   load(f)
0
 end
0
\ No newline at end of file

0
@@ -18,6 +18,7 @@ require File.join(crt, "rake_task_requires")
0
   [:core, :aggregates, :migrations, :serializer, :timestamps, :validations, :observer, :types].each do |g|
0
     s.add_dependency("dm-#{g}", "0.9.3")
0
   end
0
+  s.add_dependency("mack-orm", GEM_VERSION)
0
   
0
   s.extra_rdoc_files = ["README"]
0
   s.has_rdoc = true

0
@@ -1,6 +1,6 @@
0
 require 'rubygems'
0
 require 'genosaurus'
0
-
0
+require 'mack-orm'
0
 fl = File.join(File.dirname(__FILE__), "mack-data_mapper")
0
 
0
 $: << File.expand_path(File.join(fl, "dm_patches"))
0
@@ -12,6 +12,7 @@ end
0
 
0
 
0
 require File.join(fl, "database")
0
+require File.join(fl, "database_migrations")
0
 require File.join(fl, "helpers", "orm_helpers")
0
 require File.join(fl, "resource")
0
 require File.join(fl, "runner")

0
@@ -48,7 +48,7 @@ module Mack
0
       adapter = repository(repis).adapter
0
       uri = adapter.uri
0
       structure = ""
0
-      output_file = File.join(Mack.root, "db", "#{env}_#{repis}_schema_structure.sql")
0
+      output_file = File.join(Mack.root, "db", "#{env}_schema_structure.sql")
0
       case adapter.class.name
0
       when /Mysql/
0
         sql = "SHOW TABLES"

0
@@ -1,3 +1,4 @@
0
+require 'mack-orm_tasks'
0
 Dir.glob(File.join(File.dirname(__FILE__), "mack-data_mapper", "tasks", "*.rake")).each do |f|
0
   load(f)
0
 end
0
\ No newline at end of file

0
@@ -1,11 +1,23 @@
0
 development:
0
-  adapter: sqlite3
0
-  database: <%= File.join(Mack.root, "db", "fake_application.db") %>
0
- 
0
+  default:
0
+    adapter: mysql
0
+    database: mack_data_mapper_development
0
+    host: localhost
0
+    username: root
0
+    password: 
0
+    
0
 test:
0
-  adapter: sqlite3
0
-  database: <%= File.join(Mack.root, "db", "fake_application.db") %>
0
- 
0
+  default:
0
+    adapter: mysql
0
+    database: mack_data_mapper_test
0
+    host: localhost
0
+    username: root
0
+    password:
0
+
0
 production:
0
-  adapter: sqlite3
0
-  database: <%= File.join(Mack.root, "db", "fake_application.db") %>
0
+  default:
0
+    adapter: mysql
0
+    database: mack_data_mapper_production
0
+    host: localhost
0
+    username: root
0
+    password:

0
@@ -1,7 +1,7 @@
0
 development:
0
   default:
0
     adapter: mysql
0
-    database: mack_data_mapper_development
0
+    database: mack_data_mapper2_development
0
     host: localhost
0
     username: root
0
     password: 
0
@@ -9,7 +9,7 @@ development:
0
 test:
0
   default:
0
     adapter: mysql
0
-    database: mack_data_mapper_test
0
+    database: mack_data_mapper2_test
0
     host: localhost
0
     username: root
0
     password:
0
@@ -17,7 +17,7 @@ test:
0
 production:
0
   default:
0
     adapter: mysql
0
-    database: mack_data_mapper_production
0
+    database: mack_data_mapper2_production
0
     host: localhost
0
     username: root
0
     password:
0
\ No newline at end of file