declare_schema 0.5.0.pre.2 → 0.6.2

data/lib/declare_schema/model.rb

@@ -88,7 +88,7 @@ module DeclareSchema
         add_formatting_for_field(name, type)
         add_validations_for_field(name, type, args, options)
         add_index_for_field(name, args, options)
-        field_specs[name] = ::DeclareSchema::Model::FieldSpec.new(self, name, type, options)
+        field_specs[name] = ::DeclareSchema::Model::FieldSpec.new(self, name, type, position: field_specs.size, **options)
         attr_order << name unless attr_order.include?(name)
       end
 

data/lib/declare_schema/model/field_spec.rb

@@ -13,7 +13,6 @@ module DeclareSchema
       MYSQL_TEXT_LIMITS_ASCENDING = [MYSQL_TINYTEXT_LIMIT, MYSQL_TEXT_LIMIT, MYSQL_MEDIUMTEXT_LIMIT, MYSQL_LONGTEXT_LIMIT].freeze
 
       class << self
-        # method for easy stubbing in tests
         def mysql_text_limits?
           if defined?(@mysql_text_limits)
             @mysql_text_limits
@@ -33,7 +32,8 @@ module DeclareSchema
 
       attr_reader :model, :name, :type, :position, :options
 
-      def initialize(model, name, type, options = {})
+      def initialize(model, name, type, position: 0, **options)
+        # TODO: TECH-5116
         # Invoca change - searching for the primary key was causing an additional database read on every model load.  Assume
         # "id" which works for invoca.
         # raise ArgumentError, "you cannot provide a field spec for the primary key" if name == model.primary_key
@@ -43,9 +43,8 @@ module DeclareSchema
         @name = name.to_sym
         type.is_a?(Symbol) or raise ArgumentError, "type must be a Symbol; got #{type.inspect}"
         @type = type
-        position_option = options.delete(:position)
+        @position = position
         @options = options
-
         case type
         when :text
           @options[:default] and raise "default may not be given for :text field #{model}##{@name}"
@@ -54,11 +53,20 @@ module DeclareSchema
           end
         when :string
           @options[:limit] or raise "limit must be given for :string field #{model}##{@name}: #{@options.inspect}; do you want `limit: 255`?"
+        when :bigint
+          @type = :integer
+          @options = options.merge(limit: 8)
+        end
+
+        if type.in?([:text, :string])
+          if ActiveRecord::Base.connection.class.name.match?(/mysql/i)
+            @options[:charset]   ||= model.table_options[:charset]   || Generators::DeclareSchema::Migration::Migrator.default_charset
+            @options[:collation] ||= model.table_options[:collation] || Generators::DeclareSchema::Migration::Migrator.default_collation
+          end
         else
-          @options[:collation] and raise "collation may only given for :string and :text fields"
           @options[:charset]   and raise "charset may only given for :string and :text fields"
+          @options[:collation] and raise "collation may only given for :string and :text fields"
         end
-        @position = position_option || model.field_specs.length
       end
 
       TYPE_SYNONYMS = { timestamp: :datetime }.freeze
@@ -105,16 +113,12 @@ module DeclareSchema
         @options[:default]
       end
 
-      def collation
-        if ActiveRecord::Base.connection.class.name.match?(/mysql/i)
-          (@options[:collation] || model.table_options[:collation] || Generators::DeclareSchema::Migration::Migrator.default_collation).to_s
-        end
+      def charset
+        @options[:charset]
       end
 
-      def charset
-        if ActiveRecord::Base.connection.class.name.match?(/mysql/i)
-          (@options[:charset] || model.table_options[:charset] || Generators::DeclareSchema::Migration::Migrator.default_charset).to_s
-        end
+      def collation
+        @options[:collation]
       end
 
       def same_type?(col_spec)

data/lib/declare_schema/model/foreign_key_definition.rb

@@ -50,7 +50,7 @@ module DeclareSchema
 
       attr_writer :parent_table_name
 
