activerecord-mysql-awesome 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c4fa2c015cdf2511abc7e277b57491d4dcbbd28
-  data.tar.gz: 37e2778cd1ed6cd57748d255753aba1741371b4f
+  metadata.gz: c9d3de13790545a2190a85fb7821c32d6c301b03
+  data.tar.gz: 91241e834c5079dd00ac97a24fa66f47324ca159
 SHA512:
-  metadata.gz: 55f18e15f1694fcb7365e3716d0394e2181bc11248d38a1b5de2c08b10794b597d490f047b88467afb93bf45d9a6f72726d08955b04d838dc0f23eaf8786ac1a
-  data.tar.gz: b039c7d9c91e43d1a8e8d575cc0363bd5b8daf8fcd9e30766af98b8470314ef7f59148244d071ae249630c756db0f0579ae01f94e17b3ad97143c4182410281d
+  metadata.gz: b0d28575ed05697be4e981e11813663fe6259d1cc7bcabb2bdeb5b99ca9336ad07964717091c6c55eb13f6b1f5b9a93ece087beb8fedbdae51d1b325be189777
+  data.tar.gz: 87c10585a3c76084d660354c8f4f9a0bc6a5fcd454f1cdd1dccbdfc12c6536b4adda6d3617745b3dda84d666ecc6fbf94d11696a640126ca64a5dc0e4d918db4

data/.travis.yml

@@ -2,10 +2,11 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1
+  - 2.2
   - ruby-head
 env:
-  - "AR_VERSION=4.0.12"
-  - "AR_VERSION=4.1.8"
-  - "AR_VERSION=4.2.0.rc3"
+  - "AR_VERSION=4.0.13"
+  - "AR_VERSION=4.1.9"
+  - "AR_VERSION=4.2.0"
 before_install:
   - mysql -e "create database activerecord_unittest;"

data/lib/activerecord-mysql-awesome/active_record/connection_adapters/abstract/schema_dumper.rb

@@ -7,6 +7,12 @@ module ActiveRecord
         { table_name: table_name }
       end
 
+      def column_spec_for_primary_key(column, options)
+        return if column.type == :integer
+        spec = { id: column.type.inspect }
+        spec.merge!(prepare_column_options(column, options).delete_if { |key, _| [:name, :type].include?(key) })
+      end
+
       def table_options(table_name)
         nil
       end

data/lib/activerecord-mysql-awesome/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -4,18 +4,13 @@ module ActiveRecord
   module Mysql
     module Awesome
       def type_to_sql(type, limit = nil, precision = nil, scale = nil, unsigned = false)
+        return "#{type_to_sql(type, limit, precision, scale)} unsigned" if unsigned && type != :primary_key
         case type.to_s
         when 'integer'
           case limit
           when nil, 4, 11; 'int'  # compatibility with MySQL default
           else
             super(type, limit, precision, scale)
-          end.tap do |sql_type|
-            sql_type << ' unsigned' if unsigned
-          end
-        when 'float', 'decimal'
-          super(type, limit, precision, scale).tap do |sql_type|
-            sql_type << ' unsigned' if unsigned
           end
         when 'primary_key'
           "#{type_to_sql(:integer, limit, precision, scale, unsigned)} auto_increment PRIMARY KEY"
@@ -36,6 +31,14 @@ module ActiveRecord
         def unsigned?
           sql_type =~ /unsigned/i
         end
+
+        def bigint?
+          sql_type =~ /bigint/i
+        end
+
+        def auto_increment?
+          extra == 'auto_increment'
+        end
       end
 
       if ActiveRecord::VERSION::STRING < "4.2.0"
@@ -46,12 +49,13 @@ module ActiveRecord
           when :datetime, :time
             if value.acts_like?(:time) && value.respond_to?(:usec)
               zone_conversion_method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
