scenic-mysql_adapter 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbe954472899fc9a6d5c8dbb08885ad71ea52e52
-  data.tar.gz: 8bb87cad49d599246c5ca6b71639bae7b19ec048
+  metadata.gz: d6f0744e97155966fa7ce57be4b5a54af87f87df
+  data.tar.gz: c4e85b7b3f4ddd1515c0c18dc41137fc477ad4a8
 SHA512:
-  metadata.gz: 6c70a9e38ac2d9554e3a5d80bd444cf451fba938e22036f21726a764cd0196bb121c705ea64ecd929017ea640db2ab977ea02fdfb1ced068b08d07cc6adc52e5
-  data.tar.gz: c8032f98be27836836bed9fc7c2c2ac6526fc2f53d71b3b7e5c0253837013945de04120dde1e481f5993241d22203072c5f3b3faefd801310e54ce60583fd52c
+  metadata.gz: e6ca4956ad189e565a7abeea03fa71092aa4010b9147cc3c9315e51d7d150d1b57897992b186ddcb331594d2a49c0d7e9778fe2fa6cac6d68b00e8a0d1634f3a
+  data.tar.gz: 18ee7349eeaa535d474a57d47eba3ed0e429ce177e858a75767d233d30f7e1a17de6c92db4805dd18a951b0eff55ea5aaa77a9553a75f8dcd07545e28f04bd19

data/.circleci/config.yml

@@ -12,4 +12,5 @@ jobs:
     steps:
       - checkout
       - run: bin/setup
