redhillonrails_core 1.2.0 → 2.0.0.pre

data/CHANGELOG

@@ -1,3 +1,5 @@
+2.0.0
+    * removed ConnectionAdapter::Column monkey patching
 1.2.0
     * compatibility with mysql 0.2.X line
     * quoting fixes

data/Gemfile

@@ -1,4 +1,5 @@
 source "http://rubygems.org"
 
 gemspec
+gem "activerecord", "~> 3.1.0.rc"
 # vim: ft=ruby

data/Gemfile.lock

@@ -1,38 +1,42 @@
 PATH
   remote: .
   specs:
-    redhillonrails_core (1.2.0)
-      activerecord (>= 2)
+    redhillonrails_core (2.0.0.pre)
+      activerecord (~> 3.1.0.rc)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.9)
-    arel (2.0.10)
-    builder (2.1.2)
+    activemodel (3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+      bcrypt-ruby (~> 2.1.4)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0.rc4)
+      activemodel (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+      arel (~> 2.1.1)
+      tzinfo (~> 0.3.27)
+    activesupport (3.1.0.rc4)
+      multi_json (~> 1.0)
+    arel (2.1.3)
+    bcrypt-ruby (2.1.4)
+    builder (3.0.0)
     diff-lcs (1.1.2)
-    i18n (0.5.0)
+    i18n (0.6.0)
+    multi_json (1.0.3)
     mysql (2.8.1)
-    mysql2 (0.2.11)
-    pg (0.10.1)
+    mysql2 (0.3.6)
+    pg (0.11.0)
     rake (0.8.7)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
+    rspec-mocks (2.6.0)
     sqlite3 (1.3.3)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
@@ -42,10 +46,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (~> 3.1.0.rc)
   mysql
-  mysql2 (~> 0.2.11)
-  pg
+  mysql2 (~> 0.3.0)
+  pg (~> 0.11)
   rake
   redhillonrails_core!
-  rspec (~> 2.4.0)
+  rspec (~> 2.6.0)
   sqlite3-ruby (~> 1.3.1)

data/README.rdoc

@@ -26,7 +26,8 @@ As a gem
 == Compatibility 
 
 * Ruby - 1.8, 1.9
-* ActiveRecord - 2.X, 3.X
+* ActiveRecord - 2.X, 3.0
+* ActiveRecord - 3.1 in rails31 branch
 * Databases - PostgreSQL, MySQL, SQLite3 (most features should also run on others)
 
 === Foreign Key Support

data/lib/redhillonrails_core.rb

@@ -12,7 +12,6 @@ require 'redhillonrails_core/active_record/schema'
 require 'redhillonrails_core/active_record/schema_dumper'
 require 'redhillonrails_core/active_record/connection_adapters/abstract_adapter'
 require 'redhillonrails_core/active_record/connection_adapters/foreign_key_definition'
-require 'redhillonrails_core/active_record/connection_adapters/column'
 require 'redhillonrails_core/active_record/connection_adapters/index_definition'
 require 'redhillonrails_core/active_record/connection_adapters/mysql_column'
 require 'redhillonrails_core/active_record/connection_adapters/schema_statements'
@@ -30,6 +29,5 @@ ActiveRecord::Schema.send(:include, RedhillonrailsCore::ActiveRecord::Schema)
 ActiveRecord::SchemaDumper.send(:include, RedhillonrailsCore::ActiveRecord::SchemaDumper)
 ActiveRecord::ConnectionAdapters::IndexDefinition.send(:include, RedhillonrailsCore::ActiveRecord::ConnectionAdapters::IndexDefinition)
 ActiveRecord::ConnectionAdapters::TableDefinition.send(:include, RedhillonrailsCore::ActiveRecord::ConnectionAdapters::TableDefinition)
-ActiveRecord::ConnectionAdapters::Column.send(:include, RedhillonrailsCore::ActiveRecord::ConnectionAdapters::Column)
 ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, RedhillonrailsCore::ActiveRecord::ConnectionAdapters::AbstractAdapter)
 ActiveRecord::ConnectionAdapters::SchemaStatements.send(:include, RedhillonrailsCore::ActiveRecord::ConnectionAdapters::SchemaStatements)

data/lib/redhillonrails_core/active_record/base.rb

@@ -8,7 +8,6 @@ module RedhillonrailsCore
       module ClassMethods
         def self.extended(base)
           class << base
-            alias_method_chain :columns, :redhillonrails_core
             alias_method_chain :abstract_class?, :redhillonrails_core
             alias_method_chain :reset_column_information, :redhillonrails_core
           end
@@ -22,21 +21,6 @@ module RedhillonrailsCore
           abstract_class_without_redhillonrails_core? || !(name =~ /^Abstract/).nil?
         end
 
-        def columns_with_redhillonrails_core
-          unless @columns
-            columns_without_redhillonrails_core
-            cols = columns_hash
-            indexes.each do |index|
-              next if index.columns.blank?
-              column_name = index.columns.reverse.detect { |name| name !~ /_id$/ } || index.columns.last
-              column = cols[column_name]
-              column.case_sensitive = index.case_sensitive?
-              column.unique_scope = index.columns.reject { |name| name == column_name } if index.unique
-            end
-          end
-          @columns
-        end
-
         def reset_column_information_with_redhillonrails_core
           reset_column_information_without_redhillonrails_core
           @indexes = @foreign_keys = nil

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