-              result = value.send(zone_conversion_method).to_s(:db)
+              value = value.send(zone_conversion_method) if value.respond_to?(zone_conversion_method)
+              result = value.to_s(:db)
               precision = column.precision
               case precision
               when 1..6
                 "'#{result}.#{sprintf("%0#{precision}d", value.usec / 10**(6 - precision))}'"
-              when 0, nil
+              else
                 "'#{result}'"
               end
             else
@@ -102,11 +106,12 @@ module ActiveRecord
           def type_cast_for_database(value)
             if value.acts_like?(:time) && value.respond_to?(:usec)
               zone_conversion_method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
-              result = value.send(zone_conversion_method).to_s(:db)
+              value = value.send(zone_conversion_method) if value.respond_to?(zone_conversion_method)
+              result = value.to_s(:db)
               case precision
               when 1..6
                 "#{result}.#{sprintf("%0#{precision}d", value.usec / 10**(6 - precision))}"
-              when 0, nil
+              else
                 result
               end
             else
@@ -147,6 +152,11 @@ module ActiveRecord
           @as = as
         end
 
+        def primary_key(name, type = :primary_key, options = {})
+          options[:auto_increment] ||= type == :bigint
+          super
+        end
+
         def new_column_definition(name, type, options) # :nodoc:
           column = super
           column.auto_increment = options[:auto_increment]
@@ -159,7 +169,7 @@ module ActiveRecord
         private
 
         def create_column_definition(name, type)
-          ColumnDefinition.new name, type
+          ColumnDefinition.new(name, type)
         end
       end
 
@@ -216,7 +226,7 @@ module ActiveRecord
         end
 
         def type_to_sql(type, limit, precision, scale, unsigned = false)
-          @conn.type_to_sql type.to_sym, limit, precision, scale, unsigned
+          @conn.type_to_sql(type.to_sym, limit, precision, scale, unsigned)
         end
 
         def quote_value(value, column)
@@ -233,6 +243,18 @@ module ActiveRecord
         end
       end
 
+      def column_spec_for_primary_key(column, options)
+        spec = {}
+        if column.auto_increment?
+          return unless column.bigint?
+          spec[:id] = ':bigint'
+        else
+          spec[:id] = column.type.inspect
+          spec.merge!(prepare_column_options(column, options).delete_if { |key, _| [:name, :type, :null].include?(key) })
+        end
+        spec
+      end
+
       def prepare_column_options(column, options) # :nodoc:
         spec = super
         spec[:unsigned] = 'true' if column.unsigned?
@@ -275,7 +297,7 @@ module ActiveRecord
 
         td = create_table_definition(table_name)
         cd = td.new_column_definition(column.name, type, options)
-        schema_creation.accept ChangeColumnDefinition.new cd, column.name
+        schema_creation.accept(ChangeColumnDefinition.new(cd, column.name))
       end
 
       def rename_column_sql(table_name, column_name, new_column_name)
@@ -283,13 +305,13 @@ module ActiveRecord
         options = {
           default: column.default,
           null: column.null,
-          auto_increment: column.extra == "auto_increment"
+          auto_increment: column.auto_increment?
         }
 
         current_type = select_one("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE '#{column_name}'", 'SCHEMA')["Type"]
         td = create_table_definition(table_name)
         cd = td.new_column_definition(new_column_name, current_type, options)
-        schema_creation.accept ChangeColumnDefinition.new cd, column.name
+        schema_creation.accept(ChangeColumnDefinition.new(cd, column.name))
       end
 
       alias configure_connection_without_awesome configure_connection
@@ -304,7 +326,7 @@ module ActiveRecord
       end
 
       def create_table_definition(name, temporary = false, options = nil, as = nil) # :nodoc:
-        TableDefinition.new native_database_types, name, temporary, options, as
+        TableDefinition.new(native_database_types, name, temporary, options, as)
       end
     end
   end

data/lib/activerecord-mysql-awesome/active_record/schema_dumper.rb

@@ -1,22 +1,33 @@
 require 'active_record/schema_dumper'
 
 module ActiveRecord
-  class SchemaDumper #:nodoc:
-    private
+  module Mysql
+    module Awesome
+      module SchemaDumper
+        private
+
+        def table(table, stream)
+          @types = @types.merge(@connection.options_for_column_spec(table))
+          pk = @connection.primary_key(table)
+          pkcol = @connection.columns(table).detect { |c| c.name == pk }
+          pkcolspec = @connection.column_spec_for_primary_key(pkcol, @types) if pkcol
+          table_options = @connection.table_options(table)
 
-    alias table_without_awesome table
-    def table(table, stream)
-      @types = @types.merge(@connection.options_for_column_spec(table))
-      if table_options = @connection.table_options(table)
-        buf = StringIO.new
-        table_without_awesome(table, buf)
-        stream.print buf.string.sub(/(?= do \|t\|)/, ", options: #{table_options.inspect}")
-        stream
-      else
-        table_without_awesome(table, stream)
+          buf = StringIO.new
+          super(table, buf)
+          buf = buf.string
+          buf.sub!(/(?=, force: (?:true|:cascade))/, pkcolspec.map {|key, value| ", #{key}: #{value}"}.join) if pkcolspec
+          buf.sub!(/(?= do \|t\|)/, ", options: #{table_options.inspect}") if table_options
+          stream.print buf
+          stream
+        ensure
+          @types = @connection.native_database_types
+        end
       end
-    ensure
-      @types = @connection.native_database_types
     end
   end
+
+  class SchemaDumper #:nodoc:
+    prepend Mysql::Awesome::SchemaDumper
+  end
 end

data/lib/activerecord/mysql/awesome/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Mysql
     module Awesome
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/test/cases/bigint_pk_test.rb

@@ -0,0 +1,34 @@
+require 'cases/helper'
+require 'support/schema_dumping_helper'
+
+class PrimaryKeyBigIntTest < ActiveRecord::TestCase
+  include SchemaDumpingHelper
+
+  class Widget < ActiveRecord::Base
+  end
+
+  setup do
+    @connection = ActiveRecord::Base.connection
+    @connection.create_table(:widgets, id: :bigint, force: true)
+  end
+
+  teardown do
+    @connection.execute("DROP TABLE IF EXISTS widgets")
+  end
+
+  test "primary key column type with bigint" do
+    column = Widget.columns_hash[Widget.primary_key]
+    assert_equal :integer, column.type
+    assert_equal 8, column.limit
+  end
+
+  test "primary key with bigint are automatically numbered" do
+    widget = Widget.create!
+    assert_not_nil widget.id
+  end
+
+  test "schema dump primary key with bigint" do
+    schema = dump_table_schema "widgets"
+    assert_match %r{create_table "widgets", id: :bigint}, schema
+  end
+end

data/test/cases/charset_collation_test.rb

@@ -0,0 +1,53 @@
+require 'cases/helper'
+require 'support/schema_dumping_helper'
+
+class CharsetCollationTest < ActiveRecord::TestCase
+  include SchemaDumpingHelper
+
+  class CharsetCollation < ActiveRecord::Base
+  end
+
+  setup do
+    @connection = ActiveRecord::Base.connection
+    @connection.create_table("charset_collations", force: true) do |t|
+      t.string "string_ascii_bin", charset: 'ascii', collation: 'ascii_bin'
+      t.text "text_ucs2_unicode_ci", charset: 'ucs2', collation: 'ucs2_unicode_ci'
+    end
+  end
+
+  teardown do
+    @connection.drop_table "charset_collations"
+  end
+
+  def test_column
+    string_column = CharsetCollation.columns_hash['string_ascii_bin']
+    assert_equal 'ascii_bin', string_column.collation
+
+    text_column = CharsetCollation.columns_hash['text_ucs2_unicode_ci']
+    assert_equal 'ucs2_unicode_ci', text_column.collation
+  end
+
+  def test_add_column
+    @connection.add_column 'charset_collations', 'title', :string, charset: 'utf8', collation: 'utf8_bin'
+
+    column = CharsetCollation.columns_hash['title']
+    assert_equal 'utf8_bin', column.collation
+  end
+
+  def test_change_column
+    @connection.add_column 'charset_collations', 'description', :string, charset: 'utf8', collation: 'utf8_unicode_ci'
+    @connection.change_column 'charset_collations', 'description', :text, charset: 'utf8', collation: 'utf8_general_ci'
+
+    CharsetCollation.reset_column_information
+
+    column = CharsetCollation.columns_hash['description']
+    assert_equal :text, column.type
+    assert_equal 'utf8_general_ci', column.collation
+  end
+
+  def test_schema_dump_column_collation
+    schema = dump_table_schema "charset_collations"
+    assert_match %r{t.string\s+"string_ascii_bin",(?:\s+limit: 255,)?\s+collation: "ascii_bin"$}, schema
+    assert_match %r{t.text\s+"text_ucs2_unicode_ci",(?:\s+limit: 65535,)?\s+collation: "ucs2_unicode_ci"$}, schema
+  end
+end

