sequel-sequence 0.1.0 → 0.3.0

data/lib/sequel/sequence/database.rb

@@ -3,30 +3,52 @@
 module Sequel
   module Sequence
     module Database
-      # def custom_sequence?(_sequence_name)
-      #   false
-      # end
+      DANGER_OPT_ID = "Warning! The new sequence ID can't be less than the current one."
+      DANGER_OPT_INCREMENT = 'Warning! Increments greater than 1 are not supported.'
+      IF_EXISTS = 'IF EXISTS'
+      IF_NOT_EXISTS = 'IF NOT EXISTS'
+
+      def check_options(params)
+        log_info DANGER_OPT_INCREMENT if params[:increment] && params[:increment] != 1
+        log_info DANGER_OPT_INCREMENT if params[:step] && params[:step] != 1
+      end
+
+      def custom_sequence?(_sequence_name)
+        raise Sequel::MethodNotAllowed, Sequel::MethodNotAllowed::METHOD_NOT_ALLOWED
+      end
 
       def check_sequences
-        []
+        raise Sequel::MethodNotAllowed, Sequel::MethodNotAllowed::METHOD_NOT_ALLOWED
       end
 
       def create_sequence(_name, _options = {})
         raise Sequel::MethodNotAllowed, Sequel::MethodNotAllowed::METHOD_NOT_ALLOWED
       end
 
-      def drop_sequence(_name)
+      def drop_sequence(_name, _options = {})
         raise Sequel::MethodNotAllowed, Sequel::MethodNotAllowed::METHOD_NOT_ALLOWED
       end
 
       def quote_name(name)
+        unless respond_to?(:quote_column_name, false)
+          raise Sequel::MethodNotAllowed, Sequel::MethodNotAllowed::METHOD_NOT_ALLOWED
+        end
+
         name.to_s.split('.', 2).map { |part| quote_column_name(part) }.join('.')
       end
 
       def quote(name)
+        unless respond_to?(:quote_sequence_name, false)
+          raise Sequel::MethodNotAllowed, Sequel::MethodNotAllowed::METHOD_NOT_ALLOWED
+        end
+
         name.to_s.split('.', 2).map { |part| quote_sequence_name(part) }.join('.')
       end
 
+      def nextval_with_label(_name, _num_label = 0)
+        raise Sequel::MethodNotAllowed, Sequel::MethodNotAllowed::METHOD_NOT_ALLOWED
+      end
+
       def nextval(_name)
         raise Sequel::MethodNotAllowed, Sequel::MethodNotAllowed::METHOD_NOT_ALLOWED
       end
@@ -40,7 +62,16 @@ module Sequel
       alias lastval currval
 
       def setval(_name, _value)
-        raise AR::MethodNotAllowed, AR::MethodNotAllowed::METHOD_NOT_ALLOWED
+        raise Sequel::MethodNotAllowed, Sequel::MethodNotAllowed::METHOD_NOT_ALLOWED
+      end
+
+      def build_exists_condition(option)
+        case option
+        when true
+          IF_EXISTS
+        when false
+          IF_NOT_EXISTS
+        end
       end
     end
   end

data/lib/sequel/sequence/version.rb

@@ -2,6 +2,6 @@
 
 module Sequel
   module Sequence
-    VERSION = '0.1.0'
+    VERSION = '0.3.0'
   end
 end

data/lib/sequel/sequence.rb

@@ -4,6 +4,7 @@ require 'sequel/database'
 require 'sequel/adapters/postgres'
 # require 'sequel/adapters/mysql'
 require 'sequel/adapters/mysql2'
+require 'sequel/adapters/sqlite'
 require 'sequel/error'
 
 module Sequel
@@ -14,6 +15,7 @@ module Sequel
       require 'sequel/sequence/database/postgresql'
       # require "sequel/sequence/database/mysql"
       require 'sequel/sequence/database/mysql2'
+      require 'sequel/sequence/database/sqlite'
     end
   end
 end
