arel_extensions 1.2.23 → 2.0.0.rc3

data/test/with_ar/insert_agnostic_test.rb

@@ -1,8 +1,9 @@
-require 'arelx_test_helper'
+require 'helper'
 require 'date'
 
 module ArelExtensions
   module WthAr
+
     class InsertManagerTest < Minitest::Test
       def setup_db
         ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
@@ -22,7 +23,7 @@ module ArelExtensions
             @cnx.execute(sql) rescue $stderr << "can't create functions\n"
           end
         end
-        @cnx.drop_table(:user_tests) rescue nil
+        @cnx.drop_table(:user_tests) rescue nil 
         @cnx.create_table :user_tests do |t|
           t.column :age, :integer
           t.column :name, :string
@@ -76,8 +77,8 @@ END;])
         insert_manager.bulk_insert(@cols2, @data2)
         @cnx.execute(insert_manager.to_sql)
         assert_equal 4, User.count, "insertions failed"
-
       end
+
     end
   end
 end

data/test/with_ar/test_bulk_sqlite.rb

@@ -1,8 +1,10 @@
-require 'arelx_test_helper'
+require 'helper'
 
 module ArelExtensions
   module WthAr
+
     describe 'the sqlite visitor' do
+
       before do
         ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
@@ -10,7 +12,7 @@ module ArelExtensions
         @cnx = ActiveRecord::Base.connection
         Arel::Table.engine = ActiveRecord::Base
         @cnx.drop_table(:users) rescue nil
-        @cnx.drop_table(:products) rescue nil
+        @cnx.drop_table(:products) rescue nil 
         @cnx.create_table :users do |t|
           t.column :age, :integer
           t.column :name, :string
@@ -36,10 +38,11 @@ module ArelExtensions
       it "should import large set of data" do
         insert_manager = Arel::VERSION.to_i > 6 ? Arel::InsertManager.new().into(@table) : Arel::InsertManager.new(ActiveRecord::Base).into(@table)
         insert_manager.bulk_insert(@cols, @data)
-        _(insert_manager.to_sql)
-          .must_be_like %Q[INSERT INTO "users" ("id", "name", "comments", "created_at")
-                         SELECT 23 AS 'id', 'nom1' AS 'name', 'sdfdsfdsfsdf' AS 'comments', '2016-01-01' AS 'created_at' UNION ALL SELECT 25, 'nom2', 'sdfdsfdsfsdf', '2016-01-01']
+        sql = insert_manager.to_sql
+        sql.must_be_like %Q[INSERT INTO "users" ("id", "name", "comments", "created_at") SELECT 23 AS 'id', 'nom1' AS 'name', 'sdfdsfdsfsdf' AS 'comments', '2016-01-01' AS 'created_at' UNION ALL SELECT 25, 'nom2', 'sdfdsfdsfsdf', '2016-01-01']
       end
+
     end
+
   end
-end
+end

data/test/with_ar/test_math_sqlite.rb

@@ -1,16 +1,18 @@
-require 'arelx_test_helper'
+require 'helper'
 
 module ArelExtensions
   module WthAr
+
     describe 'the sqlite visitor can do maths' do
+
       before do
         ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
         ActiveRecord::Base.default_timezone = :utc
         Arel::Table.engine = ActiveRecord::Base
         @cnx = ActiveRecord::Base.connection
-        @cnx.drop_table(:users) rescue nil
-        @cnx.drop_table(:products) rescue nil
+        @cnx.drop_table(:users) rescue nil 
+        @cnx.drop_table(:products) rescue nil 
         @cnx.create_table :users do |t|
           t.column :age, :integer
           t.column :name, :string
@@ -42,19 +44,21 @@ module ArelExtensions
       end
 
       it "should do maths" do
-        # ABS
+        #ABS
         assert_equal 20, User.where(:id => @neg.id).select(@age.abs.as("res")).first.res
         assert_equal 14, User.where(:id => @laure.id).select((@age - 39).abs.as("res")).first.res
 
-        # CEIL # require extensions
+        #CEIL # require extensions
 
         # RAND
-        #        puts User.where(@table[:score].eq(20.16)).order(Arel.rand).limit(50).to_sql if User.where(@table[:score].eq(20.16)).order(Arel.rand).limit(50).count == 0
-        #        assert_equal 5, User.where(@table[:score].eq(20.16)).order(Arel.rand).limit(50).count
+#        puts User.where(@table[:score].eq(20.16)).order(Arel.rand).limit(50).to_sql if User.where(@table[:score].eq(20.16)).order(Arel.rand).limit(50).count == 0
+#        assert_equal 5, User.where(@table[:score].eq(20.16)).order(Arel.rand).limit(50).count
         assert 42 != User.select(Arel.rand.as('res')).first.res
         assert 0 <= User.select(Arel.rand.abs.as('res')).first.res
         assert_equal 8, User.order(Arel.rand).limit(50).count
       end
+
     end
+
   end
-end
+end

data/test/with_ar/test_string_mysql.rb

@@ -1,14 +1,16 @@
-require 'arelx_test_helper'
+require 'helper'
 require 'date'
 
 module ArelExtensions
   module WthAr
+
     describe 'the mysql visitor can do string operations' do
+
       before do
         ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-mysql" : :mysql))
         ActiveRecord::Base.default_timezone = :utc
-        begin
+        begin 
           @cnx = ActiveRecord::Base.connection
         rescue => e
           puts "\n#{e.inspect}"
@@ -17,7 +19,7 @@ module ArelExtensions
         end
         Arel::Table.engine = ActiveRecord::Base
         @cnx.drop_table(:users) rescue nil
-        @cnx.drop_table(:products) rescue nil
+        @cnx.drop_table(:products) rescue nil 
         @cnx.create_table :users do |t|
           t.column :age, :integer
           t.column :name, :string
@@ -57,7 +59,7 @@ module ArelExtensions
         assert_equal "Sophie15", @sophie.select((User.arel_table[:name] + User.arel_table[:age]).as("res")).first.res
         assert_equal "SophieSophie", @sophie.select((User.arel_table[:name] + User.arel_table[:name]).as("res")).first.res
         assert_equal "Sophie2016-05-23", @sophie.select((User.arel_table[:name] + User.arel_table[:created_at]).as("res")).first.res
-        # concat Integer
+        #concat Integer
         assert_equal 1, User.where((User.arel_table[:age] + 10).eq(33)).count
         assert_equal 1, User.where((User.arel_table[:age] + "1").eq(6)).count
         assert_equal 1, User.where((User.arel_table[:age] + User.arel_table[:age]).eq(10)).count
@@ -65,7 +67,11 @@ module ArelExtensions
         # Replace
         assert_equal "LucaX", User.where(:id => @lucas).select(@name.replace("s","X").as("res")).first.res
         assert_equal "replace", User.where(:id => @lucas).select(@name.replace(@name,"replace").as("res")).first.res
+
+        # 
       end
+
     end
+
   end
-end
+end

data/test/with_ar/test_string_sqlite.rb

@@ -1,16 +1,18 @@
-require 'arelx_test_helper'
+require 'helper'
 require 'date'
 
 module ArelExtensions
   module WthAr
+
     describe 'the sqlite visitor can do string operations' do
+
       before do
         ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
         ActiveRecord::Base.default_timezone = :utc
         @cnx = ActiveRecord::Base.connection
         Arel::Table.engine = ActiveRecord::Base
-        @cnx.drop_table(:users) rescue nil
+        @cnx.drop_table(:users) rescue nil 
         @cnx.create_table :users do |t|
           t.column :age, :integer
           t.column :name, :string
@@ -50,15 +52,21 @@ module ArelExtensions
         assert_equal "Sophie15", @sophie.select((User.arel_table[:name] + User.arel_table[:age]).as("res")).first.res
         assert_equal "SophieSophie", @sophie.select((User.arel_table[:name] + User.arel_table[:name]).as("res")).first.res
         assert_equal "Sophie2016-05-23", @sophie.select((User.arel_table[:name] + User.arel_table[:created_at]).as("res")).first.res
