migration_comments 0.1.3 → 0.2.0

data/test/annotate_models_test.rb

@@ -1,53 +1,37 @@
-require 'test_helper'
-gem 'annotate'
-require 'annotate/annotate_models'
-
-class Sample < ActiveRecord::Base
-  self.table_name = 'sample'
-end
-
-class AnnotateModelsTest < Test::Unit::TestCase
-  include TestHelper
-
-  TEST_PREFIX = "== Schema Information"
-
-  def test_annotate_includes_comments
-    db_type = :default
-    ActiveRecord::Schema.define do
-      db_type = :mysql if connection.is_a?(ActiveRecord::ConnectionAdapters::MysqlAdapter) rescue false
-
-      set_table_comment :sample, "a table comment"
-      set_column_comment :sample, :field1, "a \"comment\" \\ that ' needs; escaping''"
-      add_column :sample, :field3, :string, :null => false, :default => '', :comment => "third column comment"
-    end
-
-    result = AnnotateModels.get_schema_info(Sample, TEST_PREFIX)
-    default_expected = <<EOS
-# #{TEST_PREFIX}
-#
-# Table name: sample # a table comment
-#
-#  id     :integer         not null, primary key
-#  field1 :string(255)                           # a "comment" \\ that ' needs; escaping''
-#  field2 :integer
-#  field3 :string(255)     default(""), not null # third column comment
-#
-
-EOS
-    mysql_expected = <<EOS
-# #{TEST_PREFIX}
-#
-# Table name: sample # a table comment
-#
-#  id     :integer(4)      not null, primary key
-#  field1 :string(255)                           # a "comment" \\ that ' needs; escaping''
-#  field2 :integer(4)
-#  field3 :string(255)     default(""), not null # third column comment
-#
-
-EOS
-    expected = instance_eval "#{db_type}_expected"
-    assert_equal expected, result
-  end
-end
-
+require './test_helper'
+gem 'annotate'
+require 'annotate/annotate_models'
+
+class Sample < ActiveRecord::Base
+  self.table_name = 'sample'
+end
+
+class AnnotateModelsTest < Test::Unit::TestCase
+  include TestHelper
+
+  TEST_PREFIX = "== Schema Information"
+
+  def test_annotate_includes_comments
+    ActiveRecord::Schema.define do
+      set_table_comment :sample, "a table comment"
+      set_column_comment :sample, :field1, "a \"comment\" \\ that ' needs; escaping''"
+      add_column :sample, :field3, :string, :null => false, :default => '', :comment => "third column comment"
+    end
+
+    result = AnnotateModels.get_schema_info(Sample, TEST_PREFIX)
+    expected = <<EOS
+# #{TEST_PREFIX}
+#
+# Table name: sample # a table comment
+#
+#  id     :integer          not null, primary key
+#  field1 :string(255)                            # a "comment" \\ that ' needs; escaping''
+#  field2 :integer
+#  field3 :string(255)      default(""), not null # third column comment
+#
+
+EOS
+    assert_equal expected, result
+  end
+end
+

data/test/auto_increment_test.rb

@@ -0,0 +1,50 @@
+require './test_helper'
+
+class Sample < ActiveRecord::Base
+  self.table_name = 'sample'
+end
+
+class AutoIncrementTest < Test::Unit::TestCase
+  include TestHelper
+
+  def test_basic_table_creation
+    assert_auto_increments
+  end
+
+  def test_modified_primary_key
+    comment_text = "a comment on the sample table in the primary_key field"
+    result_comment = nil
+    ActiveRecord::Schema.define do
+      set_column_comment :sample, :id, comment_text
+      result_comment = retrieve_column_comment :sample, :id
+    end
+    assert_auto_increments
+    assert_equal comment_text, result_comment
+  end
+
+  private
+  def assert_auto_increments
+    if ENV['DB'] == 'mysql'
+      extra = nil
+      ActiveRecord::Base.connection.instance_eval do
+        execute_and_free("SHOW FULL FIELDS FROM #{quote_table_name :sample}") do |result|
+          extra = each_hash(result).detect{|field| field[:Field] == 'id'}[:Extra]
+        end
+      end
+      assert_match /auto_increment/i, extra
+    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
+      end
+    end
+    assert_equal [1,2,3], ids
+
+    assert_equal Sample.count, 3
+  end
+end

data/test/config/database.yml

@@ -1,18 +1,18 @@
-postgres:
-  adapter: postgresql
-  database: migration_comments_test
-  host: 127.0.0.1
-  username: postgres
-  password: postgres
-
-mysql:
-  adapter: mysql # mysql2
-  database: migration_comments_test
-  user: root
-  password: password
-
-sqlite:
-  adapter: sqlite3
-  database: db/migration_comments_test
-  pool: 5
+postgres:
+  adapter: postgresql
+  database: migration_comments_test
+  host: 127.0.0.1
+  username: postgres
+  password: postgres
+
+mysql:
+  adapter: mysql # mysql2
+  database: migration_comments_test
+  user: root
+  password: password
+
+sqlite:
+  adapter: sqlite3
+  database: db/migration_comments_test
+  pool: 5
   timeout: 5000

