On 06/26 02:56, Jeremy Evans wrote:
> Simple version update. Changes:
>
> Enhancements
>
> Added SQLite3::ResultSet#each_hash for fetching each row as a hash.
>
> Added SQLite3::ResultSet#next_hash for fetching one row as a hash.
>
> Bugfixes
>
> Support both UTF-16LE and UTF-16BE encoding modes on PPC. Closes #63
>
> Protect parameters to custom functions from being garbage collected
> too soon. Fixes #60. Thanks hirataya!
>
> Fix backwards compatibility with 1.2.5 with bind vars and `query`
> method. Fixes #35.
>
> Fix double definition error caused by defining sqlite3_int64/uint64.
>
> Fix suspicious version regexp.
>
> Tested on i386, compiles on amd64. Will be committing later this week
> unless I hear objections. I'm also going to be unhooking the jruby
> FLAVOR from the build, since I will be removing JRuby C extension
> support when it gets updated to 1.7.0.
And the patch...
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-sqlite3/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 23 Apr 2012 17:15:18 -0000 1.24
+++ Makefile 26 Jun 2012 17:44:39 -0000
@@ -2,10 +2,9 @@
COMMENT= access a SQLite3 database from ruby
-VERSION= 1.3.5
+VERSION= 1.3.6
DISTNAME= sqlite3-${VERSION}
CATEGORIES= databases
-REVISION = 0
MAINTAINER = Jeremy Evans <[email protected]>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/ruby-sqlite3/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 22 Jan 2012 00:53:30 -0000 1.9
+++ distinfo 26 Jun 2012 17:44:54 -0000
@@ -1,5 +1,5 @@
-MD5 (sqlite3-1.3.5.gem) = EoW5HlfRu+JwC0NfJVcPEA==
-RMD160 (sqlite3-1.3.5.gem) = gV969sZD4ivDjQKxMi9TKZsVBdI=
-SHA1 (sqlite3-1.3.5.gem) = 6Geg+7FYhZD2Zzci2A5A4UE3N4U=
-SHA256 (sqlite3-1.3.5.gem) = j/OVbq3NJN0d2D3gnDWUpcyKhACm7e7DI23KumBaAX8=
-SIZE (sqlite3-1.3.5.gem) = 56320
+MD5 (sqlite3-1.3.6.gem) = pU99nX5gRQ8oHe1foPhGuw==
+RMD160 (sqlite3-1.3.6.gem) = vXzpLEV7t3NkfRHWXY4TmCD1hSY=
+SHA1 (sqlite3-1.3.6.gem) = wx/7M6eLK85olVe+R/lurFuWTiY=
+SHA256 (sqlite3-1.3.6.gem) = sAY4Wd1GgZ3SKPlimt+8FmSd/u81uQ66l1dTfAvh7Ns=
+SIZE (sqlite3-1.3.6.gem) = 57344
Index: patches/patch-ext_sqlite3_database_h
===================================================================
RCS file: patches/patch-ext_sqlite3_database_h
diff -N patches/patch-ext_sqlite3_database_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ext_sqlite3_database_h 26 Jun 2012 18:23:04 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Define a dummy RB_GC_GUARD so it works on rubinius 1.2.4.
+
+--- ext/sqlite3/database.h.orig Tue Jun 26 11:21:00 2012
++++ ext/sqlite3/database.h Tue Jun 26 11:21:44 2012
+@@ -12,4 +12,8 @@ typedef sqlite3Ruby * sqlite3RubyPtr;
+
+ void init_sqlite3_database();
+
++#ifndef RB_GC_GUARD
++#define RB_GC_GUARD(x) x
++#endif
++
+ #endif
Index: patches/patch-test_test_integration_pending_rb
===================================================================
RCS file:
/cvs/ports/databases/ruby-sqlite3/patches/patch-test_test_integration_pending_rb,v
retrieving revision 1.1
diff -u -p -r1.1 patch-test_test_integration_pending_rb
--- patches/patch-test_test_integration_pending_rb 7 Sep 2011 16:02:40
-0000 1.1
+++ patches/patch-test_test_integration_pending_rb 26 Jun 2012 18:21:51
-0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-test_test_integration_pe
Fix hang when running the test suite using rubinius. skip would be
better but rubinius uses ruby 1.8 stdlib and doesn't support it.
---- test/test_integration_pending.rb.orig Wed Sep 7 08:27:23 2011
-+++ test/test_integration_pending.rb Wed Sep 7 08:29:07 2011
-@@ -21,6 +21,7 @@ class TC_Integration_Pending < Test::Unit::TestCase
+--- test/test_integration_pending.rb.orig Wed Dec 31 16:00:00 1969
++++ test/test_integration_pending.rb Tue Jun 26 10:44:55 2012
+@@ -21,6 +21,7 @@ class TC_Integration_Pending < SQLite3::TestCase
def test_busy_handler_outwait
skip("not working in 1.9") if RUBY_VERSION >= '1.9'
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/ruby-sqlite3/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 7 Sep 2011 16:02:40 -0000 1.9
+++ pkg/PLIST 26 Jun 2012 17:44:58 -0000
@@ -65,6 +65,7 @@ ${GEM_LIB}/gems/${DISTNAME}/test/test_in
${GEM_LIB}/gems/${DISTNAME}/test/test_integration_pending.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_integration_resultset.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_integration_statement.rb
+${GEM_LIB}/gems/${DISTNAME}/test/test_result_set.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_sqlite3.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_statement.rb
${GEM_LIB}/gems/${DISTNAME}/test/test_statement_execute.rb
