sequel-sequence 0.3.0 → 0.4.0

data/test/sequel/mysql_sequence_test.rb

@@ -12,13 +12,28 @@ class MysqlSequenceTest < Minitest::Test
   test 'adds sequence with default values' do
     with_migration do
       def up
-        # create_sequence :position, {start: 1, increment: 1} - default values
+        # create_sequence :position, {start: 1, increment: 1, numeric_label: 0} - default values
         create_sequence :position
       end
     end.up
 
-    assert_equal 1, MysqlDB.nextval(:position)
     assert_equal 2, MysqlDB.nextval(:position)
+    assert_equal 3, MysqlDB.nextval(:position)
+  end
+
+  test 'adds sequence with numeric_label' do
+    with_migration do
+      def up
+        # create_sequence :position, {start: 1, increment: 1, numeric_label: 0} - default values
+        create_sequence :position, numeric_label: 10
+      end
+    end.up
+
+    assert_equal 1, MysqlDB.currval(:position)
+
+    fiction_list = MysqlDB.fetch('SELECT fiction FROM position;').all
+    assert_equal 1, fiction_list.size
+    assert_equal 10, fiction_list.first[:fiction]
   end
 
   test 'adds sequence reader within model and its inherited class' do
@@ -28,15 +43,15 @@ class MysqlSequenceTest < Minitest::Test
       end
     end.up
 
-    class Ware < Sequel::Model; end
+    class Stuff < Sequel::Model; end
 
-    assert_equal 1, Ware.db.nextval('position')
-    assert_equal 2, Ware.db.nextval('position')
+    assert_equal 2, Stuff.db.nextval('position')
+    assert_equal 3, Stuff.db.nextval('position')
 
-    class InheritedWare < Ware; end
+    class InheritedStuff < Stuff; end
 
-    assert_equal 3, InheritedWare.db.nextval(:position)
-    assert_equal 4, InheritedWare.db.nextval(:position)
+    assert_equal 4, InheritedStuff.db.nextval(:position)
+    assert_equal 5, InheritedStuff.db.nextval(:position)
   end
 
   test 'adds sequence starting at 100' do
@@ -46,30 +61,34 @@ class MysqlSequenceTest < Minitest::Test
       end
     end.up
 
-    assert_equal 100, MysqlDB.nextval(:position)
     assert_equal 101, MysqlDB.nextval(:position)
+    assert_equal 102, MysqlDB.nextval(:position)
   end
 
-  test 'adds sequence incremented by 2' do
+  test 'adds a sequence that we are trying to increase by a value greater than 1' do
+    @step = 4
     with_migration do
       def up
-        create_sequence :position, increment: 2
+        create_sequence :position, increment: 4
       end
     end.up
 
-    assert_equal 1, MysqlDB.nextval(:position)
+    assert_equal 2, MysqlDB.nextval(:position)
     assert_equal 3, MysqlDB.nextval(:position)
+    assert_operator (2 + @step), :>, MysqlDB.nextval(:position)
   end
 
-  test 'adds sequence incremented by 2 (using :step alias)' do
+  test 'adds a sequence that we are trying to increase by a value greater than 1 (using :step alias)' do
+    @step = 4
     with_migration do
       def up
-        create_sequence :position, step: 2
+        create_sequence :position, step: 4
       end
     end.up
 
-    assert_equal 1, MysqlDB.nextval(:position)
+    assert_equal 2, MysqlDB.nextval(:position)
     assert_equal 3, MysqlDB.nextval(:position)
+    assert_operator (2 + @step), :>, MysqlDB.nextval(:position)
   end
 
   test "returns current/last sequence value, which doesn't increase by itself" do
@@ -80,33 +99,70 @@ class MysqlSequenceTest < Minitest::Test
     end.up
 
     MysqlDB.nextval(:position)
+    # changed value (=2) after default one (=1)
 
-    assert_equal 1, MysqlDB.currval(:position)
-    assert_equal 1, MysqlDB.lastval(:position)
-    assert_equal 1, MysqlDB.currval(:position)
-    assert_equal 1, MysqlDB.lastval(:position)
+    assert_equal 2, MysqlDB.currval(:position)
+    assert_equal 2, MysqlDB.lastval(:position)
+    assert_equal 2, MysqlDB.currval(:position)
+    assert_equal 2, MysqlDB.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
 
