amalgalite 0.1.0 → 0.2.0

data/lib/amalgalite/table.rb

@@ -8,6 +8,8 @@ module Amalgalite
   # a class representing the meta information about an SQLite table 
   #
   class Table
+    # the schema object the table is associated with
+    attr_accessor :schema
 
     # the table name
     attr_reader   :name
@@ -27,7 +29,7 @@ module Amalgalite
       @name    = name
       @sql     = sql
       @indexes = []
-      @columns = []
+      @columns = {}
     end
   end
 end

data/lib/amalgalite/taps.rb

@@ -0,0 +1,2 @@
+require 'amalgalite/taps/console'
+require 'amalgalite/taps/io'

data/lib/amalgalite/type_maps/default_map.rb

@@ -40,7 +40,19 @@ module Amalgalite::TypeMaps
             sql_types.each { |t| @sql_to_method[t] = method }
           end
         end
-        return @sql_to_method[sql_type]
+        return_method = @sql_to_method[sql_type]
+
+        # the straight lookup didn't work, try iterating through the types and
+        # see what is found
+        unless return_method
+          @sql_to_method.each_pair do |sql, method|
+            if sql_type.index(sql) then
+              return_method = method
+              break
+            end
+          end
+        end
+        return return_method
       end
     end
 
@@ -77,6 +89,8 @@ module Amalgalite::TypeMaps
         return value
       when NilClass
         return value
+      when Amalgalite::Blob
+        return value
       when String
         if declared_type then
           conversion_method = DefaultMap.sql_to_method( declared_type.downcase )

data/lib/amalgalite/version.rb

@@ -8,7 +8,7 @@ module Amalgalite
   module Version
 
     MAJOR   = 0
-    MINOR   = 1
+    MINOR   = 2
     BUILD   = 0
 
     #

data/lib/amalgalite/view.rb

@@ -8,6 +8,8 @@ module Amalgalite
   # a class representing the meta information about an SQLite view
   #
   class View
+    # the schame this view is assciated with
+    attr_accessor :schema
 
     # the table name
     attr_reader   :name

data/spec/blob_spec.rb

@@ -0,0 +1,81 @@
+require 'rubygems'
+require 'spec'
+
+$: << File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+require 'amalgalite'
+
+describe Amalgalite::Blob do
+  DATA_FILE = File.expand_path( File.join( File.dirname(__FILE__), "iso-3166-country.txt" ) )
+  before(:each) do
+    @blob_db_name = File.join(File.dirname( __FILE__ ), "blob.db")
+    File.unlink @blob_db_name if File.exist?( @blob_db_name )
+    @db = Amalgalite::Database.new( @blob_db_name )
+    @schema_sql = <<-SQL
+      CREATE TABLE blobs(
+        id      INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+        name    VARCHAR(128) NOT NULL UNIQUE,
+        data    BLOB ); 
+    SQL
+    @db.execute( @schema_sql )
+    @junk_file = File.join( File.dirname(__FILE__), "test_output")
+  end
+
+  after(:each) do
+    @db.close
+    File.unlink @blob_db_name if File.exist?( @blob_db_name )
+    File.unlink @junk_file    if File.exist?( @junk_file )
+  end
+
+  { :file   => DATA_FILE,
+    :string => IO.read( DATA_FILE ),
+    :io     => StringIO.new( IO.read( DATA_FILE ) ) }.each_pair do |style, data |
+    describe "inserts a blob from a #{style}" do
+      before(:each) do
+        column = @db.schema.tables['blobs'].columns['data']
+        @db.execute("INSERT INTO blobs(name, data) VALUES ($name, $data)",
+                    { "$name" => DATA_FILE,
+                      "$data" => Amalgalite::Blob.new( style => data,
+                                                      :column => column ) } )
+        @db.execute("VACUUM")
+      end
+
+      after(:each) do
+        @db.execute("DELETE FROM blobs")
+        data.rewind if data.respond_to?( :rewind )
+      end
+
+      it "and retrieves the data as a single value" do
+        all_rows = @db.execute("SELECT name,data FROM blobs")
+        all_rows.size.should == 1;
+        all_rows.first['name'].should == DATA_FILE
+        all_rows.first['data'].should_not be_incremental
+        all_rows.first['data'].to_string_io.string.should == IO.read( DATA_FILE )
+      end
+
+      it "and retrieves the data using incremental IO" do
+        all_rows = @db.execute("SELECT * FROM blobs")
+        all_rows.size.should == 1;
+        all_rows.first['name'].should == DATA_FILE
+        all_rows.first['data'].should be_incremental
+        all_rows.first['data'].to_string_io.string.should == IO.read( DATA_FILE )
+      end
+
+      it "writes the data to a file " do
+        all_rows = @db.execute("SELECT * FROM blobs")
+        all_rows.size.should == 1;
+        all_rows.first['name'].should == DATA_FILE
+        all_rows.first['data'].should be_incremental
+        all_rows.first['data'].write_to_file( @junk_file )
+        IO.read( @junk_file).should == IO.read( DATA_FILE )
+      end
+    end
+  end
+
+
+
+  it "raises an error if initialized incorrectly" do
+    lambda{ Amalgalite::Blob.new( :file => "/dev/null", :string => "foo" ) }.should raise_error( Amalgalite::Blob::Error )
+  end
+end
+
+

