sequel-sequence 0.3.0 → 0.4.0

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

@@ -14,8 +14,11 @@ module Sequel
           check_options(options)
           if_exists = build_exists_condition(options[:if_exists])
           start_option = options[:start] || 1
+          num_label = options[:numeric_label] || 0
+          return if (current = lastval(name)) && (current >= start_option)
+
           sql = [create_sequence_table(stringify(name), if_exists)]
-          sql << insert_into_sqlite_sequence(stringify(name), start_option)
+          sql << insert_into_sequence_table_init_values(stringify(name), start_option, num_label)
           run(sql.join("\n"))
         end
 
@@ -26,12 +29,12 @@ module Sequel
 
         def nextval(name)
           run(insert_into_sequence_table(stringify(name), 0))
-          take_seq(name)
+          take_seq(stringify(name))
         end
 
         def nextval_with_label(name, num_label = 0)
           run(insert_into_sequence_table(stringify(name), num_label))
-          take_seq(name)
+          take_seq(stringify(name))
         end
 
         def lastval(name)
@@ -85,6 +88,10 @@ module Sequel
           )
         end
 
+        def insert_into_sequence_table_init_values(name, start_id, num_label)
+          "INSERT INTO #{name} (id, fiction) VALUES (#{start_id}, #{num_label});"
+        end
+
         def insert_into_sequence_table(name, num_label)
           "INSERT INTO #{name} (fiction) VALUES (#{num_label});"
         end
@@ -119,7 +126,7 @@ module Sequel
             CREATE TRIGGER IF NOT EXISTS #{table}_#{sequence} AFTER INSERT
             ON #{table}
             BEGIN
-              INSERT INTO #{sequence}(fiction) VALUES (0);
+              INSERT INTO #{sequence} (fiction) VALUES (0);
               UPDATE #{table}
               SET #{column} = (SELECT MAX(seq) FROM sqlite_sequence WHERE name = '#{sequence}')
               WHERE rowid = NEW.rowid;

data/lib/sequel/sequence/database.rb

@@ -53,12 +53,12 @@ module Sequel
         raise Sequel::MethodNotAllowed, Sequel::MethodNotAllowed::METHOD_NOT_ALLOWED
       end
 
-      # for connection.adapter_name = "PostgreSQL"
+      # for Postgres
       def currval(_name)
         raise Sequel::MethodNotAllowed, Sequel::MethodNotAllowed::METHOD_NOT_ALLOWED
       end
 
-      # for connection.adapter_name = "Mysql2"
+      # for MariaDB
       alias lastval currval
 
       def setval(_name, _value)

data/lib/sequel/sequence/database_ext_connection.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require_relative 'database/server/mysql'
+require_relative 'database/server/mariadb'
+
+module Sequel
+  class Database
+    class << self
+      attr_reader :dbms
+    end
+
+    old_connect = singleton_method(:connect)
+
+    define_singleton_method(:connect) do |*args|
+      db = old_connect.call(*args)
+      if db.adapter_scheme == :mysql2
+        @dbms = db.mariadb? ? Mariadb : Mysql
+        puts "Sequel::Database.REconnect mariadb? = #{db.mariadb?.inspect}"
+        puts "Sequel::Database.REconnect server_version = #{db.server_version.inspect}"
+        Sequel::Mysql2::Database.include(@dbms)
+      end
+      db
+    end
+  end
+end

data/lib/sequel/sequence/version.rb

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

data/lib/sequel/sequence.rb

@@ -2,10 +2,10 @@
 
 require 'sequel/database'
 require 'sequel/adapters/postgres'
-# require 'sequel/adapters/mysql'
 require 'sequel/adapters/mysql2'
 require 'sequel/adapters/sqlite'
 require 'sequel/error'
+require 'sequel/sequence/database_ext_connection'
 
 module Sequel
   module Sequence
@@ -13,8 +13,6 @@ module Sequel
 
     module Database
       require 'sequel/sequence/database/postgresql'