-    MysqlDB.nextval(:position)
     assert_equal MysqlDB.currval(:position), 1
 
+    MysqlDB.nextval(:position)
+    assert_equal MysqlDB.currval(:position), 2
+
     MysqlDB.setval(:position, 101)
-    # in mariaDB, 'lastval' only works after 'nextval' rather than  'setval'
-    assert_equal 1, MysqlDB.lastval(:position)
+    assert_equal 101, MysqlDB.lastval(:position)
+
+    assert_equal 102, MysqlDB.nextval(:position)
+  end
+
+  test 'sets a new sequence value less than the current one' do
+    with_migration do
+      def up
+        create_sequence :position, start: 100
+      end
+    end.up
+
+    assert_equal MysqlDB.currval(:position), 100
+
+    MysqlDB.nextval(:position)
+    assert_equal MysqlDB.currval(:position), 101
+
+    MysqlDB.setval(:position, 1)
+    assert_equal 101, MysqlDB.lastval(:position)
 
     MysqlDB.nextval(:position)
-    # now the value is correct
     assert_equal 102, MysqlDB.lastval(:position)
   end
 
-  test 'drops sequence and check_sequences' do
+  test 'sets a new sequence value with a label' do
+    with_migration do
+      def up
+        create_sequence :position
+      end
+    end.up
+
+    MysqlDB.nextval(:position)
+    MysqlDB.nextval_with_label(:position, 1)
+    MysqlDB.nextval_with_label(:position, 1)
+    fiction_set_size = MysqlDB.fetch('SELECT * FROM position where fiction = 1;').all.size
+    assert_equal 2, fiction_set_size
+
+    # create_sequence + nextval
+    fiction_set_size = MysqlDB.fetch('SELECT * FROM position where fiction = 0;').all.size
+    assert_equal 2, fiction_set_size
+  end
+
+  test 'drops the sequence and the check_sequences' do
     with_migration do
       def up
         create_sequence :position
@@ -114,7 +170,7 @@ class MysqlSequenceTest < Minitest::Test
     end.up
 
     sequence = MysqlDB.check_sequences.find_all do |seq|
-      seq[:Tables_in_test] == 'position'
+      seq[:name] == 'position'
     end
 
     assert_equal 1, sequence.size
@@ -126,14 +182,40 @@ class MysqlSequenceTest < Minitest::Test
     end.down
 
     sequence = MysqlDB.check_sequences.find do |seq|
-      seq[:Tables_in_test] == 'position'
+      seq[:name] == 'position'
+    end
+
+    assert_nil sequence
+  end
+
+  test 'drops the sequence with the parameter if_exists' do
+    with_migration do
+      def up
+        create_sequence :position
+      end
+    end.up
+
+    sequence = MysqlDB.check_sequences.find_all do |seq|
+      seq[:name] == 'position'
+    end
+
+    assert_equal 1, sequence.size
+
+    with_migration do
+      def down
+        drop_sequence :position, if_exists: true
+      end
+    end.down
+
+    sequence = MysqlDB.check_sequences.find do |seq|
+      seq[:name] == 'position'
     end
 
     assert_nil sequence
   end
 
   test 'orders sequences' do
-    list = MysqlDB.check_sequences.map { |s| s[:Tables_in_test] }
+    list = MysqlDB.check_sequences.map { |s| s[:name] }
     assert !list.include?('a')
     assert !list.include?('b')
     assert !list.include?('c')
@@ -141,42 +223,133 @@ class MysqlSequenceTest < Minitest::Test
     with_migration do
       def up
         drop_table :things, if_exists: true
-        create_sequence :c
-        create_sequence :a
+        create_sequence :c, { start: 1 }
+        create_sequence :a, { start: 3 }
         create_sequence :b
       end
     end.up
 
-    list = MysqlDB.check_sequences.map { |s| s[:Tables_in_test] }
+    list = MysqlDB.check_sequences.map { |s| s[:name] }
     assert list.include?('a')
     assert list.include?('b')
     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