@@ -60,9 +60,9 @@ module RedhillonrailsCore
           execute "ALTER TABLE #{quote_table_name(table_name)} DROP CONSTRAINT #{foreign_key_name}"
         end
 
-        def drop_table_with_redhillonrails_core(name, options = {})
-          reverse_foreign_keys(name).each { |foreign_key| remove_foreign_key(foreign_key.table_name, foreign_key.name, options) }
-          drop_table_without_redhillonrails_core(name, options)
+        def drop_table_with_redhillonrails_core(name, *args)
+          reverse_foreign_keys(name).each { |foreign_key| remove_foreign_key(foreign_key.table_name, foreign_key.name) }
+          drop_table_without_redhillonrails_core(name)
         end
 
         def supports_partial_indexes?

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

@@ -82,7 +82,7 @@ module RedhillonrailsCore
         end
 
         def view_definition(view_name, name = nil)
-          select_one("SHOW CREATE VIEW #{quote_table_name(view_name)}", name)["Create View"]
+          execute("SHOW CREATE VIEW #{quote_table_name(view_name)}", name).first[1]
         end
 
       end

data/lib/redhillonrails_core/active_record/connection_adapters/sqlite3_adapter.rb

@@ -10,7 +10,7 @@ module RedhillonrailsCore
 
         def move_table(from, to, options = {}, &block) #:nodoc:
           copy_table(from, to, options, &block)
-          drop_table(from, options)
+          drop_table(from)
         end
 
         def add_foreign_key(from_table_name, from_column_names, to_table_name, to_column_names, options = {})

data/lib/redhillonrails_core/version.rb

@@ -1,3 +1,3 @@
 module RedhillonrailsCore
-  VERSION = "1.2.0"
+  VERSION = "2.0.0.pre"
 end

data/redhillonrails_core.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("activerecord", ">= 2")
+  s.add_dependency("activerecord", "~> 3.1.0.rc")
 
-  s.add_development_dependency("rspec", "~> 2.4.0")
-  s.add_development_dependency("pg")
+  s.add_development_dependency("rspec", "~> 2.6.0")
+  s.add_development_dependency("pg", "~> 0.11")
   s.add_development_dependency("mysql")
-  s.add_development_dependency("mysql2", "~> 0.2.11")
+  s.add_development_dependency("mysql2", "~> 0.3.0")
   s.add_development_dependency("sqlite3-ruby", "~> 1.3.1")
   s.add_development_dependency("rake")
 end

metadata

@@ -1,53 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: redhillonrails_core
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 2.0.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Michał Łomnicki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-21 00:00:00.000000000 +02:00
+date: 2011-07-22 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &84719870 !ruby/object:Gem::Requirement
+  requirement: &84750110 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 3.1.0.rc
   type: :runtime
   prerelease: false
-  version_requirements: *84719870
+  version_requirements: *84750110
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &84719590 !ruby/object:Gem::Requirement
+  requirement: &84749820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *84719590
+  version_requirements: *84749820
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &84719370 !ruby/object:Gem::Requirement
+  requirement: &84749560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.11'
   type: :development
   prerelease: false
-  version_requirements: *84719370
+  version_requirements: *84749560
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &84719110 !ruby/object:Gem::Requirement
+  requirement: &84749350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,21 +55,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84719110
+  version_requirements: *84749350
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &84718820 !ruby/object:Gem::Requirement
+  requirement: &84749040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.3.0
   type: :development
   prerelease: false
-  version_requirements: *84718820
+  version_requirements: *84749040
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &84718540 !ruby/object:Gem::Requirement
+  requirement: &84748750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *84718540
+  version_requirements: *84748750
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &84718340 !ruby/object:Gem::Requirement
+  requirement: &84748560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84718340
+  version_requirements: *84748560
 description: Adds support in ActiveRecord for foreign_keys, complex indexes and other
   database-related stuff. Easily create foreign_keys, complex indexes and views.
 email:
@@ -108,7 +108,6 @@ files:
 - lib/redhillonrails_core.rb
 - lib/redhillonrails_core/active_record/base.rb
 - lib/redhillonrails_core/active_record/connection_adapters/abstract_adapter.rb
-- lib/redhillonrails_core/active_record/connection_adapters/column.rb
 - lib/redhillonrails_core/active_record/connection_adapters/foreign_key_definition.rb
 - lib/redhillonrails_core/active_record/connection_adapters/index_definition.rb
 - lib/redhillonrails_core/active_record/connection_adapters/mysql_adapter.rb
@@ -156,9 +155,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: redhillonrails_core
 rubygems_version: 1.6.2

data/lib/redhillonrails_core/active_record/connection_adapters/column.rb

@@ -1,25 +0,0 @@
-module RedhillonrailsCore
-  module ActiveRecord
-    module ConnectionAdapters
-      module Column
-        attr_accessor :unique_scope
-        attr_accessor :case_sensitive
-        alias case_sensitive? case_sensitive
-
-        def unique?
-          !unique_scope.nil?
-        end
-
-        def required_on
-          if null
-            nil
-          elsif default.nil?
-            :save
-          else
-            :update
-          end
-        end
-      end
-    end
-  end
-end