-      # require "sequel/sequence/database/mysql"
-      require 'sequel/sequence/database/mysql2'
       require 'sequel/sequence/database/sqlite'
     end
   end
@@ -26,12 +24,6 @@ Sequel::Database.include(
 Sequel::Postgres::Database.include(
   Sequel::Sequence::Database::PostgreSQL
 )
-Sequel::Mysql2::Database.include(
-  Sequel::Sequence::Database::Mysql2
-)
-# Sequel::Mysql::Database.include(
-#   Sequel::Sequence::Database::Mysql
-# )
 Sequel::SQLite::Database.include(
   Sequel::Sequence::Database::SQLite
 )

data/sequel-sequence.gemspec

@@ -7,10 +7,11 @@ Gem::Specification.new do |spec|
   spec.version               = Sequel::Sequence::VERSION
   spec.licenses              = ['MIT']
   spec.summary               = \
-    "Add support for PostgreSQL's and MySQL's SEQUENCE on Sequel migrations."
+    '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
-    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.
   DES
   spec.authors               = ['Nikolai Bocharov']
   spec.email                 = ['it.architect@yahoo.com']

data/test/mariadb_test_helper.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+MariaDB = Sequel.connect(
+  adapter: 'mysql2',
+  user: ENV['TEST_MARIA_USERNAME'] || 'root',
+  password: ENV['TEST_MARIA_PASSWORD'] || 'root',
+  host: ENV['TEST_MARIA_HOST'] || '127.0.0.1',
+  port: ENV['TEST_MARIA_PORT'] || 3306,
+  database: ENV['TEST_MARIA_DATABASE'] || 'test'
+)
+
+module MariadbTestHelper
+  def recreate_table
+    MariaDB.run 'DROP SEQUENCE IF EXISTS position'
+    MariaDB.run 'DROP TABLE IF EXISTS wares'
+    MariaDB.run 'DROP SEQUENCE IF EXISTS a'
+    MariaDB.run 'DROP SEQUENCE IF EXISTS b'
+    MariaDB.run 'DROP SEQUENCE IF EXISTS c'
+    sql = 'CREATE TABLE wares (id INT AUTO_INCREMENT, slug VARCHAR(255), quantity INT DEFAULT(0), PRIMARY KEY(id));'
+    MariaDB.run sql
+  end
+
+  def with_migration(&block)
+    migration_class = Sequel::Migration
+
+    Sequel::Model.db = MariaDB
+
+    Class.new(migration_class, &block).new(MariaDB)
+  end
+end

data/test/mysql_test_helper.rb

@@ -5,20 +5,22 @@ require 'test_helper'
 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,
+  password: ENV['TEST_MYSQL_PASSWORD'] || 'rootroot',
+  host: ENV['TEST_MYSQL_HOST'] || '0.0.0.0',
+  port: ENV['TEST_MYSQL_PORT'] || 3360,
   database: ENV['TEST_MYSQL_DATABASE'] || 'test'
 )
 
 module MysqlTestHelper
   def recreate_table
-    MysqlDB.run 'DROP SEQUENCE IF EXISTS position'
-    MysqlDB.run 'DROP TABLE IF EXISTS wares'
-    MysqlDB.run 'DROP SEQUENCE IF EXISTS a'
-    MysqlDB.run 'DROP SEQUENCE IF EXISTS b'
-    MysqlDB.run 'DROP SEQUENCE IF EXISTS c'
-    sql = 'CREATE TABLE wares (id INT AUTO_INCREMENT, slug VARCHAR(255), quantity INT DEFAULT(0), PRIMARY KEY(id));'
+    MysqlDB.drop_table :creators, if_exists: true
+    MysqlDB.drop_sequence :position_id, if_exists: true
+    MysqlDB.drop_sequence :position
+    MysqlDB.drop_table :stuffs, if_exists: true
+    MysqlDB.drop_sequence 'a'
+    MysqlDB.drop_sequence 'b'
+    MysqlDB.drop_sequence 'c'
+    sql = 'CREATE TABLE stuffs (id INT AUTO_INCREMENT PRIMARY KEY, slug VARCHAR(255), quantity INT DEFAULT(0));'
     MysqlDB.run sql
   end
 

