fix Util's markJsFunction function of checking '=>' exist

koolreport · Sep 11, 2023 · 7cf23aa · 7cf23aa
1 parent 78dee2a
commit 7cf23aa
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## Version 6.2.0
+1. Fix Utility's arrayToDatastore function when there's only one column.
+2. Update Google chart to use Date type in X axis for zoom option to work.
+
 ## Version 6.1.0
 1. Fix dynamic properties in PHP 8.2.
 2. Fix mull meta column key in core/Table widget.

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "koolreport/core",
-    "version":"6.1.0",
+    "version":"6.2.0",
     "description": "An Open Source PHP Reporting Framework for easier and faster report delivery.",
     "keywords": ["php reporting framework","php reporting tools","data processing","data visualization","charts and graphs"],
     "homepage": "https://www.koolreport.com",

diff --git a/src/core/Utility.php b/src/core/Utility.php
@@ -226,8 +226,10 @@ public static function markJsFunction(&$obj, &$marks = array())
                     ) $isJsFunction = true;
                     if (
                         strpos($tsv, "(") === 0
-                        && strpos($tsv, "=>") !== -1
-                    ) $isJsFunction = true;
+                        && strpos($tsv, "=>") !== false
+                    ) {
+                        $isJsFunction = true;
+                    }
                     if ($isJsFunction) {
                         $marks[] = trim($v);
                         $obj[$k] = "--js(" . (count($marks) - 1) . ")";

diff --git a/src/datasources/PdoDataSource.php b/src/datasources/PdoDataSource.php
@@ -426,6 +426,10 @@ protected function guessTypeFromValue($value)
     protected function buildMetaData()
     {
         // echo "pdodatasource buildMetaData<br>";
+
+        // $this->connection->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_ASSOC);
+        // $this->connection->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_BOTH);
+
         $metaData = array("columns" => array());
 
         if (empty($this->sqlParams)) $this->sqlParams = [];
@@ -562,6 +566,9 @@ public function start()
     {
         // echo "pdodatasource start()<br>";
 
+        // $this->connection->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_ASSOC);
+        // $this->connection->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_NUM);
+
         $this->buildMetaData();
         $this->sendMeta($this->builtMetaData, $this);