declare_schema 0.10.0.pre.dc.1 → 0.12.0.pre.1

data/lib/declare_schema/model/index_definition.rb

@@ -37,7 +37,7 @@ module DeclareSchema
         def for_model(model, old_table_name = nil)
           t = old_table_name || model.table_name
 
-          primary_key_columns = Array(model.connection.primary_key(t)).presence || sqlite_compound_primary_key(model, t) or
+          primary_key_columns = Array(model.connection.primary_key(t)).presence || fallback_find_primary_key(model, t) or
             raise "could not find primary key for table #{t} in #{model.connection.columns(t).inspect}"
 
           primary_key_found = false
@@ -67,8 +67,8 @@ module DeclareSchema
         private
 
         # This is the old approach which is still needed for MySQL in Rails 4 and SQLite
-        def sqlite_compound_primary_key(model, table)
-          ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/) || Rails::VERSION::MAJOR < 5 or return nil
+        def fallback_find_primary_key(model, table)
+          ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/) || ActiveSupport::VERSION::MAJOR < 5 or return nil
 
           connection = model.connection.dup
 
@@ -83,9 +83,11 @@ module DeclareSchema
             end
           end
 
-          pk_index = connection.indexes(table).find { |index| index.name.to_s == PRIMARY_KEY_NAME } or return nil
-
-          Array(pk_index.columns)
+          if (pk_index = connection.indexes(table).find { |index| index.name.to_s == PRIMARY_KEY_NAME })
+            Array(pk_index.columns)
+          elsif model.connection.columns(table).any? { |col| col.name == 'id' }
+            ['id']
+          end
         end
       end
 
@@ -93,25 +95,6 @@ module DeclareSchema
         name == PRIMARY_KEY_NAME
       end
 
-      def to_add_statement(new_table_name, existing_primary_key = nil)
-        if primary_key? && !ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/)
-          to_add_primary_key_statement(new_table_name, existing_primary_key)
-        else
-          # Note: + below keeps that interpolated string from being frozen, so we can << into it.
-          r = +"add_index #{new_table_name.to_sym.inspect}, #{fields.map(&:to_sym).inspect}"
-          r << ", unique: true"      if unique
-          r << ", where: '#{where}'" if where.present?
-          r << ", name: '#{name}'"
-          r
-        end
-      end
-
-      def to_add_primary_key_statement(new_table_name, existing_primary_key)
-        drop = "DROP PRIMARY KEY, " if existing_primary_key
-        statement = "ALTER TABLE #{new_table_name} #{drop}ADD PRIMARY KEY (#{fields.join(', ')})"
-        "execute #{statement.inspect}"
-      end
-
       def to_key
         @key ||= [table, fields, name, unique, where].map(&:to_s)
       end

data/lib/declare_schema/schema_change/all.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module DeclareSchema
+  module SchemaChange
+    module All
+    end
+    autoload :Base, 'declare_schema/schema_change/base'
+    autoload :ColumnAdd, 'declare_schema/schema_change/column_add'
+    autoload :ColumnChange, 'declare_schema/schema_change/column_change'
+    autoload :ColumnRename, 'declare_schema/schema_change/column_rename'
+    autoload :ForeignKeyAdd, 'declare_schema/schema_change/foreign_key_add'
+    autoload :ForeignKeyRemove, 'declare_schema/schema_change/foreign_key_remove'
+    autoload :IndexAdd, 'declare_schema/schema_change/index_add'
+    autoload :IndexRemove, 'declare_schema/schema_change/index_remove'
+    autoload :PrimaryKeyChange, 'declare_schema/schema_change/primary_key_change'
+    autoload :TableAdd, 'declare_schema/schema_change/table_add'
+    autoload :TableChange, 'declare_schema/schema_change/table_change'
+    autoload :TableRemove, 'declare_schema/schema_change/table_remove'
+    autoload :TableRename, 'declare_schema/schema_change/table_rename'
+  end
+end
+

data/lib/declare_schema/schema_change/base.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module DeclareSchema
+  module SchemaChange
+    class Base
+      class << self
+        def format_options(options)
+          options.map do |k, v|
+            value =
+              if v.is_a?(Hash)
+                "{ #{format_options(v).join(', ')} }"
+              else
+                v.inspect
+              end
+            if k.is_a?(Symbol)
+              "#{k}: #{value}"
+            else
+              "#{k.inspect} => #{value}"
+            end
+          end
+        end
+      end
+
+      def up
+        up_command + spacing(up_command)
+      end
+
+      def down
+        down_command + spacing(down_command)
+      end
+
+      private
+
+      def spacing(command)
+        if command["\n"]
+          "\n\n"
+        else
+          "\n"
+        end
+      end
+    end
+  end
+end

