umbrellio-sequel-plugins 0.6.0.36 → 0.8.0.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c92a1d29490b8fd24dd91e437cb033f352ee39e0c0536883c9e96e5d1246bac6
-  data.tar.gz: 628872cf99c8cda84dc57c5e909f5b18f16fa0d8c08e5dbce800124dc13fa28b
+  metadata.gz: a5c9f5f32a4df0073264d3eaceffad9ddd253d6f0ba2df064cef8f3a4c833007
+  data.tar.gz: e8419cbb2ae5eea378770e05090119551aaf7d94e8787417ca90feaf0f496cb6
 SHA512:
-  metadata.gz: 24f16e52cda5ebe24717d8e73f7ff2ca91841936d7c8626847e13dd51127133ad270a48dfcfd3e4c4ffb4b62a7652907a62334365959f800d6484fc149f03af0
-  data.tar.gz: c391e66f9bc8758b5569aefdc668cb45a5a6b3a3179e8a508ba691b1ced66562556aa3634a32df7f6cb0a042c437b9165a7b57c90f99af3805993c900d9393a0
+  metadata.gz: f6b623635f70d7a4d7a8865a379e65352979ffa453f66eb736bf557a7b9956278a2b1bc97b0ae94bd531c627bee732e903f365d83c482e300f8e52223c0ebfdc
+  data.tar.gz: 4aef5eb0a420c6df4af7d8384d79d55763582d6a8a4ddda0d2220f996d667d757bfb005a1bfe8c334a486f661ee2969c9c5a4fa2ca05c0514a4b66e2a53a7e08

data/.github/workflows/ci.yml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.5", "2.6", "2.7", "3.0"]
+        ruby: ["2.7", "3.0", "3.1"]
 
     name: ${{ matrix.ruby }}
 

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.7
 
 Naming/FileName:
   Exclude:

data/CHANGELOG.md

@@ -1,13 +1,31 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [0.8.0] 2022-06-29
+### Added
+
+- `rails dbconsole` command support for Sequel (also aliased as `rails db`) for easy access to the DB console. See the README for installation instructions.
+
+## [0.7.0] 2022-06-24
+### Added
+- `DB.extension(:set_local)` - allows to set transaction locals;
+- Support of transaction options via `transaction_options` in migrations;
+
+## [0.6.0] 2022-06-15
+### Added
+- `mode` param for `Sequel::Model.plugin(:with_lock)`, defaults to `FOR NO KEY UPDATE`;
+
+## [0.5.0] 2020-06-06
+### Added
+- `Sequel::Model.plugin(:attr_encrypted)` - encrypts to model attributes;
+
 ## [0.4.0] 2019-11-18
 ### Added
 - `Sequel.extension(:deferrable_foreign_keys)` - makes foreign keys constraints deferrable by default;
 
 ## [0.3.2] 2018-07-03
 ### Added
-- Support sequel expessions in `with_rates`
+- Support sequel expressions in `with_rates`;
 
 ## [0.3.0] 2018-04-24
 ### Added

data/Gemfile.lock

@@ -1,86 +1,84 @@
 PATH
   remote: .
   specs:
-    umbrellio-sequel-plugins (0.6.0)
+    umbrellio-sequel-plugins (0.8.0)
       sequel
       symbiont-ruby
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.2)
+    activesupport (7.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.4.4)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
     docile (1.4.0)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    minitest (5.14.4)
+    minitest (5.16.1)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    pg (1.2.3)
+    pg (1.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (2.2.3)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
+    rack (2.2.3.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.30.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.7.0)
-      parser (>= 3.0.1.1)
-    rubocop-config-umbrellio (1.11.0.40)
-      rubocop (= 1.11.0)
-      rubocop-performance (= 1.10.0)
-      rubocop-rails (= 2.9.1)
-      rubocop-rake (= 0.5.1)
-      rubocop-rspec (= 2.2.0)
-      rubocop-sequel (= 0.2.0)
-    rubocop-performance (1.10.0)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    rubocop-config-umbrellio (1.30.0.65)
+      rubocop (~> 1.30.0)
+      rubocop-performance (~> 1.14.0)
+      rubocop-rails (~> 2.14.2)
+      rubocop-rake (~> 0.6.0)
+      rubocop-rspec (~> 2.11.1)
+      rubocop-sequel (~> 0.3.3)
+    rubocop-performance (1.14.2)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.9.1)
+    rubocop-rails (2.14.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.2.0)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
-    rubocop-sequel (0.2.0)
+    rubocop-rspec (2.11.1)
+      rubocop (~> 1.19)
+    rubocop-sequel (0.3.4)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
     sequel (5.57.0)