data/test/cases/primary_key_any_type_test.rb

@@ -0,0 +1,31 @@
+require 'cases/helper'
+require 'support/schema_dumping_helper'
+
+class PrimaryKeyAnyTypeTest < ActiveRecord::TestCase
+  include SchemaDumpingHelper
+
+  class Barcode < ActiveRecord::Base
+  end
+
+  setup do
+    @connection = ActiveRecord::Base.connection
+    @connection.create_table(:barcodes, primary_key: "code", id: :string, limit: 42, force: true)
+  end
+
+  teardown do
+    @connection.execute("DROP TABLE IF EXISTS barcodes")
+  end
+
+  test "primary key with any type and options" do
+    assert_equal "code", Barcode.primary_key
+
+    column = Barcode.columns_hash[Barcode.primary_key]
+    assert_equal :string, column.type
+    assert_equal 42, column.limit
+  end
+
+  test "schema dump primary key includes type and options" do
+    schema = dump_table_schema "barcodes"
+    assert_match %r{create_table "barcodes", primary_key: "code", id: :string, limit: 42}, schema
+  end
+end

data/test/cases/strict_mode_test.rb

@@ -0,0 +1,33 @@
+require 'cases/helper'
+require 'support/connection_helper'
+
+class StrictModeTest < ActiveRecord::TestCase
+  include ConnectionHelper
+
+  def setup
+    super
+    @connection = ActiveRecord::Base.connection
+  end
+
+  def test_mysql_strict_mode_enabled
+    result = @connection.exec_query "SELECT @@SESSION.sql_mode"
+    assert_equal [["STRICT_ALL_TABLES"]], result.rows
+  end
+
+  def test_mysql_strict_mode_specified_default
+    run_without_connection do |orig_connection|
+      ActiveRecord::Base.establish_connection(orig_connection.merge({strict: :default}))
+      global_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@GLOBAL.sql_mode"
+      session_sql_mode = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.sql_mode"
+      assert_equal global_sql_mode.rows, session_sql_mode.rows
+    end
+  end
+
+  def test_mysql_strict_mode_disabled
+    run_without_connection do |orig_connection|
+      ActiveRecord::Base.establish_connection(orig_connection.merge({strict: false}))
+      result = ActiveRecord::Base.connection.exec_query "SELECT @@SESSION.sql_mode"
+      assert_equal [[""]], result.rows
+    end
+  end
+end

data/test/cases/table_options_test.rb

@@ -0,0 +1,16 @@
+require 'cases/helper'
+require 'support/schema_dumping_helper'
+
+class TableOptionsTest < ActiveRecord::TestCase
+  include SchemaDumpingHelper
+
+  teardown do
+    ActiveRecord::Base.connection.drop_table "table_options"
+  end
+
+  def test_dump_table_options
+    ActiveRecord::Base.connection.create_table(:table_options, force: true, options: "COMMENT 'london bridge is falling down'")
+    output = dump_table_schema("table_options")
+    assert_match %r{COMMENT='london bridge is falling down'}, output
+  end
+end

data/test/cases/unsigned_type_test.rb

@@ -0,0 +1,42 @@
+require 'cases/helper'
+require 'support/schema_dumping_helper'
+
+class UnsignedTypeTest < ActiveRecord::TestCase
+  include SchemaDumpingHelper
+
+  class UnsignedType < ActiveRecord::Base
+  end
+
+  setup do
+    @connection = ActiveRecord::Base.connection
+    @connection.create_table("unsigned_types", force: true) do |t|
+      t.column :unsigned_integer, "int unsigned"
+      t.integer :unsigned_integer, unsigned: true
+      t.float   :unsigned_float,   unsigned: true
+      t.decimal :unsigned_decimal, unsigned: true, precision: 10, scale: 2
+    end
+  end
+
+  teardown do
+    ActiveRecord::Base.connection.drop_table "unsigned_types"
+  end
+
+  def test_minus_value_is_out_of_range
+    assert_raise(ActiveRecord::StatementInvalid, RangeError) do
+      UnsignedType.create(unsigned_integer: -10)
+    end
+    assert_raise(ActiveRecord::StatementInvalid) do
+      UnsignedType.create(unsigned_float: -10.0)
+    end
+    assert_raise(ActiveRecord::StatementInvalid) do
+      UnsignedType.create(unsigned_decimal: -10.0)
+    end
+  end
+
+  def test_schema_dump_includes_unsigned_option
+    schema = dump_table_schema "unsigned_types"
+    assert_match %r{t.integer\s+"unsigned_integer",(?:\s+limit: 4,)?\s+unsigned: true$}, schema
+    assert_match %r{t.float\s+"unsigned_float",(?:\s+limit: 24,)?\s+unsigned: true$}, schema
+    assert_match %r{t.decimal\s+"unsigned_decimal",\s+precision: 10,\s+scale: 2,\s+unsigned: true$}, schema
+  end
+end

data/test/support/connection_helper.rb

@@ -0,0 +1,8 @@
+module ConnectionHelper
+  def run_without_connection
+    original_connection = ActiveRecord::Base.remove_connection
+    yield original_connection
+  ensure
+    ActiveRecord::Base.establish_connection(original_connection)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql-awesome
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ryuta Kamizono
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,13 +103,20 @@ files:
 - lib/activerecord/mysql/awesome/railtie.rb
 - lib/activerecord/mysql/awesome/version.rb
 - test/.gitignore
+- test/cases/bigint_pk_test.rb
+- test/cases/charset_collation_test.rb
 - test/cases/datetime_test.rb
 - test/cases/helper.rb
+- test/cases/primary_key_any_type_test.rb
+- test/cases/strict_mode_test.rb
+- test/cases/table_options_test.rb
 - test/cases/test_case.rb
+- test/cases/unsigned_type_test.rb
 - test/config.example.yml
 - test/config.rb
 - test/support/config.rb
 - test/support/connection.rb
+- test/support/connection_helper.rb
 - test/support/schema_dumping_helper.rb
 homepage: https://github.com/kamipo/activerecord-mysql-awesome
 licenses:
@@ -131,17 +138,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Awesome patches backported for ActiveRecord MySQL adapters
 test_files:
 - test/.gitignore
+- test/cases/bigint_pk_test.rb
+- test/cases/charset_collation_test.rb
 - test/cases/datetime_test.rb
 - test/cases/helper.rb
+- test/cases/primary_key_any_type_test.rb
+- test/cases/strict_mode_test.rb
+- test/cases/table_options_test.rb
 - test/cases/test_case.rb
+- test/cases/unsigned_type_test.rb
 - test/config.example.yml
 - test/config.rb
 - test/support/config.rb
 - test/support/connection.rb
+- test/support/connection_helper.rb
 - test/support/schema_dumping_helper.rb