Pass name in to aggregator factory method

We can determine the name of the aggregate function in Ruby, so let's do
that.

Author: tenderlove

ext/sqlite3/aggregator.c

@@ -203,12 +203,11 @@ rb_sqlite3_aggregator_final(sqlite3_context * ctx)
  * parameter.
  */
 VALUE
-rb_sqlite3_define_aggregator2(VALUE self, VALUE aggregator)
+rb_sqlite3_define_aggregator2(VALUE self, VALUE aggregator, VALUE ruby_name)
 {
   /* define_aggregator is added as a method to SQLite3::Database in database.c */
   sqlite3RubyPtr ctx;
   int arity, status;
-  VALUE ruby_name;
   const char *name;
   VALUE aw;
   VALUE aggregators;
@@ -218,11 +217,6 @@ rb_sqlite3_define_aggregator2(VALUE self, VALUE aggregator)
     rb_raise(rb_path2class("SQLite3::Exception"), "cannot use a closed database");
   }
 
-  /* aggregator is typically a class and testing for :name or :new in class
-   * is a bit pointless */
-
-  ruby_name = rb_funcall(aggregator, rb_intern("name"), 0);
-
   if (rb_respond_to(aggregator, rb_intern("arity"))) {
     VALUE ruby_arity = rb_funcall(aggregator, rb_intern("arity"), 0);
     arity = NUM2INT(ruby_arity);

ext/sqlite3/aggregator.h

@@ -4,7 +4,7 @@
 #include <sqlite3_ruby.h>
 
 VALUE
-rb_sqlite3_define_aggregator2(VALUE self, VALUE aggregator);
+rb_sqlite3_define_aggregator2(VALUE self, VALUE aggregator, VALUE ruby_name);
 
 void
 rb_sqlite3_aggregator_init(void);

ext/sqlite3/database.c

@@ -795,7 +795,7 @@ void init_sqlite3_database()
   rb_define_method(cSqlite3Database, "define_function_with_flags", define_function_with_flags, 2);
   /* public "define_aggregator" is now a shim around define_aggregator2
    * implemented in Ruby */
-  rb_define_private_method(cSqlite3Database, "define_aggregator2", rb_sqlite3_define_aggregator2, 1);
+  rb_define_private_method(cSqlite3Database, "define_aggregator2", rb_sqlite3_define_aggregator2, 2);
   rb_define_method(cSqlite3Database, "interrupt", interrupt, 0);
   rb_define_method(cSqlite3Database, "errmsg", errmsg, 0);
   rb_define_method(cSqlite3Database, "errcode", errcode_, 0);

lib/sqlite3/database.rb

@@ -485,7 +485,7 @@ def finalize
           @ctx.result
         end
       end
-      define_aggregator2(proxy)
+      define_aggregator2(proxy, name)
     end
 
     # This is another approach to creating an aggregate function (see
@@ -558,7 +558,7 @@ def finalize
           @fp.result
         end
       end
-      define_aggregator2(proxy)
+      define_aggregator2(proxy, proxy.name)
       self
     end
 
@@ -604,7 +604,7 @@ def finalize
           @klass.finalize
         end
       end
-      define_aggregator2(proxy)
+      define_aggregator2(proxy, name)
       self
     end