-      - run: rake test
+      - run: appraisal install
+      - run: appraisal rake test

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/gemfiles/*.lock

data/Appraisals

@@ -0,0 +1,29 @@
+appraise "rails-42" do
+  gem "mysql2", "0.4.4"
+  gem "activerecord", "~> 4.2", "< 5.0"
+  gem "activemodel", "~> 4.2", "< 5.0"
+  gem "actionpack", "~> 4.2", "< 5.0"
+  gem "activesupport", "~> 4.2", "< 5.0"
+end
+
+appraise "rails-50" do
+  gem "activerecord", "~> 5.0", "< 5.1"
+  gem "activemodel", "~> 5.0", "< 5.1"
+  gem "actionpack", "~> 5.0", "< 5.1"
+  gem "activesupport", "~> 5.0", "< 5.1"
+end
+
+appraise "rails-51" do
+  gem "mysql2", "0.4.4"
+  gem "activerecord", "~> 5.1", "< 5.2"
+  gem "activemodel", "~> 5.1", "< 5.2"
+  gem "actionpack", "~> 5.1", "< 5.2"
+  gem "activesupport", "~> 5.1", "< 5.2"
+end
+
+appraise "rails-52" do
+  gem "activerecord", "~> 5.2"
+  gem "activemodel", "~> 5.2"
+  gem "actionpack", "~> 5.2"
+  gem "activesupport", "~> 5.2"
+end

data/README.md

@@ -22,7 +22,7 @@ Then create the following file:
 # config/initializers/scenic.rb
 
 Scenic.configure do |config|
-  config.database = Scenic::MySQL::Adapter
+  config.database = Scenic::Adapters::MySQL.new
 end
 ```
 

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/rails_42.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mysql2", "0.4.4"
+gem "activerecord", "~> 4.2", "< 5.0"
+gem "activemodel", "~> 4.2", "< 5.0"
+gem "actionpack", "~> 4.2", "< 5.0"
+gem "activesupport", "~> 4.2", "< 5.0"
+
+gemspec path: "../"

data/gemfiles/rails_50.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0", "< 5.1"
+gem "activemodel", "~> 5.0", "< 5.1"
+gem "actionpack", "~> 5.0", "< 5.1"
+gem "activesupport", "~> 5.0", "< 5.1"
+
+gemspec path: "../"

data/gemfiles/rails_51.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mysql2", "0.4.4"
+gem "activerecord", "~> 5.1", "< 5.2"
+gem "activemodel", "~> 5.1", "< 5.2"
+gem "actionpack", "~> 5.1", "< 5.2"
+gem "activesupport", "~> 5.1", "< 5.2"
+
+gemspec path: "../"

data/gemfiles/rails_52.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.2"
+gem "activemodel", "~> 5.2"
+gem "actionpack", "~> 5.2"
+gem "activesupport", "~> 5.2"
+
+gemspec path: "../"

data/lib/scenic/adapters/railtie.rb

@@ -0,0 +1,16 @@
+require "rails/railtie"
+require 'active_record/connection_adapters/abstract_mysql_adapter'
+require_relative '../mysql_adapter/schema_dumper'
+
+module Scenic
+  module Adapters
+    class MySqlRailtie < Rails::Railtie
+      ActiveSupport.on_load :active_record do
+        unless ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.respond_to?(:views)
+          # Versions of Rails < 5 need this patch to avoid listing views as tables in schema.rb
+          ActiveRecord::SchemaDumper.prepend Scenic::Adapters::MySql::SchemaDumper
+        end
+      end
+    end
+  end
+end

data/lib/scenic/mysql_adapter.rb

@@ -2,3 +2,4 @@ require 'active_record'
 require 'scenic'
 require_relative 'adapters/my_sql'
 require_relative 'mysql_adapter/version'
+require_relative 'adapters/railtie' if defined?(Rails)

data/lib/scenic/mysql_adapter/schema_dumper.rb

@@ -0,0 +1,42 @@
+# This code is needed to support SQL views in MySQL in Rails < 5.1
+# if you want to continue using 'db/schema.rb' instead of migrating to
+# the SQL version 'db/structure.sql'.
+#
+# The problem is that, when you execute "SHOW TABLES" in MySQL, any
+# view that you hava created also shows in that list.
+#
+# So when you create a view, when the 'db/schema.rb' file is updated,
+# the view appears twice: first as a table, then as a view.
+#
+# As of this writing, the latest 5.x versions of Rails filter out
+# views when providing the list of tables, so this problem doesn't
+# appear. But for previous versions it's still there.
+#
+# This code patches the method SchemaDumper#table which is in charge
+# of dumping a table to the 'db/schema.rb' file when it's being updated
+# and does nothing when the supplied table is actually a view.
+#
+# This module needs to be prepended to ActiveRecord::SchemaDumper for
+# the patch to work. See 'adapters/railtie.rb'
+
+require "rails"
+require_relative '../adapters/my_sql'
+
+module Scenic
+  module Adapters
+    module MySql
+      module SchemaDumper
+        def table(table, stream)
+          return if defined_views.any? { |v| v.name == table } # Ignore tables that are views
+          super
+        end
+
+        private
+
+        def defined_views
+          @defined_views ||= Scenic.database.views
+        end
+      end
+    end
+  end
+end

data/lib/scenic/mysql_adapter/version.rb

@@ -1,5 +1,5 @@
 module Scenic
   module MysqlAdapter
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/scenic-mysql_adapter.gemspec

@@ -34,4 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "appraisal"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scenic-mysql_adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Lance Ivy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scenic
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - lance@cainlevy.net
@@ -89,14 +103,22 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitignore"
+- Appraisals
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/.bundle/config
+- gemfiles/rails_42.gemfile
+- gemfiles/rails_50.gemfile
+- gemfiles/rails_51.gemfile
+- gemfiles/rails_52.gemfile
 - lib/scenic/adapters/my_sql.rb
+- lib/scenic/adapters/railtie.rb
 - lib/scenic/mysql_adapter.rb
+- lib/scenic/mysql_adapter/schema_dumper.rb
 - lib/scenic/mysql_adapter/version.rb
 - lib/scenic/mysql_adapter/views.rb
 - scenic-mysql_adapter.gemspec