activerecord-postgresql-extensions 0.2.0 → 0.2.2

data/.gitignore

@@ -15,4 +15,6 @@ debug.log
 .config
 .yardoc
 Gemfile.lock
+Gemfile.local
+Guardfile.local
 test/local_database.yml

data/Gemfile

@@ -1,3 +1,25 @@
 source 'https://rubygems.org'
 
 gemspec
+
+if RUBY_PLATFORM == "java"
+  gem "activerecord-jdbcpostgresql-adapter"
+else
+  gem "pg"
+end
+
+gem "rdoc", "~> 3.12"
+gem "rake", "~> 10.0"
+gem "minitest"
+gem "minitest-reporters"
+gem "guard-minitest"
+
+if RbConfig::CONFIG['host_os'] =~ /^darwin/
+  gem "rb-fsevent"
+  gem "growl"
+end
+
+if File.exists?('Gemfile.local')
+  instance_eval File.read('Gemfile.local')
+end
+

data/Guardfile

@@ -0,0 +1,17 @@
+
+guard 'minitest', :test_folders => 'test', :test_file_patterns => '*_tests.rb' do
+  watch(%r|^test/(.+)_tests\.rb|)
+
+  watch(%r|^lib/(.*)([^/]+)\.rb|) do |m|
+    "test/#{m[1]}#{m[2]}_tests.rb"
+  end
+
+  watch(%r|^test/test_helper\.rb|) do
+    "test"
+  end
+end
+
+if File.exists?('Guardfile.local')
+  instance_eval File.read('Guardfile.local')
+end
+

data/Rakefile

@@ -2,23 +2,12 @@
 # -*- ruby -*-
 
 require 'rubygems'
-
-gem 'rdoc', '~> 3.12'
-
 require 'rubygems/package_task'
 require 'rake/testtask'
 require 'rdoc/task'
 require 'bundler/gem_tasks'
 
-if RUBY_VERSION >= '1.9'
-  begin
-    gem 'psych'
-  rescue Exception => e
-    # it's okay, fall back on the bundled psych
-  end
-end
-
-$:.push 'lib'
+$:.push File.expand_path(File.dirname(__FILE__), 'lib')
 
 version = ActiveRecord::PostgreSQLExtensions::VERSION
 

data/activerecord-postgresql-extensions.gemspec

@@ -21,14 +21,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("activerecord", [">= 2.3"])
-  if RUBY_PLATFORM == "java"
-    s.add_dependency("activerecord-jdbcpostgresql-adapter")
-  else
-    s.add_dependency("pg")
-  end
-  s.add_dependency("rdoc")
-  s.add_dependency("rake", ["~> 0.9"])
-  s.add_dependency("minitest")
-  s.add_dependency("turn")
 end
 

data/lib/active_record/postgresql_extensions/adapter_extensions.rb

@@ -684,7 +684,7 @@ module ActiveRecord
           end
           execute("ALTER TABLE #{quote_table_name(table_name)} ALTER #{quote_column_name(column_name)} #{null ? 'DROP' : 'SET'} NOT NULL")
         else
-          change_column_null_without(table_name, column_name, null, default = nil)
+          change_column_null_without_expression(table_name, column_name, null, default = nil)
         end
       end
       alias_method_chain :change_column_null, :expression

data/lib/active_record/postgresql_extensions/version.rb

@@ -1,7 +1,7 @@
 
 module ActiveRecord
   module PostgreSQLExtensions
-    VERSION = "0.2.0"
+    VERSION = "0.2.2"
   end
 end
 

data/test/adapter_tests.rb

@@ -193,4 +193,18 @@ class AdapterExtensionTests < MiniTest::Unit::TestCase
       %{ALTER TABLE "foo" ALTER "bar" SET NOT NULL},
     ], statements)
   end
+
+  def test_change_column_without_expression
+    Mig.change_column(:foo, :bar, :integer, :null => false, :default => 100)
+    Mig.change_column(:foo, :bar, :integer, :null => true, :default => 100)
+
+    assert_equal([
+      %{ALTER TABLE "foo" ALTER COLUMN "bar" TYPE integer},
+      %{ALTER TABLE "foo" ALTER COLUMN "bar" SET DEFAULT 100},
+      %{ALTER TABLE "foo" ALTER "bar" SET NOT NULL},
+      %{ALTER TABLE "foo" ALTER COLUMN "bar" TYPE integer},
+      %{ALTER TABLE "foo" ALTER COLUMN "bar" SET DEFAULT 100},
+      %{ALTER TABLE "foo" ALTER "bar" DROP NOT NULL},
+    ], statements)
+  end
 end

data/test/test_helper.rb

@@ -5,9 +5,13 @@ require 'rubygems'
 gem 'activerecord', ACTIVERECORD_GEM_VERSION
 
 require 'active_record'
-require 'minitest/autorun'
-require 'turn'
 require 'logger'
+require 'minitest/autorun'
+
+if RUBY_VERSION >= '1.9'
+  require 'minitest/reporters'
+end
+
 require File.join(File.dirname(__FILE__), *%w{ .. lib activerecord-postgresql-extensions })
 
 ActiveRecord::Base.logger = Logger.new("debug.log") if ENV['ENABLE_LOGGER']
@@ -49,10 +53,6 @@ else
 end
 
 class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-  def statements
-    @statements ||= []
-  end
-
   def execute_with_statement_capture(*args)
     PostgreSQLExtensionsTestHelper.add_statement(args.first)
 
@@ -123,10 +123,7 @@ end
 class Foo < ActiveRecord::Base
 end
 
-if ENV['autotest']
-  module Turn::Colorize
-    def self.color_supported?
-      true
-    end
-  end
+if RUBY_VERSION >= '1.9'
+  MiniTest::Reporters.use!(MiniTest::Reporters::SpecReporter.new)
 end
+

metadata

@@ -1,112 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-postgresql-extensions
 version: !ruby/object:Gem::Version
-  version: 0.2.0
   prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-12-10 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'
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+  name: activerecord
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: turn
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: '2.3'
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A whole bunch of extensions the ActiveRecord PostgreSQL adapter.
 email: code@zoocasa.com
 executables: []
@@ -116,6 +36,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - Gemfile
+- Guardfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -171,20 +92,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A whole bunch of extensions the ActiveRecord PostgreSQL adapter.