migration_comments 0.3.1 → 0.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 766b7ebfb9c64bc9b8a4bc03e4c943d0276c6f49
+  data.tar.gz: c33c766bd47e849dc07d5c5b454eddeb1ce3278c
+SHA512:
+  metadata.gz: 5be5b935f97b70922631c45519bff6083fec3a9bc8fd6104c2f7f391aa888d0ac57fc413cb8a4ce3310eae1c15fa4bded524f9cc10a74ba20e5c1e85285a11a7
+  data.tar.gz: 22b2a9ec4daaa59bf52b7a4c53969cb4d98340844857f564e9dda63d4ed598145cf052696e6529ac70c739f11db879587c378f2933b3ddb939a9db4faf1498f4

data/lib/migration_comments/active_record/connection_adapters/abstract_adapter.rb

@@ -19,10 +19,16 @@ module MigrationComments::ActiveRecord::ConnectionAdapters
       false
     end
 
+    # SQLite style - embedded comments
     def inline_comments?
       false
     end
 
+    # PostgreSQL style - comment specific commands
+    def independent_comments?
+      false
+    end
+
     # Remove a comment on a table (if set)
     def remove_table_comment(table_name)
       set_table_comment(table_name, nil)

data/lib/migration_comments/active_record/connection_adapters/abstract_adapter/schema_creation.rb

@@ -3,6 +3,7 @@ module MigrationComments::ActiveRecord::ConnectionAdapters::AbstractAdapter
     def self.included(base)
       base.class_eval do
         alias_method_chain :column_options, :migration_comments
+        alias_method_chain :add_column_options!, :migration_comments
         alias_method_chain :visit_TableDefinition, :migration_comments
         alias_method_chain :visit_ColumnDefinition, :migration_comments
       end
@@ -14,6 +15,14 @@ module MigrationComments::ActiveRecord::ConnectionAdapters::AbstractAdapter
       column_options
     end
 
+    def add_column_options_with_migration_comments!(sql, options)
+      sql = add_column_options_without_migration_comments!(sql, options)
+      if options.keys.include?(:comment) && !@conn.independent_comments?
+        sql <<  MigrationComments::ActiveRecord::ConnectionAdapters::CommentDefinition.new(@conn, nil, nil, options[:comment]).to_sql
+      end
+      sql
+    end
+
     def visit_TableDefinition_with_migration_comments(o)
       if @conn.inline_comments?
         create_sql = "CREATE#{' TEMPORARY' if o.temporary} TABLE "

data/lib/migration_comments/active_record/connection_adapters/mysql_adapter.rb

@@ -61,10 +61,14 @@ module MigrationComments::ActiveRecord::ConnectionAdapters
     def add_column_options!(sql, options)
       super(sql, options)
       if options.keys.include?(:comment)
-        sql << " COMMENT #{escaped_comment(options[:comment])}"
+        sql << CommentDefinition.new(self, nil, nil, options[:comment]).to_sql
       end
     end
 
+    def comment_sql(comment_definition)
+      " COMMENT #{escaped_comment(comment_definition.comment_text)}"
+    end
+
     def execute_comment(comment_definition)
       if comment_definition.table_comment?
         set_table_comment comment_definition.table_name, comment_definition.comment_text

data/lib/migration_comments/active_record/connection_adapters/postgresql_adapter.rb

@@ -12,6 +12,10 @@ module MigrationComments::ActiveRecord::ConnectionAdapters
       true
     end
 
+    def independent_comments?
+      true
+    end
+
     # Set a comment on a table
     def set_table_comment(table_name, comment_text)
       execute CommentDefinition.new(self, table_name, nil, comment_text).to_sql

data/lib/migration_comments/schema_formatter.rb

@@ -13,7 +13,7 @@ module MigrationComments
     end
 
     def render_value(value)