-      def to_add_statement
+      def to_add_statement(_new_table_name = nil, _existing_primary_key = nil)
         statement = "ALTER TABLE #{@child_table} ADD CONSTRAINT #{@constraint_name} FOREIGN KEY #{@index_name}(#{@foreign_key_name}) REFERENCES #{parent_table_name}(id) #{'ON DELETE CASCADE' if on_delete_cascade}"
         "execute #{statement.inspect}"
       end

data/lib/declare_schema/model/table_options_definition.rb

@@ -26,12 +26,14 @@ module DeclareSchema
 
         def mysql_table_options(connection, table_name)
           database = connection.current_database
-          defaults = connection.select_one(<<~EOS)
+          defaults = connection.select_one(<<~EOS) or raise "no defaults found for table #{table_name}"
             SELECT CCSA.character_set_name, CCSA.collation_name
-            FROM information_schema.`TABLES` T, information_schema.`COLLATION_CHARACTER_SET_APPLICABILITY` CCSA
-            WHERE CCSA.collation_name = T.table_collation AND
-                  T.table_schema = '#{connection.quote_string(database)}' AND
-                  T.table_name = '#{connection.quote_string(table_name)}';
+            FROM information_schema.TABLES as T
+              JOIN information_schema.COLLATION_CHARACTER_SET_APPLICABILITY as CCSA
+                ON CCSA.collation_name = T.table_collation
+            WHERE
+              T.table_schema = '#{connection.quote_string(database)}' AND
+              T.table_name = '#{connection.quote_string(table_name)}'
           EOS
 
           defaults["character_set_name"] or raise "character_set_name missing from #{defaults.inspect}"
@@ -75,7 +77,7 @@ module DeclareSchema
       alias to_s settings
 
       def alter_table_statement
-        statement = "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(table_name)} #{to_s};"
+        statement = "ALTER TABLE #{ActiveRecord::Base.connection.quote_table_name(table_name)} #{to_s}"
         "execute #{statement.inspect}"
       end
     end

data/lib/declare_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeclareSchema
-  VERSION = "0.5.0.pre.2"
+  VERSION = "0.6.2"
 end

data/lib/generators/declare_schema/migration/migrator.rb

@@ -23,6 +23,10 @@ module Generators
           end
         end
 
+        def table_options
+          {}
+        end
+
         def table_name
           join_table
         end
@@ -33,11 +37,9 @@ module Generators
 
         def field_specs
           i = 0
-          foreign_keys.reduce({}) do |h, v|
-            # some trickery to avoid an infinite loop when FieldSpec#initialize tries to call model.field_specs
-            h[v] = ::DeclareSchema::Model::FieldSpec.new(self, v, :integer, position: i, null: false)
+          foreign_keys.each_with_object({}) do |v, result|
+            result[v] = ::DeclareSchema::Model::FieldSpec.new(self, v, :integer, position: i, null: false)
             i += 1
-            h
           end
         end
 
@@ -69,8 +71,8 @@ module Generators
       class Migrator
         class Error < RuntimeError; end
 
-        DEFAULT_CHARSET   = :utf8mb4
-        DEFAULT_COLLATION = :utf8mb4_general
+        DEFAULT_CHARSET   = "utf8mb4"
+        DEFAULT_COLLATION = "utf8mb4_bin"
 
         @ignore_models                        = []
         @ignore_tables                        = []
@@ -80,9 +82,18 @@ module Generators
         @default_collation                    = DEFAULT_COLLATION
 
         class << self
-          attr_accessor :ignore_models, :ignore_tables, :disable_indexing, :disable_constraints,
-                        :active_record_class, :default_charset, :default_collation
-          attr_reader :before_generating_migration_callback
+          attr_accessor :ignore_models, :ignore_tables, :disable_indexing, :disable_constraints
+          attr_reader :active_record_class, :default_charset, :default_collation, :before_generating_migration_callback
+
+          def default_charset=(charset)
+            charset.is_a?(String) or raise ArgumentError, "charset must be a string (got #{charset.inspect})"
+            @default_charset = charset
+          end
+
+          def default_collation=(collation)
+            collation.is_a?(String) or raise ArgumentError, "collation must be a string (got #{collation.inspect})"
+            @default_collation = collation
+          end
 
           def active_record_class
             @active_record_class.is_a?(Class) or @active_record_class = @active_record_class.to_s.constantize
