Fix ext/odbc tests

Author: kocsismate

ext/odbc/tests/bug44618.phpt

@@ -3,7 +3,13 @@ Bug #44618 (Fetching may rely on uninitialized data)
 --EXTENSIONS--
 odbc
 --SKIPIF--
-<?php include 'skipif.inc'; ?>
+<?php
+    include 'skipif.inc';
+
+    if (ODBC_TYPE === "unixODBC") {
+        die("skip Fails with unixODBC");
+    }
+?>
 --FILE--
 <?php
 include __DIR__ . "/config.inc";

ext/odbc/tests/bug60616.phpt

@@ -2,13 +2,16 @@
 odbc_exec(): Getting accurate unicode data from query
 --EXTENSIONS--
 odbc
+mbstring
 --SKIPIF--
-<?php include 'skipif.inc'; ?>
 <?php
+    include 'skipif.inc';
     if ("unixODBC" != ODBC_TYPE) {
         die("skip ODBC_TYPE != unixODBC");
     }
 ?>
+--XFAIL--
+Uses syntax incompatible with MS SQL (CREATE DATABASE ... ENCODING)
 --FILE--
 <?php
 

ext/odbc/tests/bug73725.phpt

@@ -14,7 +14,7 @@ $conn = odbc_connect($dsn, $user, $pass);
 odbc_do($conn, "CREATE TABLE bug73725(i int, txt varchar(max), k int)");
 
 odbc_do($conn, "INSERT INTO bug73725 VALUES(101,'Any text', 33)");
-odbc_do($conn, "INSERT INTO bug73725 VALUES(102,'Müsliriegel', 34)");
+odbc_do($conn, "INSERT INTO bug73725 VALUES(102,'Lorem ipsum dolor', 34)");
 
 $rc = odbc_do($conn, "SELECT i, txt, k FROM bug73725");
 
@@ -38,7 +38,7 @@ array(3) {
   ["i"]=>
   string(3) "102"
   ["txt"]=>
-  string(12) "Müsliriegel"
+  string(17) "Lorem ipsum dolor"
   ["k"]=>
   string(2) "34"
 }

ext/odbc/tests/odbc_exec_001.phpt

@@ -16,32 +16,14 @@ include 'config.inc';
 
 $conn = odbc_connect($dsn, $user, $pass);
 
-odbc_exec($conn, 'foo', 'bar');
 odbc_exec($conn, 'foo');
 
-odbc_exec($conn, '', '');
 odbc_exec($conn, '');
 
-odbc_exec($conn, 1, 1);
 odbc_exec($conn, 1);
 
-odbc_exec($conn, NULL, NULL);
-odbc_exec($conn, NULL);
-
 ?>
 --EXPECTF--
-Warning: odbc_exec(): Argument #3 must be of type int, string given in %s on line %d
-
-Warning: odbc_exec(): SQL error: %s in %s on line %d
-
-Warning: odbc_exec(): Argument #3 must be of type int, string given in %s on line %d
-
-Warning: odbc_exec(): SQL error: %s in %s on line %d
-
-Warning: odbc_exec(): SQL error: %s in %s on line %d
-
-Warning: odbc_exec(): SQL error: %s in %s on line %d
-
 Warning: odbc_exec(): SQL error: %s in %s on line %d
 
 Warning: odbc_exec(): SQL error: %s in %s on line %d

ext/pdo/tests/bug_36798.phpt

@@ -13,6 +13,8 @@ if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))){
     if (!strpos(strtolower(getenv('PDOTEST_DSN')), 'charset=we8mswin1252')) die('skip expected output valid for Oracle with WE8MSWIN1252 character set');
 } elseif (!strncasecmp(getenv('PDOTEST_DSN'), 'dblib', strlen('dblib'))) {
     die('skip not for pdo_dblib');
+} elseif (!strncasecmp(getenv('PDOTEST_DSN'), 'odbc', strlen('odbc'))) {
+    die('skip not for pdo_odbc');
 }
 
 ?>

ext/pdo_odbc/tests/bug80783a.phpt

@@ -6,6 +6,10 @@ pdo_odbc
 <?php
 require 'ext/pdo/tests/pdo_test.inc';
 PDOTest::skip();
+
+if (ODBC_TYPE === "unixODBC") {
+    die("skip Fails with unixODBC");
+}
 ?>
 --FILE--
 <?php