ar-sequence 0.1.0 → 0.2.1

data/ar-sequence.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "./lib/ar/sequence/version"
 
 Gem::Specification.new do |spec|
@@ -5,8 +7,10 @@ Gem::Specification.new do |spec|
   spec.version       = AR::Sequence::VERSION
   spec.authors       = ["Nando Vieira"]
   spec.email         = ["fnando.vieira@gmail.com"]
-
-  spec.summary       = "Add support for PostgreSQL's SEQUENCE on ActiveRecord migrations"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.metadata      = {"rubygems_mfa_required" => "true"}
+  spec.summary       = "Add support for PostgreSQL's SEQUENCE on " \
+                       "ActiveRecord migrations"
   spec.description   = spec.summary
   spec.homepage      = "https://rubygems.org/gems/ar-sequence"
   spec.license       = "MIT"
@@ -21,10 +25,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activerecord"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest-utils"
   spec.add_development_dependency "pg"
   spec.add_development_dependency "pry-meta"
-  spec.add_development_dependency "codeclimate-test-reporter"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-fnando"
   spec.add_development_dependency "simplecov"
 end

data/bin/console

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "ar-sequence"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+begin
+  require "pry"
+  Pry.start
+rescue LoadError
+  require "irb"
+  IRB.start(__FILE__)
+end

data/bin/setup

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/gemfiles/6_0.gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+gemspec path: ".."
+
+gem "activerecord", "~> 6.0.0"

data/gemfiles/6_1.gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+gemspec path: ".."
+
+gem "activerecord", "~> 6.1.0"

data/gemfiles/7_0.gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+gemspec path: ".."
+
+gem "activerecord", "~> 7.0.0"

data/lib/ar/sequence/adapter.rb

@@ -1,17 +1,31 @@
+# frozen_string_literal: true
+
 module AR
   module Sequence
     module Adapter
+      SEQUENCE_COMMENT = "created by ar-sequence"
+
+      def custom_sequence?(sequence_name)
+        execute(
+          "SELECT obj_description('#{sequence_name}'::regclass, 'pg_class');"
+        ).first["obj_description"] == SEQUENCE_COMMENT
+      end
+
       def check_sequences
-        select_all("SELECT * FROM information_schema.sequences").to_a
+        select_all(
+          "SELECT * FROM information_schema.sequences ORDER BY sequence_name"
+        ).to_a
       end
 
       def create_sequence(name, options = {})
         increment = options[:increment] || options[:step]
-        name = quote_column_name(name)
+        name = quote_name(name)
 
         sql = ["CREATE SEQUENCE IF NOT EXISTS #{name}"]
         sql << "INCREMENT BY #{increment}" if increment
         sql << "START WITH #{options[:start]}" if options[:start]
+        sql << ";"
+        sql << "COMMENT ON SEQUENCE #{name} IS '#{SEQUENCE_COMMENT}';"
 
         execute(sql.join("\n"))
       end
@@ -21,10 +35,14 @@ module AR
       #   drop_sequence :user_position
       #
       def drop_sequence(name)
-        name = quote_column_name(name)
+        name = quote_name(name)
         sql = "DROP SEQUENCE #{name}"
         execute(sql)
       end
+
+      def quote_name(name)
+        name.split(".", 2).map {|part| quote_column_name(part) }.join(".")
+      end
     end
   end
 end

data/lib/ar/sequence/command_recorder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AR
   module Sequence
     module CommandRecorder

data/lib/ar/sequence/model_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AR
   module Sequence
     module ModelMethods

data/lib/ar/sequence/schema_dumper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AR
   module Sequence
     module SchemaDumper
@@ -6,20 +8,54 @@ module AR
         sequences(stream)
       end
 
+      def retrieve_search_path
+        user = @connection.select_one("select user").values.first
+
+        @connection
+          .select_one("show search_path")
+          .values
+          .first
+          .split(", ")
+          .map {|path| path == '"$user"' ? user : path }
+      end
+
       def sequences(stream)
         sequences = @connection.check_sequences