-        # concat Integer
+        #concat Integer
         assert_equal 1, User.where((User.arel_table[:age] + 10).eq(33)).count
         assert_equal 1, User.where((User.arel_table[:age] + "1").eq(6)).count
         assert_equal 1, User.where((User.arel_table[:age] + User.arel_table[:age]).eq(10)).count
 
+
+
         # Replace
         assert_equal "LucaX", User.where(:id => @lucas).select(@name.replace("s","X").as("res")).first.res
         assert_equal "replace", User.where(:id => @lucas).select(@name.replace(@name,"replace").as("res")).first.res
+
+        # 
       end
+
     end
+
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.2.23
+  version: 2.0.0.rc3
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: arel
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 6.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 6.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '11'
 description: Adds new features to Arel
 email:
 - yann.azoury@faveod.com
@@ -81,7 +81,6 @@ extra_rdoc_files:
 - functions.html
 files:
 - ".codeclimate.yml"
-- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -105,11 +104,6 @@ files:
 - gemfiles/rails5_0.gemfile
 - gemfiles/rails5_1_4.gemfile
 - gemfiles/rails5_2.gemfile
-- gemfiles/rails6.gemfile
-- gemfiles/rails6_1.gemfile
-- gemspecs/arel_extensions-v1.gemspec
-- gemspecs/arel_extensions-v2.gemspec
-- generate_gems.sh
 - init/mssql.sql
 - init/mysql.sql
 - init/oracle.sql
@@ -126,7 +120,6 @@ files:
 - lib/arel_extensions/math_functions.rb
 - lib/arel_extensions/nodes.rb
 - lib/arel_extensions/nodes/abs.rb
-- lib/arel_extensions/nodes/aggregate_function.rb
 - lib/arel_extensions/nodes/blank.rb
 - lib/arel_extensions/nodes/case.rb
 - lib/arel_extensions/nodes/cast.rb
@@ -158,7 +151,6 @@ files:
 - lib/arel_extensions/nodes/soundex.rb
 - lib/arel_extensions/nodes/std.rb
 - lib/arel_extensions/nodes/substring.rb
-- lib/arel_extensions/nodes/sum.rb
 - lib/arel_extensions/nodes/then.rb
 - lib/arel_extensions/nodes/trim.rb
 - lib/arel_extensions/nodes/union.rb
@@ -172,7 +164,6 @@ files:
 - lib/arel_extensions/tasks.rb
 - lib/arel_extensions/version.rb
 - lib/arel_extensions/visitors.rb
-- lib/arel_extensions/visitors/convert_format.rb
 - lib/arel_extensions/visitors/ibm_db.rb
 - lib/arel_extensions/visitors/mssql.rb
 - lib/arel_extensions/visitors/mysql.rb
@@ -181,8 +172,8 @@ files:
 - lib/arel_extensions/visitors/postgresql.rb
 - lib/arel_extensions/visitors/sqlite.rb
 - lib/arel_extensions/visitors/to_sql.rb
-- test/arelx_test_helper.rb
 - test/database.yml
+- test/helper.rb
 - test/real_db_test.rb
 - test/support/alter_system_user_password.sql
 - test/support/create_oracle_enhanced_users.sql
@@ -199,8 +190,6 @@ files:
 - test/with_ar/test_math_sqlite.rb
 - test/with_ar/test_string_mysql.rb
 - test/with_ar/test_string_sqlite.rb
-- version_v1.rb
-- version_v2.rb
 homepage: https://github.com/Faveod/arel-extensions
 licenses:
 - MIT
@@ -218,11 +207,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Extending Arel

data/.github/workflows/ruby.yml

