Blob Blame History Raw
From 908007f4b88d8650877aef4e3889d5d11b5746b6 Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Sun, 12 Feb 2017 17:02:00 -0500
Subject: [PATCH] Restore old API

This patch was originally authored by Peter Lemenkov, and has now
been rebased by Randy Barlow.

Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
---
 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 d4d8254..b7f430c 100644
--- a/src/pgsql_proto.erl
+++ b/src/pgsql_proto.erl
@@ -51,6 +51,7 @@
 	 terminate/2]).
 
 %% For protocol unwrapping, pgsql_socket for example.
+-export([decode_packet/2]).
 -export([decode_packet/3]).
 -export([encode_message/2]).
 -export([encode/2]).
@@ -610,6 +611,10 @@ process_execute_resultset(Sock, Types, Log, AsBin) ->
 	    exit(Any)
     end.
 
+decode_packet(Code, Packet) ->
+    error_logger:warning_msg("Deprecated API - pgsql_proto:decode_packet/2~n"),
+    decode_packet(Code, Packet, false).
+
 %% With a message type Code and the payload Packet apropriate
 %% decoding procedure can proceed.
 decode_packet(Code, Packet, AsBin) ->
diff --git a/src/pgsql_util.erl b/src/pgsql_util.erl
index 9980fab..ec6ff4d 100644
--- a/src/pgsql_util.erl
+++ b/src/pgsql_util.erl
@@ -23,6 +23,8 @@
 -export([errordesc/2]).
 -export([to_integer/1, to_atom/1]).
 
+-export([coldescs/2, decode_row/2, errordesc/1, split_pair/1, split_pair_rec/1, to_string/1]).
+
 -export([zip/2]).
 
 %% Constructing authentication messages.
@@ -125,11 +127,19 @@ make_pair(Key, Value) when is_binary(Key), is_binary(Value) ->
     <<Key/binary, 0/integer, 
      Value/binary, 0/integer>>.
 
+split_pair(Bin) when is_binary(Bin) ->
+    error_logger:warning_msg("Deprecated API - pgsql_util:split_pair/1~n"),
+    split_pair(Bin, false).
+
 split_pair(Bin, AsBin) when is_binary(Bin) ->
     split_pair(binary_to_list(Bin), AsBin);
 split_pair(Str, AsBin)  ->
     split_pair_rec(Str, norec, AsBin).
 
+split_pair_rec(Bin) when is_binary(Bin) ->
+    error_logger:warning_msg("Deprecated API - pgsql_util:split_pair_rec/1~n"),
+    split_pair_rec(Bin, false).
+
 split_pair_rec(Bin, AsBin) when is_binary(Bin) ->
     split_pair_rec(binary_to_list(Bin), AsBin);
 split_pair_rec(Arg, AsBin)  ->
@@ -165,6 +175,10 @@ count_string(<<0/integer, Rest/binary>>, N) ->
 count_string(<<_C/integer, Rest/binary>>, N) ->
     count_string(Rest, N+1).
 
+to_string(Bin) when is_binary(Bin) ->
+    error_logger:warning_msg("Deprecated API - pgsql_util:to_string/1~n"),
+    to_string(Bin, false).
+
 to_string(Bin, AsBin) when is_binary(Bin) ->    
     {Count, _} = count_string(Bin, 0),
     <<String:Count/binary, _/binary>> = Bin,
@@ -179,6 +193,10 @@ oids(<<>>, Oids) ->
 oids(<<Oid:32/integer, Rest/binary>>, Oids) ->
     oids(Rest, [Oid|Oids]).
     
+coldescs(Bin, Descs) ->
+    error_logger:warning_msg("Deprecated API - pgsql_util:coldescs/2~n"),
+    coldescs(Bin, Descs, false).
+
 coldescs(<<>>, Descs, _AsBin) ->
     lists:reverse(Descs);
 coldescs(Bin, Descs, AsBin) ->
@@ -218,6 +236,10 @@ decode_descs(OidMap, [Col|ColTail], Descs) ->
     OidName = dict:fetch(Oid, OidMap),
     decode_descs(OidMap, ColTail, [{Name, Format, ColNumber, OidName, [], [], []}|Descs]).
 
+decode_row(Types, Values) ->
+    error_logger:warning_msg("Deprecated API - pgsql_util:decode_row/2~n"),
+    decode_row(Types, Values, false).
+
 decode_row(Types, Values, AsBin) ->
     decode_row(Types, Values, [], AsBin).
 decode_row([], [], Out, _AsBin) ->
@@ -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}.
 
+errordesc(Bin) ->
+    error_logger:warning_msg("Deprecated API - pgsql_util:errordesc/1~n"),
+    errordesc(Bin, false).
+
 errordesc(Bin, AsBin) ->
     errordesc(Bin, [], AsBin).
 
-- 
2.11.1