-      value.is_a?(String) ? "\"#{value}\"" : value
+      value.is_a?(String) ? %Q[#{value}].inspect : value
     end
   end
 end

data/lib/migration_comments/version.rb

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

data/test/add_comments_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class AddCommentsTest < Test::Unit::TestCase
+class AddCommentsTest < Minitest::Unit::TestCase
   include TestHelper
 
   def test_adding_a_table_comment

data/test/annotate_models_test.rb

@@ -6,7 +6,7 @@ class Sample < ActiveRecord::Base
   self.table_name = 'sample'
 end
 
-class AnnotateModelsTest < Test::Unit::TestCase
+class AnnotateModelsTest < Minitest::Unit::TestCase
   include TestHelper
 
   TEST_PREFIX = "== Schema Information"

data/test/auto_increment_test.rb

@@ -4,7 +4,7 @@ class Sample < ActiveRecord::Base
   self.table_name = 'sample'
 end
 
-class AutoIncrementTest < Test::Unit::TestCase
+class AutoIncrementTest < Minitest::Unit::TestCase
   include TestHelper
 
   def test_basic_table_creation
@@ -35,13 +35,11 @@ class AutoIncrementTest < Test::Unit::TestCase
     end
 
     ids = []
-    assert_nothing_raised ActiveRecord::StatementInvalid do
-      ActiveRecord::Base.connection.instance_eval do
-        3.times do |n|
-          execute "INSERT INTO #{quote_table_name :sample} (#{quote_column_name :field1}, #{quote_column_name :field2}) VALUES ('text#{n}', #{n})"
-        end
-        ids = select_rows("SELECT #{quote_column_name :id} FROM #{quote_table_name :sample}").map{|r| r.first.to_i }.sort
+    ActiveRecord::Base.connection.instance_eval do
+      3.times do |n|
+        execute "INSERT INTO #{quote_table_name :sample} (#{quote_column_name :field1}, #{quote_column_name :field2}) VALUES ('text#{n}', #{n})"
       end
+      ids = select_rows("SELECT #{quote_column_name :id} FROM #{quote_table_name :sample}").map{|r| r.first.to_i }.sort
     end
     assert_equal [1,2,3], ids
 

data/test/schema_dumper_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
-class SchemaDumperTest < Test::Unit::TestCase
+class SchemaDumperTest < Minitest::Unit::TestCase
   include TestHelper
   include MigrationComments::SchemaFormatter
 
@@ -15,15 +15,11 @@ class SchemaDumperTest < Test::Unit::TestCase
     dest.rewind
     result = dest.read
     expected = <<EOS
-ActiveRecord::Schema.define(#{render_kv_pair(:version, 1)}) do
-
   create_table "sample", #{render_kv_pair(:force, true)}, #{render_kv_pair(:comment, "a table comment")} do |t|
     t.string  "field1", __SPACES__#{render_kv_pair(:comment, %{a \"comment\" \\ that ' needs; escaping''})}
     t.integer "field2"
     t.string  "field3", #{render_kv_pair(:default, "")}, #{render_kv_pair(:null, false)}, #{render_kv_pair(:comment, "third column comment")}
   end
-
-end
 EOS
     assert_match /#{Regexp.escape(expected).gsub(/__SPACES__/, " +")}/, result
   end
@@ -39,12 +35,8 @@ EOS
     dest.rewind
     result = dest.read
     expected = <<EOS
-ActiveRecord::Schema.define(#{render_kv_pair(:version, 1)}) do
-
   create_table "sample", #{render_kv_pair(:force, true)}, #{render_kv_pair(:comment, "a table comment")} do |t|
   end
-
-end
 EOS
 
     assert_match /#{Regexp.escape expected}/, result
@@ -66,12 +58,8 @@ EOS
     result = dest.read
 
     expected = <<EOS
-ActiveRecord::Schema.define(#{render_kv_pair(:version, 1)}) do
-
 # Could not dump table "sample" because of following StandardError
 #   Unknown type 'my_custom_type' for column 'field2'
-
-end
 EOS
 
     assert_match /#{Regexp.escape expected}/, result

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/autorun'
 
 require 'rubygems'
 gem 'activerecord', '>= 2.3.2'

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: migration_comments
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors:
 - Pinny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: annotate
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Add schema comments in your migrations, see them in model annotations
@@ -99,7 +88,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - MIT-LICENSE
 - README.rdoc
@@ -132,32 +121,25 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/pinnymz/migration_comments
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3400320072112058526
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3400320072112058526
 requirements: []
 rubyforge_project: migration_comments
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Comments for your migrations
 test_files: []