schema_plus 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb0e9e9c0ae722f3745bf153ca27e10feba32557
-  data.tar.gz: 475c3532ec3953c3b34c68357dec44b69b5554e5
+  metadata.gz: 0d5b988ea47657ad4e1be912509f3d17c4c4e329
+  data.tar.gz: e4fcc4ac3d1ca3003e4a9c7fc1c0a48e687dd197
 SHA512:
-  metadata.gz: b0e183c3f7af709ebe5b8fb73f9278a3c5a9cf1a9d31ae39934d12ef727df309772edc43dfbf5e06b4202a5216f19307d4438da67c883e6a974ec2c581b0692d
-  data.tar.gz: 5fe1d3eaacef6220fa894d3b491fddeac460856567e32972a63d95373e590e9a0ddc58111bd6ee198dd3baa1e520ee834cedc81dc798f1e5f3bd19735c904dfa
+  metadata.gz: 4ea4f3e69dd6fd4705146b05123e7ec245414ef77de85382a5ada63bebfce065088d4447ea9f411b82444d33c94d7a9ce6ad96a76061816a7a851023a9672e8f
+  data.tar.gz: 9251ec18b5b5f416627162c4adecff472c22c82ac23076461d7b8d045f40744f246827da14580c17d5957efb45218a7b235d71ffbcc1092e1b7486a4547cc3f2

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby
 gemfile:
   - gemfiles/rails-3.2/Gemfile.postgresql
@@ -10,48 +11,38 @@ gemfile:
   - gemfiles/rails-4.0/Gemfile.postgresql
   - gemfiles/rails-4.0/Gemfile.sqlite3
   - gemfiles/rails-4.0/Gemfile.mysql2
-  - gemfiles/rails-edge/Gemfile.postgresql
-  - gemfiles/rails-edge/Gemfile.sqlite3
-  - gemfiles/rails-edge/Gemfile.mysql2
+  - gemfiles/rails-4.1/Gemfile.postgresql
+  - gemfiles/rails-4.1/Gemfile.sqlite3
+  - gemfiles/rails-4.1/Gemfile.mysql2
 before_script:
   - rake create_databases
 after_script:
   - rake drop_databases
-env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER=""'
+env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'
 notifications:
   recipients:
     - michal.lomnicki@gmail.com
     - ronen@barzel.org
 matrix:
-  allow_failures:
-    - gemfile: gemfiles/rails-edge/Gemfile.postgresql
-    - gemfile: gemfiles/rails-edge/Gemfile.sqlite3
-    - gemfile: gemfiles/rails-edge/Gemfile.mysql2
   exclude:
     - rvm: jruby
       gemfile: gemfiles/rails-3.2/Gemfile.sqlite3
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER=""'
-    - rvm: jruby
-      gemfile: gemfiles/rails-3.2/Gemfile.mysql
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER=""'
-    - rvm: jruby
-      gemfile: gemfiles/rails-3.2/Gemfile.mysql2
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER=""'
+      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'
     - rvm: jruby
       gemfile: gemfiles/rails-4.0/Gemfile.postgresql
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER=""'
+      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'
     - rvm: jruby
       gemfile: gemfiles/rails-4.0/Gemfile.sqlite3
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER=""'
+      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'
     - rvm: jruby
       gemfile: gemfiles/rails-4.0/Gemfile.mysql2
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER=""'
+      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'
     - rvm: jruby
-      gemfile: gemfiles/rails-edge/Gemfile.postgresql
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER=""'
+      gemfile: gemfiles/rails-4.1/Gemfile.postgresql
+      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'
     - rvm: jruby
-      gemfile: gemfiles/rails-edge/Gemfile.sqlite3
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER=""'
+      gemfile: gemfiles/rails-4.1/Gemfile.sqlite3
+      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'
     - rvm: jruby
-      gemfile: gemfiles/rails-edge/Gemfile.mysql2
-      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER=""'
+      gemfile: gemfiles/rails-4.1/Gemfile.mysql2
+      env: 'POSTGRES_DB_USER=postgres MYSQL_DB_USER="travis"'

data/README.md

@@ -17,19 +17,16 @@ For added rails DRYness see also the gems
 
 SchemaPlus supports all combinations of:
 
-*   Rails 3.2 or Rails 4
+*   Rails 3.2, 4.0, and 4.1 (currently 4.1.0beta3)
 *   PostgreSQL, MySQL (using mysql2 gem; mysql gem only supported with Rails
     3.2), or SQLite3 (using sqlite3 >= 3.7.7 which has foreign key support)
-*   MRI Ruby 1.9.3 or 2.0.0
+*   MRI Ruby 1.9.3, 2.0.0, or 2.1.0
 
 And also supports:
 