data/test/schema_dumper_test.rb

@@ -1,33 +1,33 @@
-require 'test_helper'
-
-class SchemaDumperTest < Test::Unit::TestCase
-  include TestHelper
-
-  def test_dump
-    db_type = :default
-    ActiveRecord::Schema.define do
-      db_type = :sqlite if connection.is_a?(ActiveRecord::ConnectionAdapters::SQLiteAdapter) rescue false
-
-      set_table_comment :sample, "a table comment"
-      set_column_comment :sample, :field1, "a \"comment\" \\ that ' needs; escaping''"
-      add_column :sample, :field3, :string, :null => false, :default => "", :comment => "third column comment"
-    end
-    dest = StringIO.new
-    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, dest)
-    dest.rewind
-    result = dest.read
-    expected = <<EOS
-ActiveRecord::Schema.define(:version => 1) do
-
-  create_table "sample", :force => true, :comment => "a table comment" do |t|
-    t.string  "field1",                                 :comment => "a \"comment\" \\ that ' needs; escaping''"
-    t.integer "field2"
-    t.string  "field3", :default => "", :null => false, :comment => "third column comment"
-  end
-
-end
-EOS
-
-    assert_match /#{Regexp.escape expected}/, result
-  end
-end
+require './test_helper'
+
+class SchemaDumperTest < Test::Unit::TestCase
+  include TestHelper
+
+  def test_dump
+    db_type = :default
+    ActiveRecord::Schema.define do
+      db_type = :sqlite if connection.is_a?(ActiveRecord::ConnectionAdapters::SQLiteAdapter) rescue false
+
+      set_table_comment :sample, "a table comment"
+      set_column_comment :sample, :field1, "a \"comment\" \\ that ' needs; escaping''"
+      add_column :sample, :field3, :string, :null => false, :default => "", :comment => "third column comment"
+    end
+    dest = StringIO.new
+    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, dest)
+    dest.rewind
+    result = dest.read
+    expected = <<EOS
+ActiveRecord::Schema.define(:version => 1) do
+
+  create_table "sample", :force => true, :comment => "a table comment" do |t|
+    t.string  "field1",                                 :comment => "a \"comment\" \\ that ' needs; escaping''"
+    t.integer "field2"
+    t.string  "field3", :default => "", :null => false, :comment => "third column comment"
+  end
+
+end
+EOS
+
+    assert_match /#{Regexp.escape expected}/, result
+  end
+end

data/test/test_helper.rb

@@ -1,32 +1,32 @@
-require 'test/unit'
-
-require 'rubygems'
-gem 'rails', '>= 2.3.2'
-require 'active_record'
-require 'yaml'
-
-CONFIGURATIONS = YAML::load(IO.read('config/database.yml'))
-
-ENV['DB'] ||= 'postgres' # override as needed
-
-ActiveRecord::Base.establish_connection(CONFIGURATIONS[ENV['DB']])
-
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
-require 'migration_comments'
-
-module TestHelper
-  def setup
-    ActiveRecord::Schema.define(:version => 1) do
-      create_table :sample do |t|
-        t.string :field1
-        t.integer :field2
-      end
-    end
-  end
-
-  def teardown
-    ActiveRecord::Schema.define do
-      drop_table :sample
-    end
-  end
-end
+require 'test/unit'
+
+require 'rubygems'
+gem 'rails', '>= 2.3.2'
+require 'active_record'
+require 'yaml'
+
+CONFIGURATIONS = YAML::load(IO.read('config/database.yml'))
+
+ENV['DB'] ||= 'postgres' # override as needed
+
+ActiveRecord::Base.establish_connection(CONFIGURATIONS[ENV['DB']])
+
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
+require 'migration_comments'
+
+module TestHelper
+  def setup
+    ActiveRecord::Schema.define(:version => 1) do
+      create_table :sample do |t|
+        t.string :field1
+        t.integer :field2
+      end
+    end
+  end
+
+  def teardown
+    ActiveRecord::Schema.define do
+      drop_table :sample
+    end
+  end
+end

metadata

@@ -1,79 +1,75 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: migration_comments
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 3
-  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Pinny
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-22 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 3
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: annotate
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: pg
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: Add schema comments in your migrations, see them in model annotations and db/schema.rb dump
-email: 
+  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
+  and db/schema.rb dump
+email:
 - pinny@medwiztech.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
+- MIT-LICENSE
 - README.rdoc
 - Rakefile
 - lib/migration_comments.rb
@@ -93,42 +89,32 @@ files:
 - migration_comments.gemspec
 - test/add_comments_test.rb
 - test/annotate_models_test.rb
+- test/auto_increment_test.rb
 - test/config/database.yml
 - test/schema_dumper_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: https://github.com/pinnymz/migration_comments
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: migration_comments
-rubygems_version: 1.4.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Comments for your migrations
 test_files: []
-