diff --git a/.gitignore b/.gitignore index 9d8c331..1869e33 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /1.1.0.tar.gz /p1_pgsql-1.1.0.tar.gz /p1_pgsql-1.1.1.tar.gz +/p1_pgsql-1.1.2.tar.gz diff --git a/erlang-p1_pgsql-0001-Restore-old-API.patch b/erlang-p1_pgsql-0001-Restore-old-API.patch index b7dc327..370f708 100644 --- a/erlang-p1_pgsql-0001-Restore-old-API.patch +++ b/erlang-p1_pgsql-0001-Restore-old-API.patch @@ -1,22 +1,30 @@ -From: Peter Lemenkov -Date: Sat, 4 Jun 2016 11:28:11 +0300 +From 908007f4b88d8650877aef4e3889d5d11b5746b6 Mon Sep 17 00:00:00 2001 +From: Randy Barlow +Date: Sun, 12 Feb 2017 17:02:00 -0500 Subject: [PATCH] Restore old API -Signed-off-by: Peter Lemenkov +This patch was originally authored by Peter Lemenkov, and has now +been rebased by Randy Barlow. + +Signed-off-by: Randy Barlow +--- + src/pgsql_proto.erl | 5 +++++ + src/pgsql_util.erl | 26 ++++++++++++++++++++++++++ + 2 files changed, 31 insertions(+) diff --git a/src/pgsql_proto.erl b/src/pgsql_proto.erl -index d62cccd..9d606b7 100644 +index d4d8254..b7f430c 100644 --- a/src/pgsql_proto.erl +++ b/src/pgsql_proto.erl -@@ -50,6 +50,7 @@ +@@ -51,6 +51,7 @@ terminate/2]). - %% For protocol unwrapping, pgsql_tcp for example. + %% For protocol unwrapping, pgsql_socket for example. +-export([decode_packet/2]). -export([decode_packet/3]). -export([encode_message/2]). -export([encode/2]). -@@ -560,6 +561,10 @@ process_execute_resultset(Sock, Types, Log, AsBin) -> +@@ -610,6 +611,10 @@ process_execute_resultset(Sock, Types, Log, AsBin) -> exit(Any) end. @@ -27,38 +35,8 @@ index d62cccd..9d606b7 100644 %% With a message type Code and the payload Packet apropriate %% decoding procedure can proceed. decode_packet(Code, Packet, AsBin) -> -diff --git a/src/pgsql_tcp.erl b/src/pgsql_tcp.erl -index 2174025..040dad9 100644 ---- a/src/pgsql_tcp.erl -+++ b/src/pgsql_tcp.erl -@@ -7,6 +7,7 @@ - - -behaviour(gen_server). - -+-export([start/2, start_link/2]). - -export([start/3, start_link/3]). - - %% gen_server callbacks -@@ -19,9 +20,17 @@ - - -record(state, {socket, protopid, buffer, as_binary}). - -+start(Sock, ProtoPid) -> -+ error_logger:warning_msg("Deprecated API - pgsql_tcp:start/2~n"), -+ start(Sock, ProtoPid, false). -+ - start(Sock, ProtoPid, AsBin) -> - gen_server:start(?MODULE, [Sock, ProtoPid, AsBin], []). - -+start_link(Sock, ProtoPid) -> -+ error_logger:warning_msg("Deprecated API - pgsql_tcp:start_link/2~n"), -+ start_link(Sock, ProtoPid, false). -+ - start_link(Sock, ProtoPid, AsBin) -> - gen_server:start_link(?MODULE, [Sock, ProtoPid, AsBin], []). - diff --git a/src/pgsql_util.erl b/src/pgsql_util.erl -index 8b2559d..dce20c0 100644 +index 9980fab..ec6ff4d 100644 --- a/src/pgsql_util.erl +++ b/src/pgsql_util.erl @@ -23,6 +23,8 @@ @@ -70,7 +48,7 @@ index 8b2559d..dce20c0 100644 -export([zip/2]). %% Constructing authentication messages. -@@ -103,11 +105,19 @@ make_pair(Key, Value) when is_binary(Key), is_binary(Value) -> +@@ -125,11 +127,19 @@ make_pair(Key, Value) when is_binary(Key), is_binary(Value) -> <>. @@ -90,7 +68,7 @@ index 8b2559d..dce20c0 100644 split_pair_rec(Bin, AsBin) when is_binary(Bin) -> split_pair_rec(binary_to_list(Bin), AsBin); split_pair_rec(Arg, AsBin) -> -@@ -143,6 +153,10 @@ count_string(<<0/integer, Rest/binary>>, N) -> +@@ -165,6 +175,10 @@ count_string(<<0/integer, Rest/binary>>, N) -> count_string(<<_C/integer, Rest/binary>>, N) -> count_string(Rest, N+1). @@ -101,7 +79,7 @@ index 8b2559d..dce20c0 100644 to_string(Bin, AsBin) when is_binary(Bin) -> {Count, _} = count_string(Bin, 0), <> = Bin, -@@ -157,6 +171,10 @@ oids(<<>>, Oids) -> +@@ -179,6 +193,10 @@ oids(<<>>, Oids) -> oids(<>, Oids) -> oids(Rest, [Oid|Oids]). @@ -112,7 +90,7 @@ index 8b2559d..dce20c0 100644 coldescs(<<>>, Descs, _AsBin) -> lists:reverse(Descs); coldescs(Bin, Descs, AsBin) -> -@@ -196,6 +214,10 @@ decode_descs(OidMap, [Col|ColTail], Descs) -> +@@ -218,6 +236,10 @@ decode_descs(OidMap, [Col|ColTail], Descs) -> OidName = dict:fetch(Oid, OidMap), decode_descs(OidMap, ColTail, [{Name, Format, ColNumber, OidName, [], [], []}|Descs]). @@ -123,7 +101,7 @@ index 8b2559d..dce20c0 100644 decode_row(Types, Values, AsBin) -> decode_row(Types, Values, [], AsBin). decode_row([], [], Out, _AsBin) -> -@@ -233,6 +255,10 @@ decode_col({_Name, _Format, _ColNumber, numeric, _Size, _Modifier, _TableOID}, V +@@ -255,6 +277,10 @@ decode_col({_Name, _Format, _ColNumber, numeric, _Size, _Modifier, _TableOID}, V decode_col({_Name, _Format, _ColNumber, Oid, _Size, _Modifier, _TableOID}, Value, _AsBin) -> {Oid, Value}. @@ -134,3 +112,6 @@ index 8b2559d..dce20c0 100644 errordesc(Bin, AsBin) -> errordesc(Bin, [], AsBin). +-- +2.11.1 + diff --git a/erlang-p1_pgsql.spec b/erlang-p1_pgsql.spec index a771a9c..9eb838c 100644 --- a/erlang-p1_pgsql.spec +++ b/erlang-p1_pgsql.spec @@ -5,16 +5,16 @@ Name: erlang-%{realname} -Version: 1.1.1 -Release: 2%{?dist} +Version: 1.1.2 +Release: 1%{?dist} License: ERPL Summary: Pure Erlang PostgreSQL driver -URL: https://github.com/%{upstream}/%{realname} +URL: https://github.com/%{upstream}/%{realname} %if 0%{?el7}%{?fedora} -VCS: scm:git:https://github.com/%{upstream}/%{realname}.git +VCS: scm:git:https://github.com/%{upstream}/%{realname}.git %endif -Source0: https://github.com/%{upstream}/%{realname}/archive/%{version}/%{realname}-%{version}.tar.gz +Source0: https://github.com/%{upstream}/%{realname}/archive/%{version}/%{realname}-%{version}.tar.gz # A Fedora-specific patch which restores API from erlang-pgsql package thus # allowing fully seamless transition Patch1: erlang-p1_pgsql-0001-Restore-old-API.patch @@ -52,6 +52,12 @@ Pure Erlang PostgreSQL driver. %changelog +* Sun Feb 12 2017 Randy Barlow - 1.1.2-1 +- Update to 1.1.2 (#1412099). +- https://github.com/processone/p1_pgsql/blob/1.1.2/CHANGELOG.md +- Rebased backport API patch. +- Replaced some tabs with spaces. + * Fri Feb 10 2017 Fedora Release Engineering - 1.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index dfb4b95..1c4b7f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (p1_pgsql-1.1.1.tar.gz) = 6eaf443528d410a23086b267acbd6ebebe1503e0dc079ff9774d8c30018857c97a29f8aae67dfc9a399c35fdb7aa6e800cfe22a0b4d7836db286e05c9c7f4fad +SHA512 (p1_pgsql-1.1.2.tar.gz) = e5ead1e41e5dd0b9ec1ff96e6d133b8a5eaea38f6eb343391f5a7cc9757c3255730b147a621a8d55f7e0be2798186aedba0af2434ed96a981fa8f19c4ba8927e