activerecord-tidb-adapter 0.5.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e086031695fe37ee336da6d8722b947018501e8e3ce90051d00b83d7aebc742
-  data.tar.gz: af2a51ca724563cc076f5bf0ef018eb0bd8bb15a756947c316e374f30b100396
+  metadata.gz: acd66282a9f0c498709a9258ca7337267c9cbd3770ce8a5d55d38be1607d4466
+  data.tar.gz: 8a73bc0cb0b685fa49e8247fd9d325e8800a95c6157b12c8eaa089bc85d47277
 SHA512:
-  metadata.gz: f8e0c432e30009832966b1a70d3a2842e9b64c9fa417c3744952c0d1feb6d64a956308496dcab19ba36ac2c9da7e48a0fa94d69ad14fa4a5d2849781b6fa8bcd
-  data.tar.gz: 844d1511bb454844e4d179b7c519dbcac9398a9e4df6ad3df85f8396d1f7b687ef3f13a77330f1126c4b6479fb8fe1f472c5feae8b3002f386e964626d005120
+  metadata.gz: 9a478110b32ee9acaeaa7570a207f5721fa91cce9547f1c83bc89ab52e7b59f8401b3ccde38b4c224e8918d16fc2d1e376dca52a0bac316c77be8011161169a8
+  data.tar.gz: d9a0cdc919c9e09df981b779aa5b60b63fa927fcb93420d8629c671d96562b3f45c8a6280187813caefb5f3b39dd980d66584fbddc6d35bc7d80c11b7e96722d

data/Gemfile

@@ -14,10 +14,14 @@ gem 'pry'
 
 gem 'rubocop', '~> 1.18'
 
-gem 'rails', git: 'https://github.com/tidb-incubator/rails.git', branch: '6-1-stable'
+gem 'rails', git: 'https://github.com/pingcap/rails.git', branch: '5-2-stable'
 
 gem 'byebug', '~> 11.1'
 
 gem 'sqlite3', '~> 1.4'
 
 gem 'pg', '~> 1.2'
+
+gem "mocha", "~> 1.13"
+
+gem "bcrypt", "~> 3.1"

data/Gemfile.lock

@@ -1,100 +1,82 @@
 GIT
-  remote: https://github.com/tidb-incubator/rails.git
-  revision: e2a3d3fb2ee24c709b9f32221fbcb66cfda5acfc
-  branch: 6-1-stable
+  remote: https://github.com/pingcap/rails.git
+  revision: 7a3fbc5e103be80107fabc9e626cfc32e10e6e1c
+  branch: 5-2-stable
   specs:
-    actioncable (6.1.4)
-      actionpack (= 6.1.4)
-      activesupport (= 6.1.4)
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4)
-      actionpack (= 6.1.4)
-      activejob (= 6.1.4)
-      activerecord (= 6.1.4)
-      activestorage (= 6.1.4)
-      activesupport (= 6.1.4)
-      mail (>= 2.7.1)
-    actionmailer (6.1.4)
-      actionpack (= 6.1.4)
-      actionview (= 6.1.4)
-      activejob (= 6.1.4)
-      activesupport (= 6.1.4)
+    actionmailer (5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4)
-      actionview (= 6.1.4)
-      activesupport (= 6.1.4)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (5.2.6)
+      actionview (= 5.2.6)
+      activesupport (= 5.2.6)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4)
-      actionpack (= 6.1.4)
-      activerecord (= 6.1.4)
-      activestorage (= 6.1.4)
-      activesupport (= 6.1.4)
-      nokogiri (>= 1.8.5)
-    actionview (6.1.4)
-      activesupport (= 6.1.4)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.6)
+      activesupport (= 5.2.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4)
-      activesupport (= 6.1.4)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
       globalid (>= 0.3.6)
-    activemodel (6.1.4)
-      activesupport (= 6.1.4)
-    activerecord (6.1.4)
-      activemodel (= 6.1.4)
-      activesupport (= 6.1.4)
-    activestorage (6.1.4)
-      actionpack (= 6.1.4)
-      activejob (= 6.1.4)
-      activerecord (= 6.1.4)
-      activesupport (= 6.1.4)
+    activemodel (5.2.6)
+      activesupport (= 5.2.6)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
+      arel (>= 9.0)
+    activestorage (5.2.6)
+      actionpack (= 5.2.6)
+      activerecord (= 5.2.6)
       marcel (~> 1.0.0)