@@ -423,7 +434,7 @@ module Generators
               else
                 [":integer"]
               end
-            "add_column :#{new_table_name}, :#{c}, #{args.join(', ')}"
+            ["add_column :#{new_table_name}, :#{c}", *args].join(', ')
           end
           undo_adds = to_add.map do |c|
             "remove_column :#{new_table_name}, :#{c}"
@@ -452,8 +463,8 @@ module Generators
               change_spec[:scale]         = spec.scale         unless spec.scale.nil?
               change_spec[:null]          = spec.null          unless spec.null && col.null
               change_spec[:default]       = spec.default       unless spec.default.nil? && col.default.nil?
-              change_spec[:collation]     = spec.collation     unless spec.collation.nil?
               change_spec[:charset]       = spec.charset       unless spec.charset.nil?
+              change_spec[:collation]     = spec.collation     unless spec.collation.nil?
 
               changes << "change_column :#{new_table_name}, :#{c}, " +
                          ([":#{spec.sql_type}"] + format_options(change_spec, spec.sql_type, changing: true)).join(", ")
@@ -462,7 +473,7 @@ module Generators
             end
           end.compact
 
-          index_changes, undo_index_changes = change_indexes(model, current_table_name)
+          index_changes, undo_index_changes = change_indexes(model, current_table_name, to_remove)
           fk_changes, undo_fk_changes = if ActiveRecord::Base.connection.class.name.match?(/SQLite3Adapter/)
                                           [[], []]
                                         else
@@ -484,7 +495,7 @@ module Generators
            undo_table_options_changes * "\n"]
         end
 
-        def change_indexes(model, old_table_name)
+        def change_indexes(model, old_table_name, to_remove)
           return [[], []] if Migrator.disable_constraints
 
           new_table_name = model.table_name
@@ -497,7 +508,10 @@ module Generators
               end
             end || i
           end
-          existing_has_primary_key = existing_indexes.any? { |i| i.name == ::DeclareSchema::Model::IndexDefinition::PRIMARY_KEY_NAME }
+          existing_has_primary_key = existing_indexes.any? do |i|
+            i.name == ::DeclareSchema::Model::IndexDefinition::PRIMARY_KEY_NAME &&
+              !i.fields.all? { |f| to_remove.include?(f) } # if we're removing the primary key column(s), the primary key index will be removed too
+          end
           model_has_primary_key    = model_indexes.any?    { |i| i.name == ::DeclareSchema::Model::IndexDefinition::PRIMARY_KEY_NAME }
 
           add_indexes_init = model_indexes - existing_indexes
@@ -555,12 +569,13 @@ module Generators
 
         def format_options(options, type, changing: false)
           options.map do |k, v|
-            unless changing
-              next if k == :limit && (type == :decimal || v == native_types[type][:limit])
-              next if k == :null && v == true
+            if !changing && ((k == :limit && type == :decimal) || (k == :null && v == true))
+              next
             end
 
-            next if k == :limit && type == :text && !::DeclareSchema::Model::FieldSpec.mysql_text_limits?
+            if !::DeclareSchema::Model::FieldSpec.mysql_text_limits? && k == :limit && type == :text
+              next
+            end
 
             if k.is_a?(Symbol)
               "#{k}: #{v.inspect}"
@@ -574,9 +589,9 @@ module Generators
           foreign_key = model.constraint_specs.find { |fk| field_name == fk.foreign_key.to_s }
           if foreign_key && (parent_table = foreign_key.parent_table_name)
             parent_columns = connection.columns(parent_table) rescue []
-            pk_limit  =
+            pk_limit =
               if (pk_column = parent_columns.find { |column| column.name.to_s == "id" }) # right now foreign keys assume id is the target
-                if Rails::VERSION::MAJOR <= 4
+                if Rails::VERSION::MAJOR < 5
                   pk_column.cast_type.limit
                 else
                   pk_column.limit
@@ -605,6 +620,16 @@ module Generators
           end
         end
 
