Use proper default_timezone method

Author: enebo

lib/arjdbc/db2/adapter.rb

@@ -422,15 +422,15 @@ def quote(value)
     def quoted_date(value)
       if value.acts_like?(:time) && value.respond_to?(:usec)
         usec = sprintf("%06d", value.usec)
-        value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+        value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
         "#{value.strftime("%Y-%m-%d %H:%M:%S")}.#{usec}"
       else
         super
       end
     end if ::ActiveRecord::VERSION::MAJOR >= 3
 
     def quote_time(value)
-      value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+      value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
       # AS400 doesn't support date in time column
       "'#{value.strftime("%H:%M:%S")}'"
     end

lib/arjdbc/db2/column.rb

@@ -34,7 +34,7 @@ def self.cast_to_time(value)
         return nil unless time
         time_array = [time.year, time.month, time.day, time.hour, time.min, time.sec]
         time_array[0] ||= 2000; time_array[1] ||= 1; time_array[2] ||= 1;
-        Time.send(ActiveRecord::Base.default_timezone, *time_array) rescue nil
+        Time.send(ActiveRecord.default_timezone, *time_array) rescue nil
       end
 
       # @deprecated

lib/arjdbc/derby/adapter.rb

@@ -197,7 +197,7 @@ def quote(value, column = nil)
     def quoted_date(value)
       if value.acts_like?(:time) && value.respond_to?(:usec)
         usec = sprintf("%06d", value.usec)
-        value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+        value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
         "#{value.strftime("%Y-%m-%d %H:%M:%S")}.#{usec}"
       else
         super

lib/arjdbc/firebird/adapter.rb

@@ -339,7 +339,7 @@ def quote(value, column = nil)
     def quoted_date(value)
       if value.acts_like?(:time) && value.respond_to?(:usec)
         usec = sprintf "%04d", (value.usec / 100.0).round
-        value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+        value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
         "#{value.strftime("%Y-%m-%d %H:%M:%S")}.#{usec}"
       else
         super

lib/arjdbc/hsqldb/adapter.rb

@@ -111,7 +111,7 @@ def quote(value, column = nil)
         if column_type == :time
           "'#{value.strftime("%H:%M:%S")}'"
         #elsif column_type == :timestamp # || column_type == :datetime
-          #value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+          #value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
           #"'#{value.strftime("%Y-%m-%d %H:%M:%S")}.#{sprintf("%06d", value.usec)}'"
         else
           super
@@ -127,7 +127,7 @@ def quote(value, column = nil)
     def quoted_date(value)
       if value.acts_like?(:time) && value.respond_to?(:usec)
         usec = sprintf("%06d", value.usec)
-        value = ::ActiveRecord::Base.default_timezone == :utc ? value.getutc : value.getlocal
+        value = ::ActiveRecord.default_timezone == :utc ? value.getutc : value.getlocal
         "#{value.strftime("%Y-%m-%d %H:%M:%S")}.#{usec}"
       else
         super

lib/arjdbc/jdbc/adapter.rb

@@ -434,9 +434,9 @@ def self.prepared_statements?(config)
       # to be quoted, fixed since AREL 4.0.0.beta1 : http://git.io/7gyTig
       def sql_literal?(value); ::Arel::Nodes::SqlLiteral === value; end
 
-      # Helper to get local/UTC time (based on `ActiveRecord::Base.default_timezone`).
+      # Helper to get local/UTC time (based on `ActiveRecord::default_timezone`).
       def get_time(value)
-        get = ::ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
+        get = ::ActiveRecord.default_timezone == :utc ? :getutc : :getlocal
         value.respond_to?(get) ? value.send(get) : value
       end
 

lib/arjdbc/jdbc/type_cast.rb

@@ -130,9 +130,9 @@ def new_time(year, mon, mday, hour, min, sec, microsec, offset = nil)
             return nil unless time
 
             time -= offset
-            ActiveRecord::Base.default_timezone == :utc ? time : time.getlocal
+            ActiveRecord.default_timezone == :utc ? time : time.getlocal
           else
-            timezone = ActiveRecord::Base.default_timezone
+            timezone = ActiveRecord.default_timezone
             Time.public_send(timezone, year, mon, mday, hour, min, sec, microsec) rescue nil
           end
         end

lib/arjdbc/postgresql/adapter.rb

@@ -81,7 +81,7 @@ def configure_connection
       # If using Active Record's time zone support configure the connection to return
       # TIMESTAMP WITH ZONE types in UTC.
       # (SET TIME ZONE does not use an equals sign like other SET variables)
-      if ActiveRecord::Base.default_timezone == :utc
+      if ActiveRecord.default_timezone == :utc
         execute("SET time zone 'UTC'", 'SCHEMA')
       elsif tz = local_tz
         execute("SET time zone '#{tz}'", 'SCHEMA')

src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -2633,8 +2633,8 @@ protected DateTimeZone getDefaultTimeZone(final ThreadContext context) {
     }
 
     private String default_timezone(final ThreadContext context) {
-        final RubyClass base = getBase(context.runtime);
-        return default_timezone.call(context, base, base).asJavaString(); // :utc (or :local)
+        final RubyModule activeRecord = ActiveRecord(context);
+        return default_timezone.call(context, activeRecord, activeRecord).asJavaString(); // :utc (or :local)
     }
 
     // ActiveRecord::Base.default_timezone