Merge pull request #80 from gocardless/add_reference

Remove add_reference and remove_reference

README.md

@@ -161,11 +161,11 @@ We now have three new migration files:
 
 class AddReferenceOnFoosToBars < Nandi::Migration
   def up
-    add_reference :foos, :bar
+    add_column :foos, :bar_id, :bigint
   end
 
   def down
-    remove_reference :foos, :bar
+    remove_column :foos, :bar_id
   end
 end
 
@@ -286,12 +286,6 @@ create_table :widgets do |t|
 end
 ```
 
-### `#add_reference(table, ref_name, **extra_args)`
-Adds a new reference column. Nandi will validate that the foreign key flag is not set to true; use `add_foreign_key` and `validate_foreign_key` instead!
-
-### `#remove_reference(table, ref_name, **extra_args)`
-Removes a reference column.
-
 ### `#remove_column(table, name, **extra_args)`
 Remove an existing column.
 

lib/generators/nandi/foreign_key/foreign_key_generator.rb

@@ -11,7 +11,7 @@ class ForeignKeyGenerator < Rails::Generators::Base
     argument :target, type: :string
     class_option :name, type: :string
     class_option :column, type: :string
-    class_option :type, type: :string
+    class_option :type, type: :string, default: "bigint"
     class_option :no_create_column, type: :boolean
     class_option :validation_timeout, type: :numeric, default: 15 * 60 * 1000
 
@@ -61,11 +61,11 @@ def validate_foreign_key
     private
 
     def type
-      options["type"]&.to_sym
+      options["type"].to_sym
     end
 
     def reference_name
-      target.singularize.to_sym
+      "#{target.singularize}_id".to_sym
     end
 
     def base_path

lib/generators/nandi/foreign_key/templates/add_reference.rb

@@ -2,10 +2,10 @@
 
 class <%= add_reference_name.camelize %> < Nandi::Migration
   def up
-    add_reference <%= format_value(table) %>, <%= format_value(reference_name) %><% if type %>, type: <%= format_value(type) %><% end %>
+    add_column <%= format_value(table) %>, <%= format_value(reference_name) %>, <%= format_value(type) %>
   end
 
   def down
-    remove_reference <%= format_value(table) %>, <%= format_value(reference_name) %>
+    remove_column <%= format_value(table) %>, <%= format_value(reference_name) %>
   end
 end

lib/nandi/instructions.rb

@@ -5,8 +5,6 @@
 require "nandi/instructions/create_table"
 require "nandi/instructions/drop_table"
 require "nandi/instructions/add_column"
-require "nandi/instructions/add_reference"
-require "nandi/instructions/remove_reference"
 require "nandi/instructions/remove_column"
 require "nandi/instructions/add_foreign_key"
 require "nandi/instructions/drop_constraint"

lib/nandi/migration.rb

@@ -188,31 +188,6 @@ def add_column(table, name, type, **kwargs)
       )
     end
 
-    # Adds a new reference column. Nandi will validate that the foreign key flag
-    # is not set to true; use `add_foreign_key` and `validate_foreign_key` instead!
-    # @param table [Symbol, String] The name of the table to add the column to
-    # @param ref_name [Symbol, String] The referenced column name
-    # @param kwargs [Hash] Arbitrary options to be passed to the backend.
-    def add_reference(table, ref_name, **kwargs)
-      current_instructions << Instructions::AddReference.new(
-        table: table,
-        ref_name: ref_name,
-        **kwargs,
-      )
-    end
-
-    # Removes a reference column.
-    # @param table [Symbol, String] The name of the table to remove the reference from
-    # @param ref_name [Symbol, String] The referenced column name
-    # @param kwargs [Hash] Arbitrary options to be passed to the backend.
-    def remove_reference(table, ref_name, **kwargs)
-      current_instructions << Instructions::RemoveReference.new(
-        table: table,
-        ref_name: ref_name,
-        **kwargs,
-      )
-    end
-
     # Remove an existing column.
     # @param table [Symbol, String] The name of the table to remove the column
     #   from.

lib/nandi/renderers/active_record/instructions.rb

@@ -82,18 +82,6 @@ class AddColumnCell < Base
           formatted_property :extra_args
         end
 
-        class AddReferenceCell < Base
-          formatted_property :table
-          formatted_property :ref_name
-          formatted_property :extra_args
-        end
-
-        class RemoveReferenceCell < Base
-          formatted_property :table
-          formatted_property :ref_name
-          formatted_property :extra_args
-        end
-
         class RemoveColumnCell < Base
           formatted_property :table
           formatted_property :name

lib/nandi/validation.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "nandi/validation/add_column_validator"
-require "nandi/validation/add_reference_validator"
 require "nandi/validation/remove_index_validator"
 require "nandi/validation/each_validator"
 require "nandi/validation/result"

lib/nandi/validation/each_validator.rb

@@ -21,8 +21,6 @@ def call
           RemoveIndexValidator.call(instruction)
         when :add_column
           AddColumnValidator.call(instruction)
-        when :add_reference
-          AddReferenceValidator.call(instruction)
         else
           success
         end

lib/nandi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nandi
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end