+        create_sequence :position_id, if_exists: false, start: 1
+      end
+    end.up
+
+    assert_equal 1, MysqlDB.currval(:position_id)
+
+    fiction_set_size = MysqlDB.fetch('SELECT * FROM position_id where fiction = 0;').all.size
+    assert_equal 1, fiction_set_size
+
+    with_migration do
+      def up
+        create_sequence :position_id, if_exists: false, start: 1
+      end
+    end.up
+
+    assert_equal 1, MysqlDB.currval(:position_id)
+
+    fiction_set_size = MysqlDB.fetch('SELECT * FROM position_id where fiction = 0;').all.size
+    assert_equal 1, fiction_set_size
+  end
+
+  test 'recreates the same sequence with a smaller start value' do
+    with_migration do
+      def up
+        create_sequence :position_id, if_exists: false, start: 100
+      end
+    end.up
+
+    assert_equal 100, MysqlDB.currval(:position_id)
+
+    fiction_set_size = MysqlDB.fetch('SELECT * FROM position_id where fiction = 0;').all.size
+    assert_equal 1, fiction_set_size
+
+    with_migration do
+      def up
+        create_sequence :position_id, if_exists: false, start: 1
+      end
+    end.up
+
+    assert_equal 100, MysqlDB.currval(:position_id)
+
+    fiction_set_size = MysqlDB.fetch('SELECT * FROM position_id where fiction = 0;').all.size
+    assert_equal 1, fiction_set_size
+  end
+
+  test 'recreates the same sequence with a greater start value' do
+    with_migration do
+      def up
+        create_sequence :position_id, if_exists: false, start: 1
+      end
+    end.up
+
+    assert_equal 1, MysqlDB.currval(:position_id)
+
+    fiction_set_size = MysqlDB.fetch('SELECT * FROM position_id where fiction = 0;').all.size
+    assert_equal 1, fiction_set_size
+
+    with_migration do
+      def up
+        create_sequence :position_id, if_exists: false, start: 100
+      end
+    end.up
+
+    assert_equal 100, MysqlDB.currval(:position_id)
+
+    fiction_set_size = MysqlDB.fetch('SELECT * FROM position_id where fiction = 0;').all.size
+    assert_equal 2, fiction_set_size
+  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
+        create_table :creators do
           primary_key :id
           String :name, text: true
-          Bignum :position, null: false
+          Bignum :position
         end
-        set_column_default_nextval :builders, :position, :position_id
+        set_column_default_nextval :creators, :position, :position_id
       end
     end.up
 
-    class Builder < Sequel::Model; end
+    class Creator < Sequel::Model; end
 
-    builder1 = Builder.create(name: 'Builder 1')
-    pos1 = MysqlDB.currval(:position_id)
-    assert_equal pos1, builder1.reload.position
+    creator1 = Creator.create(name: 'Creator 1')
+    pos1 = MysqlDB.lastval(:position_id)
+    assert_equal pos1, creator1.reload.position
 
-    builder2 = Builder.create(name: 'Builder 2')
+    creator2 = Creator.create(name: 'Creator 2')
     pos2 = MysqlDB.currval(:position_id)
-    assert_equal pos2, builder2.reload.position
+    assert_equal pos2, creator2.reload.position
 
     assert_equal pos2 - pos1, 1
+
+    MysqlDB.nextval(:position_id)
+
+    creator4 = Creator.create(name: 'Creator 4')
+    pos4 = MysqlDB.currval(:position_id)
+    assert_equal pos4, creator4.reload.position
+
+    assert_equal pos4 - pos2, 2
   end
 end

data/test/sequel/sqlite_sequence_test.rb

@@ -12,7 +12,7 @@ class SqliteSequenceTest < Minitest::Test
   test 'adds sequence with default values' do
     with_migration do
       def up
-        # create_sequence :position, {start: 1, increment: 1} - default values
+        # create_sequence :position, {start: 1, increment: 1, numeric_label: 0} - default values
         create_sequence :position
       end
     end.up
