Remove more 1.8.7, REE compatibility shims (#908)

Author: tamird

ext/mysql2/mysql2_ext.h

@@ -18,6 +18,12 @@ void Init_mysql2(void);
 #endif
 
 #include <ruby/encoding.h>
+// ruby/thread.h was added in 2.0.0. See:
+// https://github.com/ruby/ruby/commit/c51a826
+//
+// Rubinius doesn't define this, but it ships an empty thread.h (the symbols we
+// care about are in ruby.h); this is safe to remove when < 2.0.0 is no longer
+// supported.
 #ifdef HAVE_RUBY_THREAD_H
 #include <ruby/thread.h>
 #endif

ext/mysql2/statement.c

@@ -202,6 +202,8 @@ static int my_big2ll(VALUE bignum, LONG_LONG *ptr)
 {
   unsigned LONG_LONG num;
   size_t len;
+// rb_absint_size was added in 2.1.0. See:
+// https://github.com/ruby/ruby/commit/9fea875
 #ifdef HAVE_RB_ABSINT_SIZE
   int nlz_bits = 0;
   len = rb_absint_size(bignum, &nlz_bits);
@@ -220,16 +222,15 @@ static int my_big2ll(VALUE bignum, LONG_LONG *ptr)
 #ifdef HAVE_RB_ABSINT_SIZE
         nlz_bits == 0 &&
 #endif
+// rb_absint_singlebit_p was added in 2.1.0. See:
+// https://github.com/ruby/ruby/commit/e5ff9d5
 #if defined(HAVE_RB_ABSINT_SIZE) && defined(HAVE_RB_ABSINT_SINGLEBIT_P)
         /* Optimized to avoid object allocation for Ruby 2.1+
          * only -0x8000000000000000 is safe if `len == 8 && nlz_bits == 0`
          */
         !rb_absint_singlebit_p(bignum)
-#elif defined(HAVE_RB_BIG_CMP)
-        rb_big_cmp(bignum, LL2NUM(LLONG_MIN)) == INT2FIX(-1)
 #else
-        /* Ruby 1.8.7 and REE doesn't have rb_big_cmp */
-        rb_funcall(bignum, id_cmp, 1, LL2NUM(LLONG_MIN)) == INT2FIX(-1)
+        rb_big_cmp(bignum, LL2NUM(LLONG_MIN)) == INT2FIX(-1)
 #endif
        ) {
       goto overflow;

ext/mysql2/wait_for_single_fd.h

@@ -1,5 +1,6 @@
 /*
- * backwards compatibility for pre-1.9.3 C API
+ * backwards compatibility for Rubinius. See
+ * https://github.com/rubinius/rubinius/issues/3771.
  *
  * Ruby 1.9.3 provides this API which allows the use of ppoll() on Linux
  * to minimize select() and malloc() overhead on high-numbered FDs.

spec/mysql2/client_spec.rb

@@ -670,7 +670,6 @@ def run_gc
       end
 
       it "evented async queries should be supported" do
-        skip("ruby 1.8 doesn't support IO.for_fd options") if RUBY_VERSION.start_with?("1.8.")
         # should immediately return nil
         expect(@client.query("SELECT sleep(0.1)", :async => true)).to eql(nil)
 

spec/mysql2/statement_spec.rb

@@ -147,24 +147,16 @@ def stmt_count
     now = Time.now
     statement = @client.prepare('SELECT ? AS a')
     result = statement.execute(now)
-    if RUBY_VERSION =~ /1.8/
-      expect(result.first['a'].strftime('%F %T %z')).to eql(now.strftime('%F %T %z'))
-    else
-      # microseconds is six digits after the decimal, but only test on 5 significant figures
-      expect(result.first['a'].strftime('%F %T.%5N %z')).to eql(now.strftime('%F %T.%5N %z'))
-    end
+    # microseconds is six digits after the decimal, but only test on 5 significant figures
+    expect(result.first['a'].strftime('%F %T.%5N %z')).to eql(now.strftime('%F %T.%5N %z'))
   end
 
   it "should prepare DateTime values with microseconds" do
     now = DateTime.now
     statement = @client.prepare('SELECT ? AS a')
     result = statement.execute(now)
-    if RUBY_VERSION =~ /1.8/
-      expect(result.first['a'].strftime('%F %T %z')).to eql(now.strftime('%F %T %z'))
-    else
-      # microseconds is six digits after the decimal, but only test on 5 significant figures
-      expect(result.first['a'].strftime('%F %T.%5N %z')).to eql(now.strftime('%F %T.%5N %z'))
-    end
+    # microseconds is six digits after the decimal, but only test on 5 significant figures
+    expect(result.first['a'].strftime('%F %T.%5N %z')).to eql(now.strftime('%F %T.%5N %z'))
   end
 
   it "should tell us about the fields" do