Do not mangle column names.

diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 6099e6665e8181f3574982329cef994c9dc77d91..030dabc52cfde6dd1541e6168dccdcd52f5ca5af 100644 (file)
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -1376,10 +1376,8 @@ next_row:
                /* first row - lets copy the column names */
                rres->col_names = safe_emalloc(rres->ncolumns, sizeof(char *), 0);
                for (i = 0; i < rres->ncolumns; i++) {
-                       colname = strchr(colnames[i], '.');
-                       if (!colname++) {
-                               colname = (char*)colnames[i];
-                       }
+                       colname = (char*)colnames[i];
+
                        if (SQLITE_G(assoc_case) == 1) {
                                php_sqlite_strtoupper(colname);
                        } else if (SQLITE_G(assoc_case) == 2) {

diff --git a/ext/sqlite/tests/sqlite_011.phpt b/ext/sqlite/tests/sqlite_011.phpt
index e47d0314051d59360b7411597d59ab6b1189dd3f..9c1bf3990f8a784aad86d5140f2954f318aa9e91 100755 (executable)
--- a/ext/sqlite/tests/sqlite_011.phpt
+++ b/ext/sqlite/tests/sqlite_011.phpt
@@ -18,11 +18,17 @@ var_dump(sqlite_fetch_array($r));
 sqlite_close($db);
 ?>
 --EXPECT--
-array(3) {
-  ["c1"]=>
+array(6) {
+  ["foo.c1"]=>
+  string(1) "1"
+  ["foo.c2"]=>
+  string(1) "2"
+  ["foo.c3"]=>
+  string(1) "3"
+  ["bar.c1"]=>
   string(1) "4"
-  ["c2"]=>
+  ["bar.c2"]=>
   string(1) "5"
-  ["c3"]=>
+  ["bar.c3"]=>
   string(1) "6"
 }

diff --git a/ext/sqlite/tests/sqlite_oo_011.phpt b/ext/sqlite/tests/sqlite_oo_011.phpt
index c8fdfd120045b586643c633e7e3e320a0fa2f781..ae6c445a4f066457fc3d1963663a800f8faaaf8f 100755 (executable)
--- a/ext/sqlite/tests/sqlite_oo_011.phpt
+++ b/ext/sqlite/tests/sqlite_oo_011.phpt
@@ -17,11 +17,17 @@ $r = $db->query("SELECT * from foo, bar", SQLITE_ASSOC);
 var_dump($r->fetch_array());
 ?>
 --EXPECT--
-array(3) {
-  ["c1"]=>
+array(6) {
+  ["foo.c1"]=>
+  string(1) "1"
+  ["foo.c2"]=>
+  string(1) "2"
+  ["foo.c3"]=>
+  string(1) "3"
+  ["bar.c1"]=>
   string(1) "4"
-  ["c2"]=>
+  ["bar.c2"]=>
   string(1) "5"
-  ["c3"]=>
+  ["bar.c3"]=>
   string(1) "6"
 }