amalgalite 0.7.3-x86-mswin32-60 → 0.7.4-x86-mswin32-60

data/HISTORY

@@ -1,4 +1,11 @@
 = Amalgalite Changelog
+== Version 0.7.4 - 2009-02-08
+
+=== Bug Fixes
+
+* fix Database#first_row_from not behaving the same as Database#execute() when
+  there are no results. [reported by James Edward Gray II]
+
 == Version 0.7.3 - 2009-02-08
 
 === Enhancements

data/lib/amalgalite/database.rb

@@ -334,21 +334,21 @@ module Amalgalite
     ##
     # Execute a sql statment, and only return the first row of results.  This
     # is a shorthand method when you only want a single row of results from a
-    # query.
+    # query.  If there is no result, then return an empty array
     #
     # It is in all other was, exactly like #execute()
     #
     def first_row_from( sql, *bind_params ) 
       stmt = prepare( sql )
       stmt.bind( *bind_params)
-      row = stmt.next_row
+      row = stmt.next_row || []
       stmt.close
       return row
     end
 
     ##
     # Execute an sql statement, and return only the first column of the first
-    # row.  
+    # row.  If there is no result, return nil.
     #
     # It is in all other ways, exactly like #first_row_from()
     #

data/lib/amalgalite/version.rb

@@ -9,7 +9,7 @@ module Amalgalite
 
     MAJOR   = 0
     MINOR   = 7
-    BUILD   = 3
+    BUILD   = 4
 
     #
     # return the Version as an array of MAJOR, MINOR, BUILD

data/spec/database_spec.rb

@@ -122,6 +122,11 @@ describe Amalgalite::Database do
     db.execute_batch( @schema ).should == 5
   end
 
+  it "returns an empty array when there are no results" do
+    row = @iso_db.execute("SELECT * from subcountry where country = 'Antarctica'")
+    row.should be_empty
+  end
+
   it "traces the execution of code" do
     db = Amalgalite::Database.new( SpecInfo.test_db )
     sql = "CREATE TABLE trace_test( x, y, z)"
@@ -360,6 +365,7 @@ describe Amalgalite::Database do
     all_sub.should == ( us_sub + other_sub )
 
   end
+
   it "rolls back a savepoint" do
     all_sub = @iso_db.execute("SELECT count(*) as cnt from subcountry").first['cnt']
     lambda {
@@ -413,6 +419,16 @@ describe Amalgalite::Database do
     row['count'].should == 232
   end
 
+  it "returns and empty row if there are no results for the first row" do
+    row = @iso_db.first_row_from("SELECT * from subcountry where country = 'Antarctica'")
+    row.should be_empty
+  end
+
+  it "returns nil if there is no value in the first value" do
+    val = @iso_db.first_value_from("select * from subcountry where country = 'Antarctica'" )
+    val.should == nil
+  end
+
   it "returns the first value of results as a conveinience" do
     val = @iso_db.first_value_from("SELECT count(*) from subcountry ")
     val.should == 3995

data/tasks/config.rb

@@ -85,7 +85,7 @@ Configuration.for('rdoc') {
   files       Configuration.for('packaging').files.rdoc
   main_page   files.first
   title       Configuration.for('project').name
-  options     %w[ --line-numbers --inline-source ] #-f darkfish ]
+  options     %w[ --line-numbers --inline-source -T darkfish ]
   output_dir  "doc"
 }
 

data/tasks/documentation.rake

@@ -8,9 +8,8 @@ if rdoc_config = Configuration.for_if_exist?('rdoc') then
 
   namespace :doc do
 
+    require 'rdoc'
     require 'rake/rdoctask'
-    #gem 'darkfish-rdoc'
-    #require 'darkfish-rdoc'
 
     # generating documentation locally
     Rake::RDocTask.new do |rdoc|
@@ -19,7 +18,7 @@ if rdoc_config = Configuration.for_if_exist?('rdoc') then
       rdoc.rdoc_files = rdoc_config.files
       rdoc.title      = rdoc_config.title
       rdoc.main       = rdoc_config.main_page
-    end 
+    end
 
     if rubyforge_config = Configuration.for_if_exist?('rubyforge') then
       desc "Deploy the RDoc documentation to #{rubyforge_config.rdoc_location}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amalgalite
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
+  version: 0.7.4
 platform: x86-mswin32-60
 authors: 
 - Jeremy Hinegardner
@@ -187,6 +187,8 @@ post_install_message:
 rdoc_options: 
 - --line-numbers
 - --inline-source
+- -T
+- darkfish
 - --main
 - README
 require_paths: