sqlite3 0.0.2 → 0.0.3

data/lib/sqlite3/driver/ffi/api.rb

@@ -1,260 +1,107 @@
-require "ffi"
-
 module SQLite3
   module Driver
     module FFI
 
       module API
-
         extend ::FFI::Library
 
-        ffi_lib "libsqlite3.so"
+        # TODO: cleanup
+        ffi_lib case RUBY_PLATFORM.downcase
+                when /darwin/
+                  "libsqlite3.dylib"
+                when /linux|freebsd|netbsd|openbsd|dragonfly|solaris/
+                  "libsqlite3.so"
+                when /win32/
+                  "sqlite3.dll"
+                else
+                  abort <<-EOF
+==== UNSUPPORTED PLATFORM ======================================================
+The platform '#{RUBY_PLATFORM}' is unsupported. Please help the author by
+editing the following file to allow your sqlite3 library to be found, and
+submitting a patch to qoobaa@gmail.com. Thanks!
+
+#{__FILE__}
+================================================================================
+EOF
+                end
 
-        # extern "const char *sqlite3_libversion()"
         attach_function :sqlite3_libversion, [], :string
-
-        # extern "int sqlite3_open(const char*,db*)"
         attach_function :sqlite3_open, [:string, :pointer], :int
-
-        # extern "int sqlite3_open16(const void*,db*)"
         attach_function :sqlite3_open16, [:pointer, :pointer], :int
-
-        # extern "int sqlite3_close(db)"
         attach_function :sqlite3_close, [:pointer], :int
-
-        # extern "const char* sqlite3_errmsg(db)"
         attach_function :sqlite3_errmsg, [:pointer], :string
-
-        # extern "void* sqlite3_errmsg16(db)"
         attach_function :sqlite3_errmsg16, [:pointer], :pointer
-
-        # extern "int sqlite3_errcode(db)"
         attach_function :sqlite3_errcode, [:pointer], :int
-
-        # extern "int sqlite3_prepare(db,const char*,int,stmt*,const char**)"
         attach_function :sqlite3_prepare, [:pointer, :string, :int, :pointer, :pointer], :int
-
-        # extern "int sqlite3_prepare16(db,const void*,int,stmt*,const void**)"
-        attach_function :sqlite3_prepare16, [:pointer, :pointer, :int, :pointer, :pointer], :int
-
-        # extern "int sqlite3_finalize(stmt)"
+        # attach_function :sqlite3_prepare16, [:pointer, :pointer, :int, :pointer, :pointer], :int
         attach_function :sqlite3_finalize, [:pointer], :int
-
-        # extern "int sqlite3_reset(stmt)"
-        attach_function :sqlite3_reset, [:pointer], :int
-
-        # extern "int sqlite3_step(stmt)"
+        # attach_function :sqlite3_reset, [:pointer], :int
         attach_function :sqlite3_step, [:pointer], :int
-
-        # extern "int64 sqlite3_last_insert_rowid(db)"
         attach_function :sqlite3_last_insert_rowid, [:pointer], :int64
-
-        # extern "int sqlite3_changes(db)"
-        attach_function :sqlite3_changes, [:pointer], :int
-
-        # extern "int sqlite3_total_changes(db)"
-        attach_function :sqlite3_total_changes, [:pointer], :int
-
-        # extern "void sqlite3_interrupt(db)"
-        attach_function :sqlite3_interrupt, [:pointer], :void
-
-        # extern "ibool sqlite3_complete(const char*)"
-        attach_function :sqlite3_complete, [:string], :int
-
-        # extern "ibool sqlite3_complete16(const void*)"
-        attach_function :sqlite3_complete16, [:pointer], :int
-
-        # extern "int sqlite3_busy_handler(db,void*,void*)"
-        attach_function :sqlite3_busy_handler, [:pointer, :pointer, :pointer], :int
-
-        # extern "int sqlite3_busy_timeout(db,int)"
+        # attach_function :sqlite3_changes, [:pointer], :int
+        # attach_function :sqlite3_total_changes, [:pointer], :int
+        # attach_function :sqlite3_interrupt, [:pointer], :void
+        # attach_function :sqlite3_complete, [:string], :int
+        # attach_function :sqlite3_complete16, [:pointer], :int
         attach_function :sqlite3_busy_timeout, [:pointer, :int], :int
-
-        # extern "int sqlite3_set_authorizer(db,void*,void*)"
-        attach_function :sqlite3_set_authorizer, [:pointer, :pointer, :pointer], :int
-
-        # extern "void* sqlite3_trace(db,void*,void*)"
-        attach_function :sqlite3_trace, [:pointer, :pointer, :pointer], :pointer
-
-        # extern "int sqlite3_bind_blob(stmt,int,const void*,int,void*)"
         attach_function :sqlite3_bind_blob, [:pointer, :int, :pointer, :int, :pointer], :int
-
-        # extern "int sqlite3_bind_double(stmt,int,double)"
         attach_function :sqlite3_bind_double, [:pointer, :int, :double], :int
-
-        # extern "int sqlite3_bind_int(stmt,int,int)"
         attach_function :sqlite3_bind_int, [:pointer, :int, :int], :int
-
-        # extern "int sqlite3_bind_int64(stmt,int,int64)"
         attach_function :sqlite3_bind_int64, [:pointer, :int, :int64], :int
-
-        # extern "int sqlite3_bind_null(stmt,int)"
         attach_function :sqlite3_bind_null, [:pointer, :int], :int
-
-        # extern "int sqlite3_bind_text(stmt,int,const char*,int,void*)"
         attach_function :sqlite3_bind_text, [:pointer, :int, :string, :int, :pointer], :int
-
-        # extern "int sqlite3_bind_text16(stmt,int,const void*,int,void*)"
         attach_function :sqlite3_bind_text16, [:pointer, :int, :pointer, :int, :pointer], :int
-
-        # #extern "int sqlite3_bind_value(stmt,int,value)"
-        attach_function :sqlite3_bind_value, [:pointer, :int, :pointer], :int
-
-        # extern "int sqlite3_bind_parameter_count(stmt)"
-        attach_function :sqlite3_bind_parameter_count, [:pointer], :int
-
-        # extern "const char* sqlite3_bind_parameter_name(stmt,int)"
-        attach_function :sqlite3_bind_parameter_name, [:pointer, :int], :string
-
-        # extern "int sqlite3_bind_parameter_index(stmt,const char*)"
-        attach_function :sqlite3_bind_parameter_index, [:pointer, :string], :int
-
-        # extern "int sqlite3_column_count(stmt)"
+        # attach_function :sqlite3_bind_value, [:pointer, :int, :pointer], :int
+        # attach_function :sqlite3_bind_parameter_count, [:pointer], :int
+        # attach_function :sqlite3_bind_parameter_name, [:pointer, :int], :string
+        # attach_function :sqlite3_bind_parameter_index, [:pointer, :string], :int
         attach_function :sqlite3_column_count, [:pointer], :int
-
-        # extern "int sqlite3_data_count(stmt)"
         attach_function :sqlite3_data_count, [:pointer], :int
-
-        # extern "const void *sqlite3_column_blob(stmt,int)"
         attach_function :sqlite3_column_blob, [:pointer, :int], :pointer
-
-        # extern "int sqlite3_column_bytes(stmt,int)"
         attach_function :sqlite3_column_bytes, [:pointer, :int], :int
-
-        # extern "int sqlite3_column_bytes16(stmt,int)"
         attach_function :sqlite3_column_bytes16, [:pointer, :int], :int
-
-        # extern "const char *sqlite3_column_decltype(stmt,int)"
         attach_function :sqlite3_column_decltype, [:pointer, :int], :string
-
-        # extern "void *sqlite3_column_decltype16(stmt,int)"
-        attach_function :sqlite3_column_decltype16, [:pointer, :int], :pointer
-
-        # extern "double sqlite3_column_double(stmt,int)"
+        # attach_function :sqlite3_column_decltype16, [:pointer, :int], :pointer
         attach_function :sqlite3_column_double, [:pointer, :int], :double
-
-        # extern "int sqlite3_column_int(stmt,int)"
-        attach_function :sqlite3_column_int, [:pointer, :int], :int
-
-        # extern "int64 sqlite3_column_int64(stmt,int)"
+        # attach_function :sqlite3_column_int, [:pointer, :int], :int
         attach_function :sqlite3_column_int64, [:pointer, :int], :int64
-
-        # extern "const char *sqlite3_column_name(stmt,int)"
         attach_function :sqlite3_column_name, [:pointer, :int], :string
-
-        # extern "const void *sqlite3_column_name16(stmt,int)"
-        attach_function :sqlite3_column_name16, [:pointer, :int], :pointer
-
-        # extern "const char *sqlite3_column_text(stmt,int)"
+        # attach_function :sqlite3_column_name16, [:pointer, :int], :pointer
         attach_function :sqlite3_column_text, [:pointer, :int], :string
-
-        # extern "const void *sqlite3_column_text16(stmt,int)"
         attach_function :sqlite3_column_text16, [:pointer, :int], :pointer
-
-        # extern "int sqlite3_column_type(stmt,int)"
         attach_function :sqlite3_column_type, [:pointer, :int], :int
-
-        # extern "int sqlite3_create_function(db,const char*,int,int,void*,void*,void*,void*)"
-        attach_function :sqlite3_create_function, [:pointer, :string, :int, :int, :pointer, :pointer, :pointer, :pointer], :int
-
-        # extern "int sqlite3_create_function16(db,const void*,int,int,void*,void*,void*,void*)"
-        attach_function :sqlite3_create_function16, [:pointer, :pointer, :int, :int, :pointer, :pointer, :pointer, :pointer], :int
-
-        # extern "int sqlite3_aggregate_count(context)"
-        attach_function :sqlite3_aggregate_count, [:pointer], :int
-
-        # extern "const void *sqlite3_value_blob(value)"
-        attach_function :sqlite3_value_blob, [:pointer], :pointer
-
-        # extern "int sqlite3_value_bytes(value)"
-        attach_function :sqlite3_value_bytes, [:pointer], :int
-
-        # extern "int sqlite3_value_bytes16(value)"
-        attach_function :sqlite3_value_bytes16, [:pointer], :int
-
-        # extern "double sqlite3_value_double(value)"
-        attach_function :sqlite3_value_double, [:pointer], :double
-
-        # extern "int sqlite3_value_int(value)"
-        attach_function :sqlite3_value_int, [:pointer], :int
-
-        # extern "int64 sqlite3_value_int64(value)"
-        attach_function :sqlite3_value_int64, [:pointer], :int64
-
-        # extern "const char* sqlite3_value_text(value)"
-        attach_function :sqlite3_value_text, [:pointer], :string
-
-        # extern "const void* sqlite3_value_text16(value)"
-        attach_function :sqlite3_value_text16, [:pointer], :pointer
-
-        # extern "const void* sqlite3_value_text16le(value)"
-        attach_function :sqlite3_value_text16le, [:pointer], :pointer
-
-        # extern "const void* sqlite3_value_text16be(value)"
-        attach_function :sqlite3_value_text16be, [:pointer], :pointer
-
-        # extern "int sqlite3_value_type(value)"
-        attach_function :sqlite3_value_type, [:pointer], :int
-
-        # extern "void *sqlite3_aggregate_context(context,int)"
-        attach_function :sqlite3_aggregate_context, [:pointer, :int], :pointer
-
-        # extern "void *sqlite3_user_data(context)"
-        attach_function :sqlite3_user_data, [:pointer], :pointer
-
-        # extern "void *sqlite3_get_auxdata(context,int)"
-        attach_function :sqlite3_get_auxdata, [:pointer, :int], :pointer
-
-        # extern "void sqlite3_set_auxdata(context,int,void*,void*)"
-        attach_function :sqlite3_set_auxdata, [:pointer, :int, :pointer, :pointer], :void
-
-        # extern "void sqlite3_result_blob(context,const void*,int,void*)"
-        attach_function :sqlite3_result_blob, [:pointer, :pointer, :int, :pointer], :void
-
-        # extern "void sqlite3_result_double(context,double)"
-        attach_function :sqlite3_result_double, [:pointer, :double], :void
-
-        # extern "void sqlite3_result_error(context,const char*,int)"
-        attach_function :sqlite3_result_error, [:pointer, :string, :int], :void
-
-        # extern "void sqlite3_result_error16(context,const void*,int)"
-        attach_function :sqlite3_result_error16, [:pointer, :pointer, :int], :void
-
-        # extern "void sqlite3_result_int(context,int)"
-        attach_function :sqlite3_result_int, [:pointer, :int], :void
-
-        # extern "void sqlite3_result_int64(context,int64)"
-        attach_function :sqlite3_result_int64, [:pointer, :int64], :void
-
-        # extern "void sqlite3_result_null(context)"
-        attach_function :sqlite3_result_null, [:pointer], :void
-
-        # extern "void sqlite3_result_text(context,const char*,int,void*)"
-        attach_function :sqlite3_result_text, [:pointer, :string, :int, :pointer], :void
-
-        # extern "void sqlite3_result_text16(context,const void*,int,void*)"
-        attach_function :sqlite3_result_text16, [:pointer, :pointer, :int, :pointer], :void
-
-        # extern "void sqlite3_result_text16le(context,const void*,int,void*)"
-        attach_function :sqlite3_result_text16le, [:pointer, :pointer, :int, :pointer], :void
-
-        # extern "void sqlite3_result_text16be(context,const void*,int,void*)"
-        attach_function :sqlite3_result_text16be, [:pointer, :pointer, :int, :pointer], :void
-
-        # extern "void sqlite3_result_value(context,value)"
-        attach_function :sqlite3_result_value, [:pointer, :pointer], :void
-
-        # extern "int sqlite3_create_collation(db,const char*,int,void*,void*)"
-        attach_function :sqlite3_create_collation, [:pointer, :string, :int, :pointer, :pointer], :int
-
-        # extern "int sqlite3_create_collation16(db,const char*,int,void*,void*)"
-        attach_function :sqlite3_create_collation16, [:pointer, :string, :int, :pointer, :pointer], :int
-
-        # extern "int sqlite3_collation_needed(db,void*,void*)"
-        attach_function :sqlite3_collation_needed, [:pointer, :pointer, :pointer], :int
-
-        # extern "int sqlite3_collation_needed16(db,void*,void*)"
-        attach_function :sqlite3_collation_needed16, [:pointer, :pointer, :pointer], :int
+        # attach_function :sqlite3_aggregate_count, [:pointer], :int
+        # attach_function :sqlite3_value_blob, [:pointer], :pointer
+        # attach_function :sqlite3_value_bytes, [:pointer], :int
+        # attach_function :sqlite3_value_bytes16, [:pointer], :int
+        # attach_function :sqlite3_value_double, [:pointer], :double
+        # attach_function :sqlite3_value_int, [:pointer], :int
+        # attach_function :sqlite3_value_int64, [:pointer], :int64
+        # attach_function :sqlite3_value_text, [:pointer], :string
+        # attach_function :sqlite3_value_text16, [:pointer], :pointer
+        # attach_function :sqlite3_value_text16le, [:pointer], :pointer
+        # attach_function :sqlite3_value_text16be, [:pointer], :pointer
+        # attach_function :sqlite3_value_type, [:pointer], :int
+        # attach_function :sqlite3_aggregate_context, [:pointer, :int], :pointer
+        # attach_function :sqlite3_user_data, [:pointer], :pointer
+        # attach_function :sqlite3_get_auxdata, [:pointer, :int], :pointer
+        # attach_function :sqlite3_set_auxdata, [:pointer, :int, :pointer, :pointer], :void
+        # attach_function :sqlite3_result_blob, [:pointer, :pointer, :int, :pointer], :void
+        # attach_function :sqlite3_result_double, [:pointer, :double], :void
+        # attach_function :sqlite3_result_error, [:pointer, :string, :int], :void
+        # attach_function :sqlite3_result_error16, [:pointer, :pointer, :int], :void
+        # attach_function :sqlite3_result_int, [:pointer, :int], :void
+        # attach_function :sqlite3_result_int64, [:pointer, :int64], :void
+        # attach_function :sqlite3_result_null, [:pointer], :void
+        # attach_function :sqlite3_result_text, [:pointer, :string, :int, :pointer], :void
+        # attach_function :sqlite3_result_text16, [:pointer, :pointer, :int, :pointer], :void
+        # attach_function :sqlite3_result_text16le, [:pointer, :pointer, :int, :pointer], :void
+        # attach_function :sqlite3_result_text16be, [:pointer, :pointer, :int, :pointer], :void
+        # attach_function :sqlite3_result_value, [:pointer, :pointer], :void
+        # attach_function :sqlite3_create_collation, [:pointer, :string, :int, :pointer, :pointer], :int
+        # attach_function :sqlite3_create_collation16, [:pointer, :string, :int, :pointer, :pointer], :int
+        # attach_function :sqlite3_collation_needed, [:pointer, :pointer, :pointer], :int
+        # attach_function :sqlite3_collation_needed16, [:pointer, :pointer, :pointer], :int
       end
 
     end

data/lib/sqlite3/driver/ffi/driver.rb

@@ -5,206 +5,140 @@ module SQLite3
     module FFI
 
       class Driver
-        STATIC    =  0
-        TRANSIENT = -1
+        TRANSIENT = ::FFI::Pointer.new(-1)
 
-        def open(filename, utf16 = false)
+        def open(filename, utf_16 = false)
           handle = ::FFI::MemoryPointer.new(:pointer)
-          result = API.send((utf16 ? :sqlite3_open16 : :sqlite3_open), filename, handle)
+          if utf_16
+            filename = filename.encode(Encoding.utf_16native)
+            result = API.sqlite3_open16(c_string(filename), handle)
+          else
+            filename = filename.encode(Encoding.utf_8)
+            result = API.sqlite3_open(filename, handle)
+          end
           [result, handle.get_pointer(0)]
         end
 
-        def errmsg(db, utf16 = false)
-          if utf16
-            msg = API.sqlite3_errmsg16(db)
-            msg.free = nil
-            msg.to_s(utf16_length(msg))
+        def errmsg(db, utf_16 = false)
+          if utf_16
+            ptr = API.sqlite3_errmsg16(db)
+            get_string_utf_16(ptr).force_encoding(Encoding.utf_16native)
           else
-            API.sqlite3_errmsg(db)
+            API.sqlite3_errmsg(db).force_encoding(Encoding.utf_8)
           end
         end
 
-        def prepare(db, sql, utf16 = false)
+        def prepare(db, sql)
           handle = ::FFI::MemoryPointer.new(:pointer)
           remainder = ::FFI::MemoryPointer.new(:pointer)
 
-          result = API.send((utf16 ? :sqlite3_prepare16 : :sqlite3_prepare), db, sql, sql.length, handle, remainder)
-
-          # TODO: UTF-16
-          # args = utf16 ? [utf16_length(remainder)] : []
-          # remainder = remainder.to_s(*args)
-
-          [result, handle.get_pointer(0), remainder.get_pointer(0).get_string(0)]
-        end
-
-        def complete?(sql, utf16 = false)
-          API.send(utf16 ? :sqlite3_complete16 : :sqlite3_complete, sql)
-        end
-
-        def value_blob(value)
-          blob = API.sqlite3_value_blob(value)
-          blob.free = nil
-          blob.to_s(API.sqlite3_value_bytes(value))
-        end
-
-        def value_text(value, utf16 = false)
-          method = case utf16
-                   when nil, false
-                     :sqlite3_value_text
-                   when :le
-                     :sqlite3_value_text16le
-                   when :be
-                     :sqlite3_value_text16be
-                   else
-                     :sqlite3_value_text16
-                   end
-
-          result = API.send(method, value)
-          if utf16
-            result.free = nil
-            size = API.sqlite3_value_bytes(value)
-            result = result.to_s(size)
+          if Encoding.utf_16?(sql)
+            str = c_string(sql)
+            result = API.sqlite3_prepare16(db, str, str.bytesize, handle, remainder)
+            remainder_string = get_string_utf_16(remainder.get_pointer(0))
+          else
+            result = API.sqlite3_prepare(db, sql, sql.bytesize, handle, remainder)
+            remainder_string = remainder.get_pointer(0).get_string(0)
           end
 
-          result
+          [result, handle.get_pointer(0), remainder_string]
+        end
+
+        # def complete?(sql)
+        #   API.send(utf16?(string) ? :sqlite3_complete16 : :sqlite3_complete, sql)
+        # end
+
+        # def value_blob(value)
+        #   blob = API.sqlite3_value_blob(value)
+        #   # blob.free = nil
+        #   blob.to_s(API.sqlite3_value_bytes(value))
+        # end
+
+        # def value_text(value)
+        #   method = case utf16
+        #            when nil, false
+        #              :sqlite3_value_text
+        #            when :le
+        #              :sqlite3_value_text16le
+        #            when :be
+        #              :sqlite3_value_text16be
+        #            else
+        #              :sqlite3_value_text16
+        #            end
+
+        #   result = API.send(method, value)
+
+        #   if utf16
+        #     # result.free = nil
+        #     size = API.sqlite3_value_bytes(value)
+        #     result = result.to_s(size)
+        #   end
+
+        #   result
+        # end
+
+        # def result_text(func, text)
+        #   method = case utf16
+        #            when false, nil
+        #              :sqlite3_result_text
+        #            when :le
+        #              :sqlite3_result_text16le
+        #            when :be
+        #              :sqlite3_result_text16be
+        #            else
+        #              :sqlite3_result_text16
+        #            end
+
+        #   s = text.to_s
+        #   API.send(method, func, s, s.length, TRANSIENT)
+        # end
+
+        # def aggregate_context(context)
+        #   ptr = API.sqlite3_aggregate_context(context, 4)
+        #   ptr.free = nil
+        #   obj = (ptr ? ptr.to_object : nil)
+        #   if obj.nil?
+        #     obj = Hash.new
+        #     ptr.set_object obj
+        #   end
+        #   obj
+        # end
+
+        def bind_string(stmt, index, value)
+          case value.encoding
+          when Encoding.utf_8, Encoding.us_ascii
+            API.sqlite3_bind_text(stmt, index, value, value.bytesize, TRANSIENT)
+          when Encoding.utf_16le, Encoding.utf_16be
+            value = add_byte_order_mask(value)
+            API.sqlite3_bind_text16(stmt, index, value, value.bytesize, TRANSIENT)
+          else
+            API.sqlite3_bind_blob(stmt, index, value, value.bytesize, TRANSIENT)
+          end
         end
 
         def column_blob(stmt, column)
           blob = API.sqlite3_column_blob(stmt, column)
-          blob.free = nil
-          blob.to_s(API.sqlite3_column_bytes(stmt, column))
-        end
-
-        def result_text(func, text, utf16 = false)
-          method = case utf16
-                   when false, nil
-                     :sqlite3_result_text
-                   when :le
-                     :sqlite3_result_text16le
-                   when :be
-                     :sqlite3_result_text16be
-                   else
-                     :sqlite3_result_text16
-                   end
-
-          s = text.to_s
-          API.send(method, func, s, s.length, TRANSIENT)
-        end
-
-        def busy_handler(db, data = nil, &block)
-          @busy_handler = block
-
-          unless @busy_handler_callback
-            @busy_handler_callback = ::DL.callback("IPI") do |cookie, timeout|
-              @busy_handler.call(cookie, timeout) || 0
-            end
-          end
-
-          API.sqlite3_busy_handler(db, block&&@busy_handler_callback, data)
-        end
-
-        def set_authorizer(db, data = nil, &block)
-          @authorizer_handler = block
-
-          unless @authorizer_handler_callback
-            @authorizer_handler_callback = ::DL.callback("IPIPPPP") do |cookie,mode,a,b,c,d|
-              @authorizer_handler.call(cookie, mode, a&&a.to_s, b&&b.to_s, c&&c.to_s, d&&d.to_s) || 0
-            end
-          end
-
-          API.sqlite3_set_authorizer(db, block&&@authorizer_handler_callback, data)
-        end
-
-        def trace(db, data = nil, &block)
-          @trace_handler = block
-
-          unless @trace_handler_callback
-            @trace_handler_callback = ::DL.callback("IPS") do |cookie,sql|
-              @trace_handler.call(cookie ? cookie.to_object : nil, sql) || 0
-            end
-          end
-
-          API.sqlite3_trace(db, block&&@trace_handler_callback, data)
+          length = API.sqlite3_column_bytes(stmt, column)
+          blob.get_bytes(0, length) # free?
         end
 
-        def create_function(db, name, args, text, cookie, func, step, final)
-          # begin
-          if @func_handler_callback.nil? && func
-            @func_handler_callback = ::DL.callback("0PIP") do |context,nargs,args|
-              args = args.to_s(nargs*4).unpack("L*").map {|i| ::FFI::MemoryPointer.new(i)}
-              data = API.sqlite3_user_data(context).to_object
-              data[:func].call(context, *args)
-            end
-          end
-
-          if @step_handler_callback.nil? && step
-            @step_handler_callback = ::DL.callback("0PIP") do |context,nargs,args|
-              args = args.to_s(nargs*4).unpack("L*").map {|i| ::FFI::MemoryPointer.new(i)}
-              data = API.sqlite3_user_data(context).to_object
-              data[:step].call(context, *args)
-            end
-          end
-
-          if @final_handler_callback.nil? && final
-            @final_handler_callback = ::DL.callback("0P") do |context|
-              data = API.sqlite3_user_data(context).to_object
-              data[:final].call(context)
-            end
-          end
-
-          data = {
-            :cookie => cookie,
-            :name => name,
-            :func => func,
-            :step => step,
-            :final => final
-          }
-
-          API.sqlite3_create_function(db, name, args, text, data, (func ? @func_handler_callback : nil), (step ? @step_handler_callback : nil), (final ? @final_handler_callback : nil))
-        end
-
-        def aggregate_context(context)
-          ptr = API.sqlite3_aggregate_context(context, 4)
-          ptr.free = nil
-          obj = (ptr ? ptr.to_object : nil)
-          if obj.nil?
-            obj = Hash.new
-            ptr.set_object obj
+        def column_text(stmt, column, utf_16 = false)
+          if utf_16
+            ptr = API.sqlite3_column_text16(stmt, column)
+            length = API.sqlite3_column_bytes16(stmt, column)
+            ptr.get_bytes(0, length).force_encoding(Encoding.utf_16native) # free?
+          else
+            API.sqlite3_column_text(stmt, column).force_encoding(Encoding.utf_8)
           end
-          obj
-        end
-
-        def bind_blob(stmt, index, value)
-          s = value.to_s
-          API.sqlite3_bind_blob(stmt, index, s, s.length, TRANSIENT)
-        end
-
-        def bind_text(stmt, index, value, utf16 = false)
-          s = value.to_s
-          method = (utf16 ? :sqlite3_bind_text16 : :sqlite3_bind_text)
-          API.send(method, stmt, index, s, s.length, TRANSIENT)
-        end
-
-        def column_text(stmt, column)
-          result = API.sqlite3_column_text(stmt, column)
-          result ? result.to_s : nil
-        end
-
-        def column_name(stmt, column)
-          result = API.sqlite3_column_name(stmt, column)
-          result ? result.to_s : nil
-        end
-
-        def column_decltype(stmt, column)
-          result = API.sqlite3_column_decltype(stmt, column)
-          result ? result.to_s : nil
         end
 
         def self.api_delegate(name)
           define_method(name) { |*args| API.send("sqlite3_#{name}", *args) }
         end
 
-        api_delegate :aggregate_count
+        api_delegate :column_name
+        api_delegate :column_decltype
+        # api_delegate :aggregate_count
         api_delegate :bind_double
         api_delegate :bind_int
         api_delegate :bind_int64
@@ -212,44 +146,57 @@ module SQLite3
         api_delegate :bind_parameter_index
         api_delegate :bind_parameter_name
         api_delegate :busy_timeout
-        api_delegate :changes
+        # api_delegate :changes
         api_delegate :close
-        api_delegate :column_bytes
-        api_delegate :column_bytes16
+        # api_delegate :column_bytes
+        # api_delegate :column_bytes16
         api_delegate :column_count
         api_delegate :column_double
-        api_delegate :column_int
+        # api_delegate :column_int
         api_delegate :column_int64
         api_delegate :column_type
         api_delegate :data_count
         api_delegate :errcode
         api_delegate :finalize
-        api_delegate :interrupt
+        # api_delegate :interrupt
         api_delegate :last_insert_rowid
         api_delegate :libversion
-        api_delegate :reset
-        api_delegate :result_error
+        # api_delegate :reset
+        # api_delegate :result_error
         api_delegate :step
-        api_delegate :total_changes
-        api_delegate :value_bytes
-        api_delegate :value_bytes16
-        api_delegate :value_double
-        api_delegate :value_int
-        api_delegate :value_int64
-        api_delegate :value_type
+        # api_delegate :total_changes
+        # api_delegate :value_bytes
+        # api_delegate :value_bytes16
+        # api_delegate :value_double
+        # api_delegate :value_int
+        # api_delegate :value_int64
+        # api_delegate :value_type
 
         private
 
-        def utf16_length(ptr)
-          len = 0
-          loop do
-            break if ptr[len,1] == "\0"
-            len += 2
+        def c_string(string)
+          if Encoding.utf_16?(string)
+            result = add_byte_order_mask(string)
+            terminate_string!(result)
+          else
+            string # FFI does the job
           end
-          len
         end
-      end
 
+        def add_byte_order_mask(string)
+          "\uFEFF".encode(string.encoding) + string
+        end
+
+        def terminate_string!(string)
+          string << "\0\0".force_encoding(string.encoding)
+        end
+
+        def get_string_utf_16(ptr)
+          length = 0
+          length += 2 until ptr.get_bytes(length, 2) == "\0\0"
+          ptr.get_bytes(0, length)
+        end
+      end
     end
   end
 end