activerecord-tidb-adapter 5.2.2 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ec81c5f43cb98b0fe8fb61484ea7b0050a84cb8c7caac6d25e314d58f5f1be0
-  data.tar.gz: 4a99eafd9d2f53885e063cc89af6ecf2afce3506e0f9b118a999e52c5fe93e71
+  metadata.gz: 5f82e1eb06fb93971e146fafade1c45e2e3c5909e3968f32a719c9581efb55f3
+  data.tar.gz: 5a0bc0100489a41230115924cbff3f52e1ef2206441724116135ed01ccdd28da
 SHA512:
-  metadata.gz: 66909adaf233af63fb1f7f251cb8f11ba4a484c80e7646c9202c5636a7477575880f85927e01403ce26f8ebaa4a88c5eea6ffa1052a5a34d4e8b12d18f5cbb86
-  data.tar.gz: 8ad7289243de4d4f4e1b34d759be041f33c5b02d6b99428e9fc09ad918baa021751d708adc335c126495dce29eae9fca61a63cf7533711c7cd88cb6caf3511a3
+  metadata.gz: 0b059eabd253b3e7e0ead32528ac380d874dd9ab42ff942ec86ff3ddec86257b00aa5aea3c44912f95d3c0c8ba2dc7e8ba0a33abff668f6100f929fc2ed45f61
+  data.tar.gz: 216b0b9917670ca40cd30d3c243493e88aaf2279d946b68eaa927b0a65d78226e075279f12c8839f32a4d9be8b3edb7c348ba2038cd25bfa2845dc62aa9d4944

data/Gemfile

@@ -14,14 +14,10 @@ gem 'pry'
 
 gem 'rubocop', '~> 1.18'
 
-gem 'rails', git: 'https://github.com/pingcap/rails.git', branch: '5-2-stable'
+gem 'rails', git: 'https://github.com/pingcap/rails.git', branch: '6-1-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,82 +1,100 @@
 GIT
   remote: https://github.com/pingcap/rails.git
-  revision: a1adbde17b229e9131d40787ee4342c1180afb36
-  branch: 5-2-stable
+  revision: e2a3d3fb2ee24c709b9f32221fbcb66cfda5acfc
+  branch: 6-1-stable
   specs:
-    actioncable (5.2.6)
-      actionpack (= 5.2.6)
+    actioncable (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.6)
-      actionpack (= 5.2.6)
-      actionview (= 5.2.6)
-      activejob (= 5.2.6)
+    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)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.6)
-      actionview (= 5.2.6)
-      activesupport (= 5.2.6)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.4)
+      actionview (= 6.1.4)
+      activesupport (= 6.1.4)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.6)
-      activesupport (= 5.2.6)
+      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)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.6)
-      activesupport (= 5.2.6)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.4)
+      activesupport (= 6.1.4)
       globalid (>= 0.3.6)
-    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)
+    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)
       marcel (~> 1.0.0)
-    activesupport (5.2.6)
+      mini_mime (>= 1.1.0)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      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)
+      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)
       sprockets-rails (>= 2.0.0)
-    railties (5.2.6)
-      actionpack (= 5.2.6)
-      activesupport (= 5.2.6)
+    railties (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      rake (>= 0.13)
+      thor (~> 1.0)
 
 PATH
   remote: .
   specs:
-    activerecord-tidb-adapter (5.2.2)
-      activerecord (~> 5.2)
+    activerecord-tidb-adapter (6.1.0)
+      activerecord (~> 6.1)
       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)
@@ -98,7 +116,6 @@ 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)
@@ -146,13 +163,13 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
     thor (1.1.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     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
@@ -160,11 +177,9 @@ 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/README.md

@@ -8,7 +8,7 @@ TiDB adapter for ActiveRecord 5 and 6. This is a lightweight extension of the my
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'activerecord-tidb-adapter', "~> 5.2.2"
+gem 'activerecord-tidb-adapter', "~> 6.1.0"
 ```
 
 And then execute:

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', '~> 5.2'
+  spec.add_dependency 'activerecord', '~> 6.1'
   spec.add_dependency 'mysql2'
 
   # Uncomment to register a new dependency of your gem

data/lib/active_record/connection_adapters/tidb_adapter.rb

@@ -1,11 +1,10 @@
 # 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'
 require_relative '../sequence'
-require_relative 'tidb/database_statements'
-require_relative 'tidb/schema_statements'
 
 ActiveRecord::ConnectionAdapters::Tidb.initial_setup
 
@@ -31,28 +30,7 @@ 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'
@@ -121,6 +99,51 @@ module ActiveRecord
       rescue ActiveRecord::NoDatabaseError
         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]
+        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
+        elsif default.to_s =~ /nextval/i
+          default_function = default
+          default = nil
+        end
+
+        MySQL::Column.new(
+          field[:Field],
+          default,
+          type_metadata,
+          field[:Null] == 'YES',
+          default_function,
+          collation: field[:Collation],
+          comment: field[:Comment].presence
+        )
+      end
     end
   end
 end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-tidb-adapter
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 6.1.0
 platform: ruby
 authors:
 - Hooopo Wang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-23 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: '5.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -45,10 +45,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".buildkite/hooks/pre-command"
-- ".buildkite/pipeline.yml"
-- ".github/entrypoint.sh"
-- ".github/workflows/ci.yml"
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
@@ -59,9 +55,7 @@ files:
 - bin/console
 - bin/setup
 - config.toml
-- lib/active_record/connection_adapters/tidb/database_statements.rb
 - lib/active_record/connection_adapters/tidb/database_tasks.rb
-- lib/active_record/connection_adapters/tidb/schema_statements.rb
 - lib/active_record/connection_adapters/tidb/setup.rb
 - lib/active_record/connection_adapters/tidb/type.rb
 - lib/active_record/connection_adapters/tidb_adapter.rb
@@ -72,7 +66,6 @@ files:
 - lib/active_record/sequence/schema_dumper.rb
 - lib/activerecord-tidb-adapter.rb
 - lib/version.rb
-- testing.sh
 homepage: https://github.com/pingcap/activerecord-tidb-adapter
 licenses:
 - Apache-2.0

data/.buildkite/hooks/pre-command

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Place this in /etc/buildkite-agent/hooks/pre-command
-#
-# Needs to be `chown buildkite-agent` and `chmod +x`
-
-# RVM uses unbound variables and will fail without this
-set +u
-
-source /var/lib/buildkite-agent/.rvm/scripts/rvm

data/.buildkite/pipeline.yml

@@ -1,7 +0,0 @@
-env:
-  MYSQL_HOST: 127.0.0.1
-  MYSQL_USER: root
-
-steps:
-  - command: "testing.sh"
-    label: "Run TiDB ActiveRecord Adapter testing 5-2-stable"

data/.github/entrypoint.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-set -eu
-service supervisor start
-
-while sleep 60; do
-  ps aux |grep tidb |grep -q -v grep
-  TIDB_STATUS=$?
-  ps aux |grep tikv |grep -q -v grep
-  TIKV_STATUS=$?
-  # If the greps above find anything, they exit with 0 status
-  # If they are not both 0, then something is wrong
-  if [ $TIDB_STATUS -ne 0 -o $TIKV_STATUS -ne 0 ]; then
-    echo "One of the processes has already exited."
-    exit 1
-  fi
-done

data/.github/workflows/ci.yml

@@ -1,35 +0,0 @@
-name: activerecord-tidb-adapter ci
-
-on:
-  push:
-    branches:
-      - 5-2-stable
-    paths-ignore:
-      - 'README*.md'
-      - 'docs/**'
-  pull_request:
-    branches:
-      - 5-2-stable
-    paths-ignore:
-      - 'README*.md'
-      - 'docs/**'
-
-jobs:
-  build:
-    if: ${{ !contains(github.event.commits[0].message, '[skip ci]') }}
-    runs-on: ubuntu-latest
-    services:
-      tidb:
-        image: hawkingrei/tind:v5.1.0
-        options: --entrypoint /entrypoint.sh
-        env:
-          TIDB_VERSION: v5.1.0
-        ports: ["4000:4000"]
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-        bundler-cache: true
-    - run: sleep 30 && MYSQL_USER=root MYSQL_HOST=127.0.0.1 MYSQL_PORT=4000 tidb=1 ARCONN=tidb bundle exec rake db:tidb:build
-    - run: sleep 10 && MYSQL_USER=root MYSQL_HOST=127.0.0.1 MYSQL_PORT=4000 tidb=1 ARCONN=tidb bundle exec rake test:tidb

data/lib/active_record/connection_adapters/tidb/database_statements.rb

@@ -1,19 +0,0 @@
-require 'active_record/connection_adapters/abstract/database_statements'
-
-ActiveRecord::ConnectionAdapters::DatabaseStatements.class_eval do 
-  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?
-    return last_inserted_id(value) if arel.is_a?(String)
-    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')}")
-    else
-      last_inserted_id(value)
-    end
-  end
-  alias create insert
-end

data/lib/active_record/connection_adapters/tidb/schema_statements.rb

@@ -1,28 +0,0 @@
-require 'pry'
-require 'active_record/connection_adapters/mysql/schema_statements'
-
-
-ActiveRecord::ConnectionAdapters::MySQL::SchemaStatements.class_eval do 
-  def new_column_from_field(table_name, field)
-    type_metadata = fetch_type_metadata(field[:Type], field[:Extra])
-    if type_metadata.type == :datetime && /\ACURRENT_TIMESTAMP(?:\([0-6]?\))?\z/i.match?(field[:Default])
-      default, default_function = nil, field[:Default]
-    elsif field[:Default].to_s =~ /nextval/i
-      default_function = field[:Default]
-      default = nil
-    else
-      default, default_function = field[:Default], nil
-    end
-
-    ActiveRecord::ConnectionAdapters::MySQL::Column.new(
-      field[:Field],
-      default,
-      type_metadata,
-      field[:Null] == "YES",
-      table_name,
-      default_function,
-      field[:Collation],
-      comment: field[:Comment].presence
-    )
-  end
-end

data/testing.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -eo pipefail
-
-bundle config set --local path '/tmp/buildkite-cache' 
-
-echo "Setup gem mirror"
-bundle config mirror.https://rubygems.org https://gems.ruby-china.com 
-
-echo "Bundle install"
-bundle install
-
-echo "Setup database for testing"
-tidb=1 ARCONN=tidb bundle exec rake db:tidb:rebuild && tidb=1 ARCONN=tidb bundle exec rake test:tidb