redhillonrails_core 1.0.3 → 1.0.3.1

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.3.1

data/lib/red_hill_consulting/core/active_record/connection_adapters/abstract_adapter.rb

@@ -1,8 +1,19 @@
 module RedHillConsulting::Core::ActiveRecord::ConnectionAdapters
   module AbstractAdapter
     def self.included(base)
-      base.module_eval do
-        alias_method_chain :drop_table, :redhillonrails_core
+      base.alias_method_chain :initialize, :redhillonrails_core
+      base.alias_method_chain :drop_table, :redhillonrails_core
+    end
+    
+    def initialize_with_redhillonrails_core(*args)
+      initialize_without_redhillonrails_core(*args)
+      case adapter_name
+      when 'MySQL' 
+        self.class.send(:include, MySQLAdapter) unless self.class.include?(MySQLAdapter)
+      when 'PostgreSQL' 
+        self.class.send(:include, PostgresqlAdapter) unless self.class.include?(PostgresqlAdapter)
+      when 'SQLite' 
+        self.class.send(:include, SqliteAdapter) unless self.class.include?(SqliteAdapter)
       end
     end
     

data/lib/red_hill_consulting/core/active_record/connection_adapters/mysql_adapter.rb

@@ -3,6 +3,17 @@ module RedHillConsulting::Core::ActiveRecord::ConnectionAdapters
     def self.included(base)
       base.class_eval do
         alias_method_chain :remove_column, :redhillonrails_core
+        alias_method_chain :connect, :redhillonrails_core
+      end
+    end
+
+    def connect_with_redhillonrails_core(*args)
+      returning connect_without_redhillonrails_core(*args) do 
+        if version[0] < 5
+          self.class.send(:include, Mysql4Adapter) unless self.class.included?(Mysql4Adapter)
+        else
+          self.class.send(:include, Mysql5Adapter) unless self.class.included?(Mysql5Adapter)
+        end
       end
     end
 

data/lib/redhillonrails_core.rb

@@ -34,16 +34,4 @@ ActiveRecord::ConnectionAdapters::Column.send(:include, RedHillConsulting::Core:
 ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, RedHillConsulting::Core::ActiveRecord::ConnectionAdapters::AbstractAdapter)
 ActiveRecord::ConnectionAdapters::SchemaStatements.send(:include, RedHillConsulting::Core::ActiveRecord::ConnectionAdapters::SchemaStatements)
 
-ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:include, RedHillConsulting::Core::ActiveRecord::ConnectionAdapters::PostgresqlAdapter)
 
-ActiveRecord::ConnectionAdapters::MysqlColumn.send(:include, RedHillConsulting::Core::ActiveRecord::ConnectionAdapters::MysqlColumn)
-ActiveRecord::ConnectionAdapters::MysqlAdapter.send(:include, RedHillConsulting::Core::ActiveRecord::ConnectionAdapters::MysqlAdapter)
-if ActiveRecord::Base.connection.send(:version)[0] < 5
-  #include MySql4Adapter
-  ActiveRecord::ConnectionAdapters::MysqlAdapter.send(:include, RedHillConsulting::Core::ActiveRecord::ConnectionAdapters::Mysql4Adapter)
-else
-  #include MySql5Adapter
-  ActiveRecord::ConnectionAdapters::MysqlAdapter.send(:include, RedHillConsulting::Core::ActiveRecord::ConnectionAdapters::Mysql5Adapter)
-end
-
-ActiveRecord::ConnectionAdapters::SQLite3Adapter.send(:include, RedHillConsulting::Core::ActiveRecord::ConnectionAdapters::Sqlite3Adapter)

data/redhillonrails_core.gemspec

@@ -5,10 +5,10 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redhillonrails_core}
-  s.version = "1.0.3"
+  s.version = "1.0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Micha\305\202 \305\201omnicki"]
+  s.authors = ["Michał Łomnicki"]
   s.date = %q{2010-04-05}
   s.description = %q{RedHill on Rails Core is a plugin that features to support other RedHill on Rails plugins. It creates and drops views and foreign-keys or obtains indexes directly from a model class.}
   s.email = %q{michal.lomnicki@gmail.com}

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - 3
-  version: 1.0.3
+  - 1
+  version: 1.0.3.1
 platform: ruby
 authors: 
 - "Micha\xC5\x82 \xC5\x81omnicki"