amalgalite 0.10.2-x86-mswin32 → 0.11.0-x86-mswin32

data/lib/amalgalite/sqlite3/version.rb

@@ -28,6 +28,9 @@ module Amalgalite
         [ MAJOR, MINOR, RELEASE ]
       end
 
+      def self.compiled_matches_runtime?
+        self.compiled_version == self.runtime_version
+      end
     end
 
     # Version of SQLite that ships with Amalgalite
@@ -35,3 +38,19 @@ module Amalgalite
   end
   Version.freeze
 end
+
+unless Amalgalite::SQLite3::Version.compiled_matches_runtime? then
+  warn <<eom
+You are seeing something odd.  The compiled version of SQLite that
+is embedded in this extension is for some reason, not being used.
+The version in the extension is #{Amalgalite::SQLite3::Version.compiled_version} and the version that
+as been loaded as a shared library is #{Amalgalite::SQLite3::Version.runtime_version}.  These versions
+should be the same, but they are not.
+
+One known issue is if you are using this libary in conjunction with
+Hitimes on Mac OS X.  You should make sure that "require 'amalgalite'"
+appears before "require 'hitimes'" in your ruby code.
+
+This is a non-trivial problem, and I am working on it.
+eom
+end

data/lib/amalgalite/type_maps/default_map.rb

@@ -22,9 +22,9 @@ module Amalgalite::TypeMaps
           'date'      => %w[ date ],
           'datetime'  => %w[ datetime ],
           'time'      => %w[ timestamp time ],
-          'float'     => %w[ double real numeric decimal ],
+          'float'     => %w[ double float real numeric decimal ],
           'integer'   => %w[ integer tinyint smallint int int2 int4 int8 bigint serial bigserial ],
-          'string'    => %w[ text char varchar character ],
+          'string'    => %w[ text char string varchar character ],
           'boolean'   => %w[ bool boolean ],
           'blob'      => %w[ binary blob ],
         }

data/lib/amalgalite/version.rb

@@ -8,8 +8,8 @@ module Amalgalite
   module Version
 
     MAJOR   = 0
-    MINOR   = 10
-    BUILD   = 2
+    MINOR   = 11
+    BUILD   = 0
 
     #
     # return the Version as an array of MAJOR, MINOR, BUILD

data/spec/default_map_spec.rb

@@ -62,6 +62,10 @@ describe Amalgalite::TypeMaps::DefaultMap do
       @map.result_value_of( "double", "3.14" ).should be_kind_of(Float)
     end
     
+    it "Float is returned for declared types of 'float'" do
+      @map.result_value_of( "float", "3.14" ).should be_kind_of(Float)
+    end
+
     it "Integer is returned for declared types of 'int'" do
       @map.result_value_of( "int", "42" ).should be_kind_of(Integer)
     end
@@ -70,11 +74,15 @@ describe Amalgalite::TypeMaps::DefaultMap do
       @map.result_value_of( "bool", "True" ).should == true
     end
 
-    it "Blob is returned for declated types of 'blob'" do
+    it "Blob is returned for declared types of 'blob'" do
       blob = @map.result_value_of( "blob", "stuff")
       blob.to_s.should == "stuff"
     end
 
+    it "String is returned for delcared types of 'string'" do
+      @map.result_value_of( "string", "stuff").should == "stuff"
+    end
+
     it "raises and error if an unknown sql type is returned" do
       x = nil
       lambda{ x = @map.result_value_of( "footype", "foo" ) }.should raise_error( ::Amalgalite::Error )

data/spec/sqlite3/version_spec.rb

@@ -5,10 +5,18 @@ describe "Amalgalite::SQLite3::Version" do
   it "should have the sqlite3 version" do
     Amalgalite::SQLite3::VERSION.should =~ /\d\.\d\.\d/
     Amalgalite::SQLite3::Version.to_s.should =~ /\d\.\d\.\d/
-    Amalgalite::SQLite3::Version.to_i.should eql(3006016)
+    Amalgalite::SQLite3::Version.runtime_version.should =~ /\d\.\d\.\d/
+
+    Amalgalite::SQLite3::Version.to_i.should eql(3006017)
+    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3006017)
+
     Amalgalite::SQLite3::Version::MAJOR.should eql(3)
     Amalgalite::SQLite3::Version::MINOR.should eql(6)
-    Amalgalite::SQLite3::Version::RELEASE.should eql(16)
+    Amalgalite::SQLite3::Version::RELEASE.should eql(17)
     Amalgalite::SQLite3::Version.to_a.should have(3).items
+
+    Amalgalite::SQLite3::Version.compiled_version.should == "3.6.17"
+    Amalgalite::SQLite3::Version.compiled_version_number.should == 3006017
+    Amalgalite::SQLite3::Version.compiled_matches_runtime?.should == true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amalgalite
 version: !ruby/object:Gem::Version 
-  version: 0.10.2
+  version: 0.11.0
 platform: x86-mswin32
 authors: 
 - Jeremy Hinegardner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -06:00
+date: 2009-08-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency