activerecord-tidb-adapter 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85ed982e6735cfcb567e2d863975ba8f56e98dd6243578394e2ca01dc07ca91a
-  data.tar.gz: c7aefb6293698e59ce8ff6812b156070622c6ed7c58689e39c4eca5946309959
+  metadata.gz: 7e086031695fe37ee336da6d8722b947018501e8e3ce90051d00b83d7aebc742
+  data.tar.gz: af2a51ca724563cc076f5bf0ef018eb0bd8bb15a756947c316e374f30b100396
 SHA512:
-  metadata.gz: af4ea51bd264d25cd621e3c95438fd9fd3c7df8b2dea533172cbeb0e07110e661dc68b0d294c23a1420e2b9c0a74334b14c46213d59425764a37336702d17034
-  data.tar.gz: d07ec9fa2f944d6832c7f70287d4583073ea633b7c8364936801e555ac5592a4c5d21b18e9fff5b12a2599b4b8bfc637c5163cbb0b6604e0af1c5b388bc7f70f
+  metadata.gz: f8e0c432e30009832966b1a70d3a2842e9b64c9fa417c3744952c0d1feb6d64a956308496dcab19ba36ac2c9da7e48a0fa94d69ad14fa4a5d2849781b6fa8bcd
+  data.tar.gz: 844d1511bb454844e4d179b7c519dbcac9398a9e4df6ad3df85f8396d1f7b687ef3f13a77330f1126c4b6479fb8fe1f472c5feae8b3002f386e964626d005120

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/tidb-incubator/rails.git
-  revision: e377e0dc16e9841a048ec7eab2666c06155b6a0c
+  revision: e2a3d3fb2ee24c709b9f32221fbcb66cfda5acfc
   branch: 6-1-stable
   specs:
     actioncable (6.1.4)
@@ -87,7 +87,7 @@ GIT
 PATH
   remote: .
   specs:
-    activerecord-tidb-adapter (0.4.0)
+    activerecord-tidb-adapter (0.5.0)
       activerecord (~> 6.1)
       mysql2
 
@@ -105,7 +105,7 @@ GEM
       activesupport (>= 5.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    loofah (2.11.0)
+    loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -118,6 +118,8 @@ GEM
       minitest (~> 5.0)
     mysql2 (0.5.3)
     nio4r (2.5.8)
+    nokogiri (1.12.3-x86_64-darwin)
+      racc (~> 1.4)
     nokogiri (1.12.3-x86_64-linux)
       racc (~> 1.4)
     parallel (1.20.1)
@@ -140,16 +142,16 @@ GEM
     rake (13.0.6)
     regexp_parser (2.1.1)
     rexml (3.2.5)
-    rubocop (1.18.4)
+    rubocop (1.19.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.8.0, < 2.0)
+      rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.8.0)
+    rubocop-ast (1.10.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
     sprockets (4.0.2)

data/README.md

@@ -140,13 +140,19 @@ MYSQL_USER=root MYSQL_HOST=127.0.0.1 MYSQL_PORT=4000 tidb=1 ARCONN=tidb bundle e
 
 ```
 
-run tidb adapter tests
+run tidb adapter tests and activerecord buildin tests
 
 ```
-MYSQL_USER=root MYSQL_HOST=127.0.0.1 MYSQL_PORT=4000 tidb=1 ARCONN=tidb bundle exec rake test:idb
+MYSQL_USER=root MYSQL_HOST=127.0.0.1 MYSQL_PORT=4000 tidb=1 ARCONN=tidb bundle exec rake test:tidb
 
 ```
 
+run **ONLY** tidb adapter tests using `ONLY_TEST_TIDB` env:
+
+```
+ONLY_TEST_TIDB=1 MYSQL_USER=root MYSQL_HOST=127.0.0.1 MYSQL_PORT=4000 tidb=1 ARCONN=tidb bundle exec rake test:tidb
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/pingcap/activerecord-tidb-adapter.

data/lib/active_record/connection_adapters/tidb_adapter.rb

@@ -9,9 +9,9 @@ require_relative '../sequence'
 ActiveRecord::ConnectionAdapters::Tidb.initial_setup
 
 module ActiveRecord
-  module ConnectionHandling #:nodoc:
+  module ConnectionHandling # :nodoc:
     # Establishes a connection to the database that's used by all Active Record objects.
-    def tidb_connection(config) #:nodoc:
+    def tidb_connection(config) # :nodoc:
       config = config.symbolize_keys
       config[:flags] ||= 0
 
@@ -100,6 +100,23 @@ module ActiveRecord
         false
       end
 
+      def insert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
+        sql, binds = to_sql_and_binds(arel, binds)
+        value = exec_insert(sql, name, binds, pk, sequence_name)
+        return id_value if id_value.present?
+
+        model = arel.ast.relation.instance_variable_get(:@klass)
+        pk_def = schema_cache.columns_hash(model.table_name)[pk]
+        if pk_def&.default_function && pk_def.default_function =~ /nextval/
+          query_value("SELECT #{pk_def.default_function.sub('nextval', 'lastval')}")
+        elsif model.sequence_name
+          ActiveRecord::Base.lastval(model.sequence_name)
+        else
+          last_inserted_id(value)
+        end
+      end
+      alias create insert
+
       def new_column_from_field(_table_name, field)
         type_metadata = fetch_type_metadata(field[:Type], field[:Extra])
         default = field[:Default]

data/lib/active_record/sequence/adapter.rb

@@ -37,9 +37,14 @@ module ActiveRecord
 
       def drop_sequence(name)
         name = quote_column_name(name)
-        sql = "DROP SEQUENCE #{name}"
+        sql = "DROP SEQUENCE IF EXISTS #{name}"
         execute(sql)
       end
+
+      def recreate_sequence(name, options = {})
+        drop_sequence(name)
+        create_sequence(name, options)
+      end
     end
   end
 end

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecord
-  TIDB_ADAPTER_VERSION = '0.4.0'
+  TIDB_ADAPTER_VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-tidb-adapter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Hooopo Wang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-15 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord