aspgems-redhillonrails_core 2.0.0.beta2 → 2.0.0.beta4

data/gemfiles/rails-3.0.8

@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'rake', '0.9.2'
+gem 'rspec', '~> 2.6.0'
+
+gem "rails", "3.0.8"
+
+group :db do
+  gem "pg", ">= 0.9.0"
+  gem "mysql", ">= 2.8.1"
+  gem "mysql2", "~> 0.2.6"
+  gem "sqlite3", "~> 1.3.3"
+end

data/gemfiles/rails-3.0.8.lock

@@ -0,0 +1,90 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.8)
+      actionpack (= 3.0.8)
+      mail (~> 2.2.19)
+    actionpack (3.0.8)
+      activemodel (= 3.0.8)
+      activesupport (= 3.0.8)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.8)
+      activesupport (= 3.0.8)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.8)
+      activemodel (= 3.0.8)
+      activesupport (= 3.0.8)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.8)
+      activemodel (= 3.0.8)
+      activesupport (= 3.0.8)
+    activesupport (3.0.8)
+    arel (2.0.10)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    mysql (2.8.1)
+    mysql2 (0.2.10)
+    pg (0.11.0)
+    polyglot (0.3.1)
+    rack (1.2.3)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.8)
+      actionmailer (= 3.0.8)
+      actionpack (= 3.0.8)
+      activerecord (= 3.0.8)
+      activeresource (= 3.0.8)
+      activesupport (= 3.0.8)
+      bundler (~> 1.0)
+      railties (= 3.0.8)
+    railties (3.0.8)
+      actionpack (= 3.0.8)
+      activesupport (= 3.0.8)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.9.2)
+    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.6.0)
+    sqlite3 (1.3.3)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.28)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mysql (>= 2.8.1)
+  mysql2 (~> 0.2.6)
+  pg (>= 0.9.0)
+  rails (= 3.0.8)
+  rake (= 0.9.2)
+  rspec (~> 2.6.0)
+  sqlite3 (~> 1.3.3)

data/gemfiles/rails-3.0.9

@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'rake', '0.9.2'
+gem 'rspec', '~> 2.6.0'
+
+gem "rails", "3.0.9"
+
+group :db do
+  gem "pg", ">= 0.9.0"
+  gem "mysql", ">= 2.8.1"
+  gem "mysql2", "~> 0.2.6"
+  gem "sqlite3", "~> 1.3.3"
+end

data/gemfiles/rails-3.0.9.lock

@@ -0,0 +1,92 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.9)
+      actionpack (= 3.0.9)
+      mail (~> 2.2.19)
+    actionpack (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    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)
+    activeresource (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+    activesupport (3.0.9)
+    arel (2.0.10)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    mysql (2.8.1)
+    mysql2 (0.2.10)
+    pg (0.11.0)
+    polyglot (0.3.1)
+    rack (1.2.3)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.9)
+      actionmailer (= 3.0.9)
+      actionpack (= 3.0.9)
+      activerecord (= 3.0.9)
+      activeresource (= 3.0.9)
+      activesupport (= 3.0.9)
+      bundler (~> 1.0)
+      railties (= 3.0.9)
+    railties (3.0.9)
+      actionpack (= 3.0.9)
+      activesupport (= 3.0.9)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (0.9.2)
+    rdoc (3.6.1)
+    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.6.0)
+    sqlite3 (1.3.3)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.28)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mysql (>= 2.8.1)
+  mysql2 (~> 0.2.6)
+  pg (>= 0.9.0)
+  rails (= 3.0.9)
+  rake (= 0.9.2)
+  rspec (~> 2.6.0)
+  sqlite3 (~> 1.3.3)

data/gemfiles/rails-3.1.0.rc5

@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'rake', '0.9.2'
+gem 'rspec', '~> 2.6.0'
+
+gem "rails", "3.1.0.rc5"
+
+group :db do
+  gem "pg", ">= 0.11.0"
+  gem "mysql", ">= 2.8.1"
+  gem "mysql2", ">= 0.3.0"
+  gem "sqlite3", "~> 1.3.3"
+end

data/gemfiles/rails-3.1.0.rc5.lock

@@ -0,0 +1,106 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.0.rc5)
+      actionpack (= 3.1.0.rc5)
+      mail (~> 2.3.0)
+    actionpack (3.1.0.rc5)
+      activemodel (= 3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.1)
+      rack-cache (~> 1.0.2)
+      rack-mount (~> 0.8.1)
+      rack-test (~> 0.6.0)
+      sprockets (~> 2.0.0.beta.12)
+    activemodel (3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
+      bcrypt-ruby (~> 2.1.4)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0.rc5)
+      activemodel (= 3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
+      arel (~> 2.1.4)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0.rc5)
+      activemodel (= 3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
+    activesupport (3.1.0.rc5)
+      multi_json (~> 1.0)
+    arel (2.1.4)
+    bcrypt-ruby (2.1.4)
+    builder (3.0.0)
+    diff-lcs (1.1.2)
+    erubis (2.7.0)
+    hike (1.2.0)
+    i18n (0.6.0)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    multi_json (1.0.3)
+    mysql (2.8.1)
+    mysql2 (0.3.6)
+    pg (0.11.0)
+    polyglot (0.3.2)
+    rack (1.3.2)
+    rack-cache (1.0.2)
+      rack (>= 0.4)
+    rack-mount (0.8.1)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.0.rc5)
+      actionmailer (= 3.1.0.rc5)
+      actionpack (= 3.1.0.rc5)
+      activerecord (= 3.1.0.rc5)
+      activeresource (= 3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
+      bundler (~> 1.0)
+      railties (= 3.1.0.rc5)
+    railties (3.1.0.rc5)
+      actionpack (= 3.1.0.rc5)
+      activesupport (= 3.1.0.rc5)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2)
+    rdoc (3.8)
+    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.6.0)
+    sprockets (2.0.0.beta.12)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.4)
+    thor (0.14.6)
+    tilt (1.3.2)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.29)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mysql (>= 2.8.1)
+  mysql2 (>= 0.3.0)
+  pg (>= 0.11.0)
+  rails (= 3.1.0.rc5)
+  rake (= 0.9.2)
+  rspec (~> 2.6.0)
+  sqlite3 (~> 1.3.3)

data/lib/redhillonrails_core.rb

@@ -9,6 +9,12 @@ module RedhillonrailsCore
   module ActiveRecord
     extend ActiveSupport::Autoload
 
+    module Migration
+      extend ActiveSupport::Autoload
+
+      autoload :CommandRecorder
+    end
+
     autoload :Base
     autoload :Schema
     autoload :SchemaDumper
@@ -42,6 +48,12 @@ module RedhillonrailsCore
     ::ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, RedhillonrailsCore::ActiveRecord::ConnectionAdapters::AbstractAdapter)
     ::ActiveRecord::ConnectionAdapters::SchemaStatements.send(:include, RedhillonrailsCore::ActiveRecord::ConnectionAdapters::SchemaStatements)
 
+    if defined?(::ActiveRecord::Migration::CommandRecorder)
+      ::ActiveRecord::Migration::CommandRecorder.class_eval do
+        include RedhillonrailsCore::ActiveRecord::Migration::CommandRecorder
+      end
+    end
+
     self.loaded_into_rails_core = true
   end
 end

data/lib/redhillonrails_core/active_record/base.rb

@@ -26,7 +26,7 @@ module RedhillonrailsCore::ActiveRecord
       end
 
       def pluralized_table_name(table_name)
-        ActiveRecord::Base.pluralize_table_names ? table_name.to_s.pluralize : table_name
+        ::ActiveRecord::Base.pluralize_table_names ? table_name.to_s.pluralize : table_name
       end
 
       def indexes

data/lib/redhillonrails_core/active_record/connection_adapters/abstract/foreign_key_definition.rb

@@ -18,8 +18,15 @@ module RedhillonrailsCore::ActiveRecord::ConnectionAdapters
     end
 
     def to_sql
