activerecord-tidb-adapter 0.4.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85ed982e6735cfcb567e2d863975ba8f56e98dd6243578394e2ca01dc07ca91a
-  data.tar.gz: c7aefb6293698e59ce8ff6812b156070622c6ed7c58689e39c4eca5946309959
+  metadata.gz: 841479ce689b846211133017869602520491030764a7844b5888946c5b71f606
+  data.tar.gz: 141316e2fb3464a8eee551b1d27a156ac1d17d4fb85efedce8f5bf190cb71a13
 SHA512:
-  metadata.gz: af4ea51bd264d25cd621e3c95438fd9fd3c7df8b2dea533172cbeb0e07110e661dc68b0d294c23a1420e2b9c0a74334b14c46213d59425764a37336702d17034
-  data.tar.gz: d07ec9fa2f944d6832c7f70287d4583073ea633b7c8364936801e555ac5592a4c5d21b18e9fff5b12a2599b4b8bfc637c5163cbb0b6604e0af1c5b388bc7f70f
+  metadata.gz: 54d1ce5aba761df255809464ba50cc5ceaba25b2f68fb79a5f1e012e934bda42bc63f7946d74081c27d01972d90290a5736bc312bb41ef856a4d35f6dda338ec
+  data.tar.gz: 9737ed2ead8e72a7ade7deeea3afeae186761f3a29cc3eaa6d01d3b9366eacb1a97167cdc31f71e16aeec216b3613687599f375d8bcfcf83b64f43b3a40c91bc

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 6-1-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:
+      - main
+    paths-ignore:
+      - 'README*.md'
+      - 'docs/**'
+  pull_request:
+    branches:
+      - main
+    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: MYSQL_USER=root MYSQL_HOST=127.0.0.1 MYSQL_PORT=4000 tidb=1 ARCONN=tidb bundle exec rake db:tidb:build
+    - run: MYSQL_USER=root MYSQL_HOST=127.0.0.1 MYSQL_PORT=4000 tidb=1 ARCONN=tidb bundle exec rake test:tidb

data/Gemfile

@@ -14,7 +14,7 @@ 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: '6-1-stable'
 
 gem 'byebug', '~> 11.1'
 

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
-  remote: https://github.com/tidb-incubator/rails.git
-  revision: e377e0dc16e9841a048ec7eab2666c06155b6a0c
+  remote: https://github.com/pingcap/rails.git
+  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 (6.1.1)
       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)
@@ -134,22 +136,22 @@ 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)
     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

@@ -1,4 +1,5 @@
 # ActiveRecord TiDB Adapter
+[![Build status](https://badge.buildkite.com/2cc593ab1a36b95eeb063ebc5cbecb40492177c03800ef33a4.svg)](https://buildkite.com/hooopo/tidb-dot-5-1-dot-0-ar-tidb-adapter-dot-6-1-stable)
 
 TiDB adapter for ActiveRecord 5 and 6. This is a lightweight extension of the mysql2 adapter that establishes compatibility with [TiDB](https://github.com/pingcap/tidb).
 
@@ -8,9 +9,13 @@ 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', "~> 6.1.0"
 ```
 
+If you're using Rails 5.2, use the 5.2.x versions of this gem.
+
+If you're using Rails 6.1, use the 6.1.x versions of this gem.
+
 And then execute:
 
     $ bundle install
@@ -140,11 +145,17 @@ 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:tidb
 
 ```
-MYSQL_USER=root MYSQL_HOST=127.0.0.1 MYSQL_PORT=4000 tidb=1 ARCONN=tidb bundle exec rake test:idb
 
+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

data/config.toml

@@ -1 +1,2 @@
 new_collations_enabled_on_first_bootstrap = true
+allow-expression-index = true

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

@@ -0,0 +1,18 @@
+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)
+    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')}")
+    else
+      last_inserted_id(value)
+    end
+  end
+  alias create insert
+end

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

@@ -0,0 +1,71 @@
+require 'active_record/connection_adapters/mysql/schema_statements'
+
+ActiveRecord::ConnectionAdapters::MySQL::SchemaStatements.class_eval do 
+  def indexes(table_name)
+    indexes = []
+    current_index = nil
+    execute_and_free("SHOW KEYS FROM #{quote_table_name(table_name)}", "SCHEMA") do |result|
+      each_hash(result) do |row|
+        if current_index != row[:Key_name]
+          next if row[:Key_name] == "PRIMARY" # skip the primary key
+          current_index = row[:Key_name]
+
+          mysql_index_type = row[:Index_type].downcase.to_sym
+          case mysql_index_type
+          when :fulltext, :spatial
+            index_type = mysql_index_type
+          when :btree, :hash
+            index_using = mysql_index_type
+          end
+
+          indexes << [
+            row[:Table],
+            row[:Key_name],
+            row[:Non_unique].to_i == 0,
+            [],
+            lengths: {},
+            orders: {},
+            type: index_type,
+            using: index_using,
+            comment: row[:Index_comment].presence
+          ]
+        end
+        
+        # FIX https://github.com/pingcap/tidb/issues/26110 for older version of TiDB
+        row[:Expression] = nil if row[:Expression] == 'NULL'
+
+        if row[:Expression]
+          expression = row[:Expression]
+          expression = +"(#{expression})" unless expression.start_with?("(")
+          indexes.last[-2] << expression
+          indexes.last[-1][:expressions] ||= {}
+          indexes.last[-1][:expressions][expression] = expression
+          indexes.last[-1][:orders][expression] = :desc if row[:Collation] == "D"
+        else
+          indexes.last[-2] << row[:Column_name]
+          indexes.last[-1][:lengths][row[:Column_name]] = row[:Sub_part].to_i if row[:Sub_part]
+          indexes.last[-1][:orders][row[:Column_name]] = :desc if row[:Collation] == "D"
+        end
+      end
+    end
+
+    indexes.map do |index|
+      options = index.pop
+
+      if expressions = options.delete(:expressions)
+        orders = options.delete(:orders)
+        lengths = options.delete(:lengths)
+
+        columns = index[-1].map { |name|
+          [ name.to_sym, expressions[name] || +quote_column_name(name) ]
+        }.to_h
+
+        index[-1] = add_options_for_index_columns(
+          columns, order: orders, length: lengths
+        ).values.join(", ")
+      end
+
+      ActiveRecord::ConnectionAdapters::IndexDefinition.new(*index, **options)
+    end
+  end
+end

data/lib/active_record/connection_adapters/tidb_adapter.rb

@@ -5,13 +5,15 @@ require 'active_record/connection_adapters/mysql2_adapter'
 require 'active_record/connection_adapters/tidb/setup'
 require_relative '../../version'
 require_relative '../sequence'
+require_relative 'tidb/schema_statements'
+require_relative 'tidb/database_statements'
 
 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
 
@@ -65,7 +67,7 @@ module ActiveRecord
       end
 
       def supports_expression_index?
-        true
+        false
       end
 
       def supports_common_table_expressions?

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 = '6.1.1'
 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: 0.4.0
+  version: 6.1.1
 platform: ruby
 authors:
 - Hooopo Wang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-15 00:00:00.000000000 Z
+date: 2021-08-21 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