ncs_mdes_warehouse 0.10.0 → 0.10.1

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 NCS Navigator MDES Warehouse History
 ====================================
 
+0.10.1
+------
+
+- Eliminate method name collisions when a generated model would have had
+  both a property and a belongs_to with the same name. (#3184)
+- Update MDES 3.1 models to 3.1.01.00. (#2750)
+
 0.10.0
 ------
 

data/generated_models/ncs_navigator/warehouse/models/three_point_one/core_quest_air_cleaning.rb

@@ -13,9 +13,9 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :psu_id,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 2..8, :set => ["20000054", "20000032", "20000032", "20000032", "20000032", "20000016", "20000039", "20000200", "20000028", "20000063", "20000067", "20000201", "20000202", "20000203", "20000090", "20000083", "20000204", "20000205", "20000042", "20000037", "20000206", "20000040", "20000207", "20000208", "20000209", "20000091", "20000210", "20000069", "20000211", "20000094", "20000212", "20000213", "20000102", "20000214", "20000215", "20000044", "20000216", "20000216", "20000216", "20000030", "20000217", "20000218", "20000218", "20000218", "20000219", "20000220", "20000221", "20000092", "20000222", "20000223", "20000224", "20000225", "20000225", "20000088", "20000087", "20000226", "20000103", "20000227", "20000228", "20000229", "20000230", "20000231", "20000232", "20000025", "20000233", "20000233", "20000233", "20000048", "20000234", "20000235", "20000050", "20000236", "20000035", "20000237", "20000238", "20000239", "20000240", "20000052", "20000241", "20000243", "20000244", "20000245", "20000246", "20000247", "20000248", "20000113", "20000249", "20000250", "20000251", "20000086", "20000252", "20000253", "20000254", "20000255", "20000256", "20000018", "20000058", "20000014", "20000257", "20000258", "20000259", "20000259", "20000098", "20000060", "20000260", "20000260", "20000260", "20000260", "20000261", "20000262", "20000263", "20000097", "20000264", "20000264", "20000265", "20000062", "20000117", "20000266", "20000267", "20000268", "20000269", "20000270", "20000271", "20000272", "20000273", "-4", "20000000"] }
-    belongs_to :core_quest_child_care,
-               'NcsNavigator::Warehouse::Models::ThreePointOne::CoreQuestChildCare',
-               :child_key => [ :core_quest_child_care_id ], :required => true
+    belongs_to :core_quest_housing,
+               'NcsNavigator::Warehouse::Models::ThreePointOne::CoreQuestHousing',
+               :child_key => [ :core_quest_housing_id ], :required => true
     property   :core_quest_air_cleaning_id,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :key => true, :required => true, :length => 1..36 }
@@ -26,7 +26,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..255 }
 
-    mdes_order :psu_id, :core_quest_child_care_id, :core_quest_air_cleaning_id, :air_cleaning, :air_cleaning_oth
+    mdes_order :psu_id, :core_quest_housing_id, :core_quest_air_cleaning_id, :air_cleaning, :air_cleaning_oth
 
   end # class
 end # module NcsNavigator::Warehouse::Models::ThreePointOne

data/generated_models/ncs_navigator/warehouse/models/three_point_one/core_quest_cool.rb

@@ -13,9 +13,9 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :psu_id,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 2..8, :set => ["20000054", "20000032", "20000032", "20000032", "20000032", "20000016", "20000039", "20000200", "20000028", "20000063", "20000067", "20000201", "20000202", "20000203", "20000090", "20000083", "20000204", "20000205", "20000042", "20000037", "20000206", "20000040", "20000207", "20000208", "20000209", "20000091", "20000210", "20000069", "20000211", "20000094", "20000212", "20000213", "20000102", "20000214", "20000215", "20000044", "20000216", "20000216", "20000216", "20000030", "20000217", "20000218", "20000218", "20000218", "20000219", "20000220", "20000221", "20000092", "20000222", "20000223", "20000224", "20000225", "20000225", "20000088", "20000087", "20000226", "20000103", "20000227", "20000228", "20000229", "20000230", "20000231", "20000232", "20000025", "20000233", "20000233", "20000233", "20000048", "20000234", "20000235", "20000050", "20000236", "20000035", "20000237", "20000238", "20000239", "20000240", "20000052", "20000241", "20000243", "20000244", "20000245", "20000246", "20000247", "20000248", "20000113", "20000249", "20000250", "20000251", "20000086", "20000252", "20000253", "20000254", "20000255", "20000256", "20000018", "20000058", "20000014", "20000257", "20000258", "20000259", "20000259", "20000098", "20000060", "20000260", "20000260", "20000260", "20000260", "20000261", "20000262", "20000263", "20000097", "20000264", "20000264", "20000265", "20000062", "20000117", "20000266", "20000267", "20000268", "20000269", "20000270", "20000271", "20000272", "20000273", "-4", "20000000"] }
-    belongs_to :core_quest_child_care,
-               'NcsNavigator::Warehouse::Models::ThreePointOne::CoreQuestChildCare',
-               :child_key => [ :core_quest_child_care_id ], :required => true
+    belongs_to :core_quest_housing,
+               'NcsNavigator::Warehouse::Models::ThreePointOne::CoreQuestHousing',
+               :child_key => [ :core_quest_housing_id ], :required => true
     property   :core_quest_cool_id,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :key => true, :required => true, :length => 1..36 }
