Released version 4.0.2

Added getTypes method, to get all columns and its types, this is faster then write foreach for getting all columns, and getColumns do not get column type (there is null)

.travis.yml

@@ -2,6 +2,7 @@ language: php
 php:
     - 7.1
     - 7.2
+    - 7.3
 
 before_install:
     # turn off XDebug
@@ -25,18 +26,29 @@ after_failure:
 
 jobs:
     include:
-        -   stage: Code Standard Checker
-            php: 7.1
+        -   name: Nette Code Checker
             install:
-                # Install Nette Code Checker
                 - travis_retry composer create-project nette/code-checker temp/code-checker ^3 --no-progress
-                # Install Nette Coding Standard
-                - travis_retry composer create-project nette/coding-standard temp/coding-standard ^2 --no-progress
             script:
                 - php temp/code-checker/code-checker --strict-types
+
+
+        -   name: Nette Coding Standard
+            install:
+                - travis_retry composer create-project nette/coding-standard temp/coding-standard ^2 --no-progress
+            script:
                 - php temp/coding-standard/ecs check src tests examples --config tests/coding-standard.yml
 
 
+        -   stage: Static Analysis (informative)
+            install:
+                # Install PHPStan
+                - travis_retry composer create-project phpstan/phpstan-shim temp/phpstan --no-progress
+                - travis_retry composer install --no-progress --prefer-dist
+            script:
+                - php temp/phpstan/phpstan.phar analyse --autoload-file vendor/autoload.php --level 5 src
+
+
         -   stage: Code Coverage
             script:
                 - vendor/bin/tester -p phpdbg tests -s --coverage ./coverage.xml --coverage-src ./src
@@ -46,7 +58,7 @@ jobs:
 
 
     allow_failures:
-        -   php: 7.2
+        -   stage: Static Analysis (informative)
         -   stage: Code Coverage
 
 

src/Dibi/Drivers/PostgreReflector.php

@@ -176,8 +176,11 @@ class PostgreReflector implements Dibi\Reflector
 			$indexes[$row['relname']]['name'] = $row['relname'];
 			$indexes[$row['relname']]['unique'] = $row['indisunique'] === 't' || $row['indisunique'] === true;
 			$indexes[$row['relname']]['primary'] = $row['indisprimary'] === 't' || $row['indisprimary'] === true;
+			$indexes[$row['relname']]['columns'] = [];
 			foreach (explode(' ', $row['indkey']) as $index) {
-				$indexes[$row['relname']]['columns'][] = $columns[$index];
+				if (isset($columns[$index])) {
+					$indexes[$row['relname']]['columns'][] = $columns[$index];
+				}
 			}
 		}
 		return array_values($indexes);

src/Dibi/Fluent.php

@@ -30,6 +30,7 @@ namespace Dibi;
  * @method Fluent as(...$field)
  * @method Fluent on(...$cond)
  * @method Fluent and(...$cond)
+ * @method Fluent or(...$cond)
  * @method Fluent using(...$cond)
  * @method Fluent asc()
  * @method Fluent desc()

src/Dibi/Result.php

@@ -463,8 +463,11 @@ class Result implements IDataSource
 			} elseif ($type === Type::FLOAT) {
 				$value = ltrim((string) $value, '0');
 				$p = strpos($value, '.');
-				if ($p !== false) {
+				$e = strpos($value, 'e');
+				if ($p !== false && $e === false) {
 					$value = rtrim(rtrim($value, '0'), '.');
+				} elseif ($p !== false && $e !== false) {
+					$value = rtrim($value, '.');
 				}
 				if ($value === '' || $value[0] === '.') {
 					$value = '0' . $value;
@@ -519,6 +522,15 @@ class Result implements IDataSource
 	}
 
 
+	/**
+	 * Returns columns type.
+	 */
+	final public function getTypes(): array
+	{
+		return $this->types;
+	}
+
+
 	/**
 	 * Sets date format.
 	 */

src/Dibi/dibi.php

@@ -11,28 +11,28 @@ declare(strict_types=1);
 /**
  * Static container class for Dibi connections.
  *
- * @method void disconnect()
- * @method Dibi\Result query(...$args)
- * @method Dibi\Result nativeQuery(...$args)
- * @method bool test(...$args)
- * @method Dibi\DataSource dataSource(...$args)
- * @method Dibi\Row|null fetch(...$args)
- * @method array fetchAll(...$args)
- * @method mixed fetchSingle(...$args)
- * @method array fetchPairs(...$args)
- * @method int getAffectedRows()
- * @method int getInsertId(string $sequence = null)
- * @method void begin(string $savepoint = null)
- * @method void commit(string $savepoint = null)
- * @method void rollback(string $savepoint = null)
- * @method Dibi\Reflection\Database getDatabaseInfo()
- * @method Dibi\Fluent command()
- * @method Dibi\Fluent select(...$args)
- * @method Dibi\Fluent update(string|string[] $table, array $args)
- * @method Dibi\Fluent insert(string $table, array $args)
- * @method Dibi\Fluent delete(string $table)
- * @method Dibi\HashMap getSubstitutes()
- * @method int loadFile(string $file)
+ * @method static void disconnect()
+ * @method static Dibi\Result query(...$args)
+ * @method static Dibi\Result nativeQuery(...$args)
+ * @method static bool test(...$args)
+ * @method static Dibi\DataSource dataSource(...$args)
+ * @method static Dibi\Row|null fetch(...$args)
+ * @method static array fetchAll(...$args)
+ * @method static mixed fetchSingle(...$args)
+ * @method static array fetchPairs(...$args)
+ * @method static int getAffectedRows()
+ * @method static int getInsertId(string $sequence = null)
+ * @method static void begin(string $savepoint = null)
+ * @method static void commit(string $savepoint = null)
+ * @method static void rollback(string $savepoint = null)
+ * @method static Dibi\Reflection\Database getDatabaseInfo()
+ * @method static Dibi\Fluent command()
+ * @method static Dibi\Fluent select(...$args)
+ * @method static Dibi\Fluent update(string|string[] $table, array $args)
+ * @method static Dibi\Fluent insert(string $table, array $args)
+ * @method static Dibi\Fluent delete(string $table)
+ * @method static Dibi\HashMap getSubstitutes()
+ * @method static int loadFile(string $file)
  */
 class dibi
 {
@@ -44,7 +44,7 @@ class dibi
 
 	/** version */
 	public const
-		VERSION = '4.0.1';
+		VERSION = '4.0.2';
 
 	/** sorting order */
 	public const

tests/dibi/Result.normalize.phpt

@@ -100,6 +100,11 @@ test(function () {
 	Assert::same(['col' => 1.0], $result->test(['col' => 1]));
 	Assert::same(['col' => 1.0], $result->test(['col' => 1.0]));
 
+	Assert::same(['col' => '1.1e+10'], $result->test(['col' => '1.1e+10']));
+	Assert::same(['col' => '1.1e-10'], $result->test(['col' => '1.1e-10']));
+	Assert::same(['col' => '1.1e+10'], $result->test(['col' => '001.1e+10']));
+	Assert::notSame(['col' => '1.1e+1'], $result->test(['col' => '1.1e+10']));
+
 	setlocale(LC_ALL, 'de_DE@euro', 'de_DE', 'deu_deu');
 	Assert::same(['col' => 0.0], $result->test(['col' => '']));
 	Assert::same(['col' => 0.0], $result->test(['col' => '0']));