@@ -3,7 +3,9 @@ === Enhancements -* Update to Sqlite 3.6.15 +* windows gem is now a fat binary to support installing into ruby 1.8 and 1.9 + from the same gem +* Update to Sqlite 3.6.16 ** fix errors returned by define_aggregate and define_function based upon 3.6.15 update == Version 0.9.0 - 2009-04-05 HISTORY @@ -116,7 +116,7 @@ Packing complete. To utilize the bootstrapping in #{dbfile} you must do one of the following: * statically compile the amalgalite C extension into your application - * require 'amalgalite3' + * require 'amalgalite/amalgalite3' Once one of those is working you can boostrap the Amalgalite library with this line in your code: bin/amalgalite-pack @@ -13,7 +13,7 @@ # Require "ONLY" then binary extension, do not +require+ the ruby based code $: << "../ext" -require 'amalgalite3' +require 'amalgalite/amalgalite3' # See what the load path is, notice that it is very small puts "Before $\" : #{$LOADED_FEATURES.inspect}" examples/bootstrap.rb @@ -2,7 +2,7 @@ # Copyright (c) 2008 Jeremy Hinegardner # All rights reserved. See LICENSE and/or COPYING for details. #++ -require 'amalgalite3' +require 'amalgalite/amalgalite3' require 'amalgalite/statement' require 'amalgalite/trace_tap' require 'amalgalite/profile_tap' lib/amalgalite/database.rb @@ -1,4 +1,4 @@ -require 'amalgalite3' +require 'amalgalite/amalgalite3' require 'amalgalite/version' require 'amalgalite/sqlite3/version' require 'amalgalite/sqlite3/constants' lib/amalgalite/sqlite3.rb @@ -3,7 +3,7 @@ # All rights reserved. See LICENSE and/or COPYING for details. #++ -require 'amalgalite3' +require 'amalgalite/amalgalite3' module Amalgalite::SQLite3 module Constants module Helpers lib/amalgalite/sqlite3/constants.rb @@ -1,4 +1,4 @@ -require 'amalgalite3' +require 'amalgalite/amalgalite3' require 'amalgalite/sqlite3/constants' module Amalgalite::SQLite3 class Database lib/amalgalite/sqlite3/database/status.rb @@ -1,4 +1,4 @@ -require 'amalgalite3' +require 'amalgalite/amalgalite3' require 'amalgalite/sqlite3/constants' module Amalgalite::SQLite3 lib/amalgalite/sqlite3/status.rb @@ -2,7 +2,7 @@ # Copyright (c) 2008 Jeremy Hinegardner # All rights reserved. See LICENSE and/or COPYING for details. #++ -require 'amalgalite3' +require 'amalgalite/amalgalite3' module Amalgalite module SQLite3 module Version lib/amalgalite/sqlite3/version.rb @@ -3,7 +3,7 @@ # All rights reserved. See LICENSE and/or COPYING for details. #++ # -require 'amalgalite3' +require 'amalgalite/amalgalite3' require 'date' require 'arrayfields' require 'ostruct' lib/amalgalite/statement.rb @@ -2,6 +2,7 @@ # Copyright (c) 2008 Jeremy Hinegardner # All rights reserved. See LICENSE and/or COPYING for details. #++ +require 'amalgalite/amalgalite3' module Amalgalite ## # TypeMap defines the protocol used between Ruby and SQLite for mapping lib/amalgalite/type_map.rb @@ -4,7 +4,6 @@ #++ require 'amalgalite/type_map' -require 'amalgalite3' require 'time' require 'date' lib/amalgalite/type_maps/default_map.rb @@ -4,7 +4,6 @@ #++ require 'amalgalite/type_map' -require 'amalgalite3' module Amalgalite::TypeMaps ## lib/amalgalite/type_maps/storage_map.rb @@ -4,7 +4,6 @@ #++ # require 'amalgalite/type_map' -require 'amalgalite3' module Amalgalite::TypeMaps ## lib/amalgalite/type_maps/text_map.rb @@ -5,10 +5,10 @@ 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(3006015) + Amalgalite::SQLite3::Version.to_i.should eql(3006016) Amalgalite::SQLite3::Version::MAJOR.should eql(3) Amalgalite::SQLite3::Version::MINOR.should eql(6) - Amalgalite::SQLite3::Version::RELEASE.should eql(15) + Amalgalite::SQLite3::Version::RELEASE.should eql(16) Amalgalite::SQLite3::Version.to_a.should have(3).items end end spec/sqlite3/version_spec.rb @@ -116,7 +116,7 @@ if ext_config = Configuration.for_if_exist?('extension') then tar.each_entry do |entry| bname = File.basename( entry.full_name ) if upstream_files.include?( bname ) then - dest_file = File.join( "ext", bname ) + dest_file = File.join( "ext", "amalgalite", bname ) puts "updating #{ dest_file }" File.open( dest_file, "wb" ) do |df| while bytes = entry.read do tasks/extension.rake 030798ced20e460898ece31df7bef36b199a7f30 Jeremy Hinegardner jeremy@hinegardner.org http://github.com/copiousfreetime/amalgalite/commit/b3f429605e13659142354edc7c3f6d806b1a357b b3f429605e13659142354edc7c3f6d806b1a357b 2009-06-28T17:51:33-07:00 2009-06-28T17:51:33-07:00 change require paths to reflect new subdirectory in ext 51e06434da3a534cb82611265be31c5e9509740d Jeremy Hinegardner jeremy@hinegardner.org