@@ -23,7 +23,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "3", "4", "-7", "-1", "-2", "-3", "-4"] }
 
-    mdes_order :psu_id, :core_quest_child_care_id, :core_quest_cool_id, :cool
+    mdes_order :psu_id, :core_quest_housing_id, :core_quest_cool_id, :cool
 
   end # class
 end # module NcsNavigator::Warehouse::Models::ThreePointOne

data/generated_models/ncs_navigator/warehouse/models/three_point_one/core_quest_delayed_type.rb

@@ -13,9 +13,9 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :psu_id,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 2..8, :set => ["20000054", "20000032", "20000032", "20000032", "20000032", "20000016", "20000039", "20000200", "20000028", "20000063", "20000067", "20000201", "20000202", "20000203", "20000090", "20000083", "20000204", "20000205", "20000042", "20000037", "20000206", "20000040", "20000207", "20000208", "20000209", "20000091", "20000210", "20000069", "20000211", "20000094", "20000212", "20000213", "20000102", "20000214", "20000215", "20000044", "20000216", "20000216", "20000216", "20000030", "20000217", "20000218", "20000218", "20000218", "20000219", "20000220", "20000221", "20000092", "20000222", "20000223", "20000224", "20000225", "20000225", "20000088", "20000087", "20000226", "20000103", "20000227", "20000228", "20000229", "20000230", "20000231", "20000232", "20000025", "20000233", "20000233", "20000233", "20000048", "20000234", "20000235", "20000050", "20000236", "20000035", "20000237", "20000238", "20000239", "20000240", "20000052", "20000241", "20000243", "20000244", "20000245", "20000246", "20000247", "20000248", "20000113", "20000249", "20000250", "20000251", "20000086", "20000252", "20000253", "20000254", "20000255", "20000256", "20000018", "20000058", "20000014", "20000257", "20000258", "20000259", "20000259", "20000098", "20000060", "20000260", "20000260", "20000260", "20000260", "20000261", "20000262", "20000263", "20000097", "20000264", "20000264", "20000265", "20000062", "20000117", "20000266", "20000267", "20000268", "20000269", "20000270", "20000271", "20000272", "20000273", "-4", "20000000"] }
-    belongs_to :core_quest_occupation,
-               'NcsNavigator::Warehouse::Models::ThreePointOne::CoreQuestOccupation',
-               :child_key => [ :core_quest_occupation_id ], :required => true
+    belongs_to :core_quest_health_care,
+               'NcsNavigator::Warehouse::Models::ThreePointOne::CoreQuestHealthCare',
+               :child_key => [ :core_quest_health_care_id ], :required => true
     property   :core_quest_delayed_type_id,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :key => true, :required => true, :length => 1..36 }
@@ -26,7 +26,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..255 }
 
-    mdes_order :psu_id, :core_quest_occupation_id, :core_quest_delayed_type_id, :ins_delayed_type, :ins_delayed_type_oth
+    mdes_order :psu_id, :core_quest_health_care_id, :core_quest_delayed_type_id, :ins_delayed_type, :ins_delayed_type_oth
 
   end # class
 end # module NcsNavigator::Warehouse::Models::ThreePointOne

data/generated_models/ncs_navigator/warehouse/models/three_point_one/core_quest_how_apply.rb

@@ -13,9 +13,9 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :psu_id,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 2..8, :set => ["20000054", "20000032", "20000032", "20000032", "20000032", "20000016", "20000039", "20000200", "20000028", "20000063", "20000067", "20000201", "20000202", "20000203", "20000090", "20000083", "20000204", "20000205", "20000042", "20000037", "20000206", "20000040", "20000207", "20000208", "20000209", "20000091", "20000210", "20000069", "20000211", "20000094", "20000212", "20000213", "20000102", "20000214", "20000215", "20000044", "20000216", "20000216", "20000216", "20000030", "20000217", "20000218", "20000218", "20000218", "20000219", "20000220", "20000221", "20000092", "20000222", "20000223", "20000224", "20000225", "20000225", "20000088", "20000087", "20000226", "20000103", "20000227", "20000228", "20000229", "20000230", "20000231", "20000232", "20000025", "20000233", "20000233", "20000233", "20000048", "20000234", "20000235", "20000050", "20000236", "20000035", "20000237", "20000238", "20000239", "20000240", "20000052", "20000241", "20000243", "20000244", "20000245", "20000246", "20000247", "20000248", "20000113", "20000249", "20000250", "20000251", "20000086", "20000252", "20000253", "20000254", "20000255", "20000256", "20000018", "20000058", "20000014", "20000257", "20000258", "20000259", "20000259", "20000098", "20000060", "20000260", "20000260", "20000260", "20000260", "20000261", "20000262", "20000263", "20000097", "20000264", "20000264", "20000265", "20000062", "20000117", "20000266", "20000267", "20000268", "20000269", "20000270", "20000271", "20000272", "20000273", "-4", "20000000"] }
-    belongs_to :core_quest_child_care,
-               'NcsNavigator::Warehouse::Models::ThreePointOne::CoreQuestChildCare',
-               :child_key => [ :core_quest_child_care_id ], :required => true
+    belongs_to :core_quest_pesticide,
+               'NcsNavigator::Warehouse::Models::ThreePointOne::CoreQuestPesticide',
+               :child_key => [ :core_quest_pesticide_id ], :required => true
     property   :core_quest_how_apply_id,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :key => true, :required => true, :length => 1..36 }
@@ -26,7 +26,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..255 }
 
-    mdes_order :psu_id, :core_quest_child_care_id, :core_quest_how_apply_id, :how_apply, :how_apply_oth
+    mdes_order :psu_id, :core_quest_pesticide_id, :core_quest_how_apply_id, :how_apply, :how_apply_oth
 
   end # class
 end # module NcsNavigator::Warehouse::Models::ThreePointOne

data/generated_models/ncs_navigator/warehouse/models/three_point_one/core_quest_rxn_shots.rb

@@ -13,9 +13,9 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :psu_id,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 2..8, :set => ["20000054", "20000032", "20000032", "20000032", "20000032", "20000016", "20000039", "20000200", "20000028", "20000063", "20000067", "20000201", "20000202", "20000203", "20000090", "20000083", "20000204", "20000205", "20000042", "20000037", "20000206", "20000040", "20000207", "20000208", "20000209", "20000091", "20000210", "20000069", "20000211", "20000094", "20000212", "20000213", "20000102", "20000214", "20000215", "20000044", "20000216", "20000216", "20000216", "20000030", "20000217", "20000218", "20000218", "20000218", "20000219", "20000220", "20000221", "20000092", "20000222", "20000223", "20000224", "20000225", "20000225", "20000088", "20000087", "20000226", "20000103", "20000227", "20000228", "20000229", "20000230", "20000231", "20000232", "20000025", "20000233", "20000233", "20000233", "20000048", "20000234", "20000235", "20000050", "20000236", "20000035", "20000237", "20000238", "20000239", "20000240", "20000052", "20000241", "20000243", "20000244", "20000245", "20000246", "20000247", "20000248", "20000113", "20000249", "20000250", "20000251", "20000086", "20000252", "20000253", "20000254", "20000255", "20000256", "20000018", "20000058", "20000014", "20000257", "20000258", "20000259", "20000259", "20000098", "20000060", "20000260", "20000260", "20000260", "20000260", "20000261", "20000262", "20000263", "20000097", "20000264", "20000264", "20000265", "20000062", "20000117", "20000266", "20000267", "20000268", "20000269", "20000270", "20000271", "20000272", "20000273", "-4", "20000000"] }
-    belongs_to :core_quest_hospitalizations,
-               'NcsNavigator::Warehouse::Models::ThreePointOne::CoreQuestHospitalizations',
-               :child_key => [ :core_quest_hospitalizations_id ], :required => true
+    belongs_to :core_quest_well_child_care,
+               'NcsNavigator::Warehouse::Models::ThreePointOne::CoreQuestWellChildCare',
+               :child_key => [ :core_quest_well_child_care_id ], :required => true
     property   :core_quest_rxn_shots_id,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :key => true, :required => true, :length => 1..36 }
@@ -26,7 +26,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..255 }
 
-    mdes_order :psu_id, :core_quest_hospitalizations_id, :core_quest_rxn_shots_id, :rxn_shots_type, :rxn_shots_type_oth
+    mdes_order :psu_id, :core_quest_well_child_care_id, :core_quest_rxn_shots_id, :rxn_shots_type, :rxn_shots_type_oth
 
   end # class
 end # module NcsNavigator::Warehouse::Models::ThreePointOne

data/generated_models/ncs_navigator/warehouse/models/three_point_one/core_quest_shots_type.rb

@@ -13,9 +13,9 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :psu_id,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 2..8, :set => ["20000054", "20000032", "20000032", "20000032", "20000032", "20000016", "20000039", "20000200", "20000028", "20000063", "20000067", "20000201", "20000202", "20000203", "20000090", "20000083", "20000204", "20000205", "20000042", "20000037", "20000206", "20000040", "20000207", "20000208", "20000209", "20000091", "20000210", "20000069", "20000211", "20000094", "20000212", "20000213", "20000102", "20000214", "20000215", "20000044", "20000216", "20000216", "20000216", "20000030", "20000217", "20000218", "20000218", "20000218", "20000219", "20000220", "20000221", "20000092", "20000222", "20000223", "20000224", "20000225", "20000225", "20000088", "20000087", "20000226", "20000103", "20000227", "20000228", "20000229", "20000230", "20000231", "20000232", "20000025", "20000233", "20000233", "20000233", "20000048", "20000234", "20000235", "20000050", "20000236", "20000035", "20000237", "20000238", "20000239", "20000240", "20000052", "20000241", "20000243", "20000244", "20000245", "20000246", "20000247", "20000248", "20000113", "20000249", "20000250", "20000251", "20000086", "20000252", "20000253", "20000254", "20000255", "20000256", "20000018", "20000058", "20000014", "20000257", "20000258", "20000259", "20000259", "20000098", "20000060", "20000260", "20000260", "20000260", "20000260", "20000261", "20000262", "20000263", "20000097", "20000264", "20000264", "20000265", "20000062", "20000117", "20000266", "20000267", "20000268", "20000269", "20000270", "20000271", "20000272", "20000273", "-4", "20000000"] }
-    belongs_to :core_quest_hospitalizations,
-               'NcsNavigator::Warehouse::Models::ThreePointOne::CoreQuestHospitalizations',
-               :child_key => [ :core_quest_hospitalizations_id ], :required => true
+    belongs_to :core_quest_well_child_care_vis,
+               'NcsNavigator::Warehouse::Models::ThreePointOne::CoreQuestWellChildCareVis',
+               :child_key => [ :core_quest_well_child_care_vis_id ], :required => true
     property   :core_quest_shots_type_id,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :key => true, :required => true, :length => 1..36 }
@@ -26,7 +26,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..255 }
 
-    mdes_order :psu_id, :core_quest_hospitalizations_id, :core_quest_shots_type_id, :shots_type, :shots_type_oth
+    mdes_order :psu_id, :core_quest_well_child_care_vis_id, :core_quest_shots_type_id, :shots_type, :shots_type_oth
 
   end # class
 end # module NcsNavigator::Warehouse::Models::ThreePointOne

data/generated_models/ncs_navigator/warehouse/models/three_point_one/eighteen_mth_mother_saq_2.rb

@@ -112,7 +112,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :asq18_country,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..50 }
-    belongs_to :home_phone,
+    belongs_to :home_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :home_phone_id ], :required => false
     property   :home_phone,
@@ -121,7 +121,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :other_phone,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => true, :length => 0..10 }
-    belongs_to :email,
+    belongs_to :email_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Email',
                :child_key => [ :email_id ], :required => false
     property   :email,

data/generated_models/ncs_navigator/warehouse/models/three_point_one/fourteen_mth_asq_saq.rb

@@ -112,7 +112,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :asq14_country,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..50 }
-    belongs_to :home_phone,
+    belongs_to :home_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :home_phone_id ], :required => false
     property   :home_phone,
@@ -121,7 +121,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :other_phone,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => true, :length => 0..10 }
-    belongs_to :email,
+    belongs_to :email_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Email',
                :child_key => [ :email_id ], :required => false
     property   :email,

data/generated_models/ncs_navigator/warehouse/models/three_point_one/link_person_provider.rb

@@ -27,7 +27,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
                { :required => true, :length => 1..2, :set => ["1", "2", "-4"] }
     property   :prov_intro_outcome,
                NcsNavigator::Warehouse::DataMapper::NcsString,
-               { :required => true, :length => 1..2, :set => ["1", "2", "3", "4", "-5", "-7", "-4"] }
+               { :required => true, :length => 1..2, :set => ["1", "2", "3", "4", "5", "-5", "-7", "-4"] }
     property   :prov_intro_outcome_oth,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..255 }

data/generated_models/ncs_navigator/warehouse/models/three_point_one/participant_verif.rb

@@ -166,7 +166,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :c_zip4,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..4 }
-    belongs_to :pa_phone,
+    belongs_to :pa_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :pa_phone_id ], :required => false
     property   :pa_phone,
@@ -202,7 +202,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :sa_phone_confirm,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :sa_phone,
+    belongs_to :sa_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :sa_phone_id ], :required => false
     property   :sa_phone,

data/generated_models/ncs_navigator/warehouse/models/three_point_one/pb_samp_frame.rb

@@ -112,13 +112,13 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :contact_zip4,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..4 }
-    belongs_to :contact_email,
+    belongs_to :contact_email_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Email',
                :child_key => [ :contact_email_id ], :required => false
     property   :contact_email,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => true, :length => 0..100 }
-    belongs_to :contact_phone_num,
+    belongs_to :contact_phone_num_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :contact_phone_num_id ], :required => false
     property   :contact_phone_num,
@@ -265,13 +265,13 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :contact_zip4_larger,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..4 }
-    belongs_to :contact_email_larger,
+    belongs_to :contact_email_larger_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Email',
                :child_key => [ :contact_email_larger_id ], :required => false
     property   :contact_email_larger,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => true, :length => 0..100 }
-    belongs_to :contact_phone_num_larger,
+    belongs_to :contact_phone_num_larger_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :contact_phone_num_larger_id ], :required => false
     property   :contact_phone_num_larger,

data/generated_models/ncs_navigator/warehouse/models/three_point_one/pbs_elig_screener.rb

@@ -64,7 +64,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :female_1,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :r_phone_1,
+    belongs_to :r_phone_1_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :r_phone_1_id ], :required => false
     property   :r_phone_1,
@@ -88,7 +88,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :r_other_phone,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :r_phone_2,
+    belongs_to :r_phone_2_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :r_phone_2_id ], :required => false
     property   :r_phone_2,
@@ -109,7 +109,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :best_ttc2_3,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :r_email,
+    belongs_to :r_email_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Email',
                :child_key => [ :r_email_id ], :required => false
     property   :r_email,

data/generated_models/ncs_navigator/warehouse/models/three_point_one/preg_visit_1_saq_4.rb

@@ -100,7 +100,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :f_zip4_2,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..4 }
-    belongs_to :f_phone,
+    belongs_to :f_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :f_phone_id ], :required => false
     property   :f_phone,

data/generated_models/ncs_navigator/warehouse/models/three_point_one/sixteen_mth_asq_saq.rb

@@ -112,7 +112,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :asq16_country,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..50 }
-    belongs_to :home_phone,
+    belongs_to :home_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :home_phone_id ], :required => false
     property   :home_phone,
@@ -121,7 +121,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :other_phone,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => true, :length => 0..10 }
-    belongs_to :email,
+    belongs_to :email_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Email',
                :child_key => [ :email_id ], :required => false
     property   :email,

data/generated_models/ncs_navigator/warehouse/models/three_point_one/thirty_mth_asq_saq.rb

@@ -109,7 +109,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :asq30_country,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..50 }
-    belongs_to :home_phone,
+    belongs_to :home_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :home_phone_id ], :required => false
     property   :home_phone,
@@ -118,7 +118,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :other_phone,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => true, :length => 0..10 }
-    belongs_to :email,
+    belongs_to :email_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Email',
                :child_key => [ :email_id ], :required => false
     property   :email,

data/generated_models/ncs_navigator/warehouse/models/three_point_one/tracing_int.rb

@@ -121,7 +121,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :home_phone_confirm,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-7", "-3", "-4"] }
-    belongs_to :home_phone,
+    belongs_to :home_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :home_phone_id ], :required => false
     property   :home_phone,
@@ -130,7 +130,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :cell_phone_confirm,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-7", "-3", "-4"] }
-    belongs_to :cell_phone,
+    belongs_to :cell_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :cell_phone_id ], :required => false
     property   :cell_phone,
@@ -148,7 +148,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :email_confirm,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-7", "-3", "-4"] }
-    belongs_to :email,
+    belongs_to :email_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Email',
                :child_key => [ :email_id ], :required => false
     property   :email,
