sequel-rails 0.9.16 → 1.1.1

data/ci/rails-5.2.gemfile

@@ -0,0 +1,28 @@
+source 'https://rubygems.org'
+
+gem 'railties', '~> 5.2.2'
+gem 'activemodel', '~> 5.2.2'
+gem 'actionpack', '~> 5.2.2'
+
+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/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/action_dispatch/middleware/session/sequel_store.rb

@@ -26,13 +26,17 @@ module ActionDispatch
       end
 
       def get_session(env, sid)
-        session = load_from_store(sid)
-        env[SESSION_RECORD_KEY] = session
-        [session.session_id, session.data]
+        with_silenced_logger do
+          session = load_from_store(sid)
+          env[SESSION_RECORD_KEY] = session
+          [session.session_id, session.data]
+        end
       end
 
       def write_session(req, sid, session_data, options)
-        set_session(req.env, sid, session_data, options)
+        with_silenced_logger do
+          set_session(req.env, sid, session_data, options)
+        end
       end
 
       def set_session(env, sid, session_data, options)
@@ -42,7 +46,9 @@ module ActionDispatch
       end
 
       def delete_session(req, sid, options)
-        destroy_session(req.env, sid, options)
+        with_silenced_logger do
+          destroy_session(req.env, sid, options)
+        end
       end
 
       def destroy_session(env, sid, options)
@@ -53,10 +59,12 @@ module ActionDispatch
       end
 
       def get_session_model(env, sid)
-        if env[ENV_SESSION_OPTIONS_KEY][:id].nil?
-          env[SESSION_RECORD_KEY] = load_from_store(sid)
-        else
-          env[SESSION_RECORD_KEY] ||= load_from_store(sid)
+        with_silenced_logger do
+          if env[ENV_SESSION_OPTIONS_KEY][:id].nil?
+            env[SESSION_RECORD_KEY] = load_from_store(sid)
+          else
+            env[SESSION_RECORD_KEY] ||= load_from_store(sid)
+          end
         end
       end
 
@@ -65,6 +73,10 @@ module ActionDispatch
         klass.where(:session_id => sid).first ||
           klass.new(:session_id => generate_sid, :data => {})
       end
+
+      def with_silenced_logger
+        Rails.application.config.sequel.logger.silence { yield }
+      end
     end
   end
 end

data/lib/generators/sequel.rb

@@ -17,6 +17,13 @@ module Sequel
         )
       end
 
+      # Implement the required interface for Rails::Generators::Migration.
+      #
+      def self.next_migration_number(dirname) #:nodoc:
+        next_migration_number = current_migration_number(dirname) + 1
+        [Time.now.utc.strftime('%Y%m%d%H%M%S'), format('%.14d', next_migration_number)].max
+      end
+
       protected
 
       # Sequel does not care if migrations have the same name as long as
@@ -25,13 +32,6 @@ module Sequel
       def migration_exists?(_dirname, _file_name) #:nodoc:
         false
       end
-
-      # Implement the required interface for Rails::Generators::Migration.
-      #
-      def self.next_migration_number(dirname) #:nodoc:
-        next_migration_number = current_migration_number(dirname) + 1
-        [Time.now.utc.strftime('%Y%m%d%H%M%S'), format('%.14d', next_migration_number)].max
-      end
     end
 
     class ActiveModel < ::Rails::Generators::ActiveModel #:nodoc:

data/lib/generators/sequel/migration/migration_generator.rb

@@ -61,7 +61,7 @@ module Sequel
       end
 
       def validate_file_name!
-        fail IllegalMigrationNameError file_name unless file_name =~ /^[_a-z0-9]+$/
+        raise IllegalMigrationNameError.new(file_name) unless file_name =~ /^[_a-z0-9]+$/
       end
     end
   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/generators/sequel/model/model_generator.rb

@@ -12,10 +12,11 @@ module Sequel
       class_option :parent,     :type => :string, :desc => 'The parent class for the generated model'
 
       def create_migration_file
+        return unless options[:migration]
         migration_template(
           'migration.rb.erb',
           File.join('db', 'migrate', "create_#{table_name}.rb")
-        ) if options[:migration]
+        )
       end
 
       def create_model_file

data/lib/generators/sequel/session_migration/session_migration_generator.rb

@@ -23,7 +23,7 @@ module Sequel
       end
 
       def validate_file_name!
