From db839ee6017332f1a7c03f5286d80754e9f4c8cc Mon Sep 17 00:00:00 2001 From: Steve Singer Date: Thu, 15 Jan 2015 17:56:05 -0500 Subject: [PATCH] remove unsupported for PG 9.4 since it has ben released --- src/slonik/slonik.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/slonik/slonik.c b/src/slonik/slonik.c index 5ab4cd9c..b0e23e03 100644 --- a/src/slonik/slonik.c +++ b/src/slonik/slonik.c @@ -2074,17 +2074,17 @@ load_slony_base(SlonikStmt * stmt, int no_id) else if ((adminfo->pg_version >= 80400) && (adminfo->pg_version < 80500)) /* 8.4 */ { use_major = 8; - use_minor = 4; - } + use_minor = 4; + } else if ((adminfo->pg_version >= 90000) && (adminfo->pg_version < 90500)) /* 9.x */ { /** - * 9.0 to 9.4 are so far just like 8.4 + * 9.0 and 9.1 and 9.2, 9.3,9.4 are so far just like 8.4 **/ use_major = 8; use_minor = 4; } - else /* above 9.2 ??? */ + else /* above 9.4 ??? */ { use_major = 8; use_minor = 4; @@ -2165,10 +2165,17 @@ load_slony_functions(SlonikStmt * stmt, int no_id) use_major = 8; use_minor = 4; } +<<<<<<< HEAD else if ((adminfo->pg_version >= 90000) && (adminfo->pg_version < 90500)) /* 9.0 ... 9.4 */ { /** * 9.0 to 9.4 are so far just like 8.4 +======= + else if ((adminfo->pg_version >= 90000) && (adminfo->pg_version < 90500)) /* 9.0, 9.1, 9.2 */ + { + /** + * 9.0 and 9.1 and 9.2 and 9.3,9.4 are so far just like 8.4 +>>>>>>> 7c22d3b... remove unsupported for PG 9.4 since it has ben released */ use_major = 8; use_minor = 4; -- 2.39.5