+        # TODO: TECH-4814 remove all methods from here through end of file
+        def default_collation_from_charset(charset)
+          case charset
+          when "utf8"
+            "utf8_general_ci"
+          when "utf8mb4"
+            "utf8mb4_general_ci"
+          end
+        end
+
         def revert_table(table)
           res = StringIO.new
           schema_dumper_klass = case Rails::VERSION::MAJOR
@@ -614,30 +639,55 @@ module Generators
                                   ActiveRecord::ConnectionAdapters::SchemaDumper
                                 end
           schema_dumper_klass.send(:new, ActiveRecord::Base.connection).send(:table, table, res)
-          res.string.strip.gsub("\n  ", "\n")
+
+          result = res.string.strip.gsub("\n  ", "\n")
+          if connection.class.name.match?(/mysql/i)
+            if !result['options: ']
+              result = result.sub('",', "\", options: \"DEFAULT CHARSET=#{Generators::DeclareSchema::Migration::Migrator.default_charset} "+
+                                   "COLLATE=#{Generators::DeclareSchema::Migration::Migrator.default_collation}\",")
+            end
+            default_charset   = result[/CHARSET=(\w+)/, 1]   or raise "unable to find charset in #{result.inspect}"
+            default_collation = result[/COLLATE=(\w+)/, 1] || default_collation_from_charset(default_charset) or
+              raise "unable to find collation in #{result.inspect} or charset #{default_charset.inspect}"
+            result = result.split("\n").map do |line|
+              if line['t.text'] || line['t.string']
+                if !line['charset: ']
+                  if line['collation: ']
+                    line = line.sub('collation: ', "charset: #{default_charset.inspect}, collation: ")
+                  else
+                    line += ", charset: #{default_charset.inspect}"
+                  end
+                end
+                line['collation: '] or line += ", collation: #{default_collation.inspect}"
+              end
+              line
+            end.join("\n")
+          end
+          result
         end
 
-        def column_options_from_reverted_table(table, col_name)
+        def column_options_from_reverted_table(table, column)
           revert = revert_table(table)
-          if (md = revert.match(/\s*t\.column\s+"#{col_name}",\s+(:[a-zA-Z0-9_]+)(?:,\s+(.*?)$)?/m))
+          if (md = revert.match(/\s*t\.column\s+"#{column}",\s+(:[a-zA-Z0-9_]+)(?:,\s+(.*?)$)?/m))
             # Ugly migration
             _, type, options = *md
-          elsif (md = revert.match(/\s*t\.([a-z_]+)\s+"#{col_name}"(?:,\s+(.*?)$)?/m))
+          elsif (md = revert.match(/\s*t\.([a-z_]+)\s+"#{column}"(?:,\s+(.*?)$)?/m))
             # Sexy migration
-            _, type, options = *md
-            type = ":#{type}"
+            _, string_type, options = *md
+            type = ":#{string_type}"
           end
+          type or raise "unable to find column options for #{table}.#{column} in #{revert.inspect}"
           [type, options]
         end
 
-        def change_column_back(table, col_name)
-          type, options = column_options_from_reverted_table(table, col_name)
-          "change_column :#{table}, :#{col_name}, #{type}#{', ' + options.strip if options}"
+        def change_column_back(table, column)
+          type, options = column_options_from_reverted_table(table, column)
+          ["change_column :#{table}, :#{column}, #{type}", options&.strip].compact.join(', ')
         end
 
         def revert_column(table, column)
           type, options = column_options_from_reverted_table(table, column)
-          "add_column :#{table}, :#{column}, #{type}#{', ' + options.strip if options}"
+          ["add_column :#{table}, :#{column}, #{type}", options&.strip].compact.join(', ')
         end
       end
     end

