sqlite3-ruby 1.2.2-mswin32 → 1.2.3-mswin32

data/ext/sqlite3_api/sqlite3_api.i

@@ -4,6 +4,14 @@
 #include <sqlite3.h>
 #include "ruby.h"
 
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+ 
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+
 #define Init_API Init_sqlite3_api
 
 struct CallbackData {

data/ext/sqlite3_api/win32/build.bat

@@ -1,7 +1,7 @@
-REM This is not guaranteed to work, ever. It's just a little helper
-REM script that I threw together to help me build the win32 version of
-REM the library. If someone with more win32-fu than I wants to make
-REM something more robust, please feel free! I'd love to include it.
-REM -- Jamis Buck
-
-cl /LD /Ie:\WinSDK\Include /Ic:\ruby\lib\ruby\1.8\i386-mswin32 /Ic:\ruby\sqlite3 /Ic:\ruby\src\ruby-1.8.4_2006-04-14 sqlite3_api_wrap.c /link /LIBPATH:c:\ruby\sqlite3 /LIBPATH:e:\WinSDK\Lib /LIBPATH:c:\ruby\lib sqlite3.lib msvcrt-ruby18.lib
+REM This is not guaranteed to work, ever. It's just a little helper
+REM script that I threw together to help me build the win32 version of
+REM the library. If someone with more win32-fu than I wants to make
+REM something more robust, please feel free! I'd love to include it.
+REM -- Jamis Buck
+
+cl /LD /Ie:\WinSDK\Include /Ic:\ruby\lib\ruby\1.8\i386-mswin32 /Ic:\ruby\sqlite3\src /Ic:\ruby\src\ruby-1.8.4_2006-04-14 sqlite3_api_wrap.c /link /LIBPATH:c:\ruby\sqlite3 /LIBPATH:e:\WinSDK\Lib /LIBPATH:c:\ruby\lib sqlite3.lib msvcrt-ruby18.lib

data/lib/sqlite3/resultset.rb

@@ -10,16 +10,25 @@ module SQLite3
   class ResultSet
     include Enumerable
 
-    # A trivial module for adding a +types+ accessor to an object.
-    module TypesContainer
+    # The class of which we return an object in case we want an Array as
+    # result. (ArrayFields is installed.)
+    class ArrayWithTypes < Array
       attr_accessor :types
     end
 
-    # A trivial module for adding a +fields+ accessor to an object.
-    module FieldsContainer
+    # The class of which we return an object in case we want an Array as
+    # result. (ArrayFields is not installed.)
+    class ArrayWithTypesAndFields < Array
+      attr_accessor :types
       attr_accessor :fields
     end
 
+    # The class of which we return an object in case we want a Hash as
+    # result.
+    class HashWithTypes < Hash
+      attr_accessor :types
+    end
+
     # Create a new ResultSet attached to the given database, using the
     # given sql text.
     def initialize( db, stmt )
@@ -112,15 +121,18 @@ module SQLite3
         end
 
         if @db.results_as_hash
-          new_row = Hash[ *( @stmt.columns.zip( row ).flatten ) ]
+          new_row = HashWithTypes[ *( @stmt.columns.zip( row ).to_a.flatten ) ]
           row.each_with_index { |value,idx| new_row[idx] = value }
           row = new_row
         else
-          row.extend FieldsContainer unless row.respond_to?(:fields)
+          if row.respond_to?(:fields)
+            row = ArrayWithTypes.new(row)
+          else
+            row = ArrayWithTypesAndFields.new(row)
+          end
           row.fields = @stmt.columns
         end
 
-        row.extend TypesContainer
         row.types = @stmt.types
 
         return row

data/lib/sqlite3/version.rb

@@ -4,7 +4,7 @@ module SQLite3
 
     MAJOR = 1
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
 
     STRING = [ MAJOR, MINOR, TINY ].join( "." )
     #:beta-tag:

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: sqlite3-ruby
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
-date: 2008-05-31 00:00:00 -06:00
+  version: 1.2.3
+date: 2008-08-26 00:00:00 -06:00
 summary: SQLite3/Ruby is a module to allow Ruby scripts to interface with a SQLite database.
 require_paths: 
 - lib
@@ -37,10 +37,6 @@ files:
 - ext/sqlite3_api/MANIFEST
 - ext/sqlite3_api/sqlite3_api.i
 - ext/sqlite3_api/sqlite3_api_wrap.c
-- ext/sqlite3_api/sqlite3_api_wrap.dll
-- ext/sqlite3_api/sqlite3_api_wrap.exp
-- ext/sqlite3_api/sqlite3_api_wrap.lib
-- ext/sqlite3_api/sqlite3_api_wrap.obj
 - ext/sqlite3_api/win32
 - ext/sqlite3_api/win32/build.bat
 - lib/sqlite3