-      mini_mime (>= 1.1.0)
-    activesupport (6.1.4)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    rails (6.1.4)
-      actioncable (= 6.1.4)
-      actionmailbox (= 6.1.4)
-      actionmailer (= 6.1.4)
-      actionpack (= 6.1.4)
-      actiontext (= 6.1.4)
-      actionview (= 6.1.4)
-      activejob (= 6.1.4)
-      activemodel (= 6.1.4)
-      activerecord (= 6.1.4)
-      activestorage (= 6.1.4)
-      activesupport (= 6.1.4)
-      bundler (>= 1.15.0)
-      railties (= 6.1.4)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    rails (5.2.6)
+      actioncable (= 5.2.6)
+      actionmailer (= 5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      activemodel (= 5.2.6)
+      activerecord (= 5.2.6)
+      activestorage (= 5.2.6)
+      activesupport (= 5.2.6)
+      bundler (>= 1.3.0)
+      railties (= 5.2.6)
       sprockets-rails (>= 2.0.0)
-    railties (6.1.4)
-      actionpack (= 6.1.4)
-      activesupport (= 6.1.4)
+    railties (5.2.6)
+      actionpack (= 5.2.6)
+      activesupport (= 5.2.6)
       method_source
-      rake (>= 0.13)
-      thor (~> 1.0)
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
 
 PATH
   remote: .
   specs:
-    activerecord-tidb-adapter (0.5.0)
-      activerecord (~> 6.1)
+    activerecord-tidb-adapter (5.2.0)
+      activerecord (~> 5.2)
       mysql2
 
 GEM
   remote: https://rubygems.org/
   specs:
+    arel (9.0.0)
     ast (2.4.2)
+    bcrypt (3.1.16)
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
@@ -116,6 +98,7 @@ GEM
     minitest (5.14.4)
     minitest-excludes (2.0.1)
       minitest (~> 5.0)
+    mocha (1.13.0)
     mysql2 (0.5.3)
     nio4r (2.5.8)
     nokogiri (1.12.3-x86_64-darwin)
@@ -136,7 +119,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.1)
       loofah (~> 2.3)
     rainbow (3.0.0)
     rake (13.0.6)
@@ -163,13 +146,13 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
     thor (1.1.0)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
     unicode-display_width (2.0.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   x86_64-darwin-18
@@ -177,9 +160,11 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-tidb-adapter!
+  bcrypt (~> 3.1)
   byebug (~> 11.1)
   minitest (~> 5.0)
   minitest-excludes (~> 2.0)
+  mocha (~> 1.13)
   pg (~> 1.2)
   pry
   rails!

data/activerecord-tidb-adapter.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '~> 6.1'
+  spec.add_dependency 'activerecord', '~> 5.2'
   spec.add_dependency 'mysql2'
 
   # Uncomment to register a new dependency of your gem

data/lib/active_record/connection_adapters/tidb_adapter.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_record/connection_adapters'
 require 'active_record/connection_adapters/mysql2_adapter'
 require 'active_record/connection_adapters/tidb/setup'
 require_relative '../../version'
@@ -30,7 +29,28 @@ module ActiveRecord
     end
   end
 
+  
+
   module ConnectionAdapters
+    class Mysql2Adapter < AbstractMysqlAdapter
+      ER_BAD_DB_ERROR = 1049
+      ADAPTER_NAME = "Mysql2"
+
+      include MySQL::DatabaseStatements
+
+      class << self
+        def new_client(config)
+          Mysql2::Client.new(config)
+        rescue Mysql2::Error => error
+          if error.error_number == ConnectionAdapters::Mysql2Adapter::ER_BAD_DB_ERROR
+            raise ActiveRecord::NoDatabaseError
+          else
+            raise ActiveRecord::ConnectionNotEstablished, error.message
+          end
+        end
+      end
+    end
+
     class TidbAdapter < Mysql2Adapter
       include ActiveRecord::Sequence::Adapter
       ADAPTER_NAME = 'Tidb'
@@ -105,42 +125,35 @@ module ActiveRecord
         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]
+        table_name = arel.ast.relation.table_name
+        pk_def = schema_cache.columns_hash(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)
+      def new_column_from_field(table_name, field)
         type_metadata = fetch_type_metadata(field[:Type], field[:Extra])
-        default = field[:Default]
-        default_function = nil
-
-        if type_metadata.type == :datetime && /\ACURRENT_TIMESTAMP(?:\([0-6]?\))?\z/i.match?(default)
-          default_function = default
-          default = nil
-        elsif type_metadata.extra == 'DEFAULT_GENERATED'
-          default = +"(#{default})" unless default.start_with?('(')
-          default_function = default
-          default = nil
+        if type_metadata.type == :datetime && /\ACURRENT_TIMESTAMP(?:\([0-6]?\))?\z/i.match?(field[:Default])
+          default, default_function = nil, field[:Default]
         elsif default.to_s =~ /nextval/i
           default_function = default
           default = nil
+        else
+          default, default_function = field[:Default], nil
         end
 
         MySQL::Column.new(
           field[:Field],
           default,
           type_metadata,
-          field[:Null] == 'YES',
+          field[:Null] == "YES",
+          table_name,
           default_function,
-          collation: field[:Collation],
+          field[:Collation],
           comment: field[:Comment].presence
         )
       end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-tidb-adapter
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Hooopo Wang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement