redhillonrails_core 1.1.2 → 1.1.3.pre1

data/CHANGELOG

@@ -1,3 +1,7 @@
+1.1.3
+    * sorting of indexes and foreign keys on schema dumper
+1.1.2
+    * don't quote constraint name (bugfix)
 1.1.1
     * quote values for foreign key definition
 1.1.0

data/README.rdoc

@@ -167,6 +167,7 @@ First you have to fetch sources from github as specs are not inculded in a gem.
 === Contributors
 
 * Michał Łomnicki
-* François Beausoleil - http://github.com/francois
+* François Beausoleil - https://github.com/francois
 * Greg Barnett
+* Romulo A. Ceccon - https://github.com/romuloceccon
 

data/lib/redhillonrails_core/active_record/schema_dumper.rb

@@ -25,6 +25,10 @@ module RedhillonrailsCore
 
       def indexes_with_redhillonrails_core(table, stream)
         indexes = @connection.indexes(table)
+        
+        indexes.sort! do |a, b|
+          a.columns.sort <=> b.columns.sort
+        end
         indexes.each do |index|
           unless index.columns.blank? 
             stream.print "  add_index #{index.table.inspect}, #{index.columns.inspect}, :name => #{index.name.inspect}"
@@ -48,6 +52,10 @@ module RedhillonrailsCore
 
       def foreign_keys(table, stream)
         foreign_keys = @connection.foreign_keys(table)
+
+        foreign_keys.sort! do |a, b|
+          a.column_names.sort <=> b.column_names.sort
+        end
         foreign_keys.each do |foreign_key|
           stream.print "  "
           stream.print foreign_key.to_dump

data/spec/schema_dumper_spec.rb

@@ -18,7 +18,6 @@ describe "Schema dump" do
     end
   end
 
-
   unless ::ActiveRecord::Base.connection.class.include?(RedhillonrailsCore::ActiveRecord::ConnectionAdapters::Sqlite3Adapter)
 
     it "should include foreign_key options" do
@@ -47,6 +46,28 @@ describe "Schema dump" do
     end
   end
   
+  it "should order foreign keys" do
+    with_foreign_key Post, :user_id, :users, :id, :name => 'posts_user_id_fk' do
+      with_foreign_key Post, :author_id, :users, :id, :name => 'posts_author_id_fk' do
+        foreign_key_defs = dump.split("\n").select { |x| x.match(/add_foreign_key/) }
+        foreign_key_defs.size.should be_equal(2)
+        foreign_key_defs[0].should match(to_regexp(%q{add_foreign_key "posts", ["author_id"], "users", ["id"]}))
+        foreign_key_defs[1].should match(to_regexp(%q{add_foreign_key "posts", ["user_id"], "users", ["id"]}))
+      end
+    end
+  end
+
+  it "should order indexes" do
+    with_index Post, :user_id do
+      with_index Post, :author_id do
+        foreign_key_defs = dump.split("\n").select { |x| x.match(/add_index/) }
+        foreign_key_defs.size.should be_equal(2)
+        foreign_key_defs[0].should match(to_regexp(%q{add_index "posts", ["author_id"]}))
+        foreign_key_defs[1].should match(to_regexp(%q{add_index "posts", ["user_id"]}))
+      end
+    end
+  end
+
   if ::ActiveRecord::Base.connection.class.include?(RedhillonrailsCore::ActiveRecord::ConnectionAdapters::PostgresqlAdapter)
 
   it "should define case insensitive index" do
@@ -72,7 +93,7 @@ describe "Schema dump" do
       dump.should match(to_regexp(%q{add_index "posts", ["body"], :name => "posts_body_index", :kind => "hash"}))
     end
   end
-
+  
   end # of postgresql specific examples
 
   protected

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redhillonrails_core
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  - pre1
+  version: 1.1.3.pre1
 platform: ruby
 authors: 
 - "Micha\xC5\x82 \xC5\x81omnicki"
@@ -14,26 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +01:00
+date: 2011-02-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  requirement: *id001
   prerelease: false
-  version_requirements: *id001
+  type: :runtime
+  name: activerecord
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -41,13 +39,12 @@ dependencies:
         - 1
         - 5
         version: "1.5"
-  type: :development
+  requirement: *id002
   prerelease: false
-  version_requirements: *id002
+  type: :development
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -55,52 +52,48 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  type: :development
+  requirement: *id003
   prerelease: false
-  version_requirements: *id003
+  type: :development
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  name: pg
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :development
+  requirement: *id004
   prerelease: false
-  version_requirements: *id004
+  type: :development
+  name: pg
 - !ruby/object:Gem::Dependency 
-  name: mysql
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :development
+  requirement: *id005
   prerelease: false
-  version_requirements: *id005
+  type: :development
+  name: mysql
 - !ruby/object:Gem::Dependency 
-  name: mysql2
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :development
+  requirement: *id006
   prerelease: false
-  version_requirements: *id006
+  type: :development
+  name: mysql2
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -109,9 +102,10 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  type: :development
+  requirement: *id007
   prerelease: false
-  version_requirements: *id007
+  type: :development
+  name: sqlite3-ruby
 description: Adds support in ActiveRecord for foreign_keys, complex indexes and other database-related stuff. Easily create foreign_keys, complex indexes and views.
 email: michal.lomnicki@gmail.com
 executables: []
@@ -165,26 +159,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -983253727
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Adds support in ActiveRecord for foreign_keys, complex indexes and other database-related stuff