From b50c48581c1d13ecf01c2564510f623ec2786dd3 Mon Sep 17 00:00:00 2001
From: Bilal <bilal@saburly.com>
Date: Tue, 6 Oct 2020 10:36:23 +0300
Subject: [PATCH] fix merge revert

---
 ...0200918012614_remove_default_chip_from_homies.rb |  5 +++++
 db/migrate/20200918032033_create_ogs.rb             | 13 +++++++++++++
 db/migrate/20201006103218_remove_ogs.rb             |  5 +++++
 ...20201006103421_add_default_chip_ref_to_homies.rb |  5 +++++
 db/schema.rb                                        |  2 +-
 5 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20200918012614_remove_default_chip_from_homies.rb
 create mode 100644 db/migrate/20200918032033_create_ogs.rb
 create mode 100644 db/migrate/20201006103218_remove_ogs.rb
 create mode 100644 db/migrate/20201006103421_add_default_chip_ref_to_homies.rb

diff --git a/db/migrate/20200918012614_remove_default_chip_from_homies.rb b/db/migrate/20200918012614_remove_default_chip_from_homies.rb
new file mode 100644
index 0000000..7b2ba31
--- /dev/null
+++ b/db/migrate/20200918012614_remove_default_chip_from_homies.rb
@@ -0,0 +1,5 @@
+class RemoveDefaultChipFromHomies < ActiveRecord::Migration[5.2]
+  def change
+    remove_reference :homies, :chip
+  end
+end
\ No newline at end of file
diff --git a/db/migrate/20200918032033_create_ogs.rb b/db/migrate/20200918032033_create_ogs.rb
new file mode 100644
index 0000000..f4fe3b5
--- /dev/null
+++ b/db/migrate/20200918032033_create_ogs.rb
@@ -0,0 +1,13 @@
+class CreateOgs < ActiveRecord::Migration[5.2]
+  def change
+    create_table :ogs do |t|
+      t.text :chip_name
+      t.text :chip_code
+      t.text :chip_symbol
+      t.boolean :chip_prefixed
+      t.integer :chip_scale
+
+      t.timestamps
+    end
+  end
+end
\ No newline at end of file
diff --git a/db/migrate/20201006103218_remove_ogs.rb b/db/migrate/20201006103218_remove_ogs.rb
new file mode 100644
index 0000000..b29fbc2
--- /dev/null
+++ b/db/migrate/20201006103218_remove_ogs.rb
@@ -0,0 +1,5 @@
+class RemoveOgs < ActiveRecord::Migration[5.2]
+  def change
+    drop_table :ogs
+  end
+end
diff --git a/db/migrate/20201006103421_add_default_chip_ref_to_homies.rb b/db/migrate/20201006103421_add_default_chip_ref_to_homies.rb
new file mode 100644
index 0000000..7c8d028
--- /dev/null
+++ b/db/migrate/20201006103421_add_default_chip_ref_to_homies.rb
@@ -0,0 +1,5 @@
+class AddDefaultChipRefToHomies < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :homies, :chip
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 41dcfe5..902c3f0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_09_19_023237) do
+ActiveRecord::Schema.define(version: 2020_10_06_103421) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"