activerecord-tidb-adapter 5.2.0 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acd66282a9f0c498709a9258ca7337267c9cbd3770ce8a5d55d38be1607d4466
-  data.tar.gz: 8a73bc0cb0b685fa49e8247fd9d325e8800a95c6157b12c8eaa089bc85d47277
+  metadata.gz: 1ec81c5f43cb98b0fe8fb61484ea7b0050a84cb8c7caac6d25e314d58f5f1be0
+  data.tar.gz: 4a99eafd9d2f53885e063cc89af6ecf2afce3506e0f9b118a999e52c5fe93e71
 SHA512:
-  metadata.gz: 9a478110b32ee9acaeaa7570a207f5721fa91cce9547f1c83bc89ab52e7b59f8401b3ccde38b4c224e8918d16fc2d1e376dca52a0bac316c77be8011161169a8
-  data.tar.gz: d9a0cdc919c9e09df981b779aa5b60b63fa927fcb93420d8629c671d96562b3f45c8a6280187813caefb5f3b39dd980d66584fbddc6d35bc7d80c11b7e96722d
+  metadata.gz: 66909adaf233af63fb1f7f251cb8f11ba4a484c80e7646c9202c5636a7477575880f85927e01403ce26f8ebaa4a88c5eea6ffa1052a5a34d4e8b12d18f5cbb86
+  data.tar.gz: 8ad7289243de4d4f4e1b34d759be041f33c5b02d6b99428e9fc09ad918baa021751d708adc335c126495dce29eae9fca61a63cf7533711c7cd88cb6caf3511a3

data/.buildkite/hooks/pre-command

@@ -0,0 +1,10 @@
+#!/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

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,16 @@
+#!/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

@@ -0,0 +1,35 @@
+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/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/pingcap/rails.git
-  revision: 7a3fbc5e103be80107fabc9e626cfc32e10e6e1c
+  revision: a1adbde17b229e9131d40787ee4342c1180afb36
   branch: 5-2-stable
   specs:
     actioncable (5.2.6)
@@ -67,7 +67,7 @@ GIT
 PATH
   remote: .
   specs:
-    activerecord-tidb-adapter (5.2.0)
+    activerecord-tidb-adapter (5.2.2)
       activerecord (~> 5.2)
       mysql2
 

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'
+gem 'activerecord-tidb-adapter', "~> 5.2.2"
 ```
 
 And then execute:

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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,28 @@
+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/lib/active_record/connection_adapters/tidb_adapter.rb

@@ -4,6 +4,8 @@ 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
 
@@ -119,44 +121,6 @@ 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?
-
-        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
-
-      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 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",
-          table_name,
-          default_function,
-          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.0'
+  TIDB_ADAPTER_VERSION = '5.2.2'
 end

data/testing.sh

@@ -0,0 +1,14 @@
+#!/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-tidb-adapter
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.2
 platform: ruby
 authors:
 - Hooopo Wang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -45,6 +45,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".buildkite/hooks/pre-command"
+- ".buildkite/pipeline.yml"
+- ".github/entrypoint.sh"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
@@ -55,7 +59,9 @@ 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
@@ -66,6 +72,7 @@ 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