activerecord-tidb-adapter 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ad173cdbfab54d867f0116350b372fc06224abb5c3166da8d59dcbe59125d5e
-  data.tar.gz: 03a849590718d9d94f9d59730d51f001050c00ad09d54ba7dcd9470625627dd1
+  metadata.gz: 442a2dcd175987185739a1fad7a8ef8788d0b13b7263018795ac144a4c10ee03
+  data.tar.gz: e568154643ebebfc8a9dcfd506b18732d52dea1a19b6500b76e9103965fd2cff
 SHA512:
-  metadata.gz: 86b8d677d14434d8db2c688caf99946bbc8357d729abcdea9c707330f792cd190cebdfd47b7e9305154ed41399fdaf0315b9f5d718217c922c92faecbcaf80d0
-  data.tar.gz: 563c533e208b02539137b94f5b0e4f6939114dacec5a04524e31744bd8267ead0db261d4e04e02c997b3a2d9646959d56c095aa7be72974cbfa67b91f20a9d9c
+  metadata.gz: d01699afa9a6c147317b8b6fd5763bcbf63852bccaa4fe6dd5bac076405bfc02ff98ae177cd1eef39a8aac95493a4e7eac31896260bceb8b78d2c2b3976605c6
+  data.tar.gz: 932f70292fde728c25d21bf7180dbad488ca4b5d7630bfe669b70dbf1dee0165f24b311d284ed0ab8edd1b5ab1b688d28d29e7a1748c8a571101950568373a00

data/.gitignore

@@ -6,3 +6,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+/sqlnet.log
+/test/config.yml
+/test/db/
+/test/fixtures/*.sqlite*
+/debug.log

data/Gemfile

@@ -8,7 +8,16 @@ gemspec
 gem 'rake', '~> 13.0'
 
 gem 'minitest', '~> 5.0'
+gem 'minitest-excludes', '~> 2.0'
 
 gem 'pry'
 
 gem 'rubocop', '~> 1.18'
+
+gem 'rails', git: 'https://github.com/tidb-incubator/rails.git', branch: '6-1-stable'
+
+gem 'byebug', '~> 11.1'
+
+gem 'sqlite3', '~> 1.4'
+
+gem 'pg', '~> 1.2'

data/Gemfile.lock

@@ -1,38 +1,141 @@
-PATH
-  remote: .
-  specs:
-    activerecord-tidb-adapter (0.2.0)
-      activerecord (~> 6.1)
-      mysql2
-
-GEM
-  remote: https://rubygems.org/
+GIT
+  remote: https://github.com/tidb-incubator/rails.git
+  revision: e377e0dc16e9841a048ec7eab2666c06155b6a0c
+  branch: 6-1-stable
   specs:
+    actioncable (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
+      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)
+      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)
+      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)
+      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)
+      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)
+      marcel (~> 1.0.0)
+      mini_mime (>= 1.1.0)
     activesupport (6.1.4)
       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)
+      sprockets-rails (>= 2.0.0)
+    railties (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
+      method_source
+      rake (>= 0.13)
+      thor (~> 1.0)
+
+PATH
+  remote: .
+  specs:
+    activerecord-tidb-adapter (0.3.0)
+      activerecord (~> 6.1)
+      mysql2
+
+GEM
+  remote: https://rubygems.org/
+  specs:
     ast (2.4.2)
+    builder (3.2.4)
+    byebug (11.1.3)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
+    crass (1.0.6)
+    erubi (1.10.0)
+    globalid (0.5.2)
+      activesupport (>= 5.0)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
+    loofah (2.11.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (1.0.1)
     method_source (1.0.0)
+    mini_mime (1.1.0)
     minitest (5.14.4)
+    minitest-excludes (2.0.1)
+      minitest (~> 5.0)
     mysql2 (0.5.3)
+    nio4r (2.5.8)
+    nokogiri (1.12.3-x86_64-linux)
+      racc (~> 1.4)
     parallel (1.20.1)
     parser (3.0.2.0)
       ast (~> 2.4.1)
+    pg (1.2.3)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    racc (1.5.2)
+    rack (2.2.3)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     rainbow (3.0.0)
     rake (13.0.6)
     regexp_parser (2.1.1)
@@ -49,9 +152,21 @@ GEM
     rubocop-ast (1.8.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
+    sprockets (4.0.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.2)
+    thor (1.1.0)
     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
@@ -60,10 +175,15 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-tidb-adapter!
+  byebug (~> 11.1)
   minitest (~> 5.0)
+  minitest-excludes (~> 2.0)
+  pg (~> 1.2)
   pry
+  rails!
   rake (~> 13.0)
   rubocop (~> 1.18)
+  sqlite3 (~> 1.4)
 
 BUNDLED WITH
    2.2.25

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
 
 ## Usage
 
-database.yml
+config/database.yml
 
 ```yml
 default: &default
@@ -44,16 +44,57 @@ development:
 
 * demo repo with rails 6.1.4: https://github.com/hooopo/activerecord-tidb-adapter-demo
 
+## Setting up local TiDB server
+
+Install [tiup](https://github.com/pingcap/tiup)
+
+```shell
+$ curl --proto '=https' --tlsv1.2 -sSf https://tiup-mirrors.pingcap.com/install.sh | sh
+```
+Starting TiDB playground
+
+```shell
+$ tiup playground  nightly
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+## Testing
+
+install gems
+
+```
+bundle install
+```
+
+start tidb server
+
+```
+tiup playground  nightly
+```
+
+create database for testing
+
+```
+MYSQL_USER=root MYSQL_HOST=127.0.0.1 MYSQL_PORT=4000 tidb=1 ARCONN=tidb bundle exec rake db:tidb:rebuild
+
+```
+
+run tidb adapter tests
+
+```
+MYSQL_USER=root MYSQL_HOST=127.0.0.1 MYSQL_PORT=4000 tidb=1 ARCONN=tidb bundle exec rake test:idb
+
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/activerecord-tidb-adapter.
 
 ## License
 
-Apache 2.0
+Apache 2.0

data/Rakefile

@@ -2,11 +2,56 @@
 
 require 'bundler/gem_tasks'
 require 'rake/testtask'
+require 'pry'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.test_files = FileList['test/**/*_test.rb']
+require_relative 'test/support/paths_tidb'
+require_relative 'test/support/rake_helpers'
+require_relative 'test/support/config'
+
+task test: ['test:tidb']
+task default: [:test]
+
+namespace :test do
+  Rake::TestTask.new('tidb') do |t|
+    t.libs = ARTest::TiDB.test_load_paths
+    t.test_files = test_files
+    t.warning = !!ENV['WARNING']
+    t.verbose = false
+  end
+
+  task 'tidb:env' do
+    ENV['ARCONN'] = 'tidb'
+    ENV['tidb'] = '1'
+  end
+end
+
+task 'test:tidb' => 'test:tidb:env'
+
+namespace :db do
+  namespace :tidb do
+    connection_arguments = lambda do |connection_name|
+      config = ARTest.config['connections']['tidb'][connection_name]
+      ["--user=#{config['username']}", "--password=#{config['password']}", "--port=#{config['port']}",
+       ("--host=#{config['host']}" if config['host'])].join(' ')
+    end
+
+    desc 'Build the TiDB test databases'
+    task :build do
+      config = ARTest.config['connections']['tidb']
+      `mysql #{connection_arguments['arunit']} -e "create DATABASE #{config['arunit']['database']} DEFAULT CHARACTER SET utf8mb4 COLLATE #{config['arunit']['collation']}"`
+      `mysql #{connection_arguments['arunit2']} -e "create DATABASE #{config['arunit2']['database']} DEFAULT CHARACTER SET utf8mb4 COLLATE #{config['arunit2']['collation']}"`
+    end
+
+    desc 'Drop the TiDB test databases'
+    task :drop do
+      config = ARTest.config['connections']['tidb']
+      `mysqladmin #{connection_arguments['arunit']} -f drop #{config['arunit']['database']}`
+      `mysqladmin #{connection_arguments['arunit2']} -f drop #{config['arunit2']['database']}`
+    end
+
+    desc 'Rebuild the TiDB test databases'
+    task rebuild: %i[drop build]
+  end
 end
 
