schema_plus 0.1.2 → 0.1.3

data/.gitignore

@@ -23,4 +23,3 @@ pkg
 *.log
 *.sqlite3
 Gemfile.lock
-gemfiles/*.lock

data/README.rdoc

@@ -86,17 +86,21 @@ Here are some examples:
     t.integer :author_id                                 # automatically references table 'authors', key id
     t.integer :parent_id                                 # special name parent_id automatically references its own table (for tree nodes)
     t.integer :author, :references => :authors           # non-conventional column name needs :references for a constraint
-    t.integer :author_id, :refences => :authors          # same as automatic behavior
-    t.integer :author_id, :refences => [:authors, :id]   # same as automatic behavior
+    t.integer :author_id, :references => :authors          # same as automatic behavior
+    t.integer :author_id, :references => [:authors, :id]   # same as automatic behavior
     t.integer :author_id, :references => :people         # override table name
     t.integer :author_id, :references => [:people, :ssn] # override table name and key
-    t.integer :author_id, :referencs => nil              # don't create a constraint
-
+    t.integer :author_id, :references => nil              # don't create a constraint
 
 You can also modify the behavior using +:on_delete+, +:on_update+, and +:deferrable+
 
     t.integer :author_id, :on_delete => :cascade
 
+SchemaPlus also creates foreign keys when used rails' <tt>t.references</tt>
+or <tt>t.belongs_to</tt>< which take the singular of the referenced table
+name and implicitly create the column suffixed with +_id+, and it accepts
+the same arguments.
+
 The foreign key behavior can be configured globally (see Config) or per-table (see create_table).
 
 To examine your foreign key constraints, connection.foreign_keys returns a
@@ -143,14 +147,13 @@ running.  Create database user "schema_plus" with permissions for database
   $ bundle install
   $ rake postgresql:build_databases
   $ rake mysql:build_databases
-  $ ./runspecs --install  # do this once to install gem dependencies for all versions (slow)
+  $ ./runspecs --install  # do this once, it runs 'bundle install' for all versions (slow)
   $ ./runspecs # as many times as you like
 
 See <tt>./runspecs --help</tt> for more options.  You can also manually pick a specific version of rails and ruby to use, such as:
   $ rvm use 1.9.2
-  $ export SCHEMA_ASSOCIATIONS_RAILS_VERSION=3.1
-  $ bundle update --local rails mysql2  # different versions of rails require different mysql2's
-  $ rake spec
+  $ export BUNDLE_GEMFILE=gemfiles/Gemfile.rails-3.1
+  $ bundle exec rake spec
 
 And you can run the specs for a specific adapter:
   $ rake postgresql:spec # to run postgresql tests only

data/gemfiles/Gemfile.rails-2.3.lock

@@ -0,0 +1,65 @@
+PATH
+  remote: /home/snatcher/projects/schema_plus
+  specs:
+    schema_plus (0.1.3)
+      rails
+      valuable
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.14)
+      actionpack (= 2.3.14)
+    actionpack (2.3.14)
+      activesupport (= 2.3.14)
+      rack (~> 1.1.0)
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activeresource (2.3.14)
+      activesupport (= 2.3.14)
+    activesupport (2.3.14)
+    diff-lcs (1.1.3)
+    multi_json (1.0.3)
+    mysql (2.8.1)
+    mysql2 (0.2.13)
+    pg (0.11.0)
+    rack (1.1.2)
+    rails (2.3.14)
+      actionmailer (= 2.3.14)
+      actionpack (= 2.3.14)
+      activerecord (= 2.3.14)
+      activeresource (= 2.3.14)
+      activesupport (= 2.3.14)
+      rake (>= 0.8.3)
+    rake (0.8.7)
+    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)
+    simplecov (0.5.3)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-gem-adapter (1.0.1)
+      simplecov
+    simplecov-html (0.5.3)
+    sqlite3 (1.3.4)
+    valuable (0.9.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mysql
+  mysql2 (~> 0.2.7)
+  pg
+  rails (~> 2.3)
+  rake (~> 0.8.7)
+  rspec
+  schema_plus!
+  simplecov
+  simplecov-gem-adapter
+  sqlite3

data/gemfiles/Gemfile.rails-3.0.lock

@@ -0,0 +1,111 @@
+PATH
+  remote: /home/snatcher/projects/schema_plus
+  specs:
+    schema_plus (0.1.3)
+      rails
+      valuable
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.10)
+      actionpack (= 3.0.10)
+      mail (~> 2.2.19)
+    actionpack (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      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.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+    activesupport (3.0.10)
+    arel (2.0.10)
+    builder (2.1.2)
+    diff-lcs (1.1.3)
+    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)
+    multi_json (1.0.3)
+    mysql (2.8.1)
+    mysql2 (0.2.13)
+    pg (0.11.0)
+    polyglot (0.3.2)
+    rack (1.2.4)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.10)
+      actionmailer (= 3.0.10)
+      actionpack (= 3.0.10)
+      activerecord (= 3.0.10)
+      activeresource (= 3.0.10)
+      activesupport (= 3.0.10)
+      bundler (~> 1.0)
+      railties (= 3.0.10)
+    railties (3.0.10)
+      actionpack (= 3.0.10)
+      activesupport (= 3.0.10)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    rdoc (3.9.4)
+    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)
+    simplecov (0.5.3)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-gem-adapter (1.0.1)
+      simplecov
+    simplecov-html (0.5.3)
+    sqlite3 (1.3.4)
+    thor (0.14.6)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.29)
+    valuable (0.9.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mysql
+  mysql2 (~> 0.2.7)
+  pg
+  rails (~> 3.0.0)
+  rake (~> 0.8.7)
+  rspec
+  schema_plus!
+  simplecov
+  simplecov-gem-adapter
+  sqlite3

data/gemfiles/Gemfile.rails-3.1

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
 
 gemspec :path => File.expand_path('../..', __FILE__)
-gem "rails", "~> 3.1.0.rc5"
+gem "rails", "~> 3.1"
 gem "mysql2"

data/gemfiles/Gemfile.rails-3.1.lock

@@ -0,0 +1,123 @@
+PATH
+  remote: /home/snatcher/projects/schema_plus
+  specs:
+    schema_plus (0.1.3)
+      rails
+      valuable
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
+      mail (~> 2.3.0)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
+    arel (2.2.1)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.0)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    hike (1.2.1)
+    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.7)
+    pg (0.11.0)
+    polyglot (0.3.2)
+    rack (1.3.3)
+    rack-cache (1.0.3)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
+      bundler (~> 1.0)
+      railties (= 3.1.0)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.8.7)
+    rdoc (3.9.4)
+    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)
+    simplecov (0.5.3)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-gem-adapter (1.0.1)
+      simplecov
+    simplecov-html (0.5.3)
+    sprockets (2.0.0)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
+    sqlite3 (1.3.4)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.29)
+    valuable (0.9.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mysql
+  mysql2
+  pg
+  rails (~> 3.1)
+  rake (~> 0.8.7)
+  rspec
+  schema_plus!
+  simplecov
+  simplecov-gem-adapter
+  sqlite3

data/lib/schema_plus.rb

@@ -2,7 +2,7 @@ require 'valuable'
 
 require 'schema_plus/version'
 require 'schema_plus/active_record/base'
-require 'schema_plus/active_record/migration'
+require 'schema_plus/active_record/foreign_keys'
 require 'schema_plus/active_record/connection_adapters/table_definition'
 require 'schema_plus/active_record/connection_adapters/schema_statements'
 require 'schema_plus/active_record/schema'
@@ -128,7 +128,6 @@ module SchemaPlus
     @inserted = true
     insert_connection_adapters
     ::ActiveRecord::Base.send(:include, SchemaPlus::ActiveRecord::Base)
-    ::ActiveRecord::Migration.send(:include, SchemaPlus::ActiveRecord::Migration)
     ::ActiveRecord::Schema.send(:include, SchemaPlus::ActiveRecord::Schema)
     ::ActiveRecord::SchemaDumper.send(:include, SchemaPlus::ActiveRecord::SchemaDumper)
   end

data/lib/schema_plus/active_record/base.rb

@@ -20,16 +20,9 @@ module SchemaPlus
         public
 
         def columns_with_schema_plus #:nodoc:
-          unless @schema_plus_extended_columns
-            @schema_plus_extended_columns = true
-            cols = columns_hash
-            indexes.each do |index|
-              index.columns.each do |name|
-                cols[name].indexes << index
-              end
-            end
-          end
-          columns_without_schema_plus
+          columns = columns_without_schema_plus
+          columns.each do |column| column.connection = self end unless @schema_plus_extended_columns
+          columns
         end
 
         def reset_column_information_with_schema_plus #:nodoc:

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

@@ -41,6 +41,7 @@ module SchemaPlus
             # if that constant exists, then include the patches
             ::ActiveRecord::ConnectionAdapters::Mysql2IndexDefinition.send(:include, SchemaPlus::ActiveRecord::ConnectionAdapters::IndexDefinition) if defined? ::ActiveRecord::ConnectionAdapters::Mysql2IndexDefinition
           end
+          extend(SchemaPlus::ActiveRecord::ForeignKeys)
         end
 
         # Create a view given the SQL definition
@@ -71,13 +72,22 @@ module SchemaPlus
 
         # Define a foreign key constraint.  Valid options are :on_update,
         # :on_delete, and :deferrable, with values as described at
-        # ForeignKeyDefinition
+        # ConnectionAdapters::ForeignKeyDefinition
+        #
+        # (NOTE: Sqlite3 does not support altering a table to add foreign-key
+        # constraints; they must be included in the table specification when
+        # it's created.  If you're using Sqlite3, this method will raise an
+        # error.)
         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 #{quote_table_name(table_name)} ADD #{foreign_key.to_sql}"
         end
 
         # Remove a foreign key constraint
+        #
+        # (NOTE: Sqlite3 does not support altering a table to remove
+        # foreign-key constraints.  If you're using Sqlite3, this method will
+        # raise an error.)
         def remove_foreign_key(table_name, foreign_key_name)
           execute "ALTER TABLE #{quote_table_name(table_name)} DROP CONSTRAINT #{foreign_key_name}"
         end

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

@@ -7,12 +7,13 @@ module SchemaPlus
       #
       module Column
 
+        attr_writer :connection # connection gets set by SchemaPlus::ActiveRecord::Base::columns_with_schema_plus
+
         # Returns the list of IndexDefinition instances for each index that
         # refers to this column.  Returns an empty list if there are no
         # such indexes.
         def indexes
-          # list get filled by SchemaPlus::ActiveRecord::Base::columns_with_schema_plus
-          @indexes ||= []
+          @indexes ||= @connection.indexes.select{|index| index.columns.include? self.name}
         end
 
         # If the column is in a unique index, returns a list of names of other columns in