migration_comments 0.1.0 → 0.1.1

data/README.rdoc

@@ -2,7 +2,10 @@
 
 Comments for your migrations
 
-Tested on Ruby 1.8.6 using Rails 2.3.x.
+Tested on:
+
+Ruby 1.8.7 using Rails 3.x
+Ruby 1.8.6 using Rails 2.3.x.
 
 == Why?
 
@@ -26,9 +29,9 @@ file.
 
 == Examples
 
-Want to add a comment to an existing structure...
+To add a comment to an existing structure...
 
-  self.up
+  def self.up
     add_table_comment :table_name, "A table comment"
     comment_table :table_name, "A table comment"                      # does the same thing
 
@@ -38,7 +41,7 @@ Want to add a comment to an existing structure...
 
 Or you can use the change_table macro...
 
-  self.up
+  def self.up
     change_table :table_name do |t|
       t.comment "A table comment"
       t.change_comment :column_name, "A column comment"
@@ -47,7 +50,7 @@ Or you can use the change_table macro...
 
 Creating a new table?
 
-  self.up
+  def self.up
     create_table :table_name, :comment => "A table comment" do |t|
       t.string :column_name, :comment => "A column comment"
     end
@@ -55,14 +58,14 @@ Creating a new table?
 
 You can also remove comments...
 
-  self.up
+  def self.up
     remove_table_comment :table_name
     remove_column_comment :table_name, :column_name
   end
 
 Or you can combine these commands while modifying a table...
 
-  self.up
+  def self.up
     change_table :existing_table do |t|
       t.comment nil                                       # remove an existing table comment
       t.string :new_column, :comment => "a new column"    # add a new column with a comment

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

@@ -90,7 +90,7 @@ SQL
     def ensure_database_name
       return if database_name
       info = YAML::load(IO.read('config/database.yml'))
-      @database_name = info[ENV['DB'] || RAILS_ENV]["database"]
+      @database_name = info[ENV['DB'] || Rails.env.to_s]["database"]
     end
 
   end

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

@@ -23,12 +23,12 @@ module MigrationComments::ActiveRecord::ConnectionAdapters
     end
 
     def retrieve_table_comment(table_name)
-      result = execute(table_comment_sql(table_name)).result
+      result = select_rows(table_comment_sql(table_name))
       result[0].nil? ? nil : result[0][0]
     end
 
     def retrieve_column_comments(table_name, *column_names)
-      result = execute(column_comment_sql(table_name, *column_names)).result
+      result = select_rows(column_comment_sql(table_name, *column_names))
       return {} if result.nil?
       return result.inject({}){|m, row| m[row[0].to_sym] = row[1]; m}
     end

data/lib/migration_comments/version.rb

@@ -1,3 +1,3 @@
 module MigrationComments
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/migration_comments.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'rails', '~> 2.3', '>= 2.3.2'
+  s.add_runtime_dependency 'rails', '>= 2.3.2'
 
   # for development, we are testing against the 'annotate' gem
   # however, the comments should work with the original 'annotate_models' plugin as well at:
@@ -26,7 +26,8 @@ Gem::Specification.new do |s|
   # provided the environment is not loaded until _after_ the AnnotateModels module is declared
   s.add_development_dependency 'annotate'
 
-  s.add_development_dependency 'postgres-pr' # replace with other adapter as needed
+  s.add_development_dependency 'pg' # replace with other adapter as needed
+  # s.add_development_dependency 'postgres-pr'
   # s.add_development_dependency 'mysql'
   # s.add_development_dependency 'mysql2'
 end

data/test/schema_dumper_test.rb

@@ -14,17 +14,6 @@ class SchemaDumperTest < Test::Unit::TestCase
     dest.rewind
     result = dest.read
     expected = <<EOS
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
 ActiveRecord::Schema.define(:version => 1) do
 
   create_table "sample", :force => true, :comment => "a table comment" do |t|
@@ -35,6 +24,6 @@ ActiveRecord::Schema.define(:version => 1) do
 
 end
 EOS
-    assert_equal expected, result
+    assert_match /#{Regexp.escape expected}/, result
   end
 end

data/test/test_helper.rb

@@ -7,7 +7,9 @@ require 'yaml'
 
 CONFIGURATIONS = YAML::load(IO.read('config/database.yml'))
 
-ActiveRecord::Base.establish_connection(CONFIGURATIONS[ENV['DB'] || 'postgres'])
+ENV['DB'] ||= 'postgres' # override as needed
+
+ActiveRecord::Base.establish_connection(CONFIGURATIONS[ENV['DB']])
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'migration_comments'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: migration_comments
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Pinny
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-10 00:00:00 -05:00
+date: 2012-02-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,13 +24,6 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
     - - ">="
       - !ruby/object:Gem::Version 
         hash: 7
@@ -56,7 +49,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: postgres-pr
+  name: pg
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false