data/test/sequel/mariadb_sequence_test.rb

@@ -0,0 +1,182 @@
+# frozen_string_literal: true
+
+require 'mariadb_test_helper'
+
+class MariadbSequenceTest < Minitest::Test
+  include MariadbTestHelper
+
+  setup do
+    recreate_table
+  end
+
+  test 'adds sequence with default values' do
+    with_migration do
+      def up
+        # create_sequence :position, {start: 1, increment: 1} - default values
+        create_sequence :position
+      end
+    end.up
+
+    assert_equal 1, MariaDB.nextval(:position)
+    assert_equal 2, MariaDB.nextval(:position)
+  end
+
+  test 'adds sequence reader within model and its inherited class' do
+    with_migration do
+      def up
+        create_sequence :position
+      end
+    end.up
+
+    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
+    with_migration do
+      def up
+        create_sequence :position, start: 100
+      end
+    end.up
+
+    assert_equal 100, MariaDB.nextval(:position)
+    assert_equal 101, MariaDB.nextval(:position)
+  end
+
+  test 'adds sequence incremented by 2' do
+    with_migration do
+      def up
+        create_sequence :position, increment: 2
+      end
+    end.up
+
+    assert_equal 1, MariaDB.nextval(:position)
+    assert_equal 3, MariaDB.nextval(:position)
+  end
+
+  test 'adds sequence incremented by 2 (using :step alias)' do
+    with_migration do
+      def up
+        create_sequence :position, step: 2
+      end
+    end.up
+
+    assert_equal 1, MariaDB.nextval(:position)
+    assert_equal 3, MariaDB.nextval(:position)
+  end
+
+  test "returns current/last sequence value, which doesn't increase by itself" 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)
+  end
+
+  test 'sets sequence value' do
+    with_migration do
+      def up
+        create_sequence :position
+      end
+    end.up
+
+    MariaDB.nextval(:position)
+    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)
+
+    MariaDB.nextval(:position)
+    # now the value is correct
+    assert_equal 102, MariaDB.lastval(:position)
+  end
+
+  test 'drops sequence and check_sequences' do
+    with_migration do
+      def up
+        create_sequence :position
+      end
+    end.up
+
+    sequence = MariaDB.check_sequences.find_all do |seq|
+      seq[:Tables_in_test] == 'position'
+    end
+
+    assert_equal 1, sequence.size
+
+    with_migration do
+      def down
+        drop_sequence :position
+      end
+    end.down
+
+    sequence = MariaDB.check_sequences.find do |seq|
+      seq[:Tables_in_test] == 'position'
+    end
+
+    assert_nil sequence
+  end
+
+  test 'orders sequences' do
+    list = MariaDB.check_sequences.map { |s| s[:Tables_in_test] }
+    assert !list.include?('a')
+    assert !list.include?('b')
+    assert !list.include?('c')
+
+    with_migration do
+      def up
+        drop_table :things, if_exists: true
+        create_sequence :c
+        create_sequence :a
+        create_sequence :b
+      end
+    end.up
+
+    list = MariaDB.check_sequences.map { |s| s[:Tables_in_test] }
+    assert list.include?('a')
+    assert list.include?('b')
+    assert list.include?('c')
+  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
+          String :name, text: true
+          Bignum :position, null: false
+        end
+        set_column_default_nextval :builders, :position, :position_id
+      end
+    end.up
+
+    class Builder < Sequel::Model; end
+
+    builder1 = Builder.create(name: 'Builder 1')
+    pos1 = MariaDB.currval(:position_id)
+    assert_equal pos1, builder1.reload.position
+
+    builder2 = Builder.create(name: 'Builder 2')
+    pos2 = MariaDB.currval(:position_id)
+    assert_equal pos2, builder2.reload.position
+
+    assert_equal pos2 - pos1, 1
+  end
+end