authorization callbacks are working

Author: tenderlove

ext/sqlite3/database.c

@@ -411,6 +411,11 @@ static int rb_sqlite3_auth(
  *
  * Set the authorizer for this database.  +auth+ must respond to +call+, and
  * +call+ must take 5 arguments.
+ *
+ * Installs (or removes) a block that will be invoked for every access
+ * to the database. If the block returns 0 (or +true+), the statement
+ * is allowed to proceed. Returning 1 or false causes an authorization error to
+ * occur, and returning 2 or nil causes the access to be silently denied.
  */
 static VALUE set_authorizer(VALUE self, VALUE authorizer)
 {

ext/sqlite3/statement.c

@@ -49,8 +49,17 @@ static VALUE initialize(VALUE self, VALUE db, VALUE sql)
       &tail
   );
 
-  if(SQLITE_OK != status)
-    rb_raise(rb_path2class("SQLite3::SQLException"), "%s", sqlite3_errmsg(db_ctx->db));
+  switch(status) {
+    case SQLITE_OK:
+      break;
+    case SQLITE_AUTH:
+      rb_raise(
+          rb_path2class("SQLite3::AuthorizationException"), "%s",
+          sqlite3_errmsg(db_ctx->db));
+      break;
+    default:
+      rb_raise(rb_path2class("SQLite3::SQLException"), "%s", sqlite3_errmsg(db_ctx->db));
+  }
 
   rb_iv_set(self, "@connection", db);
   rb_iv_set(self, "@remainder", rb_str_new2(tail));

lib/sqlite3/database.rb

@@ -70,9 +70,8 @@ def translator
     # to the database. If the block returns 0 (or +nil+), the statement
     # is allowed to proceed. Returning 1 causes an authorization error to
     # occur, and returning 2 causes the access to be silently denied.
-    def authorizer( data=nil, &block )
-      result = @driver.set_authorizer( @handle, data, &block )
-      Error.check( result, self )
+    def authorizer &block
+      self.authorizer = block
     end
 
     # Returns a Statement object representing the given SQL. This does not

test/test_integration.rb

@@ -81,20 +81,20 @@ def test_trace
   end
 
   def test_authorizer_okay
-    @db.authorizer( "data" ) { |data,type,a,b,c,d| 0 }
+    @db.authorizer { |type,a,b,c,d| 0 }
     rows = @db.execute "select * from foo"
     assert_equal 3, rows.length
   end
 
   def test_authorizer_error
-    @db.authorizer( "data" ) { |data,type,a,b,c,d| 1 }
+    @db.authorizer { |type,a,b,c,d| 1 }
     assert_raise( SQLite3::AuthorizationException ) do
       @db.execute "select * from foo"
     end
   end
 
   def test_authorizer_silent
-    @db.authorizer( "data" ) { |data,type,a,b,c,d| 2 }
+    @db.authorizer { |type,a,b,c,d| 2 }
     rows = @db.execute "select * from foo"
     assert rows.empty?
   end