From b8deb17a94c8fbabca21d6192d666d57f86d262b Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 11 Dec 2017 13:37:52 +0100 Subject: [PATCH] 0.11023 bump --- .gitignore | 1 + ...-0.11021-Adapt-tests-to-JSON-PP-2.92.patch | 178 ------------------ perl-SQL-Translator.spec | 5 +- sources | 2 +- 4 files changed, 6 insertions(+), 180 deletions(-) delete mode 100644 SQL-Translator-0.11021-Adapt-tests-to-JSON-PP-2.92.patch diff --git a/.gitignore b/.gitignore index 5f856fb..60a46d8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ SQL-Translator-0.11005.tar.gz /SQL-Translator-0.11020.tar.gz /SQL-Translator-0.11021.tar.gz /SQL-Translator-0.11022.tar.gz +/SQL-Translator-0.11023.tar.gz diff --git a/SQL-Translator-0.11021-Adapt-tests-to-JSON-PP-2.92.patch b/SQL-Translator-0.11021-Adapt-tests-to-JSON-PP-2.92.patch deleted file mode 100644 index 9e21636..0000000 --- a/SQL-Translator-0.11021-Adapt-tests-to-JSON-PP-2.92.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 5dd8305efe56f37f8718e0a9cd08e9ed5aa83cbf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= -Date: Fri, 26 May 2017 10:43:05 +0200 -Subject: [PATCH] Adapt tests to JSON-PP-2.92 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -JSON-PP-2.91_01 fixed numeric value detection and that cused -t/23json.t test failure. There was a change in "order" value quoting. -Previously, the value was encoded as a string, now it's encoded as -number. - -CPAN RT#121901 - -Ported to 0.11021. - -Signed-off-by: Petr Písař ---- - t/23json.t | 37 +++++++++++++++++++++---------------- - 1 file changed, 21 insertions(+), 16 deletions(-) - -diff --git a/t/23json.t b/t/23json.t -index 0b063e2..9ef4e86 100644 ---- a/t/23json.t -+++ b/t/23json.t -@@ -15,8 +15,7 @@ BEGIN { - } - - my $sqlt_version = $SQL::Translator::VERSION; --use JSON; --my $json = to_json(from_json(< 1, pretty => 1 }); -+my $json_string = < 1, pretty => 1 }); - "is_primary_key" : 0, - "is_unique" : 0, - "name" : "age", -- "order" : "3", -+ "order" : 3, - "size" : [ - "0" - ] -@@ -74,7 +73,7 @@ my $json = to_json(from_json(< 1, pretty => 1 }); - "is_primary_key" : 0, - "is_unique" : 0, - "name" : "description", -- "order" : "6", -+ "order" : 6, - "size" : [ - "0" - ] -@@ -86,7 +85,7 @@ my $json = to_json(from_json(< 1, pretty => 1 }); - "is_primary_key" : 0, - "is_unique" : 0, - "name" : "iq", -- "order" : "5", -+ "order" : 5, - "size" : [ - "0" - ] -@@ -98,7 +97,7 @@ my $json = to_json(from_json(< 1, pretty => 1 }); - "is_primary_key" : 0, - "is_unique" : 1, - "name" : "name", -- "order" : "2", -+ "order" : 2, - "size" : [ - "20" - ] -@@ -111,7 +110,7 @@ my $json = to_json(from_json(< 1, pretty => 1 }); - "is_primary_key" : 1, - "is_unique" : 0, - "name" : "person_id", -- "order" : "1", -+ "order" : 1, - "size" : [ - "0" - ] -@@ -123,7 +122,7 @@ my $json = to_json(from_json(< 1, pretty => 1 }); - "is_primary_key" : 0, - "is_unique" : 0, - "name" : "weight", -- "order" : "4", -+ "order" : 4, - "size" : [ - "11", - "2" -@@ -133,7 +132,7 @@ my $json = to_json(from_json(< 1, pretty => 1 }); - "indices" : [], - "name" : "person", - "options" : [], -- "order" : "1" -+ "order" : 1 - }, - "pet" : { - "constraints" : [ -@@ -192,7 +191,7 @@ my $json = to_json(from_json(< 1, pretty => 1 }); - "is_primary_key" : 0, - "is_unique" : 0, - "name" : "age", -- "order" : "4", -+ "order" : 4, - "size" : [ - "0" - ] -@@ -204,7 +203,7 @@ my $json = to_json(from_json(< 1, pretty => 1 }); - "is_primary_key" : 0, - "is_unique" : 0, - "name" : "name", -- "order" : "3", -+ "order" : 3, - "size" : [ - "30" - ] -@@ -216,7 +215,7 @@ my $json = to_json(from_json(< 1, pretty => 1 }); - "is_primary_key" : 1, - "is_unique" : 0, - "name" : "person_id", -- "order" : "2", -+ "order" : 2, - "size" : [ - "0" - ] -@@ -228,7 +227,7 @@ my $json = to_json(from_json(< 1, pretty => 1 }); - "is_primary_key" : 1, - "is_unique" : 0, - "name" : "pet_id", -- "order" : "1", -+ "order" : 1, - "size" : [ - "0" - ] -@@ -237,7 +236,7 @@ my $json = to_json(from_json(< 1, pretty => 1 }); - "indices" : [], - "name" : "pet", - "options" : [], -- "order" : "2" -+ "order" : 2 - } - }, - "triggers" : { -@@ -255,7 +254,7 @@ my $json = to_json(from_json(< 1, pretty => 1 }); - "fields" : null, - "name" : "pet_trig", - "on_table" : "pet", -- "order" : "1", -+ "order" : 1, - "perform_action_when" : "after" - } - }, -@@ -263,7 +262,7 @@ my $json = to_json(from_json(< 1, pretty => 1 }); - "person_pet" : { - "fields" : [], - "name" : "person_pet", -- "order" : "1", -+ "order" : 1, - "sql" : "select pr.person_id, pr.name as person_name, pt.name as pet_name\\n from person pr, pet pt\\n where person.person_id=pet.pet_id\\n" - } - } -@@ -285,6 +284,12 @@ my $json = to_json(from_json(< 1, pretty => 1 }); - } - } - JSON -+use JSON; -+if (JSON->is_pp && JSON->VERSION < 2.91_01) { -+ # JSON-PP-2.91_01 fixed numeric value detection, CPAN RT#121901 -+ $json_string =~ s/("order" : )(\d+)(,?)/$1"$2"$3/g; -+} -+my $json = to_json(from_json($json_string), { canonical => 1, pretty => 1 }); - - my $file = "$Bin/data/sqlite/create.sql"; - open my $fh, '<', $file or die "Can't read '$file': $!\n"; --- -2.9.4 - diff --git a/perl-SQL-Translator.spec b/perl-SQL-Translator.spec index fb21d3f..8345861 100644 --- a/perl-SQL-Translator.spec +++ b/perl-SQL-Translator.spec @@ -1,6 +1,6 @@ Name: perl-SQL-Translator Summary: Manipulate structured data definitions (SQL and more) -Version: 0.11022 +Version: 0.11023 Release: 1%{?dist} License: GPL+ or Artistic Source0: http://search.cpan.org/CPAN/authors/id/I/IL/ILMARI/SQL-Translator-%{version}.tar.gz @@ -168,6 +168,9 @@ make test %{_mandir}/man3/SQL::Translator::Producer::Diagram.* %changelog +* Mon Dec 11 2017 Jitka Plesnikova - 0.11023-1 +- 0.11023 bump + * Tue Dec 05 2017 Jitka Plesnikova - 0.11022-1 - 0.11022 bump diff --git a/sources b/sources index f161729..c2aeb7c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (SQL-Translator-0.11022.tar.gz) = 8c3f1d44fa1de2509a204af0030d4c8bcb03364166395b399c31dc5b33f42812b441d81d022eb0a3e3832055789d796935e834a2529a7a1430a8f2d61cbf570e +SHA512 (SQL-Translator-0.11023.tar.gz) = 95ae982c504b464f988b8bc04f8e733053978bbbeb532cc86ffb90485823403d403ee86ff562b591b1b82bf99bcfa357385eb6690e5c06c968dbde5653afb4dc