-        fail IllegalMigrationNameError file_name unless file_name =~ /^[_a-z0-9]+$/
+        raise IllegalMigrationNameError, file_name unless file_name =~ /^[_a-z0-9]+$/
       end
     end
   end

data/lib/sequel_rails/configuration.rb

@@ -28,6 +28,7 @@ module SequelRails
       self.load_database_tasks = true
       self.after_connect = nil
       self.skip_connect = nil
+      self.test_connect = true
     end
 
     def environment_for(name)
@@ -37,7 +38,7 @@ module SequelRails
     def environments
       @environments ||= raw.reduce(
         # default config - use just the environment variable
-        Hash.new normalize_repository_config({})
+        Hash.new(normalize_repository_config({}))
       ) do |normalized, environment|
         name = environment.first
         config = environment.last
@@ -49,8 +50,8 @@ module SequelRails
     def connect(environment)
       normalized_config = environment_for environment
 
-      unless (normalized_config.keys & %w(adapter url)).any?
-        fail "Database not configured.\n" \
+      unless (normalized_config.keys & %w[adapter url]).any?
+        raise "Database not configured.\n" \
             'Please create config/database.yml or set DATABASE_URL in environment.'
       end
 
@@ -64,7 +65,7 @@ module SequelRails
     private
 
     def default_schema_dump
-      !%w(test production).include? Rails.env
+      !%w[test production].include? Rails.env
     end
 
     def normalize_repository_config(hash)
@@ -72,6 +73,8 @@ module SequelRails
 
       config['max_connections'] = max_connections if max_connections
       config['search_path'] = search_path if search_path
+      config['servers'] = servers if servers
+      config['test'] = test_connect
 
       url = ENV['DATABASE_URL']
       config['url'] ||= url if url

data/lib/sequel_rails/db_config.rb

@@ -33,7 +33,7 @@ module SequelRails
     ADAPTER_MAPPING = {
       'sqlite3' => 'sqlite',
       'postgresql' => 'postgres'
-    }
+    }.freeze
 
     def normalize_adapter
       self[:adapter] = ADAPTER_MAPPING[adapter.to_s] || adapter.to_s
@@ -59,7 +59,7 @@ module SequelRails
         scheme, subadapter = adapter.split ':'
         URI::Generic.build(
           :scheme => scheme,
-          :opaque => build_url(to_hash.merge 'adapter' => subadapter).to_s
+          :opaque => build_url(to_hash.merge('adapter' => subadapter)).to_s
         )
       else
         build_url to_hash
@@ -73,8 +73,8 @@ module SequelRails
         return URI::Generic.build(:scheme => adapter, :opaque => database)
       end
 
-      # these four are handled separately
-      params = cfg.reject { |k, _| %w(adapter host port database).include? k }
+      # these are handled separately
+      params = cfg.reject { |k, _| non_params.include? k }
 
       if (v = params['search_path'])
         # make sure there's no whitespace
@@ -96,6 +96,10 @@ module SequelRails
         :query => q
       )
     end
+
+    def non_params
+      %w(adapter host port database servers)
+    end
   end
 end
 

data/lib/sequel_rails/migrations.rb

@@ -6,7 +6,14 @@ module SequelRails
       def migrate(version = nil)
         opts = {}
         opts[:target] = version.to_i if version
-        ::Sequel::Migrator.run(::Sequel::Model.db, migrations_dir, opts)
+        opts[:allow_missing_migration_files] = !!SequelRails.configuration.allow_missing_migration_files
+
+        if migrations_dir.directory?
+          ::Sequel::Migrator.run(::Sequel::Model.db, migrations_dir, opts)
+        else
+          relative_path_name = migrations_dir.relative_path_from(Rails.root).to_s
+          raise "The #{relative_path_name} directory doesn't exist, you need to create it."
+        end
       end
       alias_method :migrate_up!, :migrate
       alias_method :migrate_down!, :migrate
@@ -23,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
@@ -37,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)
@@ -49,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)
@@ -61,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/railtie.rb

@@ -38,12 +38,16 @@ module SequelRails
 
     rake_tasks do |app|
       load_tasks_config = app.config.sequel.load_database_tasks
+
       SequelRails::TASK_NAMESPACE =
-      case load_tasks_config
-      when Symbol, String then load_tasks_config.to_sym
-      else :db
-      end
+        case load_tasks_config
+        when Symbol, String then load_tasks_config.to_sym
+        else :db
+        end
+
       load 'sequel_rails/railties/database.rake' if load_tasks_config
+
+      check_skip_connect_conditions(app)
     end
 
     initializer 'sequel.load_hooks' do
@@ -68,7 +72,7 @@ module SequelRails
     end
 
     initializer 'sequel.connect' do |app|
-      ::SequelRails.setup ::Rails.env unless app.config.sequel[:skip_connect]
+      ::SequelRails.setup(::Rails.env) if database_connection_required?(app)
     end
 
     initializer 'sequel.spring' do |_app|
@@ -105,5 +109,17 @@ module SequelRails
       require 'sequel_rails/railties/controller_runtime'
       ActionController::Base.send :include, SequelRails::Railties::ControllerRuntime
     end
+
+    def check_skip_connect_conditions(app)
+      app.config.sequel[:skip_connect] ||= database_create_command?
+    end
+
+    def database_connection_required?(app)
+      !app.config.sequel[:skip_connect]
+    end
+
+    def database_create_command?
+      ["db:create", "db:create:all"].any? { |c| ARGV.include?(c) }
+    end
   end
 end

data/lib/sequel_rails/railties/database.rake

@@ -22,11 +22,17 @@ namespace sequel_rails_namespace do
     task :dump => :environment do
       db_for_current_env.extension :schema_dumper
       filename = ENV['SCHEMA'] || "#{Rails.root}/db/schema.rb"
-      File.open filename, 'w' do |file|
-        file << db_for_current_env.dump_schema_migration(:same_db => true)
-        file << SequelRails::Migrations.dump_schema_information(:sql => false)
+
+      if Rails.root.join("db").exist?
+        File.open filename, 'w' do |file|
+          file << db_for_current_env.dump_schema_migration(:same_db => true)
+          file << SequelRails::Migrations.dump_schema_information(:sql => false)
+        end
+
+        Rake::Task["#{sequel_rails_namespace}:schema:dump"].reenable
+      else
+        abort "The db/ directory doesn't exist, please create it."
       end
-      Rake::Task["#{sequel_rails_namespace}:schema:dump"].reenable
     end
 
     desc 'Load a schema.rb file into the database'
@@ -45,6 +51,7 @@ namespace sequel_rails_namespace do
   namespace :structure do
     desc 'Dump the database structure to db/structure.sql'
     task :dump, [:env] => :environment do |_t, args|
+      db_for_current_env
       args.with_defaults(:env => Rails.env)
 
       filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, 'db', 'structure.sql')
@@ -126,6 +133,7 @@ namespace sequel_rails_namespace do
   namespace :migrate do
     task :load => :environment do
       require 'sequel_rails/migrations'
+      db_for_current_env
     end
 
     desc 'Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x. Target specific version with VERSION=x.'
@@ -145,7 +153,7 @@ namespace sequel_rails_namespace do
     desc 'Runs the "up" for a given migration VERSION.'
     task :up => :load do
       version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
-      fail 'VERSION is required' unless version
+      raise 'VERSION is required' unless version
       SequelRails::Migrations.migrate_up!(version)
       Rake::Task["#{sequel_rails_namespace}:dump"].invoke if SequelRails.configuration.schema_dump
     end
@@ -153,7 +161,7 @@ namespace sequel_rails_namespace do
     desc 'Runs the "down" for a given migration VERSION.'
     task :down => :load do
       version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
-      fail 'VERSION is required' unless version
+      raise 'VERSION is required' unless version
       SequelRails::Migrations.migrate_down!(version)
       Rake::Task["#{sequel_rails_namespace}:dump"].invoke if SequelRails.configuration.schema_dump
     end
@@ -205,6 +213,23 @@ namespace sequel_rails_namespace do
       Rails.env = previous_env
     end
   end
+
+  namespace :sessions do
+    desc 'Clear the sessions table'
+    task clear: :environment do
+      db_for_current_env.from(:sessions).truncate
+    end
+
+    desc 'Trim old sessions from the table (default: > 30 days)'
+    task :trim, [:threshold] => :environment do |_, args|
+      cutoff_period = (args.fetch(:threshold) { 30 }).to_i.days.ago
+
+      db_for_current_env
+        .from(:sessions)
+        .where { updated_at < cutoff_period }
+        .delete
+    end
+  end
 end
 
 task 'test:prepare' => "#{sequel_rails_namespace}:test:prepare"