lib/github/sql.rb in github-ds-0.5.2 vs lib/github/sql.rb in github-ds-0.5.3

@@ -379,11 +379,11 @@
       when Class
         connection.quote value.name
 
       when DateTime, Time, Date
         enforce_timezone do
-          connection.quote value.to_s(:db)
+          connection.quote value.to_formatted_s(:db)
         end
 
       when true
         connection.quoted_true
 
@@ -400,18 +400,28 @@
 
     private
 
     # Private: Forces ActiveRecord's default timezone for duration of block.
     def enforce_timezone(&block)
+      on_rails_7 = ActiveRecord.respond_to?(:default_timezone)
       begin
         if @force_timezone
-          zone = ActiveRecord::Base.default_timezone
-          ActiveRecord::Base.default_timezone = @force_timezone
+          if on_rails_7
+            zone = ActiveRecord.default_timezone
+            ActiveRecord.default_timezone = @force_timezone
+          else
+            zone = ActiveRecord::Base.default_timezone
+            ActiveRecord::Base.default_timezone = @force_timezone
+          end
         end
 
         yield if block_given?
       ensure
-        ActiveRecord::Base.default_timezone = zone if @force_timezone
+        if on_rails_7
+          ActiveRecord.default_timezone = zone if @force_timezone
+        else
+          ActiveRecord::Base.default_timezone = zone if @force_timezone
+        end
       end
     end
   end
 end