com php-src: test fixes: ext/odbc/tests/bug60616.phpt ext/odbc/tests/bug68087.phpt ext/odbc/tests/odbc_exec_0 01.phpt
ext/odbc/tests/odbc_free_result_001 .phpt
| From: | Anatol Belski | Date: | Thu, 02 Apr 2015 18:16:01 +0000 |
| Subject: | com php-src: test fixes: ext/odbc/tests/bug60616.phpt ext/odbc/tests/bug68087.phpt ext/odbc/tests/odbc_exec_0 01.phpt ext/odbc/tests/odbc_free_result_001 .phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86060@lists.php.net to get a copy of this message | ||
Commit: 48447da83690a32eb87abfab520e8a82278bacdb
Author: Anatol Belski <ab@php.net> Thu, 2 Apr 2015 14:22:56 +0200
Parents: a8bf1c5d8f5755b53492e58040cfe88150eb57b6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=48447da83690a32eb87abfab520e8a82278bacdb
Log:
test fixes
Changed paths:
M ext/odbc/tests/bug60616.phpt
M ext/odbc/tests/bug68087.phpt
M ext/odbc/tests/odbc_exec_001.phpt
M ext/odbc/tests/odbc_free_result_001.phpt
Diff:
diff --git a/ext/odbc/tests/bug60616.phpt b/ext/odbc/tests/bug60616.phpt
index 72226f2..95c7204 100644
--- a/ext/odbc/tests/bug60616..phpt
+++ b/ext/odbc/tests/bug60616.phpt
@@ -2,6 +2,11 @@
odbc_exec(): Getting accurate unicode data from query
--SKIPIF--
<?php include 'skipif.inc'; ?>
+<?php
+ if ("unixODBC" != ODBC_TYPE) {
+ die("skip ODBC_TYPE != unixODBC");
+ }
+?>
--FILE--
<?php
diff --git a/ext/odbc/tests/bug68087.phpt b/ext/odbc/tests/bug68087.phpt
index 3bc1812..b7bdfa8 100644
--- a/ext/odbc/tests/bug68087.phpt
+++ b/ext/odbc/tests/bug68087.phpt
@@ -2,6 +2,11 @@
odbc_exec(): Getting accurate date data from query
--SKIPIF--
<?php include 'skipif.inc'; ?>
+<?php
+ if ("unixODBC" != ODBC_TYPE) {
+ die("skip ODBC_TYPE != unixODBC");
+ }
+?>
--FILE--
<?php
diff --git a/ext/odbc/tests/odbc_exec_001.phpt b/ext/odbc/tests/odbc_exec_001.phpt
index f9be908..af069af 100644
--- a/ext/odbc/tests/odbc_exec_001.phpt
+++ b/ext/odbc/tests/odbc_exec_001.phpt
@@ -2,6 +2,11 @@
odbc_exec(): Basic test
--SKIPIF--
<?php include 'skipif.inc'; ?>
+<?php
+ if ("unixODBC" != ODBC_TYPE) {
+ die("skip ODBC_TYPE != unixODBC");
+ }
+?>
--FILE--
<?php
diff --git a/ext/odbc/tests/odbc_free_result_001.phpt b/ext/odbc/tests/odbc_free_result_001.phpt
index 812ae77..cdc4211 100644
--- a/ext/odbc/tests/odbc_free_result_001.phpt
+++ b/ext/odbc/tests/odbc_free_result_001.phpt
@@ -11,7 +11,7 @@ $conn = odbc_connect($dsn, $user, $pass);
odbc_exec($conn, 'CREATE DATABASE odbcTEST');
-odbc_exec($conn, 'CREATE TABLE FOO (TEST INT)');
+odbc_exec($conn, 'CREATE TABLE FOO (TEST INT NOT NULL)');
odbc_exec($conn, 'ALTER TABLE FOO ADD PRIMARY KEY (TEST)');
odbc_exec($conn, 'INSERT INTO FOO VALUES (1)');