(Hopefully) fix circular dependency issue with database

coupler · Jul 19, 2011 · 303432b · 303432b
1 parent d46a1f4
commit 303432b
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 20 deletions.
diff --git a/db/migrate/018_fix_scenario_linkage_type.rb b/db/migrate/018_fix_scenario_linkage_type.rb
diff --git a/db/migrate/018_stub.rb b/db/migrate/018_stub.rb
@@ -0,0 +1,4 @@
+Sequel.migration do
+  up { }
+  down { }
+end
diff --git a/lib/coupler.rb b/lib/coupler.rb
@@ -1,3 +1,4 @@
+require 'pp'
 require 'java'
 require 'jruby/core_ext'
 

diff --git a/lib/coupler/models.rb b/lib/coupler/models.rb
@@ -4,20 +4,20 @@
 
 module Coupler
   module Models
+    autoload :Comparison,     File.dirname(__FILE__) + "/models/comparison"
+    autoload :Connection,     File.dirname(__FILE__) + "/models/connection"
+    autoload :Field,          File.dirname(__FILE__) + "/models/field"
+    autoload :Import,         File.dirname(__FILE__) + "/models/import"
+    autoload :Job,            File.dirname(__FILE__) + "/models/job"
+    autoload :Matcher,        File.dirname(__FILE__) + "/models/matcher"
+    autoload :Project,        File.dirname(__FILE__) + "/models/project"
+    autoload :Resource,       File.dirname(__FILE__) + "/models/resource"
+    autoload :Result,         File.dirname(__FILE__) + "/models/result"
+    autoload :Scenario,       File.dirname(__FILE__) + "/models/scenario"
+    autoload :Transformation, File.dirname(__FILE__) + "/models/transformation"
+    autoload :Transformer,    File.dirname(__FILE__) + "/models/transformer"
   end
 end
 
 require File.dirname(__FILE__) + "/models/common_model"
 require File.dirname(__FILE__) + "/models/jobify"
-require File.dirname(__FILE__) + "/models/comparison"
-require File.dirname(__FILE__) + "/models/connection"
-require File.dirname(__FILE__) + "/models/field"
-require File.dirname(__FILE__) + "/models/import"
-require File.dirname(__FILE__) + "/models/job"
-require File.dirname(__FILE__) + "/models/matcher"
-require File.dirname(__FILE__) + "/models/project"
-require File.dirname(__FILE__) + "/models/resource"
-require File.dirname(__FILE__) + "/models/result"
-require File.dirname(__FILE__) + "/models/scenario"
-require File.dirname(__FILE__) + "/models/transformation"
-require File.dirname(__FILE__) + "/models/transformer"
diff --git a/lib/coupler/models/comparison.rb b/lib/coupler/models/comparison.rb
@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Comparison < Sequel::Model

diff --git a/lib/coupler/models/connection.rb b/lib/coupler/models/connection.rb
@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Connection < Sequel::Model

diff --git a/lib/coupler/models/field.rb b/lib/coupler/models/field.rb
@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Field < Sequel::Model

diff --git a/lib/coupler/models/import.rb b/lib/coupler/models/import.rb
@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Import < Sequel::Model

diff --git a/lib/coupler/models/job.rb b/lib/coupler/models/job.rb
@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Job < Sequel::Model

diff --git a/lib/coupler/models/matcher.rb b/lib/coupler/models/matcher.rb
@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Matcher < Sequel::Model

diff --git a/lib/coupler/models/project.rb b/lib/coupler/models/project.rb
@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Project < Sequel::Model

diff --git a/lib/coupler/models/resource.rb b/lib/coupler/models/resource.rb
@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Resource < Sequel::Model

diff --git a/lib/coupler/models/result.rb b/lib/coupler/models/result.rb
@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Result < Sequel::Model

diff --git a/lib/coupler/models/scenario.rb b/lib/coupler/models/scenario.rb
@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Scenario < Sequel::Model

diff --git a/lib/coupler/models/transformation.rb b/lib/coupler/models/transformation.rb
@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Transformation < Sequel::Model

diff --git a/lib/coupler/models/transformer.rb b/lib/coupler/models/transformer.rb
@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Transformer < Sequel::Model