@@ -90,12 +88,11 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
-    simplecov_json_formatter (0.1.3)
-    symbiont-ruby (0.6.0)
+    simplecov_json_formatter (0.1.4)
+    symbiont-ruby (0.7.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.2.0)
 
 PLATFORMS
   ruby
@@ -113,4 +110,4 @@ DEPENDENCIES
   umbrellio-sequel-plugins!
 
 BUNDLED WITH
-   2.2.17
+   2.3.16

data/README.md

@@ -23,6 +23,8 @@ $ bundle
 - [`Synchronize`](#Synchronize)
 - [`Methods in Migrations`](#Methods-in-Migrations)
 - [`Deferrable Foreign Keys`](#Deferrable-Foreign-Keys)
+- [`Set Local`](#Set-Local)
+- [`Migration Transaction Options`](#Migration-Transaction-Options)
 
 # Plugins
 
@@ -37,6 +39,7 @@ $ bundle
 
 # Tools
 - [`TimestampMigratorUndoExtension`](#TimestampMigratorUndoExtension)
+- [`Rails DBConsole`](#Rails-DBConsole)
 
 ## CurrencyRates
 
@@ -186,7 +189,7 @@ OR
 ```ruby
 # wives attributes: id (pk), husband_id (fk)
 # husbands attributes: id (pk), wife_id (fk)
- 
+
 Wife = Sequel::Model(:wives)
 Husband = Sequel::Model(:husbands)
 
@@ -204,6 +207,47 @@ end
 #   => <Husband @attributes={id:1, wife_id: 1}>
 ```
 
+
+## Set Local
+
+Enable: `DB.extension(:set_local)`
+
+Makes possible to set transaction locals.
+
+Example:
+
+```ruby
+DB.transaction(set_local: { lock_timeout: "5s", statement_timeout: "5s" }) {}
+```
+```sql
+BEGIN;
+SET LOCAL lock_timeout = '5s';
+SET LOCAL statement_timeout = '5s';
+COMMIT;
+```
+
+
+## Migration Transaction Options
+
+Enable: `Sequel.extension(:migration_transaction_options)`
+
+Makes possible to pass `transaction_options` in migrations.
+
+Example:
+
+```ruby
+Sequel.migration do
+  transaction_options rollback: :always
+
+  up { DB.select("1") }
+end
+```
+```sql
+BEGIN;
+SELECT '1';
+ROLLBACK;
+```
+
 ## AttrEncrypted
 
 Enable: `Sequel::Model.plugin :attr_encrypted`
@@ -409,11 +453,21 @@ Example:
 rake sequel:undo VERSION=1549624163
 ```
 
+## Rails DBConsole
+
+Overrides Rails default `dbconsole` and `db` commands. In order to use it, you have to add the following line to your `boot.rb` file:
+
+```ruby
+require "umbrellio_sequel_plugins/rails_db_command"
+```
+
 ## License
+
 Released under MIT License.
 
 ## Authors
-Created by Aleksey Bespalov.
+
+Created by Team Umbrellio.
 
 <a href="https://github.com/umbrellio/">
   <img style="float: left;" src="https://umbrellio.github.io/Umbrellio/supported_by_umbrellio.svg" alt="Supported by Umbrellio" width="439" height="72">

data/lib/sequel/extensions/migration_transaction_options.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module MigrationDSLExtension
+  def transaction_options(opts)
+    migration.transaction_opts = opts
+  end
+end
+
+module SimpleMigrationExtension
+  attr_accessor :transaction_opts
+end
+
+module MigratorExtension
+  def checked_transaction(migration, &block)
+    if _use_transaction?(migration)
+      _transaction(migration, &block)
+    else
+      yield
+    end
+  end
+
+  private
+
+  def _use_transaction?(migration)
+    # NOTE: original code
+    if @use_transactions.nil?
+      if migration.use_transactions.nil?
+        @db.supports_transactional_ddl?
+      else
+        migration.use_transactions
+      end
+    else
+      @use_transactions
+    end
+  end
+
+  def _transaction(migration, &block)
+    if migration.transaction_opts.nil?
+      db.transaction(&block)
+    else
+      db.transaction(migration.transaction_opts, &block)
+    end
+  end
+end
+
+Sequel::MigrationDSL.include(MigrationDSLExtension)
+Sequel::SimpleMigration.include(SimpleMigrationExtension)
+Sequel::Migrator.prepend(MigratorExtension)

data/lib/sequel/extensions/set_local.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Sequel
+  module SetLocal
+    private
+
+    def begin_new_transaction(conn, opts)
+      super
+      check_set_local(conn, opts[:set_local])
+    end
+
+    def check_set_local(conn, locals)
+      return if locals.nil?
+
+      locals.each do |key, value|
+        log_connection_execute(conn, "SET LOCAL #{key} = \"#{value}\"")
+      end
+    end
+  end
+
+  Database.register_extension(:set_local, SetLocal)
+end

data/lib/sequel/plugins/synchronize.rb

@@ -4,8 +4,8 @@
 module Sequel::Plugins::Synchronize
   module ClassMethods
     # Watch Sequel::Synchronize#synchronize_with
-    def synchronize_with(*args, &block)
-      db.extension(:synchronize).synchronize_with(*args, &block)
+    def synchronize_with(...)
+      db.extension(:synchronize).synchronize_with(...)
     end
   end
 

data/lib/tasks/sequel/rollback_missing_migrations.rake

@@ -10,8 +10,8 @@ namespace :sequel do
       Dir.glob("#{path}/db/migrate/*.rb").map { |filename| File.basename(filename).to_i }
     end
 
-    old_migrations = extract_migrations(ENV["OLD_RELEASE"])
-    new_migrations = extract_migrations(ENV["NEW_RELEASE"])
+    old_migrations = extract_migrations(ENV.fetch("OLD_RELEASE"))
+    new_migrations = extract_migrations(ENV.fetch("NEW_RELEASE"))
     migrations_to_rollback = old_migrations - new_migrations
 
     next if migrations_to_rollback.empty?

data/lib/umbrellio_sequel_plugins/rails_db_command.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "rails/command"
+require "rails/commands/dbconsole/dbconsole_command"
+
+class Rails::Command::DbconsoleCommand < Rails::Command::Base
+  def perform
+    require "rake"
+    Rake.with_application(&:load_rakefile) # Needed to initialize Rails.application
+    Rails::DBConsole.start(options)
+  end
+end
+
+class Rails::DBConsole
+  DBConfig = Struct.new(:configuration_hash, :adapter, :database)
+
+  private
+
+  def db_config
+    @db_config ||= DBConfig.new(configuration_hash, adapter, database)
+  end
+
+  def configuration_hash
+    return @configuration_hash if defined?(@configuration_hash)
+
+    rails_db_config = Rails.application.config.database_configuration
+
+    sequel_configuration = SequelRails::Configuration.new
+    SequelRails.configuration = sequel_configuration.merge!(raw: rails_db_config)
+
+    storage = SequelRails::Storage.adapter_for(Rails.env)
+    @configuration_hash = storage.config.with_indifferent_access
+  end
+
+  def adapter
+    mapping = SequelRails::DbConfig::ADAPTER_MAPPING.invert
+    value = configuration_hash.fetch(:adapter)
+    mapping[value] || value
+  end
+
+  def database
+    @options[:database] || configuration_hash.fetch(:database)
+  end
+end

data/umbrellio-sequel-plugins.gemspec

@@ -4,15 +4,18 @@ lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  gem_version = "0.6.0"
-  release_version = "#{gem_version}.#{ENV["GITHUB_RUN_NUMBER"]}" if ENV["PUBLISH_JOB"]
+  gem_version = "0.8.0"
+
+  if ENV.fetch("PUBLISH_JOB", nil)
+    release_version = "#{gem_version}.#{ENV.fetch("GITHUB_RUN_NUMBER")}"
+  end
 
   spec.name = "umbrellio-sequel-plugins"
   spec.version = release_version || gem_version
-  spec.required_ruby_version = ">= 2.4"
+  spec.required_ruby_version = ">= 2.7"
 
-  spec.authors = ["nulldef"]
-  spec.email = ["nulldefiner@gmail.com", "oss@umbrellio.biz"]
+  spec.authors = ["Team Umbrellio"]
+  spec.email = ["oss@umbrellio.biz"]
   spec.homepage = "https://github.com/umbrellio/umbrellio-sequel-plugins"
   spec.licenses = ["MIT"]
   spec.summary = "Sequel plugins"

data/utils/database.rb

@@ -2,7 +2,7 @@
 
 require "logger"
 
-DB = Sequel.connect(ENV["DB_URL"] || "postgres://localhost/sequel_plugins")
+DB = Sequel.connect(ENV.fetch("DB_URL", "postgres://localhost/sequel_plugins"))
 DB.logger = Logger.new("log/db.log")
 
 Sequel::Model.db = DB
@@ -14,6 +14,7 @@ DB.extension :pg_range
 DB.extension :currency_rates
 DB.extension :pg_tools
 DB.extension :slave
+DB.extension :set_local
 DB.extension :synchronize
 
 Sequel.extension :deferrable_foreign_keys

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbrellio-sequel-plugins
 version: !ruby/object:Gem::Version
-  version: 0.6.0.36
+  version: 0.8.0.73
 platform: ruby
 authors:
-- nulldef
+- Team Umbrellio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -166,7 +166,6 @@ dependencies:
         version: '0'
 description: A colletion of sequel plugins by Umbrellio
 email:
-- nulldefiner@gmail.com
 - oss@umbrellio.biz
 executables: []
 extensions: []
@@ -176,7 +175,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -188,7 +186,9 @@ files:
 - lib/sequel/extensions/currency_rates.rb
 - lib/sequel/extensions/deferrable_foreign_keys.rb
 - lib/sequel/extensions/methods_in_migrations.rb
+- lib/sequel/extensions/migration_transaction_options.rb
 - lib/sequel/extensions/pg_tools.rb
+- lib/sequel/extensions/set_local.rb
 - lib/sequel/extensions/slave.rb
 - lib/sequel/extensions/synchronize.rb
 - lib/sequel/plugins/attr_encrypted.rb
@@ -205,6 +205,7 @@ files:
 - lib/tasks/sequel/undo.rake
 - lib/umbrellio-sequel-plugins.rb
 - lib/umbrellio_sequel_plugins.rb
+- lib/umbrellio_sequel_plugins/rails_db_command.rb
 - log/.keep
 - umbrellio-sequel-plugins.gemspec
 - utils/database.rb
@@ -220,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.travis.yml

@@ -1,55 +0,0 @@
-language: ruby
-
-os: linux
-
-dist: xenial
-
-jobs:
-  fast_finish: true
-  include:
-  - rvm: 2.5
-  - rvm: 2.6
-  - rvm: 2.7
-  - rvm: ruby-head
-  allow_failures:
-  - rvm: ruby-head
-
-services:
-- postgresql
-
-addons:
-  postgresql: 12
-  apt:
-    packages:
-    - postgresql-12
-    - postgresql-client-12
-    - postgresql-server-dev-12
-    - postgresql-client-common
-    - postgresql-common
-
-env:
-  global:
-  - PGPORT=5433
-
-cache: bundler
-
-before_install:
-- gem install bundler
-- sudo cp /etc/postgresql/9.6/main/pg_hba.conf /etc/postgresql/12/main/pg_hba.conf
-- sudo service postgresql restart 12
-- sleep 1
-
-install: bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
-
-before_script:
-- psql -c 'create database sequel_plugins;' -U postgres
-
-deploy:
-  provider: rubygems
-  api_key:
-    secure: cwFaLzVdRiYWvNkIAEL+1EduaxdSmuBeJNQ/EikaiUIXyW6FesepZfRTlfFd/hmK3XlcWwm1QVAzPR/RtNASHGhO+52LWInryqdfVeg0xqqijMEYMLipNf5boprgpqL1uh8ADs8jMSWmgtgXXTveHTg9WWrcQ7FYDVJ8QCxKPTeXUIL1O+0YLT2vKoRCD47yoAxu3mz1Ok6dk2Z3RjZVDPqbKrqUnj4EStrppKdWcapG04gq8vzrMVfuu6ek3ijJRsQui9GZNPSoRO3EIoHu9EtmC/s5JTmFQGJZv/xJPVQGmOFLVgXAS7R/id5VDIH9Kv/5jWFYzE7LD3bzUBPZ8GcNSsmjHGuIbdJr87e9m/B+SnAd/SI3hV80Mfq0MJpx8UArcbXPu+oa/oFxoN79hGo8fjMIjRtOBQYmkLr50VvYXUD2Kn7mBEgFWekPPuXbAvL5cHN1PNo1vYJC5PcEeZRow7yx1LS35VAsE0WLAQrnOH1kMc+neFnddDV8v0GXDsqOiWbrJDvDzNH/tjiQcEKhJkab5f7eGRoCLV3SCisijzTyRdzL9ijlrwCo3U1JGkimS+ToTOiWorAOtwxaYLnqKSrIHY0SJ3rVChZtVkOcaHBe1PgW5glD22C1X1fpiuH/jpGrTC986zlyCop7GBoILK+Cz/pNNcoWapglaW0=
-  gemspec: umbrellio-sequel-plugins.gemspec
-  on:
-    repo: umbrellio/umbrellio-sequel-plugins
-    branch: master
-    rvm: 2.7