-* jruby with Rails 3.2 and PostgreSQL
+* jruby with Rails 3.2 and PostgreSQL or MySQL
 
 
-Note: As of version 1.0.0, SchemaPlus no longer supports Rails 2.3, 3.0 and
-3.1, and also no longer supports MRI Ruby 1.8.7; the last version
-to support them was 0.4.1.  As of version 1.2.0, SchemaPlus no longer supports MRI Ruby 1.9.2
 
 ## Installation
 
@@ -300,6 +297,12 @@ of foreign key constraints, you can re-enable it:
 
 * *nothing currently waiting to be released*
 
+### 1.4.0
+
+* Supports jruby & mysql, thanks to [@rzenha](https://github.com/razenha)
+* Works with MRI ruby & rails 4.1.0beta3
+* Run tests against MRI 2.1.0
+
 ### 1.3.3
 
 * Bug fix, dump unique index with expression (Issue #142)

data/gemfiles/rails-4.1/Gemfile.base

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gemspec :path => File.expand_path('../../..', __FILE__)
+gem "rails", "~> 4.1.0.beta1"

data/gemfiles/rails-4.1/Gemfile.mysql2

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/rails-4.1/Gemfile.postgresql

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/rails-4.1/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

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

@@ -78,7 +78,15 @@ module SchemaPlus
         end
 
         def _build_foreign_key(table_name, column_names, references_table_name, references_column_names, options = {}) #:nodoc:
-          ForeignKeyDefinition.new(options[:name] || ForeignKeyDefinition.default_name(table_name, column_names), table_name, column_names, ::ActiveRecord::Migrator.proper_table_name(references_table_name), references_column_names, options[:on_update], options[:on_delete], options[:deferrable])
+          ForeignKeyDefinition.new(options[:name] || ForeignKeyDefinition.default_name(table_name, column_names), table_name, column_names, AbstractAdapter.proper_table_name(references_table_name), references_column_names, options[:on_update], options[:on_delete], options[:deferrable])
+        end
+
+        def self.proper_table_name(name)
+           if ::ActiveRecord::Migration.instance_methods(false).include? :proper_table_name
+           proper_name = ::ActiveRecord::Migration.new.proper_table_name(name) # Rails >= 4.1
+         else
+           proper_name = ::ActiveRecord::Migrator.proper_table_name(name) # Rails <= 4.0 ; Deprecated in 4.1
+         end
         end
 
         # Remove a foreign key constraint

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

@@ -60,7 +60,12 @@ module SchemaPlus
         # implement cascade by removing foreign keys
         def drop_table(name, options={})
           reverse_foreign_keys(name).each{ |foreign_key| remove_foreign_key(foreign_key.table_name, foreign_key.name) } if options[:cascade]
-          super
+          sql = "DROP"
+          sql += " TEMPORARY" if options[:temporary]
+          sql += " TABLE"
+          sql += " IF EXISTS" if options[:if_exists]
+          sql += " #{quote_table_name(name)}"
+          execute sql
         end
 
         def remove_index_sql(table_name, options)
@@ -82,15 +87,16 @@ module SchemaPlus
         end
 
         def foreign_keys(table_name, name = nil)
-          results = execute("SHOW CREATE TABLE #{quote_table_name(table_name)}", name)
+          results = select_all("SHOW CREATE TABLE #{quote_table_name(table_name)}", name)
 
           table_name = table_name.to_s
           namespace_prefix = table_namespace_prefix(table_name)
 
           foreign_keys = []
 
-          results.each do |row|
-            row[1].lines.each do |line|
+          results.each do |result|
+            create_table_sql = result["Create Table"]
+            create_table_sql.lines.each do |line|
               if line =~ /^  CONSTRAINT [`"](.+?)[`"] FOREIGN KEY \([`"](.+?)[`"]\) REFERENCES [`"](.+?)[`"] \((.+?)\)( ON DELETE (.+?))?( ON UPDATE (.+?))?,?$/
                 name = $1
                 column_names = $2
@@ -114,7 +120,7 @@ module SchemaPlus
         end
 
         def reverse_foreign_keys(table_name, name = nil)
-          results = execute(<<-SQL, name)
+          results = select_all(<<-SQL, name)
         SELECT constraint_name, table_name, column_name, referenced_table_name, referenced_column_name
           FROM information_schema.key_column_usage
          WHERE table_schema = #{table_schema_sql(table_name)}
@@ -127,18 +133,18 @@ module SchemaPlus
           namespace_prefix = table_namespace_prefix(table_name)
 
           results.each do |row|
-            next unless table_name_without_namespace(table_name).casecmp(row[3]) == 0
-            if current_foreign_key != row[0]
-                referenced_table_name = row[1]
+            next unless table_name_without_namespace(table_name).casecmp(row["referenced_table_name"]) == 0
+            if current_foreign_key != row["constraint_name"]
+                referenced_table_name = row["table_name"]
                 referenced_table_name = namespace_prefix + referenced_table_name if table_namespace_prefix(referenced_table_name).blank?
-                references_table_name = row[3]
+                references_table_name = row["referenced_table_name"]
                 references_table_name = namespace_prefix + references_table_name if table_namespace_prefix(references_table_name).blank?
-              foreign_keys << ForeignKeyDefinition.new(row[0], referenced_table_name, [], references_table_name, [])
-              current_foreign_key = row[0]
+              foreign_keys << ForeignKeyDefinition.new(row["constraint_name"], referenced_table_name, [], references_table_name, [])
+              current_foreign_key = row["constraint_name"]
             end
 
-            foreign_keys.last.column_names << row[2]
-            foreign_keys.last.references_column_names << row[4]
+            foreign_keys.last.column_names << row["column_name"]
+            foreign_keys.last.references_column_names << row["referenced_column_name"]
           end
 
           foreign_keys
@@ -146,19 +152,19 @@ module SchemaPlus
 
         def views(name = nil)
           views = []
-          execute("SELECT table_name FROM information_schema.views WHERE table_schema = SCHEMA()", name).each do |row|
-            views << row[0]
+          select_all("SELECT table_name FROM information_schema.views WHERE table_schema = SCHEMA()", name).each do |row|
+            views << row["table_name"]
           end
           views
         end
 
         def view_definition(view_name, name = nil)
-          result = execute("SELECT view_definition, check_option FROM information_schema.views WHERE table_schema = SCHEMA() AND table_name = #{quote(view_name)}", name)
-          return nil unless (result.respond_to?(:num_rows) ? result.num_rows : result.to_a.size) > 0 # mysql vs mysql2
-          row = result.respond_to?(:fetch_row) ? result.fetch_row : result.first
-          sql = row[0]
+          results = select_all("SELECT view_definition, check_option FROM information_schema.views WHERE table_schema = SCHEMA() AND table_name = #{quote(view_name)}", name)
+          return nil unless results.any?
+          row = results.first
+          sql = row["view_definition"]
           sql.gsub!(%r{#{quote_table_name(current_database)}[.]}, '')
-          case row[1]
+          case row["check_option"]
           when "CASCADED" then sql += " WITH CASCADED CHECK OPTION"
           when "LOCAL" then sql += " WITH LOCAL CHECK OPTION"
           end

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

@@ -142,7 +142,7 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     end
 
     def foreign_key(column_names, references_table_name, references_column_names, options = {})
-      @foreign_keys << ForeignKeyDefinition.new(options[:name] || ForeignKeyDefinition.default_name(self.name, column_names), self.name, column_names, ::ActiveRecord::Migrator.proper_table_name(references_table_name), references_column_names, options[:on_update], options[:on_delete], options[:deferrable])
+      @foreign_keys << ForeignKeyDefinition.new(options[:name] || ForeignKeyDefinition.default_name(self.name, column_names), self.name, column_names, AbstractAdapter.proper_table_name(references_table_name), references_column_names, options[:on_update], options[:on_delete], options[:deferrable])
       self
     end
 

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "1.3.3"
+  VERSION = "1.4.0"
 end

data/runspecs

@@ -5,8 +5,8 @@ require 'ostruct'
 require 'shellwords'
 require 'tempfile'
 
-RUBY_VERSIONS = %W[jruby 1.9.3 2.0.0]
-RAILS_VERSIONS = %W[3.2 edge 4.0]
+RUBY_VERSIONS = %W[jruby 1.9.3 2.0.0 2.1.0]
+RAILS_VERSIONS = %W[3.2 4.0 4.1]
 DB_ADAPTERS = %W[postgresql mysql mysql2 sqlite3]
 
 o = OpenStruct.new
@@ -68,7 +68,9 @@ combos = o.ruby_versions.product(o.rails_versions, o.db_adapters).map{|product|
     when combo.rails >= "4" && combo.db_adapter == "mysql" then false
     when combo.ruby == "jruby"
       case
-      when combo.rails == "3.2" && combo.db_adapter == "postgresql" then true
+      when combo.rails > "3.2" then false
+      when combo.db_adapter == "postgresql" then true
+      when combo.db_adapter =~ /mysql/ then true
       else false
       end
     else true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -135,6 +135,10 @@ files:
 - gemfiles/rails-4.0/Gemfile.mysql2
 - gemfiles/rails-4.0/Gemfile.postgresql
 - gemfiles/rails-4.0/Gemfile.sqlite3
+- gemfiles/rails-4.1/Gemfile.base
+- gemfiles/rails-4.1/Gemfile.mysql2
+- gemfiles/rails-4.1/Gemfile.postgresql
+- gemfiles/rails-4.1/Gemfile.sqlite3
 - gemfiles/rails-edge/Gemfile.base
 - gemfiles/rails-edge/Gemfile.mysql2
 - gemfiles/rails-edge/Gemfile.postgresql