Undefine T_DATA allocators for Ruby 3.2 compatibility

Ref: https://bugs.ruby-lang.org/issues/18007
brianmario · Jan 17, 2022 · 6c4e8be · 6c4e8be
1 parent 25c42c7
commit 6c4e8be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/ext/mysql2/result.c b/ext/mysql2/result.c
@@ -1174,6 +1174,7 @@ void init_mysql2_result() {
   rb_global_variable(&cDateTime);
 
   cMysql2Result = rb_define_class_under(mMysql2, "Result", rb_cObject);
+  rb_undef_alloc_func(cMysql2Result);
   rb_global_variable(&cMysql2Result);
 
   rb_define_method(cMysql2Result, "each", rb_mysql_result_each, -1);

diff --git a/ext/mysql2/statement.c b/ext/mysql2/statement.c
@@ -581,6 +581,7 @@ void init_mysql2_statement() {
   rb_global_variable(&cBigDecimal);
 
   cMysql2Statement = rb_define_class_under(mMysql2, "Statement", rb_cObject);
+  rb_undef_alloc_func(cMysql2Statement);
   rb_global_variable(&cMysql2Statement);
 
   rb_define_method(cMysql2Statement, "param_count", rb_mysql_stmt_param_count, 0);

diff --git a/spec/mysql2/result_spec.rb b/spec/mysql2/result_spec.rb
@@ -6,17 +6,8 @@
   end
 
   it "should raise a TypeError exception when it doesn't wrap a result set" do
-    if RUBY_VERSION >= "3.1"
-      expect { Mysql2::Result.new }.to raise_error(TypeError)
-      expect { Mysql2::Result.allocate }.to raise_error(TypeError)
-    else
-      r = Mysql2::Result.new
-      expect { r.count }.to raise_error(TypeError)
-      expect { r.fields }.to raise_error(TypeError)
-      expect { r.field_types }.to raise_error(TypeError)
-      expect { r.size }.to raise_error(TypeError)
-      expect { r.each }.to raise_error(TypeError)
-    end
+    expect { Mysql2::Result.new }.to raise_error(TypeError)
+    expect { Mysql2::Result.allocate }.to raise_error(TypeError)
   end
 
   it "should have included Enumerable" do