sequel-sequence 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 749ea113ce41f1f7f70f620d5aa70deac470a76491cdb36b4bd8e5c739487a07
-  data.tar.gz: 9628bc8f57ad5a1ead78d82eaa8348963876c93a6be40df0d8c9dabfab928f76
+  metadata.gz: a027c577de1ee27127880328c29208456a26635c9ea18b1c5eb3c1cb0dbbd5fc
+  data.tar.gz: 71764d6ec16bf3425ba3d3bfb4ac47c04dd2a6f7001342c0ae35ebec63af293d
 SHA512:
-  metadata.gz: d0dbf107132dad0bcd23bcf5da23cb9fb121119dafb109865978a6bf26fe8465985875fd6d33b72422cd57e1d5b74b54fce065ba7a2fdf21b0d76f032b7c149e
-  data.tar.gz: bd1bbeaf56ddcd37b4bc86b6b83ad06e85212c7f09bb32db03004bfc9599dd240b141ea6c6130d64fe8b85471c3e6bb7cd8537714b7b6f34f744142b117ce606
+  metadata.gz: 5ce8091d3c644545cecff05c0f85a6252bdd8de015710770a861bfea81793fc50c5b96d19ce304fc2158cd40fc8bfde72f88309e0dc6dea468e2a977a533f980
+  data.tar.gz: a80404a67e51b77a1dd6ac40fe8ebbd93329b170e25855024f325e965f76ec9ad723ea2698fc4f699edad9cd7eb8555c5f6b28d870eb6c2f0355c44686904b19

data/.ci.gemfile

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'bundler', '>= 2.2.4'
+gem 'minitest-utils', '~> 0.4.6'
+gem 'pry-byebug', '~> 3.10.1'
+gem 'rake', '~> 13.0.2'
+gem 'rubocop', '~> 1.56.3'
+gem 'sequel', '>= 5.28', '<6.0'
+gem 'simplecov', '~> 0.22.0'
+
+# MRI/Rubinius Adapter Dependencies
+platform :ruby do
+  gem 'mysql2', '~> 0.5.3'
+  gem 'pg', '~> 1.5.4'
+  gem 'sqlite3', '~> 1.6.0'
+end
+
+# JRuby Adapter Dependencies
+platform :jruby do
+  gem 'jdbc-mysql', '~> 8.0.17'
+  gem 'jdbc-postgres', '~> 42.2.14'
+  gem 'jdbc-sqlite3', '~> 3.42'
+end

data/.github/workflows/ci.yml

@@ -16,7 +16,6 @@ jobs:
         os: ['ubuntu-latest']
         sequel: ['~>5.28']
         ruby: ['3.2', '3.1', '3.0', '2.7']
-        gemfile: ['Gemfile']
     runs-on: ${{ matrix.os }}
     name: Tests with Ruby ${{ matrix.ruby }}
 
@@ -58,7 +57,7 @@ jobs:
 
     env:
       SEQUEL: ${{ matrix.sequel }}
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      BUNDLE_GEMFILE: .ci.gemfile
     steps:
       - uses: actions/checkout@v4
 

data/CHANGELOG.md

@@ -11,6 +11,17 @@ Prefix your message with one of the following:
 - [Security] in case of vulnerabilities.
 -->
 
+## v0.4.2 - 2023-10-03
+
+- [Added] Additions into README.md.
+- [Added] Exclusion of dependence on the Postgresql constraint for "PG::The object is not in the required state P: ERROR:  currval of sequence "name_of_sequence" is not yet defined in this session".
+- [Added] `custom_sequence?` method for MariaDB and SQLite.
+- [Fixed] Dependencies on gems by moving them from .gemspec to Gemfile
+- [Fixed] `currval` for initial state of sequence in Postgresql
+- [Fixed] `lastval` for initial state of sequence in MariaDB
+- [Changed] The default action `setval` for MariaDB to invoke `setval` if necessary
+- [Changed] The class initialization algorithm in `sequence.rb` depending on the gems included in the user project.
+
 ## v0.4.1 - 2023-09-28
 
 - [Added] Important notice to README.md.

data/CONTRIBUTING.md

@@ -33,13 +33,14 @@ your contribution is according to how this project works.
 
 1. [Fork](https://help.github.com/forking/) sequel-sequence
 2. Create a topic branch - `git checkout -b my_branch`
-3. Make your changes using [descriptive commit messages](#commit-messages)
-4. Update CHANGELOG.md describing your changes by adding an entry to the
+3. Unlock gem dependencies in `sequel-sequence.gemspec`
+4. Make your changes using [descriptive commit messages](#commit-messages)
+5. Update CHANGELOG.md describing your changes by adding an entry to the
    "Unreleased" section. If this section is not available, create one right
    before the last version.
-5. Push to your branch - `git push origin my_branch`
-6. [Create a pull request](https://docs.github.com/articles/creating-a-pull-request)
-7. That's it!
+6. Push to your branch - `git push origin my_branch`
+7. [Create a pull request](https://docs.github.com/articles/creating-a-pull-request)
+8. That's it!
 
 ## Styleguides
 
@@ -237,3 +238,12 @@ $ bundle exec rake TEST=test/sequel/mysql_sequence_test.rb
 $ bundle exec rake TEST=test/sequel/sqlite_sequence_test.rb
 $ bundle exec rake TEST=test/sequel/mock_sequence_test.rb
 ```
+
+Short command:
+```bash
+$ bundle exec rake postgresql
+$ bundle exec rake mariadb
+$ bundle exec rake mysql
+$ bundle exec rake sqlite
+$ bundle exec rake mock
+```

data/README.md

@@ -16,7 +16,7 @@ gem install sequel-sequence
 Or add the following line to your project's Gemfile:
 
 ```ruby
-gem "sequel-sequence"
+gem 'sequel-sequence'
 ```
 
 ## Usage with PostgreSQL and MariaDB
@@ -24,6 +24,8 @@ gem "sequel-sequence"
 To create and delete a `SEQUENCE`, simply use the `create_sequence` and `drop_sequence` methods.
 
 ```ruby
+require: 'sequel-sequence'
+
 Sequel.migration do
   up do
     create_sequence :position, if_exists: false
@@ -37,6 +39,8 @@ end
 
 It would also be correct to write:
 ```ruby
+require: 'sequel-sequence'
+
 Sequel.migration do
   up do
     create_sequence :position
@@ -95,7 +99,7 @@ DB.currval("position")
 DB.lastval("position")
 # Both options are acceptable in PostgreSQL and MySQL.
 
-# Set sequence's current value. It must be greater than lastval or currval.
+# Set a new sequence value. It must be greater than lastval or currval. Only PostgreSQL allows setting a lower value.
 DB.setval("position", 1234)
 ```
 
@@ -122,7 +126,14 @@ Otherwise, the operation of this gem for SQLite and MySQL is similar to the ways
 
 ## Known issues you may encounter
 
-This solution does not allow you to simultaneously work with MySQL and MariaDB databases from one application. If such a need arises, move the data processing functionality to different microservices.
+- This solution does not allow you to simultaneously work with MySQL and MariaDB databases from one application. If such a need arises, move the data processing functionality to different microservices.
+- When you start with a new database in SQLite, you'll receive an error message - "`SQLite3::SQLException: no such table: sqlite_sequence`".  `sqlite_sequence` table is not created, until you define at least one autoincrement and primary key column in your schema.
+
+## Additional handy functions
+
+To discover a database information about `SEQUENCE`s you could take advantage of `check_sequences` and `custom_sequence?` methods.
+- `custom_sequence?(:sequence_name)` allows you to instantly find out the availability of the called `SEQUENCE`. 
+- `check_sequences` provides complete information about known `SEQUENCE`s in the datebase. The output data depends on RDBMS.
 
 ## Maintainer
 

data/lib/sequel/sequence/database/postgresql.rb

@@ -65,12 +65,21 @@ module Sequel
 
         # for Postgres
         def currval(name)
-          name = quote(name.to_s)
+          quoted_name = quote(name.to_s)
           out = nil
-          fetch("SELECT currval(#{name})") do |row|
+          fetch("SELECT currval(#{quoted_name})") do |row|
             out = row[:currval]
           end
           out
+        rescue Sequel::DatabaseError => e
+          # We exclude dependence on the postgresql constraint.
+          if e.message =~ /\APG::ObjectNotInPrerequisiteState:(.)*is not yet defined in this session\n\z/
+            return nextval(name)
+          end
+
+          # :nocov:
+          raise e
+          # :nocov:
         end
 
         # for MariaDB
@@ -86,11 +95,12 @@ module Sequel
         end
 
         def set_column_default_nextval(table, column, sequence)
-          table = table.to_s
-          column = column.to_s
-          sequence = quote(sequence.to_s)
-          run "ALTER TABLE IF EXISTS #{table} " \
-              "ALTER COLUMN #{column} SET DEFAULT nextval(#{sequence}::regclass)"
+          sql = %(
+            ALTER TABLE IF EXISTS #{table}
+            ALTER COLUMN #{quote_name(column.to_s)}
+            SET DEFAULT nextval(#{quote(sequence.to_s)}::regclass)
+          ).strip
+          run sql
         end
       end
     end

data/lib/sequel/sequence/database/server/mariadb.rb

@@ -13,6 +13,14 @@ module Sequel
             "`#{name.gsub(/[`"']/, '')}`"
           end
 
+          def custom_sequence?(sequence_name)
+            db = name_of_current_database
+            return false if db.empty?
+
+            sql = "SHOW FULL TABLES WHERE Table_type = 'SEQUENCE' and Tables_in_#{db} = '#{sequence_name}';"
+            fetch(sql).all.size.positive?
+          end
+
           def check_sequences
             fetch("SHOW FULL TABLES WHERE Table_type = 'SEQUENCE';").all.to_a
           end
@@ -46,31 +54,48 @@ module Sequel
           end
 
           def lastval(name)
-            name = quote(name.to_s)
+            quoted_name = quote(name.to_s)
             out = nil
-            fetch("SELECT lastval(#{name});") do |row|
-              out = row["lastval(#{name})".to_sym]
+            fetch("SELECT lastval(#{quoted_name});") do |row|
+              out = row["lastval(#{quoted_name})".to_sym]
             end
+            return nextval(name) if out.nil?
+
             out
           end
 
           alias currval lastval
 
           def setval(name, value)
-            name = quote(name.to_s)
-            out = nil
-            fetch("SELECT setval(#{name}, #{value});") do |row|
-              out = row["setval(#{name}, #{value})".to_sym]
+            current = lastval(name)
+            if value <= current
+              log_info Sequel::Database::DANGER_OPT_ID if value < current
+              value = current
+            else
+              quoted_name = quote(name.to_s)
+              value -= 1
+              out = nil
+              fetch("SELECT setval(#{quoted_name}, #{value});") do |row|
+                out = row["setval(#{quoted_name}, #{value})".to_sym]
+              end
+              value = nextval(name)
             end
-            out
+            value
           end
 
           def set_column_default_nextval(table, column, sequence)
-            table = table.to_s
-            column = column.to_s
-            sequence = quote(sequence.to_s)
-            run "ALTER TABLE IF EXISTS #{table} " \
-                "ALTER COLUMN #{column} SET DEFAULT nextval(#{sequence});"
+            sql = %(
+              ALTER TABLE IF EXISTS #{quote(table.to_s)}
+              ALTER COLUMN #{quote_name(column.to_s)}
+              SET DEFAULT nextval(#{quote(sequence.to_s)})
+            ).strip
+            run sql
+          end
+
+          private
+
+          def name_of_current_database
+            fetch('SELECT DATABASE() AS db;').first[:db]
           end
         end
       end

data/lib/sequel/sequence/database/server/mysql.rb

@@ -60,7 +60,7 @@ module Sequel
           alias currval lastval
 
           def setval(name, value)
-            current = lastval(stringify(name))
+            current = lastval(name)
             if current.nil?
               create_sequence(stringify(name), { start: value })
             elsif value < current

data/lib/sequel/sequence/database/sqlite.rb

@@ -6,6 +6,11 @@ module Sequel
   module Sequence
     module Database
       module SQLite
+        def custom_sequence?(sequence_name)
+          sql = "SELECT * FROM `sqlite_sequence` WHERE name = '#{stringify(sequence_name)}';"
+          fetch(sql).all.size.positive?
+        end
+
         def check_sequences
           fetch('SELECT * FROM `sqlite_sequence`;').all.to_a
         end
@@ -44,11 +49,11 @@ module Sequel
         alias currval lastval
 
         def setval(name, value)
-          current = lastval(stringify(name))
+          current = lastval(name)
           if current.nil?
             create_sequence(stringify(name), { start: value })
           elsif value < current
-            log_info DANGER_OPT_ID
+            log_info Sequel::Database::DANGER_OPT_ID
             value = current
           else
             run(update_sqlite_sequence(stringify(name), value))
@@ -79,7 +84,7 @@ module Sequel
 
         def create_sequence_table(name, if_exists = nil)
           %(
-            CREATE TABLE #{if_exists || IF_NOT_EXISTS} #{name}
+            CREATE TABLE #{if_exists || Sequel::Database::IF_NOT_EXISTS} #{name}
             (id integer primary key autoincrement, fiction integer);
           )
         end
@@ -101,7 +106,7 @@ module Sequel
         end
 
         def drop_sequence_table(name, if_exists = nil)
-          "DROP TABLE #{if_exists || IF_EXISTS} #{name};"
+          "DROP TABLE #{if_exists || Sequel::Database::IF_EXISTS} #{name};"
         end
 
         def select_max_seq(name)

data/lib/sequel/sequence/version.rb

@@ -2,6 +2,6 @@
 
 module Sequel
   module Sequence
-    VERSION = '0.4.1'
+    VERSION = '0.4.2'
   end
 end

data/lib/sequel/sequence.rb

@@ -1,29 +1,61 @@
 # frozen_string_literal: true
 
 require 'sequel/database'
-require 'sequel/adapters/postgres'
-require 'sequel/adapters/mysql2'
-require 'sequel/adapters/sqlite'
 require 'sequel/error'
 require 'sequel/sequence/database_ext_connection'
 
 module Sequel
   module Sequence
     require 'sequel/sequence/database'
-
-    module Database
-      require 'sequel/sequence/database/postgresql'
-      require 'sequel/sequence/database/sqlite'
-    end
   end
 end
 
 Sequel::Database.include(
   Sequel::Sequence::Database
 )
-Sequel::Postgres::Database.include(
-  Sequel::Sequence::Database::PostgreSQL
-)
-Sequel::SQLite::Database.include(
-  Sequel::Sequence::Database::SQLite
-)
+
+begin
+  if Gem::Specification.find_by_name('pg')
+    require 'sequel/adapters/postgres'
+
+    module Sequel
+      module Sequence
+        module Database
+          require 'sequel/sequence/database/postgresql'
+        end
+      end
+    end
+
+    Sequel::Postgres::Database.include(
+      Sequel::Sequence::Database::PostgreSQL
+    )
+  end
+rescue Gem::LoadError
+  # do nothing
+end
+
+begin
+  require 'sequel/adapters/mysql2' if Gem::Specification.find_by_name('mysql2')
+rescue Gem::LoadError
+  # do nothing
+end
+
+begin
+  if Gem::Specification.find_by_name('sqlite3')
+    require 'sequel/adapters/sqlite'
+
+    module Sequel
+      module Sequence
+        module Database
+          require 'sequel/sequence/database/sqlite'
+        end
+      end
+    end
+
+    Sequel::SQLite::Database.include(
+      Sequel::Sequence::Database::SQLite
+    )
+  end
+rescue Gem::LoadError
+  # do nothing
+end

data/sequel-sequence.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.summary               = \
     'Adds SEQUENCE support to Sequel for migrations to PostgreSQL, MariaDB, MySQL and SQLite.'
   spec.description           = <<-DES
-    This gem provides a single interface for SEQUENCE functionality
+    This gem provides a single user-friendly interface for SEQUENCE functionality
     in Postgresql and MariaDB DBMS within the Sequel ORM.
     It also models the Sequences to meet the needs of SQLite and MySQL users.
   DES
@@ -27,22 +27,22 @@ Gem::Specification.new do |spec|
   spec.platform              = Gem::Platform::RUBY
   spec.required_ruby_version = '>= 2.7.0'
 
-  spec.add_dependency 'sequel', '>= 5.28', '<5.73'
+  spec.add_dependency 'sequel', '>= 5.28', '<6.0'
   spec.add_development_dependency 'bundler', '>= 2.2.4'
   spec.add_development_dependency 'minitest-utils', '~> 0.4.6'
   spec.add_development_dependency 'pry-byebug', '~> 3.10.1'
   spec.add_development_dependency 'rake', '~> 13.0.2'
   spec.add_development_dependency 'rubocop', '~> 1.56.3'
   spec.add_development_dependency 'simplecov', '~> 0.22.0'
-  if RUBY_ENGINE == 'jruby'
-    # JRuby Adapter Dependencies
-    spec.add_development_dependency 'jdbc-mysql', '~> 8.0.17'
-    spec.add_development_dependency 'jdbc-postgres', '~> 42.2.14'
-    spec.add_development_dependency 'jdbc-sqlite3', '~> 3.42'
-  else
-    # MRI/Rubinius Adapter Dependencies
-    spec.add_development_dependency 'mysql2', '~> 0.5.3'
-    spec.add_development_dependency 'pg', '~> 1.5.4'
-    spec.add_development_dependency 'sqlite3', '~> 1.6.0'
-  end
+  # if RUBY_ENGINE == 'jruby'
+  #   # JRuby Adapter Dependencies
+  #   spec.add_development_dependency 'jdbc-mysql', '~> 8.0.17'
+  #   spec.add_development_dependency 'jdbc-postgres', '~> 42.2.14'
+  #   spec.add_development_dependency 'jdbc-sqlite3', '~> 3.42'
+  # else
+  #   # MRI/Rubinius Adapter Dependencies
+  #   spec.add_development_dependency 'mysql2', '~> 0.5.3'
+  #   spec.add_development_dependency 'pg', '~> 1.5.4'
+  #   spec.add_development_dependency 'sqlite3', '~> 1.6.0'
+  # end
 end

data/test/mariadb_test_helper.rb

@@ -13,7 +13,9 @@ MariaDB = Sequel.connect(
 
 module MariadbTestHelper
   def recreate_table
+    MariaDB.run 'DROP TABLE IF EXISTS builders'
     MariaDB.run 'DROP SEQUENCE IF EXISTS position'
+    MariaDB.run 'DROP SEQUENCE IF EXISTS position_id'
     MariaDB.run 'DROP TABLE IF EXISTS wares'
     MariaDB.run 'DROP SEQUENCE IF EXISTS a'
     MariaDB.run 'DROP SEQUENCE IF EXISTS b'

data/test/postgresql_test_helper.rb

@@ -13,8 +13,10 @@ PostgresqlDB = Sequel.connect(
 
 module PostgresqlTestHelper
   def recreate_table
-    PostgresqlDB.run 'DROP TABLE IF EXISTS things'
+    PostgresqlDB.run 'DROP TABLE IF EXISTS masters'
     PostgresqlDB.run 'DROP SEQUENCE IF EXISTS position'
+    PostgresqlDB.run 'DROP SEQUENCE IF EXISTS position_id'
+    PostgresqlDB.run 'DROP TABLE IF EXISTS things'
     PostgresqlDB.run 'DROP SEQUENCE IF EXISTS a'
     PostgresqlDB.run 'DROP SEQUENCE IF EXISTS b'
     PostgresqlDB.run 'DROP SEQUENCE IF EXISTS c'

data/test/sequel/mariadb_sequence_test.rb

@@ -72,40 +72,77 @@ class MariadbSequenceTest < Minitest::Test
     assert_equal 3, MariaDB.nextval(:position)
   end
 
-  test "returns current/last sequence value, which doesn't increase by itself" do
+  test %( returns current/last sequence value, which doesn't increase by itself
+          for migration WITHOUT 'start' or 'increment' values ) do
     with_migration do
       def up
         create_sequence :position
       end
     end.up
 
-    MariaDB.nextval(:position)
-
-    assert_equal 1, MariaDB.currval(:position)
-    assert_equal 1, MariaDB.lastval(:position)
     assert_equal 1, MariaDB.currval(:position)
     assert_equal 1, MariaDB.lastval(:position)
+
+    MariaDB.nextval(:position)
+
+    assert_equal 2, MariaDB.currval(:position)
+    assert_equal 2, MariaDB.lastval(:position)
   end
 
-  test 'sets sequence value' do
+  test %( returns current/last sequence value, which doesn't increase by itself
+          for migration WITH 'start' and 'increment' values ) do
     with_migration do
       def up
-        create_sequence :position
+        create_sequence :position, start: 2, increment: 3
       end
     end.up
 
+    assert_equal 2, MariaDB.currval(:position)
+    assert_equal 2, MariaDB.lastval(:position)
+
     MariaDB.nextval(:position)
+
+    assert_equal 5, MariaDB.currval(:position)
+    assert_equal 5, MariaDB.lastval(:position)
+  end
+
+  test 'sets a new sequence value greater than the current one' do
+    with_migration do
+      def up
+        create_sequence :position
+      end
+    end.up
+
     assert_equal MariaDB.currval(:position), 1
 
     MariaDB.setval(:position, 101)
-    # in MariaDB, 'lastval' only works after 'nextval' rather than  'setval'
-    assert_equal 1, MariaDB.lastval(:position)
+    # assert_equal 1, MariaDB.lastval(:position)
+    # we observe the modified behavior of the method
+    assert_equal 101, MariaDB.lastval(:position)
 
     MariaDB.nextval(:position)
-    # now the value is correct
+    # the value is correct in any case
     assert_equal 102, MariaDB.lastval(:position)
   end
 
+  test 'sets a new sequence value less than the current one (does not change the value)' do
+    with_migration do
+      def up
+        create_sequence :position, start: 100
+      end
+    end.up
+
+    assert_equal MariaDB.currval(:position), 100
+
+    MariaDB.nextval(:position)
+    assert_equal MariaDB.currval(:position), 101
+
+    MariaDB.setval(:position, 1)
+    assert_equal 101, MariaDB.lastval(:position)
+
+    assert_equal 102, MariaDB.nextval(:position)
+  end
+
   test 'drops sequence and check_sequences' do
     with_migration do
       def up
@@ -125,14 +162,18 @@ class MariadbSequenceTest < Minitest::Test
       end
     end.down
 
-    sequence = MariaDB.check_sequences.find do |seq|
-      seq[:Tables_in_test] == 'position'
-    end
+    sequence = MariaDB.check_sequences
 
-    assert_nil sequence
+    assert_equal 0, sequence.size
   end
 
   test 'orders sequences' do
+    with_migration do
+      def up
+        drop_table :wares, if_exists: true
+      end
+    end.up
+
     list = MariaDB.check_sequences.map { |s| s[:Tables_in_test] }
     assert !list.include?('a')
     assert !list.include?('b')
@@ -140,7 +181,6 @@ class MariadbSequenceTest < Minitest::Test
 
     with_migration do
       def up
-        drop_table :things, if_exists: true
         create_sequence :c
         create_sequence :a
         create_sequence :b
@@ -153,10 +193,21 @@ class MariadbSequenceTest < Minitest::Test
     assert list.include?('c')
   end
 
+  test 'checks custom sequence generated from code' do
+    assert_equal MariaDB.custom_sequence?(:c), false
+
+    with_migration do
+      def up
+        create_sequence :c
+      end
+    end.up
+
+    assert_equal MariaDB.custom_sequence?(:c), true
+  end
+
   test 'creates table that references sequence' do
     with_migration do
       def up
-        drop_table :builders, if_exists: true
         create_sequence :position_id, if_exists: false, start: 1
         create_table :builders do
           primary_key :id

data/test/sequel/mysql_sequence_test.rb

@@ -91,20 +91,41 @@ class MysqlSequenceTest < Minitest::Test
     assert_operator (2 + @step), :>, MysqlDB.nextval(:position)
   end
 
-  test "returns current/last sequence value, which doesn't increase by itself" do
+  test %( returns current/last sequence value, which doesn't increase by itself
+          for migration WITHOUT 'start' or 'increment' values ) do
     with_migration do
       def up
         create_sequence :position
       end
     end.up
 
+    # catch the 'start' value 'by default
+    assert_equal 1, MysqlDB.currval(:position)
+    assert_equal 1, MysqlDB.lastval(:position)
+
     MysqlDB.nextval(:position)
-    # changed value (=2) after default one (=1)
 
     assert_equal 2, MysqlDB.currval(:position)
     assert_equal 2, MysqlDB.lastval(:position)
+  end
+
+  test %( returns current/last sequence value, which doesn't increase by itself
+          for migration WITH 'start' and 'increment' values ) do
+    with_migration do
+      def up
+        create_sequence :position, start: 2, increment: 3
+      end
+    end.up
+
+    # catch the 'start' value
     assert_equal 2, MysqlDB.currval(:position)
     assert_equal 2, MysqlDB.lastval(:position)
+
+    MysqlDB.nextval(:position)
+
+    # Doesn't support 'increment' value
+    assert_equal 3, MysqlDB.currval(:position)
+    assert_equal 3, MysqlDB.lastval(:position)
   end
 
   test 'sets a new sequence value greater than the current one' do
@@ -125,7 +146,7 @@ class MysqlSequenceTest < Minitest::Test
     assert_equal 102, MysqlDB.nextval(:position)
   end
 
-  test 'sets a new sequence value less than the current one' do
+  test 'sets a new sequence value less than the current one (does not change the value)' do
     with_migration do
       def up
         create_sequence :position, start: 100
@@ -215,6 +236,12 @@ class MysqlSequenceTest < Minitest::Test
   end
 
   test 'orders sequences' do
+    with_migration do
+      def up
+        drop_table :stuffs, if_exists: true
+      end
+    end.up
+
     list = MysqlDB.check_sequences.map { |s| s[:name] }
     assert !list.include?('a')
     assert !list.include?('b')
@@ -222,7 +249,6 @@ class MysqlSequenceTest < Minitest::Test
 
     with_migration do
       def up
-        drop_table :things, if_exists: true
         create_sequence :c, { start: 1 }
         create_sequence :a, { start: 3 }
         create_sequence :b
@@ -235,18 +261,6 @@ class MysqlSequenceTest < Minitest::Test
     assert list.include?('c')
   end
 
-  test 'checks custom sequence generated from code' do
-    assert_equal MysqlDB.custom_sequence?(:c), false
-
-    with_migration do
-      def up
-        create_sequence :c
-      end
-    end.up
-
-    assert_equal MysqlDB.custom_sequence?(:c), true
-  end
-
   test 'recreates the same sequence with the same start value' do
     with_migration do
       def up
@@ -353,6 +367,18 @@ class MysqlSequenceTest < Minitest::Test
     assert_equal pos4 - pos2, 2
   end
 
+  test 'checks custom sequence generated from code' do
+    assert_equal MysqlDB.custom_sequence?(:c), false
+
+    with_migration do
+      def up
+        create_sequence :c
+      end
+    end.up
+
+    assert_equal MysqlDB.custom_sequence?(:c), true
+  end
+
   test "catches a Mysql2::Error: «Table mysql_sequence doesn't exist»" do
     assert !sequence_table_exists?('position')
 

data/test/sequel/postgresql_sequence_test.rb

@@ -72,33 +72,80 @@ class PostgresqlSequenceTest < Minitest::Test
     assert_equal 3, PostgresqlDB.nextval(:position)
   end
 
-  test "returns current/last sequence value, which doesn't increase by itself" do
+  test %( returns current/last sequence value, which doesn't increase by itself
+          for migration WITHOUT 'start' or 'increment' values ) do
     with_migration do
       def up
-        create_sequence :position, start: 2, increment: 2
+        create_sequence :position
       end
     end.up
 
+    # catch the 'start' value
+    assert_equal 1, PostgresqlDB.currval(:position)
+    # is the same value
+    assert_equal 1, PostgresqlDB.lastval(:position)
+
     PostgresqlDB.nextval(:position)
 
     assert_equal 2, PostgresqlDB.currval(:position)
     assert_equal 2, PostgresqlDB.lastval(:position)
+  end
+
+  test %( returns current/last sequence value, which doesn't increase by itself
+          for migration WITH 'start' and 'increment' values ) do
+    with_migration do
+      def up
+        create_sequence :position, start: 2, increment: 3
+      end
+    end.up
+
+    # catch the 'start' value
     assert_equal 2, PostgresqlDB.currval(:position)
+    # is the same value
     assert_equal 2, PostgresqlDB.lastval(:position)
+
+    PostgresqlDB.nextval(:position)
+
+    # support 'increment' value
+    assert_equal 5, PostgresqlDB.currval(:position)
+    assert_equal 5, PostgresqlDB.lastval(:position)
   end
 
-  test 'sets sequence value' do
+  test 'sets a new sequence value greater than the current one' do
     with_migration do
       def up
         create_sequence :position
       end
     end.up
 
-    PostgresqlDB.nextval(:position)
     assert_equal PostgresqlDB.currval(:position), 1
 
+    PostgresqlDB.nextval(:position)
+    assert_equal PostgresqlDB.currval(:position), 2
+
     PostgresqlDB.setval(:position, 101)
-    assert_equal 101, PostgresqlDB.currval(:position)
+    assert_equal 101, PostgresqlDB.lastval(:position)
+
+    assert_equal 102, PostgresqlDB.nextval(:position)
+  end
+
+  test 'sets a new sequence value less than the current one (change the value as an EXCEPTION)' do
+    with_migration do
+      def up
+        create_sequence :position, start: 100
+      end
+    end.up
+
+    assert_equal PostgresqlDB.currval(:position), 100
+
+    PostgresqlDB.nextval(:position)
+    assert_equal PostgresqlDB.currval(:position), 101
+
+    PostgresqlDB.setval(:position, 1)
+    assert_equal 1, PostgresqlDB.lastval(:position)
+
+    PostgresqlDB.nextval(:position)
+    assert_equal 2, PostgresqlDB.lastval(:position)
   end
 
   test 'drops sequence and check_sequences' do
@@ -128,6 +175,12 @@ class PostgresqlSequenceTest < Minitest::Test
   end
 
   test 'orders sequences' do
+    with_migration do
+      def up
+        drop_table :things, if_exists: true
+      end
+    end.up
+
     list = PostgresqlDB.check_sequences.map { |s| s[:sequence_name] }
     assert !list.include?('a')
     assert !list.include?('b')
@@ -135,7 +188,6 @@ class PostgresqlSequenceTest < Minitest::Test
 
     with_migration do
       def up
-        drop_table :things, if_exists: true
         create_sequence :c
         create_sequence :a
         create_sequence :b

data/test/sequel/sqlite_sequence_test.rb

@@ -76,20 +76,41 @@ class SqliteSequenceTest < Minitest::Test
     assert_operator (2 + @step), :>, SQLiteDB.nextval(:position)
   end
 
-  test "returns current/last sequence value, which doesn't increase by itself" do
+  test %( returns current/last sequence value, which doesn't increase by itself
+          for migration WITHOUT 'start' or 'increment' values ) do
     with_migration do
       def up
         create_sequence :position
       end
     end.up
 
+    # catch the 'start' value 'by default
+    assert_equal 1, SQLiteDB.currval(:position)
+    assert_equal 1, SQLiteDB.lastval(:position)
+
     SQLiteDB.nextval(:position)
-    # changed value (=2) after default one (=1)
 
     assert_equal 2, SQLiteDB.currval(:position)
     assert_equal 2, SQLiteDB.lastval(:position)
+  end
+
+  test %( returns current/last sequence value, which doesn't increase by itself
+          for migration WITH 'start' and 'increment' values ) do
+    with_migration do
+      def up
+        create_sequence :position, start: 2, increment: 3
+      end
+    end.up
+
+    # catch the 'start' value
     assert_equal 2, SQLiteDB.currval(:position)
     assert_equal 2, SQLiteDB.lastval(:position)
+
+    SQLiteDB.nextval(:position)
+
+    # Doesn't support 'increment' value
+    assert_equal 3, SQLiteDB.currval(:position)
+    assert_equal 3, SQLiteDB.lastval(:position)
   end
 
   test 'sets a new sequence value greater than the current one' do
@@ -111,7 +132,7 @@ class SqliteSequenceTest < Minitest::Test
     assert_equal 102, SQLiteDB.lastval(:position)
   end
 
-  test 'sets a new sequence value less than the current one' do
+  test 'sets a new sequence value less than the current one (does not change the value)' do
     with_migration do
       def up
         create_sequence :position, start: 100
@@ -196,6 +217,12 @@ class SqliteSequenceTest < Minitest::Test
   end
 
   test 'orders sequences' do
+    with_migration do
+      def up
+        drop_table :objects, if_exists: true
+      end
+    end.up
+
     list = SQLiteDB.check_sequences.map { |s| s[:name] }
     assert !list.include?('a')
     assert !list.include?('b')
@@ -203,7 +230,6 @@ class SqliteSequenceTest < Minitest::Test
 
     with_migration do
       def up
-        drop_table :things, if_exists: true
         create_sequence :c, { start: 1 }
         create_sequence :a, { start: 3 }
         create_sequence :b
@@ -322,6 +348,18 @@ class SqliteSequenceTest < Minitest::Test
     assert_equal pos4 - pos2, 2
   end
 
+  test 'checks custom sequence generated from code' do
+    assert_equal SQLiteDB.custom_sequence?(:c), false
+
+    with_migration do
+      def up
+        create_sequence :c
+      end
+    end.up
+
+    assert_equal SQLiteDB.custom_sequence?(:c), true
+  end
+
   test 'creates a Sequence by calling DB.setval(position, 1) if it still does not exist' do
     assert !sequence_table_exists?('position')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-sequence
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Nikolai Bocharov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-28 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -19,7 +19,7 @@ dependencies:
         version: '5.28'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.73'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.28'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.73'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,50 +114,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.22.0
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.3
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.4
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
 description: |2
-      This gem provides a single interface for SEQUENCE functionality
+      This gem provides a single user-friendly interface for SEQUENCE functionality
       in Postgresql and MariaDB DBMS within the Sequel ORM.
       It also models the Sequences to meet the needs of SQLite and MySQL users.
 email:
@@ -168,6 +126,7 @@ extra_rdoc_files:
 - README.md
 - LICENSE.md
 files:
+- ".ci.gemfile"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"