sqlite3 1.3.7 → 1.3.13

data/ext/sqlite3/statement.c

@@ -79,7 +79,6 @@ static VALUE initialize(VALUE self, VALUE db, VALUE sql)
 static VALUE sqlite3_rb_close(VALUE self)
 {
   sqlite3StmtRubyPtr ctx;
-  sqlite3 * db;
 
   Data_Get_Struct(self, sqlite3StmtRuby, ctx);
 
@@ -113,7 +112,6 @@ static VALUE step(VALUE self)
   VALUE list;
 #ifdef HAVE_RUBY_ENCODING_H
   rb_encoding * internal_encoding;
-  int enc_index;
 #endif
 
   Data_Get_Struct(self, sqlite3StmtRuby, ctx);
@@ -125,8 +123,7 @@ static VALUE step(VALUE self)
 #ifdef HAVE_RUBY_ENCODING_H
   {
       VALUE db          = rb_iv_get(self, "@connection");
-      VALUE encoding    = rb_funcall(db, rb_intern("encoding"), 0);
-      enc_index = NIL_P(encoding) ? rb_utf8_encindex() : rb_to_encoding_index(encoding);
+      rb_funcall(db, rb_intern("encoding"), 0);
       internal_encoding = rb_default_internal_encoding();
   }
 #endif
@@ -156,7 +153,7 @@ static VALUE step(VALUE self)
                     (long)sqlite3_column_bytes(stmt, i)
                 );
 #ifdef HAVE_RUBY_ENCODING_H
-                rb_enc_associate_index(str, enc_index);
+                rb_enc_associate_index(str, rb_utf8_encindex());
                 if(internal_encoding)
                   str = rb_str_export_to_enc(str, internal_encoding);
 #endif
@@ -186,6 +183,8 @@ static VALUE step(VALUE self)
       return Qnil;
       break;
     default:
+      sqlite3_reset(stmt);
+      ctx->done_p = 0;
       CHECK(sqlite3_db_handle(ctx->st), value);
   }
 
