sequel-rails 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba61c0752e0e4ebeea5a6c4b01f6cf85f94c0413866c43dad74af0cfa694950a
-  data.tar.gz: 30ea0b29dd1ffbe0438f1b2ed1626a176146348aa4c820de51b85335eec8d4f0
+  metadata.gz: 8ae909ba1a811f03330fa4fa5f66433fb725e48f878da92a62a3f3a0d31cfa75
+  data.tar.gz: 2701e9e4c9d8389dbac1888edbc64db469ebddbd966f30af08c16317ebd2c0f0
 SHA512:
-  metadata.gz: 1455a020956c332f8d91d65fd11678ca3701ca404cfd32adc760e1f753ab531c5e29433d3a1189d12a07c76a779feea1935913e7cc65ef518b85caf210a01dc6
-  data.tar.gz: d8be6934a488b6a4aff2eb6ca6b6007833fc9614439809a8a20a691c398dbd79768f3eb62711ad50c41e427e3ecd41f4845ca546590389f0a2860a2ba41a76e4
+  metadata.gz: d26336d4cf8376c3a08b6fcdf6fbbdecd4976cef3747f845bb1c022f7f3429140beb981ba2ae86ffed9754b0a063979386a0c765cf116f2aa4b8b587b14433bb
+  data.tar.gz: c14f662a88af0d045327c13bf94bd16946865c65cb73539d328934b45fb7a7de6ef0ae92616a442fff99619d61d6380e9df1fdeef0fb1a742c4edbf5726d7d59

data/.travis.yml

@@ -26,6 +26,7 @@ gemfile:
   - ci/rails-5.0.gemfile
   - ci/rails-5.1.gemfile
   - ci/rails-5.2.gemfile
+  - ci/rails-6.0.gemfile
 matrix:
   exclude:
     - rvm: 2.4.9
@@ -50,6 +51,13 @@ matrix:
       gemfile: ci/rails-4.0.gemfile
     - rvm: jruby-9.2.8.0
       gemfile: ci/rails-4.1.gemfile
+    - rvm: 2.2.9
+      gemfile: ci/rails-6.0.gemfile
+    - rvm: 2.3.8
+      gemfile: ci/rails-6.0.gemfile
+    - rvm: 2.4.9
+      gemfile: ci/rails-6.0.gemfile
+
 notifications:
   email:
     - jonathan.tron@metrilio.com

data/History.md

@@ -1,3 +1,14 @@
+master (unreleased)
+===================
+
+* Fix readme formatting (Ben Koshy)
+  [#175](https://github.com/TalentBox/sequel-rails/pull/175)
+* Add frozen_string_literal to migration template (Semyon Pupkov)
+  [#174](https://github.com/TalentBox/sequel-rails/pull/174)
+* Add allow_missing_migration_files option (Semyon Pupkov)
+  [#172](https://github.com/TalentBox/sequel-rails/pull/172)
+  [#173](https://github.com/TalentBox/sequel-rails/pull/173)
+
 1.1.0 (2019-10-29)
 ==================
 

data/README.md

@@ -166,6 +166,9 @@ You can configure some options with the usual rails mechanism, in
     # Allowed options: :sql, :ruby.
     config.sequel.schema_format = :sql
 
+    # Allowed options: true, false, default false
+    config.sequel.allow_missing_migration_files = true
+
     # Whether to dump the schema after successful migrations.
     # Defaults to false in production and test, true otherwise.
     config.sequel.schema_dump = true
@@ -250,11 +253,11 @@ Here's some examples:
 
   For in memory testing:
 
-    ```yaml
-    development:
+```yaml
+     development:
       adapter: sqlite # Also accept sqlite3
       database: ":memory:"
-    ```
+```
 
 Enabling plugins
 ================
@@ -412,6 +415,8 @@ Improvements have been made by those awesome contributors:
 * Dustin Byrne (@dsbyrne)
 * Michael Coyne (@mjc-gh)
 * p-leger (@p-leger)
+* Semyon Pupkov (@artofhuman)
+* Ben Koshy (@BKSpurgeon)
 
 Credits
 =======

data/ci/rails-6.0.gemfile

@@ -0,0 +1,28 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 6.0.0'
+gem 'activemodel', '~> 6.0.0'
+gem 'actionpack', '~> 6.0.0'
+
+gemspec :path => '../'
+
+gem 'sequel', "#{ENV['SEQUEL']}"
+
+gem 'fakefs', '0.11.2', :require => 'fakefs/safe'
+
+# MRI/Rubinius Adapter Dependencies
+platform :ruby do
+  gem 'pg'
+  if RUBY_VERSION < '2.4'
+    gem 'mysql'
+  end
+  gem 'mysql2'
+  gem 'sqlite3'
+end
+
+# JRuby Adapter Dependencies
+platform :jruby do
+  gem 'jdbc-sqlite3'
+  gem 'jdbc-mysql'
+  gem 'jdbc-postgres'
+end

data/lib/generators/sequel/migration/templates/migration.rb.erb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Sequel.migration do
   <%- if use_change -%>
   change do

data/lib/sequel_rails/migrations.rb

@@ -6,6 +6,7 @@ module SequelRails
       def migrate(version = nil)
         opts = {}
         opts[:target] = version.to_i if version
+        opts[:allow_missing_migration_files] = !!SequelRails.configuration.allow_missing_migration_files
 
         if migrations_dir.directory?
           ::Sequel::Migrator.run(::Sequel::Model.db, migrations_dir, opts)
@@ -29,8 +30,7 @@ module SequelRails
         res = ''
 
         if available_migrations?
-          migrator_class = ::Sequel::Migrator.send(:migrator_class, migrations_dir)
-          migrator = migrator_class.new db, migrations_dir
+          migrator = init_migrator
           res << adapter.schema_information_dump(migrator, sql)
         end
         res
@@ -43,8 +43,8 @@ module SequelRails
       def current_migration
         return unless available_migrations?
 
-        migrator_class = ::Sequel::Migrator.send(:migrator_class, migrations_dir)
-        migrator = migrator_class.new ::Sequel::Model.db, migrations_dir
+        migrator = init_migrator
+
         if migrator.respond_to?(:applied_migrations)
           migrator.applied_migrations.last
         elsif migrator.respond_to?(:current_version)
@@ -55,8 +55,8 @@ module SequelRails
       def previous_migration
         return unless available_migrations?
 
-        migrator_class = ::Sequel::Migrator.send(:migrator_class, migrations_dir)
-        migrator = migrator_class.new ::Sequel::Model.db, migrations_dir
+        migrator = init_migrator
+
         if migrator.respond_to?(:applied_migrations)
           migrator.applied_migrations[-2] || '0'
         elsif migrator.respond_to?(:current_version)
@@ -67,6 +67,16 @@ module SequelRails
       def available_migrations?
         File.exist?(migrations_dir) && Dir[File.join(migrations_dir, '*')].any?
       end
+
+      def init_migrator
+        migrator_class = ::Sequel::Migrator.send(:migrator_class, migrations_dir)
+
+        migrator_class.new(
+          ::Sequel::Model.db,
+          migrations_dir,
+          allow_missing_migration_files: !!SequelRails.configuration.allow_missing_migration_files
+        )
+      end
     end
   end
 end

data/lib/sequel_rails/storage/mysql.rb

@@ -13,6 +13,7 @@ module SequelRails
         commands = ['mysqldump']
         add_connection_settings commands
         add_flag commands, '--no-data'
+        add_flag commands, '--skip-dump-date'
         add_option commands, '--result-file', filename
         commands << database
         safe_exec commands

data/lib/sequel_rails/version.rb

@@ -1,3 +1,3 @@
 module SequelRails
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

data/spec/lib/sequel_rails/migrations_spec.rb

@@ -8,23 +8,40 @@ describe SequelRails::Migrations do
     describe ".#{migration_method}" do
       let(:result) { double(:result) }
       context 'with no version specified' do
-        let(:opts) { {} }
         it 'runs migrations using Sequel::Migrator' do
           expect(::Sequel::Migrator).to receive(:run).with(
-            db, Rails.root.join('db/migrate'), opts
+            db, Rails.root.join('db/migrate'), allow_missing_migration_files: false
           ).and_return result
           expect(described_class.send(migration_method)).to be(result)
         end
       end
       context 'with version specified' do
-        let(:opts) { { :target => 1 } }
         it 'runs migrations using Sequel::Migrator' do
           expect(::Sequel::Migrator).to receive(:run).with(
-            db, Rails.root.join('db/migrate'), opts
+            db, Rails.root.join('db/migrate'), allow_missing_migration_files: false, target: 1
           ).and_return result
           expect(described_class.send(migration_method, 1)).to be(result)
         end
       end
+
+      context 'with allow_missing_migration_files' do
+        around do |ex|
+          option = SequelRails.configuration.allow_missing_migration_files
+          SequelRails.configuration.allow_missing_migration_files = true
+
+          ex.run
+
+          SequelRails.configuration.allow_missing_migration_files = option
+        end
+
+        it 'runs migrations using Sequel::Migrator' do
+          expect(::Sequel::Migrator).to receive(:run).with(
+            db, Rails.root.join('db/migrate'), allow_missing_migration_files: true
+          ).and_return result
+
+          described_class.send(migration_method)
+        end
+      end
     end
   end
 

data/spec/lib/sequel_rails/storage/mysql_spec.rb

@@ -46,7 +46,7 @@ describe SequelRails::Storage::Mysql, :mysql do
     let(:dump_file_name) { 'dump.sql' }
     it 'uses the mysqldump command' do
       expect(subject).to receive(:`).with(
-        "mysqldump --user\\=#{username} --password\\=#{password} --host\\=#{host} --port\\=#{port} --no-data --result-file\\=#{dump_file_name} #{database}"
+        "mysqldump --user\\=#{username} --password\\=#{password} --host\\=#{host} --port\\=#{port} --no-data --skip-dump-date --result-file\\=#{dump_file_name} #{database}"
       )
       subject._dump dump_file_name
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sequel-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Brasten Sager (brasten)
 - Jonathan TRON
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -216,6 +216,7 @@ files:
 - ci/rails-5.0.gemfile
 - ci/rails-5.1.gemfile
 - ci/rails-5.2.gemfile
+- ci/rails-6.0.gemfile
 - config.ru
 - lib/action_dispatch/middleware/session/sequel_store.rb
 - lib/generators/sequel.rb
@@ -283,7 +284,7 @@ homepage: http://talentbox.github.io/sequel-rails/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -299,8 +300,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Use Sequel with Rails (3.x and 4.x)
 test_files: