[DRE-commits] [ruby-sqlite3] 01/03: add fix_test_insert_duplicate_records.patch to match messages modified in libsqlite3 3.8.2

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-sqlite3.

commit 4ee642e179b4e4c39895f84ec3155a629b4df6d0
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Jan 16 00:15:54 2014 +0100

    add fix_test_insert_duplicate_records.patch to match messages modified in libsqlite3 3.8.2
---
 debian/changelog                                   |  8 +++++
 .../fix_test_insert_duplicate_records.patch        | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 45 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 66dbc68..3222702 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-sqlite3 (1.3.8-2) UNRELEASED; urgency=medium
+
+  * Team upload
+  * add fix_test_insert_duplicate_records.patch to match messages modified in
+    libsqlite3 3.8.2
+
+ -- Cédric Boutillier <boutil at debian.org>  Thu, 16 Jan 2014 00:14:34 +0100
+
 ruby-sqlite3 (1.3.8-1) unstable; urgency=low
 
   * Team upload
diff --git a/debian/patches/fix_test_insert_duplicate_records.patch b/debian/patches/fix_test_insert_duplicate_records.patch
new file mode 100644
index 0000000..bebf7e7
--- /dev/null
+++ b/debian/patches/fix_test_insert_duplicate_records.patch
@@ -0,0 +1,36 @@
+Description: Fix for new unique constraint message of SQLite 3.8.2 in test
+ SQlite 3.8,2 changed one of the error messages to have a capitalized word.
+ The regexp in the test used to match this message should be updated
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735512
+Bug: https://github.com/sparklemotion/sqlite3-ruby/issues/116
+Origin: https://github.com/strzibny/sqlite3-ruby/commit/d860ce240fcafad4656014ecc84d3f89a38bc1a8.patch
+Forwarded: https://github.com/sparklemotion/sqlite3-ruby/pull/117
+d860ce240fcafad4656014ecc84d3f89a38bc1a8 Mon Sep 17 00:00:00 2001
+Author: Josef Stribny <jstribny at redhat.com>
+Reviewed-by: Cédric Boutillier <boutil at debian.org>
+Date: Thu, 12 Dec 2013 15:13:22 +0100
+
+---
+ test/test_statement.rb | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/test_statement.rb b/test/test_statement.rb
+index 8cb3d97..31b4c6b 100644
+--- a/test/test_statement.rb
++++ b/test/test_statement.rb
+@@ -30,7 +30,11 @@ def test_insert_duplicate_records
+       stmt.execute('ruby')
+ 
+       exception = assert_raises(SQLite3::ConstraintException) { stmt.execute('ruby') }
+-      assert_match /column(s)? .* (is|are) not unique/, exception.message
++      # SQLite 3.8.2 returns new error message:
++      #   UNIQUE constraint failed: *table_name*.*column_name*
++      # Older versions of SQLite return:
++      #   column *column_name* is not unique
++      assert_match /(column(s)? .* (is|are) not unique|UNIQUE constraint failed: .*)/, exception.message
+     end
+ 
+     ###
+-- 
+1.8.5.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a163b6a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_test_insert_duplicate_records.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-sqlite3.git