From 45e709b2ccf9928b951f7925bafe20cecaf7c86e Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 11 Dec 2014 10:39:26 +1100
Subject: [PATCH] VariantOverrides require hub and variant

---
 app/models/variant_override.rb                              | 4 +++-
 ...1210233407_add_not_null_to_variant_override_relations.rb | 6 ++++++
 db/schema.rb                                                | 6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20141210233407_add_not_null_to_variant_override_relations.rb

diff --git a/app/models/variant_override.rb b/app/models/variant_override.rb
index 4c6c29a5ec..f307125e88 100644
--- a/app/models/variant_override.rb
+++ b/app/models/variant_override.rb
@@ -1,6 +1,8 @@
 class VariantOverride < ActiveRecord::Base
-  belongs_to :variant, class_name: 'Spree::Variant'
   belongs_to :hub, class_name: 'Enterprise'
+  belongs_to :variant, class_name: 'Spree::Variant'
+
+  validates_presence_of :hub_id, :variant_id
 
   scope :for_hubs, lambda { |hubs|
     where(hub_id: hubs)
diff --git a/db/migrate/20141210233407_add_not_null_to_variant_override_relations.rb b/db/migrate/20141210233407_add_not_null_to_variant_override_relations.rb
new file mode 100644
index 0000000000..e10ab41953
--- /dev/null
+++ b/db/migrate/20141210233407_add_not_null_to_variant_override_relations.rb
@@ -0,0 +1,6 @@
+class AddNotNullToVariantOverrideRelations < ActiveRecord::Migration
+  def change
+    change_column :variant_overrides, :hub_id, :integer, null: false
+    change_column :variant_overrides, :variant_id, :integer, null: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 901705bbbc..3244916b3b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20141113053004) do
+ActiveRecord::Schema.define(:version => 20141210233407) do
 
   create_table "adjustment_metadata", :force => true do |t|
     t.integer "adjustment_id"
@@ -1034,8 +1034,8 @@ ActiveRecord::Schema.define(:version => 20141113053004) do
   end
 
   create_table "variant_overrides", :force => true do |t|
-    t.integer "variant_id"
-    t.integer "hub_id"
+    t.integer "variant_id",                                  :null => false
+    t.integer "hub_id",                                      :null => false
     t.decimal "price",         :precision => 8, :scale => 2
     t.integer "count_on_hand"
   end