data/lib/declare_schema/schema_change/column_add.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module DeclareSchema
+  module SchemaChange
+    class ColumnAdd < Base
+      def initialize(table_name, column_name, column_type, **column_options)
+        @table_name = table_name
+        @column_name = column_name
+        @column_type = column_type
+        @column_options = column_options
+      end
+
+      def up_command
+        "add_column #{[@table_name.to_sym.inspect,
+                       @column_name.to_sym.inspect,
+                       @column_type.to_sym.inspect,
+                       *self.class.format_options(@column_options)].join(", ")}"
+      end
+
+      def down_command
+        "remove_column #{@table_name.to_sym.inspect}, #{@column_name.to_sym.inspect}"
+      end
+    end
+  end
+end

data/lib/declare_schema/schema_change/column_change.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module DeclareSchema
+  module SchemaChange
+    class ColumnChange < Base
+      def initialize(table_name, column_name, old_type:, old_options:, new_type:, new_options:)
+        @table_name = table_name
+        @column_name = column_name
+        @old_type = old_type
+        @old_options = old_options
+        @new_type = new_type
+        @new_options = new_options
+      end
+
+      def up_command
+        "change_column #{[@table_name.to_sym.inspect,
+                          @column_name.to_sym.inspect,
+                          @new_type.to_sym.inspect,
+                          *self.class.format_options(@new_options)].join(", ")}"
+      end
+
+      def down_command
+        "change_column #{[@table_name.to_sym.inspect,
+                          @column_name.to_sym.inspect,
+                          @old_type.to_sym.inspect,
+                          *self.class.format_options(@old_options)].join(", ")}"
+      end
+    end
+  end
+end

data/lib/declare_schema/schema_change/column_remove.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative 'column_add'
+
+module DeclareSchema
+  module SchemaChange
+    class ColumnRemove < ColumnAdd
+      alias column_add_up_command up_command
+      alias column_add_down_command down_command
+
+      def up_command
+        column_add_down_command
+      end
+
+      def down_command
+        column_add_up_command
+      end
+    end
+  end
+end

data/lib/declare_schema/schema_change/column_rename.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module DeclareSchema
+  module SchemaChange
+    class ColumnRename < Base
+      def initialize(table_name, old_name, new_name)
+        @table_name = table_name
+        @old_name = old_name
+        @new_name = new_name
+      end
+
+      def up_command
+        "rename_column #{@table_name.to_sym.inspect}, #{@old_name.to_sym.inspect}, #{@new_name.to_sym.inspect}"
+      end
+
+      def down_command
+        "rename_column #{@table_name.to_sym.inspect}, #{@new_name.to_sym.inspect}, #{@old_name.to_sym.inspect}"
+      end
+    end
+  end
+end

data/lib/declare_schema/schema_change/foreign_key_add.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module DeclareSchema
+  module SchemaChange
+    class ForeignKeyAdd < Base
+      def initialize(table_name, parent_table_name, column_name:, name:)
+        @table_name = table_name
+        @parent_table_name = parent_table_name
+        @column_name = column_name
+        @name = name
+      end
+
+      def up_command
+        "add_foreign_key #{@table_name.to_sym.inspect}, #{@parent_table_name.to_sym.inspect}, " +
+          "column: #{@column_name.to_sym.inspect}, name: #{@name.to_sym.inspect}"
+      end
+
+      def down_command
+        "remove_foreign_key #{@table_name.to_sym.inspect}, name: #{@name.to_sym.inspect}"
+      end
+    end
+  end
+end

data/lib/declare_schema/schema_change/foreign_key_remove.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative 'foreign_key_add'
+
+module DeclareSchema
+  module SchemaChange
+    class ForeignKeyRemove < ForeignKeyAdd
+      alias index_add_up_command up_command
+      alias index_add_down_command down_command
+
+      def up_command
+        index_add_down_command
+      end
+
+      def down_command
+        index_add_up_command
+      end
+    end
+  end
+end