-      sql = name ? "CONSTRAINT #{name} " : ""
-      sql << "FOREIGN KEY (#{Array(quoted_column_names).join(", ")}) REFERENCES #{quoted_references_table_name} (#{Array(quoted_references_column_names).join(", ")})"
+      if name
+        sql = "CONSTRAINT #{name} "
+      elsif table_name.present?
+        sql = "CONSTRAINT #{table_name}_#{Array(column_names).join('_')}_fkey "
+      else
+        sql = ""
+      end
+
+      sql << "FOREIGN KEY (#{quoted_column_names.join(", ")}) REFERENCES #{quoted_references_table_name} (#{quoted_references_column_names.join(", ")})"
       sql << " ON UPDATE #{ACTIONS[on_update]}" if on_update
       sql << " ON DELETE #{ACTIONS[on_delete]}" if on_delete
       sql << " DEFERRABLE" if deferrable
@@ -36,10 +43,10 @@ module RedhillonrailsCore::ActiveRecord::ConnectionAdapters
       Array(references_column_names).collect { |name| ::ActiveRecord::Base.connection.quote_column_name(name) }
     end
 
-#    def quoted_table_name
-#      ::ActiveRecord::Base.connection.quote_table_name(table_name)
-#    end
-#
+    def quoted_table_name
+      ::ActiveRecord::Base.connection.quote_table_name(table_name)
+    end
+
     def quoted_references_table_name
       ::ActiveRecord::Base.connection.quote_table_name(references_table_name)
     end

data/lib/redhillonrails_core/active_record/connection_adapters/abstract/index_definition.rb

@@ -1,5 +1,8 @@
 module RedhillonrailsCore::ActiveRecord::ConnectionAdapters
 	module IndexDefinition
+    # Using accessors in postgresql
+    attr_accessor :conditions, :expression, :kind
+
 		def case_sensitive?
 			@case_sensitive.nil? ? true : @case_sensitive
 		end

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

@@ -26,10 +26,14 @@ module RedhillonrailsCore::ActiveRecord::ConnectionAdapters
         adapter_module = RedhillonrailsCore::ActiveRecord::ConnectionAdapters.const_get(adapter)
         self.class.send(:include, adapter_module) unless self.class.include?(adapter_module)
       end
-      # Needed from mysql2 >= 0.2.7
+      # Mysql2 gem adds own Mysql2IndexDefinition in versions from 0.2.7 to 0.2.11.
+      # We must include RedhillonrailsCore IndexDefinition to support case sensitivness.
+      # 0.3 line of mysql2 removes it again so hopefully we'll remove that obsure piece of code too.
       if adapter_name =~ /^Mysql2/i && defined?(ActiveRecord::ConnectionAdapters::Mysql2IndexDefinition)
         index_definition_module = RedhillonrailsCore::ActiveRecord::ConnectionAdapters::IndexDefinition
-        ActiveRecord::ConnectionAdapters::Mysql2IndexDefinition.send(:include, index_definition_module) unless ActiveRecord::ConnectionAdapters::Mysql2IndexDefinition.include?(index_definition_module)
+        unless ActiveRecord::ConnectionAdapters::Mysql2IndexDefinition.include?(index_definition_module)
+          ActiveRecord::ConnectionAdapters::Mysql2IndexDefinition.send(:include, index_definition_module)
+        end
       end
     end
     
@@ -57,12 +61,12 @@ module RedhillonrailsCore::ActiveRecord::ConnectionAdapters
     end
 
     def add_foreign_key(table_name, column_names, references_table_name, references_column_names, options = {})
-      foreign_key = ForeignKeyDefinition.new(options[:name], table_name, column_names, ActiveRecord::Migrator.proper_table_name(references_table_name), references_column_names, options[:on_update], options[:on_delete], options[:deferrable])
-      execute "ALTER TABLE #{table_name} ADD #{foreign_key}"
+      foreign_key = ForeignKeyDefinition.new(options[:name], table_name, column_names, ::ActiveRecord::Migrator.proper_table_name(references_table_name), references_column_names, options[:on_update], options[:on_delete], options[:deferrable])
+      execute "ALTER TABLE #{quote_table_name(table_name)} ADD #{foreign_key}"
     end
 
-    def remove_foreign_key(table_name, foreign_key_name)
-      execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{foreign_key_name}"
+    def remove_foreign_key(table_name, foreign_key_name, options = {})
+      execute "ALTER TABLE #{quote_table_name(table_name)} DROP CONSTRAINT #{foreign_key_name}"
     end
 
     def drop_table_with_redhillonrails_core(name, options = {})