ketsuban 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4f7c4a677493a4b2a693280d0db1107aec0932ba
-  data.tar.gz: 2c44b0a66a5bf05bd135a89da19a8597f2591e37
+SHA256:
+  metadata.gz: 4867c4d589558084a2562c78eb9266aa2f1f43d7cc1f1acd8eefa54b8c710591
+  data.tar.gz: d79b8524b69862073197a4e92ff53cbb25f88870872c01c998bc59122b9893e9
 SHA512:
-  metadata.gz: d49afbf4e5288f84b0eb6a20bd36c452b24b9608843f8995dfcbdf36b06e7dcdf38c753e473aa966f670a1f5fe9adf32b67ec06a7b24b5d1fa12439e90351d0e
-  data.tar.gz: 4f1802118a2ee05cebfe50c68adb4c94a2aa410180ad772908ad927ebeb41101b2d699d837ff6bd99562a07844203347944a1e428e2f678b8f35c8188f0c8c7b
+  metadata.gz: 5a41b9db0b8a08fc43d1f790ed3774da4199a47f33737494551595e8600316eb0d87a03f7b61fa1f2ec41c6c8b309ba8b50e175b757269c172c1204ead418bd6
+  data.tar.gz: 13628fa0da1d14c55c01c6e62a94762f9b0170d22fa6dfaf5c591633b56c5f118d89a818550a18f9ade97a4bdd2d31241fb6b2f1dfb7d84883a5590fde3b15d6

data/lib/ketsuban/adapters/abstract_adapter.rb

@@ -6,7 +6,7 @@ module Ketsuban
       end
 
       def fetch_next_id
-        @model_class.maximum(@model_class.primary_key)&.next || 1
+        raise 'Not implemented yet!'
       end
 
       def generate_next_id(now_id)

data/lib/ketsuban/adapters/mysql2_adapter.rb

@@ -3,11 +3,30 @@ require_relative './abstract_adapter'
 module Ketsuban
   module Adapter
     class Mysql2Adapter < AbstractAdapter
+      # @override
+      def fetch_next_id
+        [max_id_now + 1, auto_incremental_id].max
+      end
+
       # @override
       def increment_sequence(_now_id)
         # do nothing
         nil
       end
+
+      private
+
+      def auto_incremental_id
+        @model_class
+          .connection
+          .execute("select auto_increment from information_schema.tables where table_name = '#{@model_class.table_name}'")
+          .first
+          .first
+      end
+
+      def max_id_now
+        @model_class.maximum(:id).presence || 0
+      end
     end
   end
 end

data/lib/ketsuban/adapters/postgresql_adapter.rb

@@ -3,6 +3,22 @@ require_relative './abstract_adapter'
 module Ketsuban
   module Adapter
     class PostgreSQLAdapter < AbstractAdapter
+      # @override
+      def fetch_next_id
+        last_value_result = @model_class
+                            .connection
+                            .execute("select last_value, is_called from #{@model_class.sequence_name}\;")
+
+        last_value = last_value_result.getvalue(0, 0)
+        is_called = last_value_result.getvalue(0, 1)
+
+        if is_called
+          last_value.next
+        else
+          last_value
+        end
+      end
+
       # @override
       def increment_sequence(now_id)
         @model_class.connection.set_pk_sequence!(@model_class.table_name, now_id)

data/lib/ketsuban/version.rb

@@ -1,3 +1,3 @@
 module Ketsuban
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ketsuban
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - oieioi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Skip unlucky numbers for ActiveRecord surrogate key