From: Ulf Wendel <uw@php.net>
Date: Thu, 12 Jul 2007 16:04:15 +0000 (+0000)
Subject: 1) Whitespace/CS
X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~169
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33c87b15d8447f66cda76a0c8a8c1c53bc62a033;p=php

1) Whitespace/CS
2) Playing with column aliases
---

diff --git a/ext/mysql/tests/mysql_result.phpt b/ext/mysql/tests/mysql_result.phpt
index ec6e6b20e1..d8b521dcf5 100644
--- a/ext/mysql/tests/mysql_result.phpt
+++ b/ext/mysql/tests/mysql_result.phpt
@@ -2,41 +2,58 @@
 mysql_result()
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
-    include "connect.inc";
-    
-    $tmp    = NULL;   
-    $link   = NULL;    
-    
-    // string mysql_result ( resource result, int row [, mixed field] )
-    
-    if (!is_null($tmp = @mysql_result()))
-        printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    if (!is_null($tmp = @mysql_result($link)))
-        printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-        
-    require('table.inc');
-    if (!$res = mysql_query("SELECT id, label FROM test ORDER BY id LIMIT 1", $link)) {
-        printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));        
-    }
-    
-    var_dump(mysql_result($res, -1));
-    var_dump(mysql_result($res, 2));
-    var_dump(mysql_result($res, 0, -1));
-    var_dump(mysql_result($res, 0, 2));
-          
-    var_dump(mysql_result($res, 0));
-    var_dump(mysql_result($res, 0, 1));
-    
-    mysql_free_result($res);
-    
-    var_dump(mysql_result($res, 0));
-    
-    mysql_close($link);   
-    print "done!";
+include "connect.inc";
+
+$tmp    = NULL;
+$link   = NULL;
+
+// string mysql_result ( resource result, int row [, mixed field] )
+
+if (!is_null($tmp = @mysql_result()))
+	printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (!is_null($tmp = @mysql_result($link)))
+	printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!$res = mysql_query("SELECT id, label, id AS _id, CONCAT(label, 'a') _label, NULL as _foo FROM test _test ORDER BY id LIMIT 1", $link)) {
+	printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+}
+
+var_dump(mysql_result($res, -1));
+var_dump(mysql_result($res, 2));
+
+var_dump(mysql_result($res, 0, -1));
+var_dump(mysql_result($res, 0, 500));
+
+print "valid fields\n";
+var_dump(mysql_result($res, 0));
+var_dump(mysql_result($res, 0, 1));
+
+var_dump(mysql_result($res, 0, 'id'));
+var_dump(mysql_result($res, 0, '_test.id'));
+var_dump(mysql_result($res, 0, 'label'));
+var_dump(mysql_result($res, 0, '_test.label'));
+print "some invalid fields\n";
+var_dump(mysql_result($res, 0, 'unknown'));
+var_dump(mysql_result($res, 0, '_test.'));
+var_dump(mysql_result($res, 0, chr(0)));
+var_dump(mysql_result($res, 0, '_test.' . chr(0)));
+print "_id\n";
+var_dump(mysql_result($res, 0, '_id'));
+print "_label\n";
+var_dump(mysql_result($res, 0, '_label'));
+print "_foo\n";
+var_dump(mysql_result($res, 0, '_foo'));
+
+mysql_free_result($res);
+
+var_dump(mysql_result($res, 0));
+
+mysql_close($link);
+print "done!";
 ?>
 --EXPECTF--
 Warning: mysql_result(): Unable to jump to row -1 on MySQL result index %d in %s on line %d
@@ -50,8 +67,32 @@ bool(false)
 
 Warning: mysql_result(): Bad column offset specified in %s on line %d
 bool(false)
+valid fields
+string(1) "1"
+string(1) "a"
+string(1) "1"
 string(1) "1"
 string(1) "a"
+string(1) "a"
+some invalid fields
+
+Warning: mysql_result(): unknown not found in MySQL result index %d in %s on line %d
+bool(false)
+
+Warning: mysql_result(): _test. not found in MySQL result index %d in %s on line %d
+bool(false)
+
+Warning: mysql_result():  not found in MySQL result index %d in %s on line %d
+bool(false)
+
+Warning: mysql_result(): _test. not found in MySQL result index %d in %s on line %d
+bool(false)
+_id
+string(1) "1"
+_label
+string(2) "aa"
+_foo
+NULL
 
 Warning: mysql_result(): %d is not a valid MySQL result resource in %s on line %d
 bool(false)
@@ -68,8 +109,32 @@ bool(false)
 
 Warning: mysql_result(): Bad column offset specified in %s on line %d
 bool(false)
+valid fields
+unicode(1) "1"
+unicode(1) "a"
 unicode(1) "1"
+unicode(1) "1"
+unicode(1) "a"
 unicode(1) "a"
+some invalid fields
+
+Warning: mysql_result(): unknown not found in MySQL result index %d in %s on line %d
+bool(false)
+
+Warning: mysql_result(): _test. not found in MySQL result index %d in %s on line %d
+bool(false)
+
+Warning: mysql_result():  not found in MySQL result index %d in %s on line %d
+bool(false)
+
+Warning: mysql_result(): _test. not found in MySQL result index %d in %s on line %d
+bool(false)
+_id
+unicode(1) "1"
+_label
+unicode(2) "aa"
+_foo
+NULL
 
 Warning: mysql_result(): %d is not a valid MySQL result resource in %s on line %d
 bool(false)