Merge branch '0.2.x'

Author: brianmario

.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --colour
+--fail-fast

ext/mysql2/client.c

@@ -171,7 +171,7 @@ static VALUE allocate(VALUE klass) {
   return obj;
 }
 
-static VALUE rb_mysql_client_escape(VALUE klass, VALUE str) {
+static VALUE rb_mysql_client_escape(RB_MYSQL_UNUSED VALUE klass, VALUE str) {
   unsigned char *newStr;
   VALUE rb_str;
   unsigned long newLen, oldLen;

ext/mysql2/result.c

@@ -4,27 +4,46 @@
 static rb_encoding *binaryEncoding;
 #endif
 
-#if SIZEOF_INT < SIZEOF_LONG
-/**
- * on 64bit platforms we can handle dates way outside 2038-01-19T03:14:07
- * because of how I'm performing the math below, this will allow a maximum
- * timestamp of 9846-12-12T11:5999:59
-*/
-#define MYSQL2_MAX_YEAR 9999
+#if (SIZEOF_INT < SIZEOF_LONG) || defined(HAVE_RUBY_ENCODING_H)
+/* on 64bit platforms we can handle dates way outside 2038-01-19T03:14:07
+ *
+ * (9999*31557600) + (12*2592000) + (31*86400) + (11*3600) + (59*60) + 59
+ */
+#define MYSQL2_MAX_TIME 315578267999ULL
 #else
 /**
- * on 32bit platforms the maximum date the Time class can handle is 2038-01-19T03:14:07
- * 2082 = 2038+1+19+3+14+7
+ * On 32bit platforms the maximum date the Time class can handle is 2038-01-19T03:14:07
+ * 2038 years + 1 month + 19 days + 3 hours + 14 minutes + 7 seconds = 64318634047 seconds
+ *
+ * (2038*31557600) + (1*2592000) + (19*86400) + (3*3600) + (14*60) + 7
  */
-#define MYSQL2_MAX_YEAR 2082
+#define MYSQL2_MAX_TIME 64318634047ULL
 #endif
 
-#ifdef NEGATIVE_TIME_T
-/* 1901-12-13 20:45:52 UTC : The oldest time in 32-bit signed time_t. */
-#define MYSQL2_MIN_YEAR 1902
+#if defined(HAVE_RUBY_ENCODING_H)
+/* 0000-1-1 00:00:00 UTC
+ *
+ * (0*31557600) + (1*2592000) + (1*86400) + (0*3600) + (0*60) + 0
+ */
+#define MYSQL2_MIN_TIME 2678400ULL
+#elif SIZEOF_INT < SIZEOF_LONG // 64bit Ruby 1.8
+/* 0139-1-1 00:00:00 UTC
+ *
+ * (139*31557600) + (1*2592000) + (1*86400) + (0*3600) + (0*60) + 0
+ */
+#define MYSQL2_MIN_TIME 4389184800ULL
+#elif defined(NEGATIVE_TIME_T)
+/* 1901-12-13 20:45:52 UTC : The oldest time in 32-bit signed time_t.
+ *
+ * (1901*31557600) + (12*2592000) + (13*86400) + (20*3600) + (45*60) + 52
+ */
+#define MYSQL2_MIN_TIME 60023299552ULL
 #else
-/* 1970-01-01 00:00:00 UTC : The Unix epoch - the oldest time in portable time_t. */
-#define MYSQL2_MIN_YEAR 1970
+/* 1970-01-01 00:00:01 UTC : The Unix epoch - the oldest time in portable time_t.
+ *
+ * (1970*31557600) + (1*2592000) + (1*86400) + (0*3600) + (0*60) + 1
+ */
+#define MYSQL2_MIN_TIME 62171150401ULL
 #endif
 
 static VALUE cMysql2Result;
@@ -244,16 +263,20 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
         }
         case MYSQL_TYPE_TIMESTAMP:  // TIMESTAMP field
         case MYSQL_TYPE_DATETIME: { // DATETIME field
-          int year, month, day, hour, min, sec, tokens;
+          unsigned int year, month, day, hour, min, sec, tokens;
+          uint64_t seconds;
+
           tokens = sscanf(row[i], "%4d-%2d-%2d %2d:%2d:%2d", &year, &month, &day, &hour, &min, &sec);
-          if (year+month+day+hour+min+sec == 0) {
+          seconds = (year*31557600ULL) + (month*2592000ULL) + (day*86400ULL) + (hour*3600ULL) + (min*60ULL) + sec;
+
+          if (seconds == 0) {
             val = Qnil;
           } else {
             if (month < 1 || day < 1) {
               rb_raise(cMysql2Error, "Invalid date: %s", row[i]);
               val = Qnil;
             } else {
-              if (year < MYSQL2_MIN_YEAR || year+month+day+hour+min+sec > MYSQL2_MAX_YEAR) { // use DateTime instead
+              if (seconds < MYSQL2_MIN_TIME || seconds > MYSQL2_MAX_TIME) { // use DateTime instead
                 VALUE offset = INT2NUM(0);
                 if (db_timezone == intern_local) {
                   offset = rb_funcall(cMysql2Client, intern_local_offset, 0);

spec/mysql2/result_spec.rb

@@ -181,37 +181,50 @@
       @test_result['date_time_test'].strftime("%F %T").should eql('2010-04-04 11:44:00')
     end
 
-    it "should return DateTime for a DATETIME value when outside the supported range, Time if otherwise" do
-      if RUBY_PLATFORM =~ /mswin/
-        inside_year = 1970
-        outside_year = inside_year-1
+    if 1.size == 4 # 32bit
+      if RUBY_VERSION =~ /1.9/
+        klass = Time
       else
-        inside_year = 1902
-        outside_year = inside_year-1
-      end
-      r = @client.query("SELECT CAST('#{inside_year}-1-1 01:01:01' AS DATETIME) as test")
-      if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/
         klass = DateTime
-      else
-        klass = Time
       end
-      r.first['test'].class.should eql(klass)
 
-      r = @client.query("SELECT CAST('#{outside_year}-1-1 01:01:01' AS DATETIME) as test")
-      r.first['test'].class.should eql(DateTime)
-    end
+      it "should return DateTime when timestamp is < 1901-12-13 20:45:52" do
+                                      # 1901-12-13T20:45:52 is the min for 32bit Ruby 1.8
+        r = @client.query("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test")
+        r.first['test'].class.should eql(klass)
+      end
 
-    if 1.size == 4 # 32bit
       it "should return DateTime when timestamp is > 2038-01-19T03:14:07" do
                                       # 2038-01-19T03:14:07 is the max for 32bit Ruby 1.8
         r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
-        r.first['test'].class.should eql(DateTime)
+        r.first['test'].class.should eql(klass)
       end
     elsif 1.size == 8 # 64bit
-      it "should return Time when timestamp is > 2038-01-19T03:14:07" do
-                                      # 2038-01-19 03:14:07 is the max for 32bit Ruby 1.8
-        r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
-        r.first['test'].class.should eql(Time)
+      if RUBY_VERSION =~ /1.9/
+        it "should return Time when timestamp is < 1901-12-13 20:45:52" do
+          r = @client.query("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test")
+          r.first['test'].class.should eql(Time)
+        end
+
+        it "should return Time when timestamp is > 2038-01-19T03:14:07" do
+          r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
+          r.first['test'].class.should eql(Time)
+        end
+      else
+        it "should return Time when timestamp is > 0138-12-31 11:59:59" do
+          r = @client.query("SELECT CAST('0139-1-1 00:00:00' AS DATETIME) as test")
+          r.first['test'].class.should eql(Time)
+        end
+
+        it "should return DateTime when timestamp is < 0139-1-1T00:00:00" do
+          r = @client.query("SELECT CAST('0138-12-31 11:59:59' AS DATETIME) as test")
+          r.first['test'].class.should eql(DateTime)
+        end
+
+        it "should return Time when timestamp is > 2038-01-19T03:14:07" do
+          r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
+          r.first['test'].class.should eql(Time)
+        end
       end
     end