@@ -220,7 +220,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :contact_other_ph_1,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :contact_phone_2_1,
+    belongs_to :contact_phone_2_1_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :contact_phone_2_1_id ], :required => false
     property   :contact_phone_2_1,
@@ -268,7 +268,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :c_zip4_2,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..4 }
-    belongs_to :contact_phone_2,
+    belongs_to :contact_phone_2_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :contact_phone_2_id ], :required => false
     property   :contact_phone_2,
@@ -283,7 +283,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :contact_other_ph_2,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :contact_phone_2_2,
+    belongs_to :contact_phone_2_2_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :contact_phone_2_2_id ], :required => false
     property   :contact_phone_2_2,
@@ -331,7 +331,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :c_zip4_3,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..4 }
-    belongs_to :contact_phone_3,
+    belongs_to :contact_phone_3_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :contact_phone_3_id ], :required => false
     property   :contact_phone_3,
@@ -346,7 +346,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :contact_other_ph_3,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :contact_phone_2_3,
+    belongs_to :contact_phone_2_3_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :contact_phone_2_3_id ], :required => false
     property   :contact_phone_2_3,

data/generated_models/ncs_navigator/warehouse/models/three_point_one/twelve_mth_mother_2.rb

@@ -184,7 +184,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :email_3,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :email,
+    belongs_to :email_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Email',
                :child_key => [ :email_id ], :required => false
     property   :email,

data/generated_models/ncs_navigator/warehouse/models/three_point_one/twenty_four_mth_saq_2.rb

@@ -109,7 +109,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :asq24_country,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..50 }
-    belongs_to :home_phone,
+    belongs_to :home_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :home_phone_id ], :required => false
     property   :home_phone,
@@ -118,7 +118,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :other_phone,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => true, :length => 0..10 }
-    belongs_to :email,
+    belongs_to :email_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Email',
                :child_key => [ :email_id ], :required => false
     property   :email,

data/generated_models/ncs_navigator/warehouse/models/three_point_one/twenty_mth_asq_saq.rb

@@ -112,7 +112,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :asq20_country,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..50 }
-    belongs_to :home_phone,
+    belongs_to :home_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :home_phone_id ], :required => false
     property   :home_phone,
@@ -121,7 +121,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :other_phone,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => true, :length => 0..10 }
-    belongs_to :email,
+    belongs_to :email_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Email',
                :child_key => [ :email_id ], :required => false
     property   :email,

data/generated_models/ncs_navigator/warehouse/models/three_point_one/twenty_seven_mth_asq_saq.rb

@@ -109,7 +109,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :asq27_country,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..50 }
-    belongs_to :home_phone,
+    belongs_to :home_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :home_phone_id ], :required => false
     property   :home_phone,
@@ -118,7 +118,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :other_phone,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => true, :length => 0..10 }
-    belongs_to :email,
+    belongs_to :email_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Email',
                :child_key => [ :email_id ], :required => false
     property   :email,

data/generated_models/ncs_navigator/warehouse/models/three_point_one/twenty_two_mth_asq_saq.rb

@@ -112,7 +112,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :asq22_country,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..50 }
-    belongs_to :home_phone,
+    belongs_to :home_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :home_phone_id ], :required => false
     property   :home_phone,
@@ -121,7 +121,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :other_phone,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => true, :length => 0..10 }
-    belongs_to :email,
+    belongs_to :email_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Email',
                :child_key => [ :email_id ], :required => false
     property   :email,

data/generated_models/ncs_navigator/warehouse/models/three_point_one/validation_ins_2.rb

@@ -73,7 +73,7 @@ module NcsNavigator::Warehouse::Models::ThreePointOne
     property   :phone,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :phone_nbr,
+    belongs_to :phone_nbr_record,
                'NcsNavigator::Warehouse::Models::ThreePointOne::Telephone',
                :child_key => [ :phone_nbr_id ], :required => false
     property   :phone_nbr,

data/generated_models/ncs_navigator/warehouse/models/three_point_one.rb

@@ -567,7 +567,7 @@ module NcsNavigator
     module Models
       module ThreePointOne
         mdes_version "3.1"
-        mdes_specification_version "3.1.00.00"
+        mdes_specification_version "3.1.01.00"
         mdes_order StudyCenter,
           Psu,
           Ssu,

data/generated_models/ncs_navigator/warehouse/models/three_point_zero/participant_verif.rb

@@ -166,7 +166,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :c_zip4,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..4 }
-    belongs_to :pa_phone,
+    belongs_to :pa_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Telephone',
                :child_key => [ :pa_phone_id ], :required => false
     property   :pa_phone,