@@ -126,8 +126,7 @@ class SqliteSequenceTest < Minitest::Test
     SQLiteDB.setval(:position, 1)
     assert_equal 101, SQLiteDB.lastval(:position)
 
-    SQLiteDB.nextval(:position)
-    assert_equal 102, SQLiteDB.lastval(:position)
+    assert_equal 102, SQLiteDB.nextval(:position)
   end
 
   test 'sets a new sequence value with a label' do
@@ -143,8 +142,9 @@ class SqliteSequenceTest < Minitest::Test
     fiction_set_size = SQLiteDB.fetch('SELECT * FROM position where fiction = 1;').all.size
     assert_equal 2, fiction_set_size
 
+    # create_sequence + nextval
     fiction_set_size = SQLiteDB.fetch('SELECT * FROM position where fiction = 0;').all.size
-    assert_equal 1, fiction_set_size
+    assert_equal 2, fiction_set_size
   end
 
   test 'drops the sequence and the check_sequences' do
@@ -173,7 +173,7 @@ class SqliteSequenceTest < Minitest::Test
     assert_nil sequence
   end
 
-  test 'dropsthe sequence with the parameter if_exists' do
+  test 'drops the sequence with the parameter if_exists' do
     with_migration do
       def up
         create_sequence :position
@@ -220,6 +220,78 @@ class SqliteSequenceTest < Minitest::Test
     assert list.include?('c')
   end
 
+  test 'recreates the same sequence with the same start value' do
+    with_migration do
+      def up
+        create_sequence :position_id, if_exists: false, start: 1
+      end
+    end.up
+
+    assert_equal 1, SQLiteDB.currval(:position_id)
+
+    fiction_set_size = SQLiteDB.fetch('SELECT * FROM position_id where fiction = 0;').all.size
+    assert_equal 1, fiction_set_size
+
+    with_migration do
+      def up
+        create_sequence :position_id, if_exists: false, start: 1
+      end
+    end.up
+
+    assert_equal 1, SQLiteDB.currval(:position_id)
+
+    fiction_set_size = SQLiteDB.fetch('SELECT * FROM position_id where fiction = 0;').all.size
+    assert_equal 1, fiction_set_size
+  end
+
+  test 'recreates the same sequence with a smaller start value' do
+    with_migration do
+      def up
+        create_sequence :position_id, if_exists: false, start: 100
+      end
+    end.up
+
+    assert_equal 100, SQLiteDB.currval(:position_id)
+
+    fiction_set_size = SQLiteDB.fetch('SELECT * FROM position_id where fiction = 0;').all.size
+    assert_equal 1, fiction_set_size
+
+    with_migration do
+      def up
+        create_sequence :position_id, if_exists: false, start: 1
+      end
+    end.up
+
+    assert_equal 100, SQLiteDB.currval(:position_id)
+
+    fiction_set_size = SQLiteDB.fetch('SELECT * FROM position_id where fiction = 0;').all.size
+    assert_equal 1, fiction_set_size
+  end
+
+  test 'recreates the same sequence with a greater start value' do
+    with_migration do
+      def up
+        create_sequence :position_id, if_exists: false, start: 1
+      end
+    end.up
+
+    assert_equal 1, SQLiteDB.currval(:position_id)
+
+    fiction_set_size = SQLiteDB.fetch('SELECT * FROM position_id where fiction = 0;').all.size
+    assert_equal 1, fiction_set_size
+
+    with_migration do
+      def up
+        create_sequence :position_id, if_exists: false, start: 100
+      end
+    end.up
+
+    assert_equal 100, SQLiteDB.currval(:position_id)
+
+    fiction_set_size = SQLiteDB.fetch('SELECT * FROM position_id where fiction = 0;').all.size
+    assert_equal 2, fiction_set_size
+  end
+
   test 'creates table that references sequence' do
     with_migration do
       def up

data/test/sqlite_test_helper.rb

