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: | Sat, 04 Apr 2015 19:42:08 +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-86080@lists.php.net to get a copy of this message | ||
Commit: a5bb37117ccd4f6abcacfd8e9ddb43a9a00dbe08
Author: Anatol Belski <ab@php.net> Thu, 2 Apr 2015 14:22:56 +0200
Parents: f29c98c1289b00e0dbb58631df6a5e006f5311d1
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a5bb37117ccd4f6abcacfd8e9ddb43a9a00dbe08
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 937049a..b816f9c 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 c525a96..038e978 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 9704501..e63f3fb 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)');