@@ -202,7 +202,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :sa_phone_confirm,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :sa_phone,
+    belongs_to :sa_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Telephone',
                :child_key => [ :sa_phone_id ], :required => false
     property   :sa_phone,

data/generated_models/ncs_navigator/warehouse/models/three_point_zero/pb_samp_frame.rb

@@ -112,13 +112,13 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :contact_zip4,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..4 }
-    belongs_to :contact_email,
+    belongs_to :contact_email_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Email',
                :child_key => [ :contact_email_id ], :required => false
     property   :contact_email,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => true, :length => 0..100 }
-    belongs_to :contact_phone_num,
+    belongs_to :contact_phone_num_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Telephone',
                :child_key => [ :contact_phone_num_id ], :required => false
     property   :contact_phone_num,
@@ -265,13 +265,13 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :contact_zip4_larger,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..4 }
-    belongs_to :contact_email_larger,
+    belongs_to :contact_email_larger_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Email',
                :child_key => [ :contact_email_larger_id ], :required => false
     property   :contact_email_larger,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => true, :length => 0..100 }
-    belongs_to :contact_phone_num_larger,
+    belongs_to :contact_phone_num_larger_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Telephone',
                :child_key => [ :contact_phone_num_larger_id ], :required => false
     property   :contact_phone_num_larger,

data/generated_models/ncs_navigator/warehouse/models/three_point_zero/pbs_elig_screener.rb

@@ -64,7 +64,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :female_1,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :r_phone_1,
+    belongs_to :r_phone_1_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Telephone',
                :child_key => [ :r_phone_1_id ], :required => false
     property   :r_phone_1,
@@ -88,7 +88,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :r_other_phone,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :r_phone_2,
+    belongs_to :r_phone_2_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Telephone',
                :child_key => [ :r_phone_2_id ], :required => false
     property   :r_phone_2,
@@ -109,7 +109,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :best_ttc2_3,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :r_email,
+    belongs_to :r_email_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Email',
                :child_key => [ :r_email_id ], :required => false
     property   :r_email,

data/generated_models/ncs_navigator/warehouse/models/three_point_zero/preg_visit_1_saq_4.rb

@@ -100,7 +100,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :f_zip4_2,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..4 }
-    belongs_to :f_phone,
+    belongs_to :f_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Telephone',
                :child_key => [ :f_phone_id ], :required => false
     property   :f_phone,

data/generated_models/ncs_navigator/warehouse/models/three_point_zero/tracing_int.rb

@@ -121,7 +121,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :home_phone_confirm,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-7", "-3", "-4"] }
-    belongs_to :home_phone,
+    belongs_to :home_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Telephone',
                :child_key => [ :home_phone_id ], :required => false
     property   :home_phone,
@@ -130,7 +130,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :cell_phone_confirm,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-7", "-3", "-4"] }
-    belongs_to :cell_phone,
+    belongs_to :cell_phone_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Telephone',
                :child_key => [ :cell_phone_id ], :required => false
     property   :cell_phone,
@@ -148,7 +148,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :email_confirm,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-7", "-3", "-4"] }
-    belongs_to :email,
+    belongs_to :email_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Email',
                :child_key => [ :email_id ], :required => false
     property   :email,
@@ -220,7 +220,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :contact_other_ph_1,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :contact_phone_2_1,
+    belongs_to :contact_phone_2_1_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Telephone',
                :child_key => [ :contact_phone_2_1_id ], :required => false
     property   :contact_phone_2_1,
@@ -268,7 +268,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :c_zip4_2,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..4 }
-    belongs_to :contact_phone_2,
+    belongs_to :contact_phone_2_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Telephone',
                :child_key => [ :contact_phone_2_id ], :required => false
     property   :contact_phone_2,
@@ -283,7 +283,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :contact_other_ph_2,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :contact_phone_2_2,
+    belongs_to :contact_phone_2_2_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Telephone',
                :child_key => [ :contact_phone_2_2_id ], :required => false
     property   :contact_phone_2_2,
@@ -331,7 +331,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :c_zip4_3,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :pii => :possible, :length => 0..4 }
-    belongs_to :contact_phone_3,
+    belongs_to :contact_phone_3_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Telephone',
                :child_key => [ :contact_phone_3_id ], :required => false
     property   :contact_phone_3,
@@ -346,7 +346,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :contact_other_ph_3,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :contact_phone_2_3,
+    belongs_to :contact_phone_2_3_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Telephone',
                :child_key => [ :contact_phone_2_3_id ], :required => false
     property   :contact_phone_2_3,