@@ -238,15 +237,22 @@ static VALUE bind_param(VALUE self, VALUE key, VALUE value)
             SQLITE_TRANSIENT
             );
       } else {
+
+
 #ifdef HAVE_RUBY_ENCODING_H
-        if(!UTF8_P(value)) {
-              VALUE db          = rb_iv_get(self, "@connection");
-              VALUE encoding    = rb_funcall(db, rb_intern("encoding"), 0);
-              rb_encoding * enc = rb_to_encoding(encoding);
-              value = rb_str_export_to_enc(value, enc);
+        if (UTF16_LE_P(value) || UTF16_BE_P(value)) {
+          status = sqlite3_bind_text16(
+              ctx->st,
+              index,
+              (const char *)StringValuePtr(value),
+              (int)RSTRING_LEN(value),
+              SQLITE_TRANSIENT
+              );
+        } else {
+          if (!UTF8_P(value) || !USASCII_P(value)) {
+              value = rb_str_encode(value, rb_enc_from_encoding(rb_utf8_encoding()), 0, Qnil);
           }
 #endif
-
         status = sqlite3_bind_text(
             ctx->st,
             index,
@@ -254,13 +260,18 @@ static VALUE bind_param(VALUE self, VALUE key, VALUE value)
             (int)RSTRING_LEN(value),
             SQLITE_TRANSIENT
             );
+#ifdef HAVE_RUBY_ENCODING_H
+        }
+#endif
       }
       break;
-    case T_BIGNUM:
-      if (RBIGNUM_LEN(value) * SIZEOF_BDIGITS <= 8) {
-          status = sqlite3_bind_int64(ctx->st, index, (sqlite3_int64)NUM2LL(value));
+    case T_BIGNUM: {
+      sqlite3_int64 num64;
+      if (bignum_to_int64(value, &num64)) {
+          status = sqlite3_bind_int64(ctx->st, index, num64);
           break;
       }
+    }
     case T_FLOAT:
       status = sqlite3_bind_double(ctx->st, index, NUM2DBL(value));
       break;
@@ -289,12 +300,11 @@ static VALUE bind_param(VALUE self, VALUE key, VALUE value)
 static VALUE reset_bang(VALUE self)
 {
   sqlite3StmtRubyPtr ctx;
-  int status;
 
   Data_Get_Struct(self, sqlite3StmtRuby, ctx);
   REQUIRE_OPEN_STMT(ctx);
 
-  status = sqlite3_reset(ctx->st);
+  sqlite3_reset(ctx->st);
 
   ctx->done_p = 0;
 
@@ -309,12 +319,11 @@ static VALUE reset_bang(VALUE self)
 static VALUE clear_bindings(VALUE self)
 {
   sqlite3StmtRubyPtr ctx;
-  int status;
 
   Data_Get_Struct(self, sqlite3StmtRuby, ctx);
   REQUIRE_OPEN_STMT(ctx);
 
-  status = sqlite3_clear_bindings(ctx->st);
+  sqlite3_clear_bindings(ctx->st);
 
   ctx->done_p = 0;
 

data/faq/faq.yml

@@ -331,7 +331,7 @@
       p obj == h
     </pre>
 
-- "How do insert binary data into the database?": >-
+- "How do I insert binary data into the database?": >-
     Use blobs. Blobs are new features of SQLite3. You have to use bind
     variables to make it work:
 

data/lib/sqlite3/database.rb

@@ -94,10 +94,17 @@ in version 2.0.0.
       begin
         yield stmt
       ensure
-        stmt.close
+        stmt.close unless stmt.closed?
       end
     end
 
+    # Returns the filename for the database named +db_name+.  +db_name+ defaults
+    # to "main".  Main return `nil` or an empty string if the database is
+    # temporary or in-memory.
+    def filename db_name = 'main'
+      db_filename db_name
+    end
+
     # Executes the given SQL statement. If additional parameters are given,
     # they are treated as bind variables, and are bound to the placeholders in
     # the query.
@@ -113,10 +120,6 @@ in version 2.0.0.
     # See also #execute2, #query, and #execute_batch for additional ways of
     # executing statements.
     def execute sql, bind_vars = [], *args, &block
-      # FIXME: This is a terrible hack and should be removed but is required
-      # for older versions of rails
-      hack = Object.const_defined?(:ActiveRecord) && sql =~ /^PRAGMA index_list/
-
       if bind_vars.nil? || !args.empty?
         if args.empty?
           bind_vars = []
@@ -147,12 +150,7 @@ Support for bind parameters as *args will be removed in 2.0.0.
         else
           if @results_as_hash
             stmt.map { |row|
-              h = type_translation ? row : ordered_map_for(columns, row)
-
-              # FIXME UGH TERRIBLE HACK!
-              h['unique'] = h['unique'].to_s if hack
-
-              h
+              type_translation ? row : ordered_map_for(columns, row)
             }
           else
             stmt.to_a
@@ -221,15 +219,18 @@ Support for this behavior will be removed in version 2.0.0.
       sql = sql.strip
       until sql.empty? do
         prepare( sql ) do |stmt|
-          # FIXME: this should probably use sqlite3's api for batch execution
-          # This implementation requires stepping over the results.
-          if bind_vars.length == stmt.bind_parameter_count
-            stmt.bind_params(bind_vars)
+          unless stmt.closed?
+            # FIXME: this should probably use sqlite3's api for batch execution
+            # This implementation requires stepping over the results.
+            if bind_vars.length == stmt.bind_parameter_count
+              stmt.bind_params(bind_vars)
+            end
+            stmt.step
           end
-          stmt.step
           sql = stmt.remainder.strip
         end
       end
+      # FIXME: we should not return `nil` as a success return value
       nil
     end
 
@@ -392,6 +393,9 @@ Support for this will be removed in version 2.0.0.
 
         def finalize
           super(@ctx)
+          result = @ctx.result
+          @ctx = FunctionProxy.new
+          result
         end
       })
       proxy.ctx = FunctionProxy.new
@@ -428,6 +432,7 @@ Support for this will be removed in version 2.0.0.
     #
     #   class LengthsAggregateHandler
     #     def self.arity; 1; end
+    #     def self.name; 'lengths'; end
     #
     #     def initialize
     #       @total = 0
@@ -446,21 +451,28 @@ Support for this will be removed in version 2.0.0.
     #   puts db.get_first_value( "select lengths(name) from A" )
     def create_aggregate_handler( handler )
       proxy = Class.new do
-        def initialize handler
-          @handler  = handler
-          @fp       = FunctionProxy.new
+        def initialize klass
+          @klass = klass
+          @fp    = FunctionProxy.new
         end
 
         def step( *args )
-          @handler.step(@fp, *args)
+          instance.step(@fp, *args)
         end
 
         def finalize
-          @handler.finalize @fp
+          instance.finalize @fp
+          @instance = nil
           @fp.result
         end
+
+        private
+
+        def instance
+          @instance ||= @klass.new
+        end
       end
-      define_aggregator(handler.name, proxy.new(handler.new))
+      define_aggregator(handler.name, proxy.new(handler))
       self
     end