@@ -30,3 +32,6 @@ Sequel::Mysql2::Database.include(
 # Sequel::Mysql::Database.include(
 #   Sequel::Sequence::Database::Mysql
 # )
+Sequel::SQLite::Database.include(
+  Sequel::Sequence::Database::SQLite
+)

data/sequel-sequence.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.email                 = ['it.architect@yahoo.com']
   spec.files                 = `git ls-files -z`.split("\x0")
   spec.require_paths         = ['lib']
-  spec.extra_rdoc_files      = ['README.md']
+  spec.extra_rdoc_files      = ['README.md', 'LICENSE.md']
   spec.homepage              = 'https://rubygems.org/gems/sequel-sequence'
   spec.metadata              = {
     'source_code_uri' => 'https://github.com/oreol-group/sequel-sequence',
@@ -26,20 +26,22 @@ Gem::Specification.new do |spec|
   spec.platform              = Gem::Platform::RUBY
   spec.required_ruby_version = '>= 2.7.0'
 
-  spec.add_dependency 'sequel'
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'minitest-utils'
-  spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'simplecov'
+  spec.add_dependency 'sequel', '>= 5.28', '<5.73'
+  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'
-    spec.add_development_dependency 'jdbc-postgres'
+    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'
-    spec.add_development_dependency 'pg'
+    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/mysql_test_helper.rb

@@ -2,18 +2,14 @@
 
 require 'test_helper'
 
-MysqlDB = Sequel.connect('mysql2://root:root@localhost/test')
-
-Sequel::Model.db = MysqlDB
-
-class Ware < Sequel::Model
-end
-
-class InheritedWare < Ware
-end
-
-class Builder < Sequel::Model
-end
+MysqlDB = Sequel.connect(
+  adapter: 'mysql2',
+  user: ENV['TEST_MYSQL_USERNAME'] || 'root',
+  password: ENV['TEST_MYSQL_PASSWORD'] || 'root',
+  host: ENV['TEST_MYSQL_HOST'] || '127.0.0.1',
+  port: ENV['TEST_MYSQL_PORT'] || 3306,
+  database: ENV['TEST_MYSQL_DATABASE'] || 'test'
+)
 
 module MysqlTestHelper
   def recreate_table
@@ -25,4 +21,12 @@ module MysqlTestHelper
     sql = 'CREATE TABLE wares (id INT AUTO_INCREMENT, slug VARCHAR(255), quantity INT DEFAULT(0), PRIMARY KEY(id));'
     MysqlDB.run sql
   end
+
+  def with_migration(&block)
+    migration_class = Sequel::Migration
+
+    Sequel::Model.db = MysqlDB
+
+    Class.new(migration_class, &block).new(MysqlDB)
+  end
 end

data/test/postgresql_test_helper.rb

@@ -2,18 +2,14 @@
 
 require 'test_helper'
 
-PostgresqlDB = Sequel.connect('postgres:///test')
-
-Sequel::Model.db = PostgresqlDB
-
-class Thing < Sequel::Model
-end
-
-class InheritedThing < Thing
-end
-
-class Master < Sequel::Model
-end
+PostgresqlDB = Sequel.connect(
+  adapter: 'postgres',
+  user: ENV['TEST_POSTGRES_USERNAME'] || 'postgres',
+  password: ENV['TEST_POSTGRES_PASSWORD'] || 'postgres',
+  host: ENV['TEST_POSTGRES_HOST'] || 'localhost',
+  port: ENV['TEST_POSTGRES_PORT'] || 5432,
+  database: ENV['TEST_POSTGRES_DATABASE'] || 'test'
+)
 
 module PostgresqlTestHelper
   def recreate_table
@@ -25,4 +21,12 @@ module PostgresqlTestHelper
     sql = 'CREATE TABLE things (id SERIAL PRIMARY KEY, slug VARCHAR(255), quantity INTEGER DEFAULT 0);'
     PostgresqlDB.run sql
   end
+
+  def with_migration(&block)
+    migration_class = Sequel::Migration
+
+    Sequel::Model.db = PostgresqlDB
+
+    Class.new(migration_class, &block).new(PostgresqlDB)
+  end
 end

data/test/sequel/mysql_sequence_test.rb

@@ -10,97 +10,108 @@ class MysqlSequenceTest < Minitest::Test
   end
 
   test 'adds sequence with default values' do
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
+        # create_sequence :position, {start: 1, increment: 1} - default values
         create_sequence :position
       end
-    end.apply(MysqlDB, :up)
+    end.up
 
-    assert_equal 1, Ware.db.nextval(:position)
-    assert_equal 2, Ware.db.nextval(:position)
+    assert_equal 1, MysqlDB.nextval(:position)
+    assert_equal 2, MysqlDB.nextval(:position)
   end
 
-  test 'adds sequence reader within inherited class' do
-    Sequel.migration do
-      up do
+  test 'adds sequence reader within model and its inherited class' do
+    with_migration do
+      def up
         create_sequence :position
       end
-    end.apply(MysqlDB, :up)
+    end.up
 
-    assert_equal 1, InheritedWare.db.nextval(:position)
-    assert_equal 2, InheritedWare.db.nextval(:position)
+    class Ware < Sequel::Model; end
+
+    assert_equal 1, Ware.db.nextval('position')
+    assert_equal 2, Ware.db.nextval('position')
+
+    class InheritedWare < Ware; end
+
+    assert_equal 3, InheritedWare.db.nextval(:position)
+    assert_equal 4, InheritedWare.db.nextval(:position)
   end
 
   test 'adds sequence starting at 100' do
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         create_sequence :position, start: 100
       end
-    end.apply(MysqlDB, :up)
+    end.up
 
-    assert_equal 100, Ware.db.nextval(:position)
-    assert_equal 101, Ware.db.nextval(:position)
+    assert_equal 100, MysqlDB.nextval(:position)
+    assert_equal 101, MysqlDB.nextval(:position)
   end
 
   test 'adds sequence incremented by 2' do
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         create_sequence :position, increment: 2
       end
-    end.apply(MysqlDB, :up)
+    end.up
 
-    assert_equal 1, Ware.db.nextval(:position)
-    assert_equal 3, Ware.db.nextval(:position)
+    assert_equal 1, MysqlDB.nextval(:position)
+    assert_equal 3, MysqlDB.nextval(:position)
   end
 
   test 'adds sequence incremented by 2 (using :step alias)' do
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         create_sequence :position, step: 2
       end
-    end.apply(MysqlDB, :up)
+    end.up
 
-    assert_equal 1, Ware.db.nextval(:position)
-    assert_equal 3, Ware.db.nextval(:position)
+    assert_equal 1, MysqlDB.nextval(:position)
+    assert_equal 3, MysqlDB.nextval(:position)
   end
 
-  test 'returns current/last sequence value without incrementing it' do
-    Sequel.migration do
-      up do
+  test "returns current/last sequence value, which doesn't increase by itself" do
+    with_migration do
+      def up
         create_sequence :position
       end
-    end.apply(MysqlDB, :up)
+    end.up
 
-    Ware.db.nextval(:position)
+    MysqlDB.nextval(:position)
 
-    assert_equal 1, Ware.db.currval(:position)
-    assert_equal 1, Ware.db.lastval(:position)
-    assert_equal 1, Ware.db.currval(:position)
-    assert_equal 1, Ware.db.lastval(:position)
+    assert_equal 1, MysqlDB.currval(:position)
+    assert_equal 1, MysqlDB.lastval(:position)
+    assert_equal 1, MysqlDB.currval(:position)
+    assert_equal 1, MysqlDB.lastval(:position)
   end
 
   test 'sets sequence value' do
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         create_sequence :position
       end
-    end.apply(MysqlDB, :up)
+    end.up
 
-    Ware.db.nextval(:position)
-    assert_equal Ware.db.currval(:position), 1
+    MysqlDB.nextval(:position)
+    assert_equal MysqlDB.currval(:position), 1
 
+    MysqlDB.setval(:position, 101)
     # in mariaDB, 'lastval' only works after 'nextval' rather than  'setval'
-    Ware.db.setval(:position, 101)
-    Ware.db.nextval(:position)
-    assert_equal Ware.db.lastval(:position), 102
+    assert_equal 1, 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
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         create_sequence :position
       end
-    end.apply(MysqlDB, :up)
+    end.up
 
     sequence = MysqlDB.check_sequences.find_all do |seq|
       seq[:Tables_in_test] == 'position'
@@ -108,14 +119,14 @@ class MysqlSequenceTest < Minitest::Test
 
     assert_equal 1, sequence.size
 
-    Sequel.migration do
-      down do
+    with_migration do
+      def down
         drop_sequence :position
       end
-    end.apply(MysqlDB, :down)
+    end.down
 
     sequence = MysqlDB.check_sequences.find do |seq|
-      seq[:sequence_name] == 'position'
+      seq[:Tables_in_test] == 'position'
     end
 
     assert_nil sequence
@@ -127,15 +138,14 @@ class MysqlSequenceTest < Minitest::Test
     assert !list.include?('b')
     assert !list.include?('c')
 
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         drop_table :things, if_exists: true
-        # drop_table :masters, if_exists: true
         create_sequence :c
         create_sequence :a
         create_sequence :b
       end
-    end.apply(MysqlDB, :up)
+    end.up
 
     list = MysqlDB.check_sequences.map { |s| s[:Tables_in_test] }
     assert list.include?('a')
@@ -144,20 +154,20 @@ class MysqlSequenceTest < Minitest::Test
   end
 
   test 'creates table that references sequence' do
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         drop_table :builders, if_exists: true
-        create_sequence :position_id, if_exists: false
+        create_sequence :position_id, if_exists: false, start: 1
         create_table :builders do
           primary_key :id
           String :name, text: true
-
-          # PostgreSQL uses bigint as the sequence's default type.
           Bignum :position, null: false
         end
         set_column_default_nextval :builders, :position, :position_id
       end
-    end.apply(MysqlDB, :up)
+    end.up
+
+    class Builder < Sequel::Model; end
 
     builder1 = Builder.create(name: 'Builder 1')
     pos1 = MysqlDB.currval(:position_id)

data/test/sequel/postgresql_sequence_test.rb

@@ -10,96 +10,103 @@ class PostgresqlSequenceTest < Minitest::Test
   end
 
   test 'adds sequence with default values' do
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         # create_sequence :position, {start: 1, increment: 1} - default values
         create_sequence :position
       end
-    end.apply(PostgresqlDB, :up)
+    end.up
 
     assert_equal 1, PostgresqlDB.nextval('position')
     assert_equal 2, PostgresqlDB.nextval('position')
   end
 
-  test 'adds sequence reader within inherited class' do
-    Sequel.migration do
-      up do
+  test 'adds sequence reader within model and its inherited class' do
+    with_migration do
+      def up
         create_sequence :position
       end
-    end.apply(PostgresqlDB, :up)
+    end.up
 
-    assert_equal 1, InheritedThing.db.nextval(:position)
-    assert_equal 2, InheritedThing.db.nextval(:position)
+    class Thing < Sequel::Model; end
+
+    assert_equal 1, Thing.db.nextval('position')
+    assert_equal 2, Thing.db.nextval('position')
+
+    class InheritedThing < Thing; end
+
+    assert_equal 3, InheritedThing.db.nextval(:position)
+    assert_equal 4, InheritedThing.db.nextval(:position)
   end
 
   test 'adds sequence starting at 100' do
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         create_sequence :position, start: 100
       end
-    end.apply(PostgresqlDB, :up)
+    end.up
 
-    assert_equal 100, Thing.db.nextval(:position)
-    assert_equal 101, Thing.db.nextval(:position)
+    assert_equal 100, PostgresqlDB.nextval(:position)
+    assert_equal 101, PostgresqlDB.nextval(:position)
   end
 
   test 'adds sequence incremented by 2' do
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         create_sequence :position, increment: 2
       end
-    end.apply(PostgresqlDB, :up)
+    end.up
 
-    assert_equal 1, Thing.db.nextval(:position)
-    assert_equal 3, Thing.db.nextval(:position)
+    assert_equal 1, PostgresqlDB.nextval(:position)
+    assert_equal 3, PostgresqlDB.nextval(:position)
   end
 
   test 'adds sequence incremented by 2 (using :step alias)' do
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         create_sequence :position, step: 2
       end
-    end.apply(PostgresqlDB, :up)
+    end.up
 
-    assert_equal 1, Thing.db.nextval(:position)
-    assert_equal 3, Thing.db.nextval(:position)
+    assert_equal 1, PostgresqlDB.nextval(:position)
+    assert_equal 3, PostgresqlDB.nextval(:position)
   end
 
-  test 'returns current (or last as alias) sequence value without incrementing it' do
-    Sequel.migration do
-      up do
+  test "returns current/last sequence value, which doesn't increase by itself" do
+    with_migration do
+      def up
         create_sequence :position, start: 2, increment: 2
       end
-    end.apply(PostgresqlDB, :up)
+    end.up
 
-    Thing.db.nextval(:position)
+    PostgresqlDB.nextval(:position)
 
-    assert_equal 2, Thing.db.currval(:position)
-    assert_equal 2, Thing.db.lastval(:position)
-    assert_equal 2, Thing.db.currval(:position)
-    assert_equal 2, Thing.db.lastval(:position)
+    assert_equal 2, PostgresqlDB.currval(:position)
+    assert_equal 2, PostgresqlDB.lastval(:position)
+    assert_equal 2, PostgresqlDB.currval(:position)
+    assert_equal 2, PostgresqlDB.lastval(:position)
   end
 
   test 'sets sequence value' do
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         create_sequence :position
       end
-    end.apply(PostgresqlDB, :up)
+    end.up
 
-    Thing.db.nextval(:position)
-    assert_equal Thing.db.currval(:position), 1
+    PostgresqlDB.nextval(:position)
+    assert_equal PostgresqlDB.currval(:position), 1
 
-    Thing.db.setval(:position, 101)
-    assert_equal 101, Thing.db.currval(:position)
+    PostgresqlDB.setval(:position, 101)
+    assert_equal 101, PostgresqlDB.currval(:position)
   end
 
   test 'drops sequence and check_sequences' do
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         create_sequence :position
       end
-    end.apply(PostgresqlDB, :up)
+    end.up
 
     sequence = PostgresqlDB.check_sequences.find_all do |seq|
       seq[:sequence_name] == 'position'
@@ -107,11 +114,11 @@ class PostgresqlSequenceTest < Minitest::Test
 
     assert_equal 1, sequence.size
 
-    Sequel.migration do
-      down do
+    with_migration do
+      def down
         drop_sequence :position
       end
-    end.apply(PostgresqlDB, :down)
+    end.down
 
     sequence = PostgresqlDB.check_sequences.find do |seq|
       seq[:sequence_name] == 'position'
@@ -126,15 +133,14 @@ class PostgresqlSequenceTest < Minitest::Test
     assert !list.include?('b')
     assert !list.include?('c')
 
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         drop_table :things, if_exists: true
-        # drop_table :masters, if_exists: true
         create_sequence :c
         create_sequence :a
         create_sequence :b
       end
-    end.apply(PostgresqlDB, :up)
+    end.up
 
     list = PostgresqlDB.check_sequences.map { |s| s[:sequence_name] }
     assert list.include?('a')
@@ -145,30 +151,30 @@ class PostgresqlSequenceTest < Minitest::Test
   test 'checks custom sequence generated from code' do
     assert_equal PostgresqlDB.custom_sequence?(:c), false
 
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         create_sequence :c
       end
-    end.apply(PostgresqlDB, :up)
+    end.up
 
     assert_equal PostgresqlDB.custom_sequence?(:c), true
   end
 
   test 'creates table that references sequence' do
-    Sequel.migration do
-      up do
+    with_migration do
+      def up
         drop_table :masters, if_exists: true
-        create_sequence :position_id, if_exists: false
-        create_table :masters do
+        create_sequence :position_id, if_exists: false, start: 1
+        create_table :masters, if_not_exists: true do
           primary_key :id
           String :name, text: true
-
-          # PostgreSQL uses bigint as the sequence's default type.
           Bignum :position, null: false
         end
         set_column_default_nextval :masters, :position, :position_id
       end
-    end.apply(PostgresqlDB, :up)
+    end.up
+
+    class Master < Sequel::Model; end
 
     master1 = Master.create(name: 'MASTER 1')
     pos1 = PostgresqlDB.currval(:position_id)