data/spec/lib/declare_schema/field_spec_spec.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+RSpec.describe 'DeclareSchema Model FieldSpec' do
+  before do
+    load File.expand_path('prepare_testapp.rb', __dir__)
+  end
+
+  context 'There are no model columns to change' do
+    it '#different_to should return false for int8 == int8' do
+      subject = DeclareSchema::Model::FieldSpec.new(Object, :price, :integer, limit: 8, null: false, position: 0)
+
+      case Rails::VERSION::MAJOR
+      when 4
+        cast_type = ActiveRecord::Type::Integer.new(limit: 8)
+        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, cast_type, "integer(8)", false)
+      else
+        sql_type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: "integer(8)", type: :integer, limit: 8)
+        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, sql_type_metadata, false, "adverts")
+      end
+
+      expect(subject.different_to?(subject.name, col)).to eq(false)
+    end
+
+    it '#different_to should return false for bigint == bigint' do
+      subject = DeclareSchema::Model::FieldSpec.new(Object, :price, :bigint, null: false, position: 0)
+
+      case Rails::VERSION::MAJOR
+      when 4
+        cast_type = ActiveRecord::Type::BigInteger.new(limit: 8)
+        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, cast_type, "bigint(20)", false)
+      else
+        sql_type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: "bigint(20)", type: :integer, limit: 8)
+        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, sql_type_metadata, false, "adverts")
+      end
+
+      expect(subject.different_to?(subject.name, col)).to eq(false)
+    end
+
+    it '#different_to should return false for int8 == bigint' do
+      subject = DeclareSchema::Model::FieldSpec.new(Object, :price, :integer, limit: 8, null: false, position: 0)
+
+      case Rails::VERSION::MAJOR
+      when 4
+        cast_type = ActiveRecord::Type::BigInteger.new(limit: 8)
+        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, cast_type, "bigint(20)", false)
+      else
+        sql_type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: "bigint(20)", type: :integer, limit: 8)
+        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, sql_type_metadata, false, "adverts")
+      end
+
+      expect(subject.different_to?(subject.name, col)).to eq(false)
+    end
+
+    it '#different_to should return false for bigint == int8' do
+      subject = DeclareSchema::Model::FieldSpec.new(Object, :price, :bigint, null: false, position: 0)
+
+      case Rails::VERSION::MAJOR
+      when 4
+        cast_type = ActiveRecord::Type::Integer.new(limit: 8)
+        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, cast_type, "integer(8)", false)
+      else
+        sql_type_metadata = ActiveRecord::ConnectionAdapters::SqlTypeMetadata.new(sql_type: "integer(8)", type: :integer, limit: 8)
+        col = ActiveRecord::ConnectionAdapters::Column.new("price", nil, sql_type_metadata, false, "adverts")
+      end
+
+      expect(subject.different_to?(subject.name, col)).to eq(false)
+    end
+  end
+end

data/spec/lib/declare_schema/generator_spec.rb

@@ -27,15 +27,28 @@ RSpec.describe 'DeclareSchema Migration Generator' do
       end
     EOS
 
-    expect_test_definition_to_eq('alpha/beta', <<~EOS)
-      require 'test_helper'
-
-      class Alpha::BetaTest < ActiveSupport::TestCase
-        # test "the truth" do
-        #   assert true
-        # end
-      end
-    EOS
+    case Rails::VERSION::MAJOR
+    when 4, 5
+      expect_test_definition_to_eq('alpha/beta', <<~EOS)
+        require "test_helper"
+
+        class Alpha::BetaTest < ActiveSupport::TestCase
+          # test "the truth" do
+          #   assert true
+          # end
+        end
+      EOS
+    else
+      expect_test_definition_to_eq('alpha/beta', <<~EOS)
+        require "test_helper"
+
+        class Alpha::BetaTest < ActiveSupport::TestCase
+          # test "the truth" do
+          #   assert true
+          # end
+        end
+      EOS
+    end
 
     case Rails::VERSION::MAJOR
     when 4
@@ -88,7 +101,9 @@ RSpec.describe 'DeclareSchema Migration Generator' do
 
     expect(File.exist?('db/schema.rb')).to be_truthy
 
-    expect(File.exist?("db/development.sqlite3") || File.exist?("db/test.sqlite3")).to be_truthy
+    if defined?(SQLite3)
+      expect(File.exist?("db/development.sqlite3") || File.exist?("db/test.sqlite3")).to be_truthy
+    end
 
     module Alpha; end
     require 'alpha/beta'