-task default: :test
+task build_mysql_databases: 'db:mysql:build'

data/config.toml

@@ -0,0 +1 @@
+new_collations_enabled_on_first_bootstrap = true

data/lib/active_record/connection_adapters/tidb_adapter.rb

@@ -67,11 +67,7 @@ module ActiveRecord
       end
 
       def supports_common_table_expressions?
-        if tidb_version >= '5.1.0'
-          true
-        else
-          false
-        end
+        tidb_version >= '5.1.0'
       end
 
       def transaction_isolation_levels
@@ -85,7 +81,7 @@ module ActiveRecord
         super(connection, logger, conn_params, config)
 
         tidb_version_string = query_value('select version()')
-        @tidb_version = tidb_version_string[/TiDB-v([0-9\.]+)/, 1]
+        @tidb_version = tidb_version_string[/TiDB-v([0-9.]+)/, 1]
       end
 
       def tidb_version_string

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-tidb-adapter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Hooopo Wang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-08 00:00:00.000000000 Z
+date: 2021-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -45,7 +45,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/main.yml"
 - ".gitignore"
 - Gemfile
 - Gemfile.lock
@@ -55,6 +54,7 @@ files:
 - activerecord-tidb-adapter.gemspec
 - bin/console
 - bin/setup
+- config.toml
 - lib/active_record/connection_adapters/tidb/database_tasks.rb
 - lib/active_record/connection_adapters/tidb/setup.rb
 - lib/active_record/connection_adapters/tidb/type.rb

data/.github/workflows/main.yml

@@ -1,16 +0,0 @@
-name: Ruby
-
-on: [push,pull_request]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7.0
-        bundler-cache: true
-    - name: Run the default task
-      run: bundle exec rake