data/spec/default_map_spec.rb

@@ -24,7 +24,7 @@ describe Amalgalite::TypeMaps::DefaultMap do
     end
 
     it "::Amalgalite::Blob is bound to DataType::BLOB" do
-      @map.bind_type_of( ::Amalgalite::Blob.new ).should == ::Amalgalite::SQLite3::Constants::DataType::BLOB
+      @map.bind_type_of( ::Amalgalite::Blob.new( :column => true, :string => "just a test" ) ).should == ::Amalgalite::SQLite3::Constants::DataType::BLOB
     end
 
     it "everything else is bound to DataType::TEXT" do
@@ -75,7 +75,8 @@ describe Amalgalite::TypeMaps::DefaultMap do
     end
 
     it "raises and error if an unknown sql type is returned" do
-      lambda{ @map.result_value_of( "footype", "foo" ) }.should raise_error( ::Amalgalite::Error )
+      x = nil
+      lambda{ x = @map.result_value_of( "footype", "foo" ) }.should raise_error( ::Amalgalite::Error )
     end
     
     it "raises and error if an ruby class is attempted to be mapped" do

data/spec/statement_spec.rb

@@ -76,6 +76,24 @@ describe Amalgalite::Statement do
     end
   end
 
+  it "can execute the same prepared statement multiple times" do
+    @db.execute(" CREATE TABLE t(x,y); ")
+    values = {}
+    @db.prepare("INSERT INTO t( x, y ) VALUES( $x, $y )" ) do |stmt|
+      20.times do |x|
+        y = rand( x )
+        stmt.execute( { "$x" => x, "$y" => y } )
+        values[x] = y
+      end
+    end
+    c = 0
+    @db.execute("SELECT * from t") do |row|
+      c += 1
+      values[ row['x'] ].should == row['y']
+    end
+    c.should == 20
+  end
+
   it "binds a integer variable correctly" do
     @iso_db.prepare("SELECT * FROM country WHERE id = ? ORDER BY name ") do |stmt|
       all_rows = stmt.execute( 891 )

data/spec/storage_map_spec.rb

@@ -24,7 +24,7 @@ describe Amalgalite::TypeMaps::StorageMap do
     end
 
     it "::Amalgalite::Blob is bound to DataType::BLOB" do
-      @map.bind_type_of( ::Amalgalite::Blob.new ).should == ::Amalgalite::SQLite3::Constants::DataType::BLOB
+      @map.bind_type_of( ::Amalgalite::Blob.new( :string => "testing mapping", :column => true )  ).should == ::Amalgalite::SQLite3::Constants::DataType::BLOB
     end
 
     it "everything else is bound to DataType::TEXT" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amalgalite
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-20 00:00:00 -06:00
+date: 2008-07-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 4.5.0
     version: 
-description: Amalgalite embeds the SQLite database engine in a ruby extension.  Scroll through Amalgalite::Database for a quick example, and a general overview of the API.
+- !ruby/object:Gem::Dependency 
+  name: mkrf
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.2.3
+    version: 
+description: Amalgalite embeds the SQLite database engine in a ruby extension.  There is no need to install SQLite separately.    Look in the examples/ directory to see  * general usage * blob io * schema information  Also Scroll through Amalgalite::Database for a quick example, and a general overview of the API.
 email: jeremy@hinegardner.org
 executables: []
 
@@ -55,6 +64,7 @@ extra_rdoc_files:
 - lib/amalgalite/table.rb
 - lib/amalgalite/taps/console.rb
 - lib/amalgalite/taps/io.rb
+- lib/amalgalite/taps.rb
 - lib/amalgalite/trace_tap.rb
 - lib/amalgalite/type_map.rb
 - lib/amalgalite/type_maps/default_map.rb
@@ -64,11 +74,13 @@ extra_rdoc_files:
 - lib/amalgalite/view.rb
 - lib/amalgalite.rb
 - ext/amalgalite3.c
+- ext/amalgalite3_blob.c
 - ext/amalgalite3_constants.c
 - ext/amalgalite3_database.c
 - ext/amalgalite3_statement.c
 files: 
 - ext/amalgalite3.c
+- ext/amalgalite3_blob.c
 - ext/amalgalite3_constants.c
 - ext/amalgalite3_database.c
 - ext/amalgalite3_statement.c
@@ -94,6 +106,7 @@ files:
 - lib/amalgalite/table.rb
 - lib/amalgalite/taps/console.rb
 - lib/amalgalite/taps/io.rb
+- lib/amalgalite/taps.rb
 - lib/amalgalite/trace_tap.rb
 - lib/amalgalite/type_map.rb
 - lib/amalgalite/type_maps/default_map.rb
@@ -103,6 +116,7 @@ files:
 - lib/amalgalite/view.rb
 - lib/amalgalite.rb
 - spec/amalgalite_spec.rb
+- spec/blob_spec.rb
 - spec/boolean_spec.rb
 - spec/database_spec.rb
 - spec/default_map_spec.rb