schema_plus_compatibility 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c51b0360654047822db12c34df59a3245af1c1c9
-  data.tar.gz: 9721d42c9745f9421bfc38d678963aede3662aa7
+  metadata.gz: e562ca76fbfc4b9802d6546d1d70dd59f5f19f9c
+  data.tar.gz: d2dfef42ed2d63926e4e56341d41dcc205e0b287
 SHA512:
-  metadata.gz: 2cc5dd85204a804ae50e3641457a3483ecffaf280927b7206c70a90459bad0d2c0e979db07297581702b4e08095183ef04be463b1c55b9efead1b664d7d0173b
-  data.tar.gz: 7473493ad1b85fa40ee585f16247302268b8987273d062822e61ad79bcb3ab50c342652533845f3fb473cfcdeed99ca4dae4a0757e8494128b58239c482fe908
+  metadata.gz: 75f2becf7f5cccb910c3f6d3d9f0c2692f1344731778daa0f989929775c02a6ea2790a06fcca0aed2886435e275dd7fd692a87b02b05ddf180a3ea7f263ac7cd
+  data.tar.gz: 812dee55b0f698949d8e20a5db998cafcf845a545589da133a88fbead38a07de2161dd6fd2f1290ba9666a6c3f2839ec0e08fc869fa1542e36d1f0e4c7f6ea6a

data/README.md

@@ -1,6 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/schema_plus_compatibility.svg)](http://badge.fury.io/rb/schema_plus_compatibility)
 [![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_plus_compatibility.svg)](http://travis-ci.org/SchemaPlus/schema_plus_compatibility)
-[![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_plus_compatibility.svg)](https://coveralls.io/r/SchemaPlus/schema_plus_compatibility)
+[![Coverage Status](https://coveralls.io/repos/github/SchemaPlus/schema_plus_compatibility/badge.svg?branch=master)](https://coveralls.io/github/SchemaPlus/schema_plus_compatibility?branch=master)
 
 # SchemaPlus::Compatibility
 
@@ -25,13 +25,17 @@ gem.add_dependency "schema_plus_compatibility" # in a .gemspec
 
 SchemaPlus::Compatibility provides the following new methods:
 
-* `connection.tables_without_deprecation`
+* `connection.tables_only`
 
-  In AR 5.0, `connection.tables` is deprecated for some db adapters, and as in AR 4.2 it may actually returns views (if any are defined) as well. This method suppresses the deprecation, and continues to be ill-defined as to whether it returns tables as well as views.
+  In AR 5.0, `connection.tables` is deprecated for some db adapters, and in AR 4.2 it may actually returns views (if any are defined) as well. This method consistently returns just tables regardless of the ActiveRecord version.
+  
+* `connection.user_tables_only`
 
-* `Migration.latest`
+  In AR 5.0, an internal table (`ActiveRecord::InternalMetadata.table_name`) is added by ActiveRecord. The existence of this table trips up some tests (and possibly real code) which doesn't expect to see it. This method returns all tables except the internal metadata table.
 
-  In AR 5.0, `ActiveRecord::Migration` is versioned using `[]`; in AR 4.2 it's not versioned.  This method returns the latest migration version in both AR 4.2 and AR 5.0
+* `Migration.latest_version`
+
+  In AR 5.0, `ActiveRecord::Migration` is versioned using `[]`; in AR 4.2 it's not versioned, making it awkward to create migrations cross-version.  This method returns the latest migration version in both AR 4.2 and AR 5.0.
 
 Note that the methods provided by SchemaPlus::Compatibility are subject to arbitrary change if/when SchemaPlus supports new versions of AR and/or drops support for old versions.  But SchemaPlus::Compatibility will of course follow semantic versioning.
 
@@ -48,6 +52,7 @@ SchemaPlus::Compatibility is tested on:
 
 ## History
 
+* 0.2.0 - replace the ill-defined `connection.tables_without_deprecation` with `connection.tables_only` which truly returns solely tables.
 * 0.1.0 - Initial release
 
 ## Development & Testing

data/lib/schema_plus/compatibility.rb

@@ -4,4 +4,14 @@ require_relative 'compatibility/version'
 require_relative 'compatibility/active_record/connection_adapters/abstract_adapter'
 require_relative 'compatibility/active_record/migration'
 
+module SchemaPlus::Compatibility
+  module ActiveRecord
+    module ConnectionAdapters
+      autoload :Mysql2Adapter, 'schema_plus/compatibility/active_record/connection_adapters/mysql2_adapter'
+      autoload :PostgreSQLAdapter, 'schema_plus/compatibility/active_record/connection_adapters/postgresql_adapter'
+      autoload :SQLite3Adapter, 'schema_plus/compatibility/active_record/connection_adapters/sqlite3_adapter'
+    end
+  end
+end
+
 SchemaMonkey.register SchemaPlus::Compatibility

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

@@ -2,10 +2,10 @@ module SchemaPlus::Compatibility
   module ActiveRecord
     module ConnectionAdapters
       module AbstractAdapter
-        def tables_without_deprecation
-          ActiveSupport::Deprecation.silence do
-            tables
-          end
+        def user_tables_only
+          t = tables_only
+          t.delete ::ActiveRecord::InternalMetadata.table_name if defined? ::ActiveRecord::InternalMetadata
+          t
         end
       end
     end

data/lib/schema_plus/compatibility/active_record/connection_adapters/mysql2_adapter.rb

@@ -0,0 +1,11 @@
+module SchemaPlus::Compatibility
+  module ActiveRecord
+    module ConnectionAdapters
+      module Mysql2Adapter
+        def tables_only
+          select_values("SHOW FULL TABLES WHERE table_type != 'VIEW'", "SCHEMA")
+        end
+      end
+    end
+  end
+end

data/lib/schema_plus/compatibility/active_record/connection_adapters/postgresql_adapter.rb

@@ -0,0 +1,17 @@
+module SchemaPlus::Compatibility
+  module ActiveRecord
+    module ConnectionAdapters
+      module PostgreSQLAdapter
+        def tables_only
+          select_values(<<-SQL, "SCHEMA")
+            SELECT c.relname
+            FROM pg_class c
+            LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
+            WHERE c.relkind IN ('r') -- (r)elation/table
+            AND n.nspname = ANY (current_schemas(false))
+          SQL
+        end
+      end
+    end
+  end
+end

data/lib/schema_plus/compatibility/active_record/connection_adapters/sqlite3_adapter.rb

@@ -0,0 +1,11 @@
+module SchemaPlus::Compatibility
+  module ActiveRecord
+    module ConnectionAdapters
+      module SQLite3Adapter
+        def tables_only
+          select_values("SELECT name FROM sqlite_master WHERE type = 'table' AND name <> 'sqlite_sequence'", 'SCHEMA')
+        end
+      end
+    end
+  end
+end

data/lib/schema_plus/compatibility/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module Compatibility
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/spec/migration_spec.rb

@@ -5,16 +5,6 @@ describe ActiveRecord::Migration do
 
   let(:connection) { ActiveRecord::Base.connection }
 
-  it "does not create deprecation" do
-    expect_not_deprecated {
-      Class.new ActiveRecord::Migration.latest_version do
-        define_method(:up) do
-          create_table :foo
-        end
-      end
-    }
-  end
-
   it "works with the latest migration object version" do
     ActiveRecord::Migration.suppress_messages do
       begin
@@ -22,7 +12,7 @@ describe ActiveRecord::Migration do
           create_table :newtable, :force => true
         end
         migration.migrate(:up)
-        expect(connection.tables_without_deprecation).to include 'newtable'
+        expect(connection.tables_only).to include 'newtable'
       ensure
         connection.drop_table :newtable, if_exists: true
       end

data/spec/tables_only_spec.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe "tables_only" do
+  let(:connection) { ActiveRecord::Base.connection }
+
+  def drop_dummy_view(v)
+    connection.execute "DROP VIEW IF EXISTS #{v}"
+  end
+
+  def create_dummy_view(v, t)
+    drop_dummy_view v
+    connection.execute "CREATE VIEW #{v} AS SELECT * FROM #{t}"
+  end
+
+  around(:each) do |example|
+    begin
+      connection.tables_only.each do |table|
+        connection.drop_table table, force: :cascade
+      end
+      ActiveRecord::InternalMetadata.create_table if ActiveRecord::VERSION::MAJOR >= 5 # ensure metadata table exists
+      connection.create_table :t1
+      connection.create_table :t2
+      create_dummy_view :v1, :t1
+      create_dummy_view :v2, :t2
+      example.run
+    ensure
+      drop_dummy_view :v1
+      drop_dummy_view :v2
+      connection.drop_table :t1, if_exists: true
+      connection.drop_table :t2, if_exists: true
+    end
+  end
+
+  it "does not cause deprecation" do
+    expect(ActiveSupport::Deprecation).not_to receive(:warn)
+    connection.tables_only
+  end
+
+  let(:ar_internal_tables) {
+    if ActiveRecord::VERSION::MAJOR >= 5
+      [ActiveRecord::InternalMetadata.table_name]
+    else
+      []
+    end
+  }
+
+  it "lists all tables" do
+    expect(connection.tables_only).to match_array %w[t1 t2] + ar_internal_tables
+  end
+
+  it "user_tables_only doesn't list internal tables" do
+    expect(connection.user_tables_only).to match_array %w[t1 t2]
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_compatibility
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ronen barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -154,15 +154,17 @@ files:
 - gemfiles/activerecord-5.0/Gemfile.sqlite3
 - lib/schema_plus/compatibility.rb
 - lib/schema_plus/compatibility/active_record/connection_adapters/abstract_adapter.rb
+- lib/schema_plus/compatibility/active_record/connection_adapters/mysql2_adapter.rb
+- lib/schema_plus/compatibility/active_record/connection_adapters/postgresql_adapter.rb
+- lib/schema_plus/compatibility/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/schema_plus/compatibility/active_record/migration.rb
 - lib/schema_plus/compatibility/version.rb
 - lib/schema_plus_compatibility.rb
 - schema_dev.yml
 - schema_plus_compatibility.gemspec
-- spec/abstract_adapter_spec.rb
 - spec/migration_spec.rb
 - spec/spec_helper.rb
-- spec/support/expectations.rb
+- spec/tables_only_spec.rb
 homepage: https://github.com/SchemaPlus/schema_plus_compatibility
 licenses:
 - MIT
@@ -188,7 +190,6 @@ signing_key:
 specification_version: 4
 summary: Compatibility helpers for the SchemaPlus family of gems
 test_files:
-- spec/abstract_adapter_spec.rb
 - spec/migration_spec.rb
 - spec/spec_helper.rb
-- spec/support/expectations.rb
+- spec/tables_only_spec.rb

data/spec/abstract_adapter_spec.rb

@@ -1,32 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe ActiveRecord::ConnectionAdapters::AbstractAdapter do
-
-  context "tables_without_deprecation" do
-
-    let(:connection) { ActiveRecord::Base.connection }
-
-    around(:each) do |example|
-      begin
-        connection.create_table :t1, force: true
-        connection.create_table :t2, force: true
-        example.run
-      ensure
-        connection.drop_table :t1, if_exists: true
-        connection.drop_table :t2, if_exists: true
-      end
-    end
-
-    it "does not create deprecation" do
-      expect_not_deprecated {
-        connection.tables_without_deprecation
-      }
-    end
-
-    it "lists all tables" do
-      expect(connection.tables_without_deprecation).to match_array %w{t1 t2}
-    end
-  end
-end
-

data/spec/support/expectations.rb

@@ -1,9 +0,0 @@
-def expect_not_deprecated(&block)
-  begin
-    save_behavior = ActiveSupport::Deprecation.behavior
-    ActiveSupport::Deprecation.behavior = :raise
-    expect { yield }.not_to raise_error
-  ensure
-    ActiveSupport::Deprecation.behavior = save_behavior
-  end
-end