+        search_path = retrieve_search_path
+
         return if sequences.empty?
 
         sequences.each do |seq|
+          schema = seq["sequence_schema"]
+
+          sequence_full_name = [
+            search_path.include?(schema) ? nil : schema,
+            seq["sequence_name"]
+          ].compact.join(".")
+
+          next unless @connection.custom_sequence?(sequence_full_name)
+
           start_value = seq["start_value"]
           increment = seq["increment"]
 
           options = []
-          options << "start: #{start_value}" if start_value && Integer(start_value) != 1
-          options << "increment: #{increment}" if increment && Integer(increment) != 1
 
-          statement = ["create_sequence", seq["sequence_name"].inspect].join(" ")
-          statement << (options.any? ? ", " << options.join(", ") : "") if options.any?
+          if start_value && Integer(start_value) != 1
+            options << "start: #{start_value}"
+          end
+
+          if increment && Integer(increment) != 1
+            options << "increment: #{increment}"
+          end
+
+          statement = [
+            "create_sequence",
+            sequence_full_name.inspect
+          ].join(" ")
+
+          if options.any?
+            statement << (options.any? ? ", #{options.join(', ')}" : "")
+          end
 
           stream.puts "  #{statement}"
         end

data/lib/ar/sequence/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module AR
   module Sequence
-    VERSION = "0.1.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/ar/sequence.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/all"
 require "active_record"
 require "active_record/connection_adapters/postgresql_adapter"
@@ -15,7 +17,9 @@ module AR
   end
 end
 
-ActiveRecord::Migration::CommandRecorder.include AR::Sequence::CommandRecorder
-ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include AR::Sequence::Adapter
-ActiveRecord::SchemaDumper.prepend AR::Sequence::SchemaDumper
-ActiveRecord::Base.extend AR::Sequence::ModelMethods
+ActiveRecord::Migration::CommandRecorder.include(AR::Sequence::CommandRecorder)
+ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.include(
+  AR::Sequence::Adapter
+)
+ActiveRecord::SchemaDumper.prepend(AR::Sequence::SchemaDumper)
+ActiveRecord::Base.extend(AR::Sequence::ModelMethods)

data/lib/ar-sequence.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "ar/sequence"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar-sequence
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Nando Vieira
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-utils
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: pry-meta
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-meta
+  name: rake
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: rubocop-fnando
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,21 +143,28 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/dependabot.yml"
+- ".github/workflows/tests.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
-- LICENSE.txt
+- LICENSE.md
 - README.md
 - Rakefile
 - ar-sequence.gemspec
-- gemfiles/activerecord_5_0.Gemfile.lock
-- gemfiles/activerecord_5_0.gemfile
-- gemfiles/activerecord_5_1.Gemfile.lock
-- gemfiles/activerecord_5_1.gemfile
-- gemfiles/activerecord_5_2.gemfile
-- gemfiles/activerecord_5_2.gemfile.lock
+- bin/console
+- bin/setup
+- gemfiles/6_0.gemfile
+- gemfiles/6_1.gemfile
+- gemfiles/7_0.gemfile
 - lib/ar-sequence.rb
 - lib/ar/sequence.rb
 - lib/ar/sequence/adapter.rb
@@ -154,8 +175,9 @@ files:
 homepage: https://rubygems.org/gems/ar-sequence
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,16 +185,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Add support for PostgreSQL's SEQUENCE on ActiveRecord migrations
 test_files: []

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Nando Vieira
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/gemfiles/activerecord_5_0.Gemfile.lock

