activerecord-mysql-unsigned 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a191990d328533d3c11ad7364dfe8bb039885b20
-  data.tar.gz: f0b1b0baafd8b7c53a4cf9dc0434c98277f0687a
+  metadata.gz: bb8f5f38a9a5fd9b1b15e1368f3c7958b2c8719a
+  data.tar.gz: fdb22adc25e2d8da3752f01e92faf34064e9badd
 SHA512:
-  metadata.gz: dbf0d9f8d490528fa43316aed3a46c44711ce33ca881c86be5f4c8cd23fc500d548be9860640311f5f5f9aadf51c8d27557c1ea5df750f3f0649110d295cd8e0
-  data.tar.gz: 2c74230976b513f0c9fe11b318c6cc332db888ab07a79f54b818e46779b910df81cf03a3bfccbc25edd651283ca763820e147ba3bc52c9413a83e19b4e144411
+  metadata.gz: 0652a2d5af79c1ffd3a466240f2d6e5cd357c3997bab5279314632c6e5313f6c70dd6e79f4027a2383882e3b9c80fe1c706a6aa1d394beb2492c53ca38939c2f
+  data.tar.gz: 5bebff108fcc8bbdf786e8e71e8549ce1b5251ab0c19418a22616c54c48397a7e974fed08f54856c754ec332832b891900da6dc03814bd6c25a5228e71c23450

data/lib/activerecord-mysql-unsigned/active_record/v4/connection_adapters/abstract_mysql_adapter.rb

@@ -10,7 +10,28 @@ module ActiveRecord
 
       # Maps logical Rails types to MySQL-specific data types.
       def type_to_sql(type, limit = nil, precision = nil, scale = nil, unsigned = false)
+        # return earlier, only need overwrite method when unsigned option == true
+        return super unless unsigned
+
         case type.to_s
+        when 'decimal'
+          # copy from rails core
+          # https://github.com/rails/rails/blob/600aaf4234c80064201ee34ddabed216b91559db/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+          native = native_database_types[type.to_sym]
+          column_type_sql = (native.is_a?(Hash) ? native[:name] : native).dup
+
+          scale ||= native[:scale]
+
+          if precision ||= native[:precision]
+            if scale
+              column_type_sql << "(#{precision},#{scale}) unsigned"
+            else
+              column_type_sql << "(#{precision}) unsigned"
+            end
+          elsif scale
+            raise ArgumentError, "Error adding decimal column: precision cannot be empty if scale is specified"
+          end
+          
         when 'binary'
           case limit
           when 0..0xfff;           "varbinary(#{limit})"
@@ -21,29 +42,17 @@ module ActiveRecord
         when 'integer'
           case limit
           when 1
-            'tinyint' + (unsigned ? ' unsigned' : '')
+            'tinyint unsigned'
           when 2
-            'smallint' + (unsigned ? ' unsigned' : '')
+            'smallint unsigned'
           when 3
-            'mediumint' + (unsigned ? ' unsigned' : '')
+            'mediumint unsigned'
           when nil, 4, 11 # compatibility with MySQL default
-            if unsigned
-              'int(10) unsigned'
-            else
-              'int(10)'
-            end
+            'int(10) unsigned'
           when 5..8
-            'bigint' + (unsigned ? ' unsigned' : '')
+            'bigint unsigned'
           else raise(ActiveRecordError, "No integer type has byte size #{limit}")
           end
-        when 'text'
-          case limit
-          when 0..0xff;               'tinytext'
-          when nil, 0x100..0xffff;    'text'
-          when 0x10000..0xffffff;     'mediumtext'
-          when 0x1000000..0xffffffff; 'longtext'
-          else raise(ActiveRecordError, "No text type has character length #{limit}")
-          end
         else
           super
         end

data/lib/activerecord-mysql-unsigned/active_record/v4_1/connection_adapters/abstract_mysql_adapter.rb

@@ -41,7 +41,28 @@ module ActiveRecord
 
       # Maps logical Rails types to MySQL-specific data types.
       def type_to_sql(type, limit = nil, precision = nil, scale = nil, unsigned = false)
+        # return earlier, only need overwrite method when unsigned option == true
+        return super unless unsigned
+
+
         case type.to_s
+        when 'decimal'
+          # copy from rails core
+          # https://github.com/rails/rails/blob/600aaf4234c80064201ee34ddabed216b91559db/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+          native = native_database_types[type.to_sym]
+          column_type_sql = (native.is_a?(Hash) ? native[:name] : native).dup
+
+          scale ||= native[:scale]
+
+          if precision ||= native[:precision]
+            if scale
+              column_type_sql << "(#{precision},#{scale}) unsigned"
+            else
+              column_type_sql << "(#{precision}) unsigned"
+            end
+          elsif scale
+            raise ArgumentError, "Error adding decimal column: precision cannot be empty if scale is specified"
+          end
         when 'binary'
           case limit
           when 0..0xfff;           "varbinary(#{limit})"
@@ -67,14 +88,6 @@ module ActiveRecord
             'bigint' + (unsigned ? ' unsigned' : '')
           else raise(ActiveRecordError, "No integer type has byte size #{limit}")
           end
-        when 'text'
-          case limit
-          when 0..0xff;               'tinytext'
-          when nil, 0x100..0xffff;    'text'
-          when 0x10000..0xffffff;     'mediumtext'
-          when 0x1000000..0xffffffff; 'longtext'
-          else raise(ActiveRecordError, "No text type has character length #{limit}")
-          end
         else
           super
         end

data/lib/activerecord-mysql-unsigned/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Mysql
     module Unsigned
-      VERSION = "0.1.3"
+      VERSION = "0.2.0"
     end
   end
 end

data/spec/support/migrations.rb

@@ -36,6 +36,8 @@ class CreateUsersTable < ActiveRecord::Migration
       t.integer :will_unsigned_int, unsigned: false
       t.integer :will_signed_int, unsigned: true
       t.integer :will_bigint
+      t.decimal :signed_decimal, null: false, default: 0, precision: 15, scale: 2
+      t.decimal :unsigned_decimal, null: false, default: 0, unsigned: true, precision: 15, scale: 2
     end
   end
 end

data/spec/unsigned_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "INT column" do
+describe "INT/Decimal column" do
 
   before :all do
     ChangePrimaryKeyToGoodsTable.change
@@ -51,4 +51,27 @@ describe "INT column" do
     unsigned_int_col = User.columns[3]
     expect(unsigned_int_col.unsigned).to be_truthy
   end
+
+  it "allowed minus value of signed decimal" do
+    @user.signed_decimal = -10.0
+    @user.save
+    expect(@user.signed_decimal).to eq(-10.0)
+  end
+
+  it "not allowed minus value of unsigned decimal" do
+    @user.unsigned_decimal = -10
+
+    if ActiveRecord::VERSION::MAJOR == 4
+      begin
+        @user.save
+        expect(true).to be_falsey # should not be reached here
+      rescue => e
+        expect(e).to be_an_instance_of ActiveRecord::StatementInvalid
+      end
+    else
+      @user.save
+      @user.reload
+      expect(@user.unsigned_int).to be 0 # saved 0
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-mysql-unsigned
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - yo_waka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-29 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Add unsigned option to integer type for ActiveRecord's MySQL2 adapter