From: Hartmut Holzgraefe <hholzgra@php.net>
Date: Wed, 23 Jul 2008 09:06:59 +0000 (+0000)
Subject: splitted test cases for lo_create and lo_import, added version aware
X-Git-Tag: php-5.3.0alpha1~194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6fcc0ec369d19e3bef23d9d71a14b12eccc37911;p=php

splitted test cases for lo_create and lo_import, added version aware
SKIP tests
---

diff --git a/ext/pgsql/tests/27large_object_oid.phpt b/ext/pgsql/tests/27large_object_oid.phpt
index 7d935cabd5..0a469bc20e 100644
--- a/ext/pgsql/tests/27large_object_oid.phpt
+++ b/ext/pgsql/tests/27large_object_oid.phpt
@@ -1,7 +1,12 @@
 --TEST--
-PostgreSQL large object with given oid
+PostgreSQL create large object with given oid
 --SKIPIF--
-<?php include("skipif.inc"); ?>
+<?php 
+include("skipif.inc"); 
+$v = pg_version($conn);
+if (version_compare("8.3", $v["client"]) > 0) die("skip - requires pg client >= 8.3\n");
+if (version_compare("8.3", $v["server"]) > 0) die("skip - requires pg server >= 8.3\n");
+?>
 --FILE--
 <?php
 
@@ -33,38 +38,10 @@ if ($oid != 21002) echo ("pg_lo_create() wrong id\n");
 pg_lo_unlink ($oid);
 pg_exec ("commit");
 
-echo "import LO from int\n";
-pg_exec($db, 'begin');
-$oid = pg_lo_import($db, __FILE__, 21003);
-if (!$oid) echo ("pg_lo_import() error\n");
-if ($oid != 21003) echo ("pg_lo_import() wrong id\n");
-pg_lo_unlink ($db, $oid);
-pg_exec($db, 'commit');
-
-echo "import LO from string\n";
-pg_exec($db, 'begin');
-$oid = pg_lo_import($db, __FILE__, "21004");
-if (!$oid) echo ("pg_lo_import() error\n");
-if ($oid != 21004) echo ("pg_lo_import() wrong id\n");
-pg_lo_unlink ($db, $oid);
-pg_exec($db, 'commit');
-
-echo "import LO using default connection\n";
-pg_exec('begin');
-$oid = pg_lo_import($db, __FILE__, 21005);
-if (!$oid) echo ("pg_lo_import() error\n");
-if ($oid != 21005) echo ("pg_lo_import() wrong id\n");
-pg_lo_unlink ($oid);
-pg_exec('commit');
-
-
 echo "OK";
 ?>
 --EXPECT--
 create LO from int
 create LO from string
 create LO using default connection
-import LO from int
-import LO from string
-import LO using default connection
 OK
diff --git a/ext/pgsql/tests/28large_object_import_oid.phpt b/ext/pgsql/tests/28large_object_import_oid.phpt
new file mode 100644
index 0000000000..323d179635
--- /dev/null
+++ b/ext/pgsql/tests/28large_object_import_oid.phpt
@@ -0,0 +1,48 @@
+--TEST--
+PostgreSQL import large object with given oid
+--SKIPIF--
+<?php 
+include("skipif.inc"); 
+$v = pg_version($conn);
+if (version_compare("8.4devel", $v["client"]) > 0) die("skip - requires pg client >= 8.4\n");
+if (version_compare("8.4devel", $v["server"]) > 0) die("skip - requires pg server >= 8.4\n");
+?>
+--FILE--
+<?php
+
+include('config.inc');
+
+$db = pg_connect($conn_str);
+
+echo "import LO from int\n";
+pg_exec($db, 'begin');
+$oid = pg_lo_import($db, __FILE__, 21003);
+if (!$oid) echo ("pg_lo_import() error\n");
+if ($oid != 21003) echo ("pg_lo_import() wrong id\n");
+pg_lo_unlink ($db, $oid);
+pg_exec($db, 'commit');
+
+echo "import LO from string\n";
+pg_exec($db, 'begin');
+$oid = pg_lo_import($db, __FILE__, "21004");
+if (!$oid) echo ("pg_lo_import() error\n");
+if ($oid != 21004) echo ("pg_lo_import() wrong id\n");
+pg_lo_unlink ($db, $oid);
+pg_exec($db, 'commit');
+
+echo "import LO using default connection\n";
+pg_exec('begin');
+$oid = pg_lo_import($db, __FILE__, 21005);
+if (!$oid) echo ("pg_lo_import() error\n");
+if ($oid != 21005) echo ("pg_lo_import() wrong id\n");
+pg_lo_unlink ($oid);
+pg_exec('commit');
+
+
+echo "OK";
+?>
+--EXPECT--
+import LO from int
+import LO from string
+import LO using default connection
+OK