@@ -10,7 +10,8 @@ SQLiteDB = Sequel.connect(
 
 module SqliteTestHelper
   def recreate_table
-    SQLiteDB.drop_sequence 'position'
+    SQLiteDB.drop_sequence :position
+    SQLiteDB.drop_sequence :position_id, if_exists: true
     SQLiteDB.run 'DROP TABLE IF EXISTS objects'
     SQLiteDB.drop_sequence 'a'
     SQLiteDB.drop_sequence 'b'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-sequence
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Nikolai Bocharov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2023-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -158,7 +158,8 @@ dependencies:
         version: 1.6.0
 description: |2
       This gem provides a single interface for SEQUENCE functionality
-      in Postgresql and Mysql databases within the Sequel ORM.
+      in Postgresql and MariaDB DBMS within the Sequel ORM.
+      It also models the Sequences to meet the needs of SQLite and MySQL users.
 email:
 - it.architect@yahoo.com
 executables: []
@@ -185,14 +186,17 @@ files:
 - lib/sequel/error.rb
 - lib/sequel/sequence.rb
 - lib/sequel/sequence/database.rb
-- lib/sequel/sequence/database/mysql.rb
-- lib/sequel/sequence/database/mysql2.rb
 - lib/sequel/sequence/database/postgresql.rb
+- lib/sequel/sequence/database/server/mariadb.rb
+- lib/sequel/sequence/database/server/mysql.rb
 - lib/sequel/sequence/database/sqlite.rb
+- lib/sequel/sequence/database_ext_connection.rb
 - lib/sequel/sequence/version.rb
 - sequel-sequence.gemspec
+- test/mariadb_test_helper.rb
 - test/mysql_test_helper.rb
 - test/postgresql_test_helper.rb
+- test/sequel/mariadb_sequence_test.rb
 - test/sequel/mysql_sequence_test.rb
 - test/sequel/postgresql_sequence_test.rb
 - test/sequel/sqlite_sequence_test.rb
@@ -223,5 +227,6 @@ requirements: []
 rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
-summary: Add support for PostgreSQL's and MySQL's SEQUENCE on Sequel migrations.
+summary: Adds SEQUENCE support to Sequel for migrations to PostgreSQL, MariaDB, MySQL
+  and SQLite.
 test_files: []

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

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Sequel
-  module Sequence
-    module Database
-      module Mysql
-      end
-    end
-  end
-end

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

@@ -1,81 +0,0 @@
-# frozen_string_literal: true
-
-# https://sequel.jeremyevans.net/rdoc/files/doc/sql_rdoc.html
-# https://github.com/jeremyevans/sequel/blob/master/lib/sequel/database/connecting.rb
-module Sequel
-  module Sequence
-    module Database
-      module Mysql2
-        def quote_column_name(name)
-          "`#{name.gsub('`', '``')}`"
-        end
-
-        def quote_sequence_name(name)
-          "`#{name.gsub(/[`"']/, '')}`"
-        end
-
-        def check_sequences
-          fetch("SHOW FULL TABLES WHERE Table_type = 'SEQUENCE';").all.to_a
-        end
-
-        def create_sequence(name, options = {})
-          increment = options[:increment] || options[:step]
-          if_exists = build_exists_condition(options[:if_exists])
-          name = quote_name(name.to_s)
-
-          sql = ["CREATE SEQUENCE #{if_exists} #{name}"]
-          sql << "INCREMENT BY #{increment}" if increment
-          sql << "START WITH #{options[:start]}" if options[:start]
-          sql << ';'
-
-          run(sql.join("\n"))
-        end
-
-        def drop_sequence(name)
-          name = quote_name(name.to_s)
-          sql = "DROP SEQUENCE IF EXISTS #{name}"
-          run(sql)
-        end
-
-        def nextval(name)
-          name = quote(name.to_s)
-          out = nil
-          fetch("SELECT nextval(#{name});") do |row|
-            out = row["nextval(#{name})".to_sym]
-          end
-          out
-        end
-
-        # for db.database_type = :mysql2
-        def lastval(name)
-          name = quote(name.to_s)
-          out = nil
-          fetch("SELECT lastval(#{name});") do |row|
-            out = row["lastval(#{name})".to_sym]
-          end
-          out
-        end
-
-        # for db.database_type = :postgres
-        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]
-          end
-          out
-        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});"
-        end
-      end
-    end
-  end
-end