Infer keys from mysqli_result

klesun · Jan 11, 2019 · 36bcca2 · 36bcca2
1 parent b3a438b
commit 36bcca2
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 7 deletions.
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>lv.midiana.misc.phpstorm-plugins.deep-keys</id>
     <name>deep-assoc-completion</name>
-    <version>2018.01.08.001</version>
+    <version>2018.01.11.001</version>
     <vendor email="arturklesun@gmail.com" url="http://midiana.lv/entry/deep-assoc-completion">klesun</vendor>
 
     <description><![CDATA[
@@ -37,11 +37,7 @@ This plugin greatly extends phpstorm's typing with associative array support<br/
 
     <change-notes><![CDATA[
     <ul>
-        <li>Add file_put_contents/preg_*/simplexml_load_string/preg_last_error constant completion</li>
-        <li>Fix: do not _Ctrl + B_ to key decl if caret is on it already. Fixes a nasty thing that you would not get GoTo of a magic method if it is used as a key</li>
-        <li>Add constant arg completion to curl_setopt_array/json_encode/str_pad/pcntl_signal and few more small functions</li>
-        <li>Suggest class constants in string === value completion (Not just it's actual string value)</li>
-        <li>Add completion of keys in stream_context_create() params</li>
+        <li>Infer keys from mysqli_result (and, same as PDO, 'SELECT * FROM abc' will work as well if you connect DB to IDEA)</li>
     </ul>
     ]]>
     </change-notes>

diff --git a/src/org/klesun/deep_assoc_completion/resolvers/MethCallRes.java b/src/org/klesun/deep_assoc_completion/resolvers/MethCallRes.java
@@ -160,12 +160,25 @@ private It<DeepType> findBuiltInRetType(Method meth, IExprCtx argCtx, MethodRefe
                     getBindVars(strType).fch(type.pdoBindVars::add);
                 });
             types = It(list(type));
-        } else if (clsNme.equals("PDOStatement") && meth.getName().equals("fetch")) {
+        } else if (clsNme.equals("PDOStatement") && meth.getName().equals("fetch")
+                || clsNme.equals("mysqli_result") && meth.getName().equals("fetch_assoc")
+        ) {
             It<DeepType> pdoTypes = opt(methCall.getClassReference())
                 .fop(toCast(PhpExpression.class))
                 .fap(obj -> ctx.findExprType(obj))
                 .fap(t -> t.pdoFetchTypes);
             types = It(pdoTypes);
+        } else if (clsNme.equals("mysqli") && meth.getName().equals("query")) {
+            MemIt<DeepType> rowTypes = argCtx.func().getArg(0).fap(mt -> mt.types)
+                .map(strType -> parseSqlSelect(strType, meth.getProject())).mem();
+            types = It.cnc(
+                som(new DeepType(methCall).btw(t -> {
+                    // it's not a PDO, but nah
+                    rowTypes.fch((rowt, i) -> t.pdoFetchTypes.add(rowt));
+                })),
+                // since PHP 5.4 mysqli_result can also be iterated
+                som(Mt.getInArraySt(It(rowTypes), methCall))
+            );
         }
         It<DeepType> modelRowTypes = getModelRowType(methCall, meth);
         It<DeepType> modelRowArrTypes = !modelRowTypes.has() ? It.non() :

diff --git a/src/org/klesun/deep_assoc_completion/structures/DeepType.java b/src/org/klesun/deep_assoc_completion/structures/DeepType.java
@@ -317,4 +317,11 @@ public Mt mt()
     {
         return new Mt(list(this));
     }
+
+    /** a handy method to do stuff in same expression */
+    public DeepType btw(C<DeepType> addData)
+    {
+        addData.accept(this);
+        return this;
+    }
 }
diff --git a/tests/src/DeepTest/ExactKeysUnitTest.php b/tests/src/DeepTest/ExactKeysUnitTest.php
@@ -1316,6 +1316,31 @@ public function provideReturnInRequire($params)
         ];
     }
 
+    public function provideMysqliIterator()
+    {
+        $rows = [];
+        $mysqli = new \mysqli("10.128.128.150", "stasadm", "G0a4wa&", "rbstools");
+        $result = $mysqli->query("SELECT id, iata_code, name FROM airports limit 20;");
+        foreach ($result as $row) {
+            $rows[] = $row;
+        }
+        $rows[0][''];
+        return [
+            [$rows[0], ['id', 'iata_code', 'name']],
+        ];
+    }
+
+    public function provideMysqliFetchAssoc()
+    {
+        $mysqli = new \mysqli("10.128.128.150", "stasadm", "G0a4wa&", "rbstools");
+        $result = $mysqli->query("SELECT id, iata_code, name FROM airports limit 20;");
+        $row = $result->fetch_assoc();
+        $row[''];
+        return [
+            [$row, ['id', 'iata_code', 'name']],
+        ];
+    }
+
     //=============================
     // following are not implemented yet
     //=============================