data/lib/declare_schema/schema_change/index_add.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module DeclareSchema
+  module SchemaChange
+    class IndexAdd < Base
+      def initialize(table_name, column_names, name:, unique:, where: nil)
+        @table_name = table_name
+        @column_names = column_names
+        @name = name
+        @unique = unique
+        @where = where.presence
+      end
+
+      def up_command
+        options = {
+          name: @name.to_sym,
+        }
+        options[:unique] = true if @unique
+        options[:where] = @where if @where
+
+        "add_index #{[@table_name.to_sym.inspect,
+                      @column_names.map(&:to_sym).inspect,
+                      *self.class.format_options(options)].join(', ')}"
+      end
+
+      def down_command
+        "remove_index #{@table_name.to_sym.inspect}, name: #{@name.to_sym.inspect}"
+      end
+    end
+  end
+end

data/lib/declare_schema/schema_change/index_remove.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative 'index_add'
+
+module DeclareSchema
+  module SchemaChange
+    class IndexRemove < IndexAdd
+      alias index_add_up_command up_command
+      alias index_add_down_command down_command
+
+      def up_command
+        index_add_down_command
+      end
+
+      def down_command
+        index_add_up_command
+      end
+    end
+  end
+end

data/lib/declare_schema/schema_change/primary_key_change.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module DeclareSchema
+  module SchemaChange
+    class PrimaryKeyChange < Base
+      def initialize(table_name, old_column_names, new_column_names)
+        @table_name = table_name
+        @old_column_names = old_column_names.presence
+        @new_column_names = new_column_names.presence
+      end
+
+      def up_command
+        alter_primary_key(@old_column_names, @new_column_names)
+      end
+
+      def down_command
+        alter_primary_key(@new_column_names, @old_column_names)
+      end
+
+      private
+
+      def alter_primary_key(old_col_names, new_col_names)
+        drop_command = "DROP PRIMARY KEY" if old_col_names
+        add_command = "ADD PRIMARY KEY (#{new_col_names.join(', ')})" if new_col_names
+        commands = [drop_command, add_command].compact.join(', ')
+        statement = "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(@table_name)} #{commands}"
+        "execute #{statement.inspect}"
+      end
+    end
+  end
+end

data/lib/declare_schema/schema_change/table_add.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module DeclareSchema
+  module SchemaChange
+    class TableAdd < Base
+      def initialize(table_name, fields, create_table_options, sql_options: nil)
+        @table_name = table_name
+        fields.all? do |type, name, options|
+          type.is_a?(Symbol) && name.is_a?(Symbol) && options.is_a?(Hash)
+        end or raise ArgumentError, "fields must be Array(Array(Symbol, Symbol, Hash)); got #{fields.inspect}"
+        @fields = fields
+        @create_table_options = create_table_options
+        @create_table_options = @create_table_options.merge(options: sql_options) if sql_options.present?
+      end
+
+      def up_command
+        longest_field_type_length = @fields.map { |type, _name, _option| type.to_s.length }.max
+
+        <<~EOS.strip
+          create_table #{[@table_name.to_sym.inspect, *self.class.format_options(@create_table_options)].join(', ')} do |t|
+          #{@fields.map do |type, name, options|
+              padded_type = format("%-*s", longest_field_type_length, type)
+              args = [name.inspect, *self.class.format_options(options)].join(', ')
+              "  t.#{padded_type} #{args}"
+            end.join("\n")}
+          end
+        EOS
+      end
+
+      def down_command
+        "drop_table #{@table_name.to_sym.inspect}"
+      end
+    end
+  end
+end

data/lib/declare_schema/schema_change/table_change.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+module DeclareSchema
+  module SchemaChange
+    class TableChange < Base
+      def initialize(table_name, old_options, new_options)
+        @table_name = table_name
+        @old_options = old_options
+        @new_options = new_options
+      end
+
+      def up_command
+        alter_table(@table_name, @new_options)
+      end
+
+      def down_command
+        alter_table(@table_name, @old_options)
+      end
+
+      private
+
+      TABLE_OPTIONS_TO_SQL_MAPPINGS = {
+        charset:   'CHARACTER SET',
+        collation: 'COLLATE'
+      }.freeze
+
+      def alter_table(table_name, options)
+        sql_options = options.map { |key, value| [TABLE_OPTIONS_TO_SQL_MAPPINGS[key], value] }
+        statement = "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(table_name)} #{sql_options.join(' ')}"
+        "execute #{statement.inspect}"
+      end
+    end
+  end
+end