@@ -1,77 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    ar-sequence (0.0.0)
-      activerecord
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.0.7)
-      activesupport (= 5.0.7)
-    activerecord (5.0.7)
-      activemodel (= 5.0.7)
-      activesupport (= 5.0.7)
-      arel (~> 7.0)
-    activesupport (5.0.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (7.1.4)
-    awesome_print (1.8.0)
-    byebug (10.0.2)
-    codeclimate-test-reporter (1.0.8)
-      simplecov (<= 0.13)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    docile (1.1.5)
-    i18n (1.1.0)
-      concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    method_source (0.9.0)
-    minitest (5.11.3)
-    minitest-utils (0.4.1)
-      minitest
-    pg (1.1.3)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    pry-meta (0.0.10)
-      awesome_print
-      pry
-      pry-byebug
-      pry-remote
-    pry-remote (0.1.8)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    rake (12.3.1)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    slop (3.6.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 5.0.0)
-  ar-sequence!
-  bundler
-  codeclimate-test-reporter
-  minitest-utils
-  pg
-  pry-meta
-  rake
-  simplecov
-
-BUNDLED WITH
-   1.16.4

data/gemfiles/activerecord_5_0.gemfile

@@ -1,4 +0,0 @@
-source "https://rubygems.org"
-gemspec path: ".."
-
-gem "activerecord", "~> 5.0.0"

data/gemfiles/activerecord_5_1.Gemfile.lock

@@ -1,77 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    ar-sequence (0.0.0)
-      activerecord
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.1.6)
-      activesupport (= 5.1.6)
-    activerecord (5.1.6)
-      activemodel (= 5.1.6)
-      activesupport (= 5.1.6)
-      arel (~> 8.0)
-    activesupport (5.1.6)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (8.0.0)
-    awesome_print (1.8.0)
-    byebug (10.0.2)
-    codeclimate-test-reporter (1.0.8)
-      simplecov (<= 0.13)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    docile (1.1.5)
-    i18n (1.1.0)
-      concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    method_source (0.9.0)
-    minitest (5.11.3)
-    minitest-utils (0.4.1)
-      minitest
-    pg (1.1.3)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    pry-meta (0.0.10)
-      awesome_print
-      pry
-      pry-byebug
-      pry-remote
-    pry-remote (0.1.8)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    rake (12.3.1)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    slop (3.6.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 5.1.0)
-  ar-sequence!
-  bundler
-  codeclimate-test-reporter
-  minitest-utils
-  pg
-  pry-meta
-  rake
-  simplecov
-
-BUNDLED WITH
-   1.16.4

data/gemfiles/activerecord_5_1.gemfile

@@ -1,4 +0,0 @@
-source "https://rubygems.org"
-gemspec path: ".."
-
-gem "activerecord", "~> 5.1.0"

data/gemfiles/activerecord_5_2.gemfile

@@ -1,4 +0,0 @@
-source "https://rubygems.org"
-gemspec path: ".."
-
-gem "activerecord", "~> 5.2.0"

data/gemfiles/activerecord_5_2.gemfile.lock

@@ -1,77 +0,0 @@
-PATH
-  remote: ..
-  specs:
-    ar-sequence (0.0.0)
-      activerecord
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activerecord (5.2.1)
-      activemodel (= 5.2.1)
-      activesupport (= 5.2.1)
-      arel (>= 9.0)
-    activesupport (5.2.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    awesome_print (1.8.0)
-    byebug (10.0.2)
-    codeclimate-test-reporter (1.0.8)
-      simplecov (<= 0.13)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    docile (1.1.5)
-    i18n (1.1.0)
-      concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    method_source (0.9.0)
-    minitest (5.11.3)
-    minitest-utils (0.4.1)
-      minitest
-    pg (1.1.3)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    pry-meta (0.0.10)
-      awesome_print
-      pry
-      pry-byebug
-      pry-remote
-    pry-remote (0.1.8)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    rake (12.3.1)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    slop (3.6.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 5.2.0)
-  ar-sequence!
-  bundler
-  codeclimate-test-reporter
-  minitest-utils
-  pg
-  pry-meta
-  rake
-  simplecov
-
-BUNDLED WITH
-   1.16.4