ar-sequence 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c49266237b1bb2277bd1faf015012d5df5c1f99c5ce72d340ba557e5e9efe63a
-  data.tar.gz: 90e809000f14898f02ad2758a7c0138866138916aa2382a7c70740ac711da979
+  metadata.gz: 31fd2b32e3b380066c4a9a8a50fa84ed0c880aaec06da39ead297f2d195ac382
+  data.tar.gz: 747332c2d4f177a524dbd212ff4e4f710812c97bf7e409efa5df571963d83de9
 SHA512:
-  metadata.gz: 06fc48bb39c6d3ffc0520073c4a34fd42e6478204051f6137441f16aa9a5b25c8b47fe363575a8a07a543bc32ba02ab472a78a1a6592f2c6e205e38feecac701
-  data.tar.gz: 647a3030e07c4d95c07f2f49376145c96fb2832590e9c84b56946598a2db7810d94e4cd1e72ecf99a44902e65d40b7210f2b4de1bf79cfca7475beab420fbdad
+  metadata.gz: d2b5de771db2981bf6ee1403b2a96cee69065434c978e1f09a1a210998d63d8bfd33096620fbf82685409d48222a794e166f3409d1edea73a8333fc241e92c96
+  data.tar.gz: 91d0005d29df02998ce1213371dddd75db069f10204349b18456cef296082f4ac2aa33a247b061a0f54d6a001fe9d689b1c4d0df9c67610067cc09a8e1da32b4

data/.github/workflows/tests.yml

@@ -1,15 +1,11 @@
+---
 name: Tests
 
 on:
   pull_request:
-    branches:
-      - main
   push:
-    branches:
-      - main
-
-  schedule:
-    - cron: "0 10 * * *"
+  workflow_dispatch:
+    inputs: {}
 
 jobs:
   build:
@@ -18,13 +14,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.6.x, 2.7.x]
+        ruby: ["2.7", "3.0"]
         gemfile:
           - Gemfile
+          - gemfiles/7_0.gemfile
+          - gemfiles/6_1.gemfile
           - gemfiles/6_0.gemfile
-          - gemfiles/5_2.gemfile
-          - gemfiles/5_1.gemfile
-          - gemfiles/5_0.gemfile
 
     services:
       postgres:
@@ -35,7 +30,7 @@ jobs:
           --health-retries 5
 
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2.4.0
 
       - uses: actions/cache@v2
         with:
@@ -48,7 +43,7 @@ jobs:
             hashFiles(matrix.gemfile) }}
 
       - name: Set up Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
 

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
   rubocop-fnando: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 
 Naming/FileName:
   Enabled: false

data/CHANGELOG.md

@@ -11,7 +11,11 @@ Prefix your message with one of the following:
 - [Security] in case of vulnerabilities.
 -->
 
-## v0.2.0
+## v0.2.1 - 2021-12-21
+
+- [Changed] Dump schema names that aren't on the default search path.
+
+## v0.2.0 - 2021-09-16
 
 - [Changed] Only dump sequences created by ar_sequence (using Postgres COMMENT).
 

data/README.md

@@ -5,7 +5,7 @@
 [![Gem](https://img.shields.io/gem/v/ar-sequence.svg)](https://rubygems.org/gems/ar-sequence)
 [![Gem](https://img.shields.io/gem/dt/ar-sequence.svg)](https://rubygems.org/gems/ar-sequence)
 
-TODO: Add project description here
+Add support for PostgreSQL's `SEQUENCE` on ActiveRecord migrations.
 
 ## Installation
 

data/ar-sequence.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |spec|
   spec.version       = AR::Sequence::VERSION
   spec.authors       = ["Nando Vieira"]
   spec.email         = ["fnando.vieira@gmail.com"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
-
+  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

data/gemfiles/{5_0.gemfile → 6_1.gemfile}

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

data/gemfiles/{5_1.gemfile → 7_0.gemfile}

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

data/lib/ar/sequence/adapter.rb

@@ -19,7 +19,7 @@ module AR
 
       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
@@ -35,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/schema_dumper.rb

@@ -8,12 +8,32 @@ 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|
-          next unless @connection.custom_sequence?(seq["sequence_name"])
+          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"]
@@ -30,7 +50,7 @@ module AR
 
           statement = [
             "create_sequence",
-            seq["sequence_name"].inspect
+            sequence_full_name.inspect
           ].join(" ")
 
           if options.any?

data/lib/ar/sequence/version.rb

@@ -2,6 +2,6 @@
 
 module AR
   module Sequence
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar-sequence
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Nando Vieira
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -162,10 +162,9 @@ files:
 - ar-sequence.gemspec
 - bin/console
 - bin/setup
-- gemfiles/5_0.gemfile
-- gemfiles/5_1.gemfile
-- gemfiles/5_2.gemfile
 - 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
@@ -176,7 +175,8 @@ files:
 homepage: https://rubygems.org/gems/ar-sequence
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -185,14 +185,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: Add support for PostgreSQL's SEQUENCE on ActiveRecord migrations

data/gemfiles/5_2.gemfile

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