arel_extensions 1.3.0 → 1.3.3

data/lib/arel_extensions/visitors/sqlite.rb

@@ -1,3 +1,5 @@
+require 'arel_extensions/helpers'
+
 module ArelExtensions
   module Visitors
     class Arel::Visitors::SQLite
@@ -327,7 +329,7 @@ module ArelExtensions
         if element.is_a?(Time)
           return Arel::Nodes::NamedFunction.new('STRFTIME',[element, '%H:%M:%S'])
         elsif element.is_a?(Arel::Attributes::Attribute)
-          col = Arel::Table.engine.connection.schema_cache.columns_hash(element.relation.table_name)[element.name.to_s]
+          col = ArelExtensions::column_of(element.relation.table_name, element.name.to_s)
           if col && (col.type == :time)
             return Arel::Nodes::NamedFunction.new('STRFTIME',[element, '%H:%M:%S'])
           else
@@ -379,9 +381,10 @@ module ArelExtensions
         else
           collector = visit o.left, collector
         end
-        collector << " AS \""
+        sep = o.right.size > 1 && o.right[0] == '"' && o.right[-1] == '"' ? '' : '"'
+        collector << " AS #{sep}"
         collector = visit o.right, collector
-        collector << "\""
+        collector << "#{sep}"
         collector
       end
 

data/lib/arel_extensions.rb

@@ -77,7 +77,17 @@ require 'arel_extensions/nodes/soundex'
 require 'arel_extensions/nodes/cast'
 require 'arel_extensions/nodes/json'
 
-
+# It seems like the code in lib/arel_extensions/visitors.rb that is supposed
+# to inject ArelExtension is not enough. Different versions of the sqlserver
+# adapter behave differently. It doesn't always proc, so we added this for
+# coverage.
+if defined?(Arel::Visitors::SQLServer)
+  Arel::Visitors.const_set('MSSQL', Arel::Visitors::SQLServer)
+  require 'arel_extensions/visitors/mssql'
+  class Arel::Visitors::SQLServer
+    include ArelExtensions::Visitors::MSSQL
+  end
+end
 
 module Arel
   def self.rand

data/test/arelx_test_helper.rb

@@ -6,8 +6,52 @@ require 'active_record'
 
 require 'support/fake_record'
 
+def colored(color, msg)
+  ENV["TERM"] =~ /^xterm|-256color$/ ? "\x1b[#{color}m#{msg}\x1b[89m\x1b[0m"  : "#{msg}"
+end
+
+YELLOW = "33"
+
+def warn(msg)
+  $stderr.puts(colored(YELLOW, msg))
+end
+
+# Load gems specific to databases
+# NOTE:
+#     It's strongly advised to test each database on its own. Loading multiple
+#     backend gems leads to undefined behavior according to tests; the backend
+#     might not recognize the correct DB visitor and will fallback to `ToSQL`
+#     and screw all tests.
+#
+#     The issue also seems to be related to arel version: at some point, arel
+#     dropped its wide support for DBs and kept Postgres, MySQL and SQLite.
+#     Here, we're just trying to load the correct ones.
+db_and_gem =  if RUBY_ENGINE == 'jruby'
+                {
+                  'oracle'     => 'activerecord-oracle_enhanced-adapter',
+                  'mssql'      => 'activerecord-jdbcsqlserver-adapter'
+                }
+              else
+                {
+                  'oracle'     => 'activerecord-oracle_enhanced-adapter',
+                  'mssql'      => 'activerecord-sqlserver-adapter'
+                }
+              end
+
+def load_lib(gem)
+  if gem && (RUBY_ENGINE == 'jruby' || Arel::VERSION.to_i > 9)
+    begin
+      Gem::Specification.find_by_name(gem)
+      require gem
+    rescue Gem::MissingSpecError
+      warn "Warning: failed to load gem #{gem}. Are you sure it's installed?"
+    end
+  end
+end
+
+load_lib(db_and_gem[ENV['DB']])
+
 require 'arel_extensions'
-Arel::Table.engine = FakeRecord::Base.new
 
 $arel_silence_type_casting_deprecation = true
 

data/test/database.yml

@@ -9,23 +9,29 @@ jdbc-sqlite:
 mysql:
   adapter: mysql2
   database: arext_test
-  username: travis
+  username: root
   host: 127.0.0.1
   port: 3306
   encoding: utf8
 jdbc-mysql:
   adapter: jdbcmysql
   database: arext_test
-  username: travis
+  username: root
   encoding: utf8
 postgresql:
   adapter: postgresql
   database: arext_test
   username: postgres
+  password: secret
+  host: 127.0.0.1
+  port: 5432
 jdbc-postgresql:
   adapter: jdbcpostgresql
   database: arext_test
   username: postgres
+  password: secret
+  host: 127.0.0.1
+  port: 5432
 oracle:
   adapter: oracle_enhanced
   database: xe

data/test/support/fake_record.rb

@@ -105,7 +105,7 @@ module FakeRecord
     attr_reader :spec, :connection
 
     def initialize
-      @spec = Spec.new(:adapter => 'america')
+      @spec = Spec.new({:adapter => 'america'})
       @connection = Connection.new
       @connection.visitor = Arel::Visitors::ToSql.new(connection)
     end

data/test/visitors/test_to_sql.rb

@@ -5,6 +5,27 @@ module ArelExtensions
   module VisitorToSql
     describe 'the to_sql visitor' do
       before do
+        if Arel::Table.engine.is_a?(ActiveRecord::Base)
+          puts "This is a hack."
+          # As a matter of fact, if the whole if-block is removed, the to_sql
+          # test become flaky.
+          #
+          # The first time `Arel::Table.engine` is called
+          # from `ArelExtenstions::column_of_via_arel_table(table_name, column_name)`
+          # in   `lib/arel_extensions/helpers.rb`
+          # will almost always fail. It's important to note that when the test
+          # fails, it's always on 1 test case, and every subsequent test that
+          # calls to these methods passes.
+          #
+          # After investigation, it turned out that `Arel::Table.engine` will be
+          # of type `ActiveRecord::Base` instead of the expected `FakeRecord::Base`
+          # as set in this `before` block, in the `@conn` instance variable.
+          # Subsequent calls to `column_of_via_arel_table` will have
+          # `Arel::Table.engine` of the expected type.
+          #
+          # It is still unclear why the call in the condition of this if-block
+          # fixes this behavior.
+        end
         @conn = FakeRecord::Base.new
         Arel::Table.engine = @conn
         @visitor = Arel::Visitors::ToSql.new @conn.connection

data/test/with_ar/all_agnostic_test.rb

@@ -33,7 +33,7 @@ module ArelExtensions
           t.column :name, :string
           t.column :comments, :text
           t.column :created_at, :date
-          t.column :updated_at, :datetime
+          t.column :updated_at, :datetime, precision: nil
           t.column :duration, :time
           t.column :other, :string
           t.column :score, :decimal, :precision => 20, :scale => 10
@@ -171,7 +171,7 @@ module ArelExtensions
         # This should works no matter which version of rails is used
         assert User.group(:score).average(:id).values.all?{|e| !e.nil?}
 
-        # Since Rails 7, a patch to calculations.rb has tirggered a double 
+        # Since Rails 7, a patch to calculations.rb has tirggered a double
         # quoting of the alias name. See https://github.com/rails/rails/commit/7e6e9091e55c3357b0162d44b6ab955ed0c718d5
         # Before the patch that fixed this the following error would occur:
         #   ActiveRecord::StatementInvalid: PG::SyntaxError: ERROR:  zero-length delimited identifier at or near """"
@@ -370,6 +370,105 @@ module ArelExtensions
         assert_equal '2016-05-23', t(@lucas, @created_at.format('%Y-%m-%d'))
         assert_equal '2014/03/03 12:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S'))
         assert_equal '12:42%', t(@lucas, @updated_at.format('%R%%'))
+
+        # The following tests will ensure proper conversion of timestamps to
+        # requested timezones.
+        #
+        # The names of the timezones is highly dependant on the underlying
+        # operating system, and this is why we need to handle each database
+        # separately: the images we're using to test these databases are
+        # different. So don't rely on the provided examples. Your setup is your
+        # reference.
+        #
+        # One could always have portable code if s/he uses standard
+        # abbreviations, like:
+        #
+        # 1. CET  => Central European Time
+        # 2. CEST => Central European Summer Time
+        #
+        # Which implies that the caller should handle daylight saving detection.
+        # In fact, CET will handle daylight saving in MySQL but not Postgres.
+        #
+        # It looks like the posix convention is supported by mysql and
+        # postgresql, e.g.:
+        #
+        # posix/Europe/Paris
+        # posix/America/Nipigon
+        #
+        # so it looks like a more reliably portable way of specifying it.
+        time_zones = {
+          'mssql'       => {
+                            'utc'       => 'UTC',
+                            'sao_paulo' => 'Argentina Standard Time',
+                            'tahiti'    => 'Hawaiian Standard Time',
+                            'paris'     => 'Central European Standard Time'
+                           },
+          'posix'       => {
+                            'utc'       => 'UTC',
+                            'sao_paulo' => 'America/Sao_Paulo',
+                            'tahiti'    => 'Pacific/Tahiti',
+                            'paris'     => 'Europe/Paris'
+                           }
+        }
+
+        skip "Unsupported timezone conversion for DB=#{ENV['DB']}" if !['mssql', 'mysql', 'oracle', 'postgresql'].include?(ENV['DB'])
+
+        tz = ENV['DB'] == 'mssql' ? time_zones['mssql'] : time_zones['posix']
+
+        assert_equal '2014/03/03 12:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S', tz['utc']))
+        assert_equal '2014/03/03 09:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S', { tz['utc'] => tz['sao_paulo'] }))
+        assert_equal '2014/03/03 02:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S', { tz['utc'] => tz['tahiti'] }))
+
+        # Skipping conversion from UTC to the desired timezones fails in SQL
+        # Server and Postgres. This is mainly due to the fact that timezone
+        # information is not preserved in the column itself.
+        #
+        # MySQL is happy to consider that times by default are in UTC.
+        assert_equal '2014/03/03 13:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S', { tz['utc'] => tz['paris'] }))
+        refute_equal '2014/03/03 13:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S', tz['paris'])) if !['mysql'].include?(ENV['DB'])
+
+        # Winter/Summer time
+        assert_equal '2014/08/03 14:42:00', t(@lucas, (@updated_at + 5.months).format('%Y/%m/%d %H:%M:%S', { tz['utc'] => tz['paris'] }))
+        if ENV['DB'] == 'mssql'
+          assert_equal '2022/02/01 11:42:00', t(@lucas, Arel::Nodes.build_quoted('2022-02-01 10:42:00').cast(:datetime).format('%Y/%m/%d %H:%M:%S', { tz['utc'] => tz['paris'] }))
+          assert_equal '2022/08/01 12:42:00', t(@lucas, Arel::Nodes.build_quoted('2022-08-01 10:42:00').cast(:datetime).format('%Y/%m/%d %H:%M:%S', { tz['utc'] => tz['paris'] }))
+        else
+          assert_equal '2022/02/01 11:42:00', t(@lucas, Arel::Nodes.build_quoted('2022-02-01 10:42:00').cast(:datetime).format('%Y/%m/%d %H:%M:%S', tz['paris']))
+          assert_equal '2022/08/01 12:42:00', t(@lucas, Arel::Nodes.build_quoted('2022-08-01 10:42:00').cast(:datetime).format('%Y/%m/%d %H:%M:%S', tz['paris']))
+        end
+      end
+
+      def test_format_iso_week
+        skip "Unsupported ISO week number for DB=#{ENV['DB']}" if ['sqlite'].include?(ENV['DB'])
+        assert_equal '10', t(@lucas, @updated_at.format('%V'))
+        {
+          '2024-01-01 10:42:00' => '01', # Monday
+          '2030-01-01 10:42:00' => '01', # Tuesday
+          '2025-01-01 10:42:00' => '01', # Wednesday
+          '2026-01-01 10:42:00' => '01', # Thursday
+          '2027-01-01 10:42:00' => '53', # Friday
+          '2028-01-01 10:42:00' => '52', # Saturday
+          '2034-01-01 10:42:00' => '52', # Sunday
+        }.each do |date, exp|
+          assert_equal exp, t(@lucas, Arel::Nodes.build_quoted(date).cast(:datetime).format('%V'))
+        end
+      end
+
+      def test_format_iso_year_of_week
+        skip "Unsupported ISO year of week for DB=#{ENV['DB']}" if ['mssql', 'sqlite'].include?(ENV['DB'])
+        assert_equal '2014', t(@lucas, @updated_at.format('%G'))
+
+        {
+          '2024-01-01 10:42:00' => '2024', # Monday
+          '2030-01-01 10:42:00' => '2030', # Tuesday
+          '2025-01-01 10:42:00' => '2025', # Wednesday
+          '2026-01-01 10:42:00' => '2026', # Thursday
+          '2027-01-01 10:42:00' => '2026', # Friday
+          '2028-01-01 10:42:00' => '2027', # Saturday
+          '2034-01-01 10:42:00' => '2033', # Sunday
+        }.each do |date, exp|
+          assert_equal exp, t(@lucas, Arel::Nodes.build_quoted(date).cast(:datetime).format('%G'))
+        end
       end
 
       def test_coalesce
@@ -525,7 +624,7 @@ module ArelExtensions
         # puts @age.is_null.inspect
         # puts @age.is_null.to_sql
         # puts @age=='34'
-        assert_equal "Test", User.select(@name).where(@age.is_null.to_sql).first.name
+        assert_equal "Test", User.select(@name).where(@age.is_null).first.name
       end
 
       def test_math_plus
@@ -673,6 +772,7 @@ module ArelExtensions
       end
 
       def test_subquery_with_order
+        skip if ['mssql'].include?(@env_db) && Arel::VERSION.to_i < 10
         assert_equal 9, User.where(:name => User.select(:name).order(:name)).count
         assert_equal 9, User.where(@ut[:name].in(@ut.project(@ut[:name]).order(@ut[:name]))).count
         if !['mysql'].include?(@env_db)  # MySql can't have limit in IN subquery

data/version_v1.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.3.0".freeze
+  VERSION = "1.3.3".freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.1.0".freeze
+  VERSION = "2.1.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.3
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -97,7 +97,6 @@ files:
 - Rakefile
 - SQL_Challenges.md
 - TODO
-- appveyor.yml
 - arel_extensions.gemspec
 - functions.html
 - gemfiles/rails3.gemfile
@@ -123,6 +122,7 @@ files:
 - lib/arel_extensions/common_sql_functions.rb
 - lib/arel_extensions/comparators.rb
 - lib/arel_extensions/date_duration.rb
+- lib/arel_extensions/helpers.rb
 - lib/arel_extensions/insert_manager.rb
 - lib/arel_extensions/math.rb
 - lib/arel_extensions/math_functions.rb

data/appveyor.yml

@@ -1,44 +0,0 @@
-version: "{build}"
-
-cache:
-  - vendor/bundle
-
-branches:
-  only:
-    - master
-
-services:
-  - mssql2014
-
-
-install:
-  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - bundle config --local path vendor/bundle
-  - bundle install
-
-# Disable normal Windows builds in favor of our test script.
-build: off
-
-
-before_test:
-  - ruby -v
-  - gem -v
-  - bundle -v
-
-test_script:
-  - ruby --version
-  - gem --version
-  - bundler --version
-  - bundle exec rake test
-  - ps: Start-Service 'MSSQL$SQL2014'
-  - timeout /t 4 /nobreak > NUL
-  - bundle exec rake test:mssql
-
-environment:
-  matrix:
-    - RUBY_VERSION: 200
-    - RUBY_VERSION: 21
-    - RUBY_VERSION: 22
-    - RUBY_VERSION: 23
-    - RUBY_VERSION: 23-x64
-