Catch HOUR_OF_DAY error

If the time stored in the missing daylight saving hour, MySQL JDBC driver starting from version 8.0.23 will raise this error (https://dev.mysql.com/doc/relnotes/connector-j/en/news-8-0-23.html)
If the date time value stored in the column actually is UTC time, then will return string representation of the value, not the time converted to the local time zone.

Author: jbaiza

src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java

@@ -217,6 +217,39 @@ protected IRubyObject timeToRuby(final ThreadContext context,
         return DateTimeUtils.newDummyTime(context, value, getDefaultTimeZone(context));
     }
 
+    @Override
+    protected IRubyObject timestampToRuby(final ThreadContext context,
+        final Ruby runtime, final ResultSet resultSet, final int column)
+        throws SQLException {
+
+        final Timestamp value;
+        try {
+            value = resultSet.getTimestamp(column);
+        }
+        catch (SQLException e) {
+            if (e.getMessage().contains("HOUR_OF_DAY")) {
+                return stringToRuby(context, runtime, resultSet, column);
+            }
+            else {
+                throw e;
+            }
+        }
+        if ( value == null ) {
+            return resultSet.wasNull() ? context.nil : RubyString.newEmptyString(runtime);
+        }
+
+        if ( rawDateTime != null && rawDateTime) {
+            return RubyString.newString(runtime, DateTimeUtils.timestampToString(value));
+        }
+
+        // NOTE: with 'raw' String AR's Type::DateTime does put the time in proper time-zone
+        // while when returning a Time object it just adjusts usec (apply_seconds_precision)
+        // yet for custom SELECTs to work (SELECT created_at ... ) and for compatibility we
+        // should be returning Time (by default) - AR does this by adjusting mysql2/pg returns
+
+        return DateTimeUtils.newTime(context, value, getDefaultTimeZone(context));
+    }
+
     @Override
     protected IRubyObject streamToRuby(final ThreadContext context,
         final Ruby runtime, final ResultSet resultSet, final int column)

test/simple.rb

@@ -321,7 +321,42 @@ def test_time_with_default_timezone_local
           end
         end
       end
+    end
+
+    def test_time_in_dst_change_hour_utc
+      with_system_tz 'Europe/Prague' do
+        Time.use_zone 'Europe/Prague' do
+          with_timezone_config default: :utc do
+            id = DbType.connection.insert(
+              "INSERT INTO db_types (sample_datetime)
+              values ('2024-03-31 03:30:00')"
+            )
+            saved_time = DbType.find(id).sample_datetime
+
+            assert_equal Time.utc(2024, 3, 31, 3, 30), saved_time
+            assert_equal 'UTC', saved_time.zone
+          end
+        end
+      end
+    end
+
+    def test_time_in_dst_change_hour_local
+      skip "with_system_tz not working in tomcat" if ActiveRecord::Base.connection.raw_connection.jndi?
+
+      with_system_tz 'Europe/Prague' do
+        Time.use_zone 'Europe/Prague' do
+          with_timezone_config default: :local do
+            id = DbType.connection.insert(
+              "INSERT INTO db_types (sample_datetime)
+              values ('2024-03-31 02:30:00')"
+            )
+            saved_time = DbType.find(id).sample_datetime
 
+            assert_equal Time.local(2024, 3, 31, 1, 30), saved_time
+            assert_not_equal 'UTC', saved_time.zone
+          end
+        end
+      end
     end
 
     #