@@ -1,102 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: Ruby
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  test:
-
-    runs-on: ubuntu-latest
-
-    services:
-      postgres:
-        image: postgres:11.6-alpine
-        env:
-          POSTGRES_DB: arext_test
-        ports:
-          - 5432:5432
-        # needed because the postgres container does not provide a healthcheck
-        options: >-
-          --health-cmd "pg_isready -d arext_test -U postgres -p 5432"
-          --health-interval 10s 
-          --health-timeout 5s 
-          --health-retries 5
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: true
-          MYSQL_USERNAME: travis
-          MYSQL_DATABASE: arext_test
-        ports:
-          - 3306:3306
-        options: >-
-          --health-cmd="mysqladmin ping" 
-          --health-interval=10s 
-          --health-timeout=5s 
-          --health-retries=3
-      
-    strategy:
-      matrix:
-        ruby-version: 
-          - 3.0.0-preview1
-          - 2.7
-          - 2.5
-          - 2.3
-        rails-version: 
-          - 6_1
-          - 6
-          - 5_2
-        exclude:
-          - ruby-version: 2.3
-            rails-version: 6_1
-          - ruby-version: 2.3
-            rails-version: 6
-          - ruby-version: 3.0.0-preview1
-            rails-version: 5.2
-    continue-on-error: ${{ true }}
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@21351ecc0a7c196081abca5dc55b08f085efe09a
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-    - name: Setup gemspec
-      if: ${{ matrix.rails-version == '6_1' || matrix.rails-version == '6' }}
-      run: cp ./gemspecs/arel_extensions-v2.gemspec ./arel_extensions.gemspec
-    - name: Install dependencies
-      run: |
-        export BUNDLE_GEMFILE=gemfiles/rails${{ matrix.rails-version }}.gemfile
-        bundle install
-    - name: Run test to_sql
-      run: rake test:to_sql
-    - name: Run test Postgres
-      env:
-        PGHOST: localhost
-        PGUSER: postgres
-      run: rake test:postgresql
-    - name: Run test MySql
-      env: 
-        DB_CONNECTION: mysql
-        DB_HOST: 127.0.0.1
-        DB_PORT: 3306
-        DB_DATABASE: arext_test
-        DB_USERNAME: travis
-      run: |
-        sudo apt-get install -y mysql-client
-        mysql --host 127.0.0.1 --port 3306 -uroot -e 'create user travis;'
-        mysql --host 127.0.0.1 --port 3306 -uroot -e 'GRANT ALL PRIVILEGES ON arext_test.* TO travis;'
-        rake test:mysql

data/gemfiles/rails6.gemfile

@@ -1,30 +0,0 @@
-source "https://rubygems.org"
-
-gem 'rails', '~> 6.0.0'
-
-
-group :development, :test do
-  gem 'activesupport', '~> 6.0.0'
-  gem 'activemodel', '~> 6.0.0'
-  gem 'activerecord', '~> 6.0.0'
-
-  gem "sqlite3", '~> 1.4', platforms: [:mri, :mswin, :mingw]
-  gem "mysql2", '0.5.2', platforms: [:mri, :mswin, :mingw]
-  gem "pg",'< 1.0.0', platforms: [:mri, :mingw]
-
-  #gem "tiny_tds", platforms: [:mri, :mingw]  if RUBY_PLATFORM =~ /windows/
-  #gem "activerecord-sqlserver-adapter", platforms: [:mri, :mingw]
-
-  gem 'ruby-oci8', platforms: [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
-  gem 'activerecord-oracle_enhanced-adapter', '~> 6.0.0' if ENV.has_key? 'ORACLE_HOME'
-
-  # for JRuby
-  gem 'activerecord-jdbc-adapter', platforms: :jruby
-  gem "jdbc-sqlite3", platforms: :jruby
-  gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
-  gem "activerecord-jdbcmysql-adapter", platforms: :jruby
-  gem "activerecord-jdbcpostgresql-adapter", platforms: :jruby
-  gem "activerecord-jdbcmssql-adapter", platforms: :jruby
-end
-
-gemspec path: "../"