schema_comments 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb906aa319149d9162686075b61ccaa340f1fd38
-  data.tar.gz: 91ba3034e9efc564abfe4e7b556639fc606a5c6a
+  metadata.gz: 6cf787ee52801a9d7e04e182ac66a11d5bd8c2f7
+  data.tar.gz: 888fa0d6e255163ff7173103e6a2091b047baf2e
 SHA512:
-  metadata.gz: 8b83e84536e4770de6e2231c9c6b712ce299ed3bb7610e847d0ba004050455d5d3a9e35d6d88ad809e67e8c8075757a5ad276370ab37363869c2f572a6a8b8ca
-  data.tar.gz: 5ac5502337703798c29e059d1bfaa7efbffdde85a2148cd88143e9ea40f579849638910107190be71f2e975952e0243f8b800c3dab2edf33f4e6e6296a8e0d01
+  metadata.gz: aeb01ef93ce21aa25ffa8e7050a54df0b24603dfdf3167c34e1eda9992031fda408f4f5f5ced2a2c248f37e1909791a4dfbb7784b9d07422f95d59f14c19b0dd
+  data.tar.gz: b58f9028895a5bbf729fc7521b5884ba0be8fad8fe90954d040a354b7dc823fde426fc25082eb96637dfc7ae409bdc62a75761d73a423d33a5963dc5dd9958e5

data/lib/schema_comments/schema_dumper/mysql.rb

@@ -4,6 +4,13 @@ require 'schema_comments/schema_dumper'
 module SchemaComments
 
   class SchemaDumper::Mysql < SchemaComments::SchemaDumper
+    include ActiveRecord::ConnectionAdapters::ColumnDumper # for schema_default
+
+    if ActiveRecord.version < Gem::Version.new("4.2.0")
+      def schema_default(column)
+        default_string(column.default)
+      end
+    end
 
     class << self
       public :new
@@ -109,7 +116,8 @@ HEADER
           spec[:precision] = column.precision.inspect if column.precision
           spec[:scale]     = column.scale.inspect if column.scale
           spec[:null]      = 'false' unless column.null
-          spec[:default]   = default_string(column.default) if column.has_default?
+          default = schema_default(column) if column.has_default?
+          spec[:default]   = default unless default.nil?
           if column.name == pk
             spec[:comment]   = '"AUTO_INCREMENT PRIMARY KEY by rails"'
           else

data/lib/schema_comments/schema_dumper.rb

@@ -1,6 +1,13 @@
 # -*- coding: utf-8 -*-
 module SchemaComments
   class SchemaDumper < ActiveRecord::SchemaDumper
+    include ActiveRecord::ConnectionAdapters::ColumnDumper # for schema_default
+
+    if ActiveRecord.version < Gem::Version.new("4.2.0")
+      def schema_default(column)
+        default_string(column.default)
+      end
+    end
 
     autoload :Mysql, 'schema_comments/schema_dumper/mysql'
 
@@ -71,7 +78,8 @@ module SchemaComments
           spec[:precision] = column.precision.inspect if column.precision
           spec[:scale]     = column.scale.inspect if column.scale
           spec[:null]      = 'false' unless column.null
-          spec[:default]   = default_string(column.default) if column.has_default?
+          default = schema_default(column) if column.has_default?
+          spec[:default]   = default unless default.nil?
           spec[:comment]   = '"' << (column.comment || '').gsub(/\"/, '\"') << '"' # ここでinspectを使うと最後の文字だけ文字化け(UTF-8のコード)になっちゃう
           (spec.keys - [:name, :type]).each{ |k| spec[k].insert(0, "#{k.inspect} => ")}
           spec

data/lib/schema_comments/version.rb

@@ -1,3 +1,3 @@
 module SchemaComments
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_comments
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - akm
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: schema_comments generates extra methods dynamically for attribute which has