# HG changeset patch # User Vincent Tondellier # Date 1442008595 -7200 # Node ID 61fa9d6269145c45241687164b59f75be1563943 # Parent dfc2f094a04fa922e6edf44b53c2d632d85c65b3# Parent 5794f095a7099e7cb0b9f39cdacbffe8142d424d Merge with other head diff -r dfc2f094a04f -r 61fa9d626914 lib/CrashTest/Storage/Sql/Schema/Result/CrashUser.pm --- a/lib/CrashTest/Storage/Sql/Schema/Result/CrashUser.pm Fri Sep 11 23:52:21 2015 +0200 +++ b/lib/CrashTest/Storage/Sql/Schema/Result/CrashUser.pm Fri Sep 11 23:56:35 2015 +0200 @@ -47,7 +47,6 @@ is_nullable => 1, }; -#column crash_report_id => { data_type => 'int' }; -#belongs_to crash_report => 'CrashTest::Storage::Sql::Schema::Result::CrashReport', 'crash_report_id'; +has_many crash_report => 'CrashTest::Storage::Sql::Schema::Result::CrashReport', 'crash_user_id'; 1; diff -r dfc2f094a04f -r 61fa9d626914 lib/CrashTest/Storage/Sql/Schema/Result/Product.pm --- a/lib/CrashTest/Storage/Sql/Schema/Result/Product.pm Fri Sep 11 23:52:21 2015 +0200 +++ b/lib/CrashTest/Storage/Sql/Schema/Result/Product.pm Fri Sep 11 23:56:35 2015 +0200 @@ -43,8 +43,6 @@ is_nullable => 16, }; -#column crash_report_id => { data_type => 'int' }; -#belongs_to crash_report => 'CrashTest::Storage::Sql::Schema::Result::CrashReport', 'crash_report_id'; +has_many crash_report => 'CrashTest::Storage::Sql::Schema::Result::CrashReport', 'product_id'; 1; -