data/generated_models/ncs_navigator/warehouse/models/three_point_zero/twelve_mth_mother_2.rb

@@ -184,7 +184,7 @@ module NcsNavigator::Warehouse::Models::ThreePointZero
     property   :email_3,
                NcsNavigator::Warehouse::DataMapper::NcsString,
                { :required => true, :length => 1..2, :set => ["1", "2", "-1", "-2", "-3", "-4"] }
-    belongs_to :email,
+    belongs_to :email_record,
                'NcsNavigator::Warehouse::Models::ThreePointZero::Email',
                :child_key => [ :email_id ], :required => false
     property   :email,

data/lib/ncs_navigator/warehouse/table_modeler/mdes_ext.rb

@@ -79,10 +79,15 @@ module NcsNavigator
         ].compact
       end
 
-      def wh_reference_name
+      def wh_reference_name(in_table)
         fail 'Does not apply' unless self.table_reference
         if self.name =~ /_id$/
-          self.name.sub(/_id$/, '')
+          possible = self.name.sub(/_id$/, '')
+          if in_table.variables.detect { |other_v| other_v.name == possible }
+            "#{possible}_record"
+          else
+            possible
+          end
         else
           self.name + '_record'
         end

data/lib/ncs_navigator/warehouse/table_modeler/model_template.rb.erb

@@ -12,7 +12,7 @@ module <%= module_name %>
 
 <% t.wh_variables.each do |v| -%>
 <% if v.table_reference -%>
-    belongs_to :<%= v.wh_reference_name %>,
+    belongs_to :<%= v.wh_reference_name(t) %>,
                '<%= v.table_reference.wh_model_name(module_name) %>',
                :child_key => [ :<%= v.name %> ], :required => <%= !!v.required %>
 <% else -%>

data/lib/ncs_navigator/warehouse/version.rb

@@ -1,5 +1,5 @@
 module NcsNavigator
   module Warehouse
-    VERSION = '0.10.0'
+    VERSION = '0.10.1'
   end
 end

data/ncs_mdes_warehouse.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib", "generated_models"]
 
-  s.add_dependency 'ncs_mdes', '~> 0.10'
+  s.add_dependency 'ncs_mdes', '~> 0.11'
   s.add_dependency 'ncs_navigator_configuration', '~> 0.2'
 
   # AS 3.2.4-3.2.6 break DataMapper due to https://github.com/rails/rails/pull/6857
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'childprocess', '~> 0.2.3'
   s.add_dependency 'json', '~> 1.6'
 
-  s.add_dependency 'nokogiri', '~> 1.5.0'
+  s.add_dependency 'nokogiri', '~> 1.5.6'
   s.add_dependency 'builder', '>= 2.1.2'
 
   %w(

data/spec/ncs_navigator/warehouse/table_modeler_spec.rb

@@ -462,6 +462,7 @@ end
       end
 
       let(:child_variable_name) { 'some_tree_id' }
+      let(:additional_variables) { [] }
 
       before do
         table.variables << NcsNavigator::Mdes::Variable.new(child_variable_name).tap do |v|
@@ -471,6 +472,7 @@ end
             v.required = false
           end
         end
+        table.variables.concat(additional_variables)
         tables << parent_table
 
         subject.load!
@@ -528,6 +530,30 @@ end
             model_class.instance_methods.collect(&:to_s).should_not include('some_tree_id')
           end
         end
+
+        describe 'when there is a different variable that matches the child key without the "_id" suffix' do
+          let(:additional_variables) {
+            [
+              NcsNavigator::Mdes::Variable.new('some_tree').tap do |v|
+                v.type = NcsNavigator::Mdes::VariableType.new.tap do |vt|
+                  vt.base_type = :string
+                end
+              end
+            ]
+          }
+
+          it 'names the relationship "*_record"' do
+            model_class.relationships['some_tree_record'].tap do |rel|
+              rel.should_not be_nil
+              rel.options[:child_key].should == [:some_tree_id]
+            end
+          end
+
+          it 'has the other variable accessor' do
+            model_class.properties['some_tree'].class.
+              should == NcsNavigator::Warehouse::DataMapper::NcsText
+          end
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ncs_mdes_warehouse
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ncs_mdes
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: ncs_navigator_configuration
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -172,7 +172,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -2399,7 +2399,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1567355274626065010
+      hash: 755124740488367604
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -2408,7 +2408,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1567355274626065010
+      hash: 755124740488367604
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24