Merge branch 'master' into jasir (v2.3)

* master: (37 commits)
  Released version 2.3.1
  removed version.txt
  dibi: named connections are allowed [Closes dg#161]
  Dibi: Dump now recognize MsSql2012 offset as keyword
  DibiPdoDriver: added support for MsSql2012 Offset
  Tracy\Panel: added vector icon
  added contributing.md
  Released version 2.3.0
  Postgre: added test for matching by %like
  Postgre: fixed %like escaping [Closes dg#159]
  Dibi: $defaultDriver changed to mysqli [Closes dg#156]
  Released 2.3.0-RC1
  removed bridge for Nette 2.0 (BC break)
  dibi: named connections and activate() are deprecated (BC break)
  DibiFluent: add `leftJoin` and `on` to phpdoc.
  DibiFirePhpLogger: save some header operations for sites with hundreds of sql queries.
  DibiFirePhpLogger: Allow user defined size of json stream chunks [Closes dg#148]
  DibiTranslator: respect %if blocks for %lmt and %ofs as well [Closes dg#145][Closes dg#87]
  DibiResult: float detection locale fix [Closes dg#154]
  DibiMySqliDriver.php: fixes for HHVM
  ...

.travis.yml

@@ -10,12 +10,21 @@ matrix:
     allow_failures:
         - php: hhvm
 
-script: vendor/bin/tester tests -s -c tests/php-unix.ini
+script:
+    - vendor/bin/tester tests -s -p php -c tests/php-unix.ini
+    - php code-checker/src/code-checker.php
 
 after_failure:
     # Print *.actual content
     - for i in $(find tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done
 
 before_script:
-    # Install Nette Tester
+    # Install Nette Tester & Code Checker
     - composer install --no-interaction --dev --prefer-source
+    - composer create-project nette/code-checker code-checker ~2.3 --no-interaction --prefer-source
+
+    # Create databases.ini
+    - cp ./tests/databases.sample.ini ./tests/databases.ini
+
+    # Create Postgre database
+    - psql -c 'CREATE DATABASE dibi_test' -U postgres

composer.json

@@ -15,7 +15,7 @@
 	},
 	"require-dev": {
 		"tracy/tracy": "~2.2",
-		"nette/tester": "~1.1"
+		"nette/tester": "~1.3"
 	},
 	"replace": {
 		"dg/dibi": "self.version"
@@ -25,7 +25,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "2.2-dev"
+			"dev-master": "2.3-dev"
 		}
 	}
 }

contributing.md

@@ -0,0 +1,27 @@
+How to contribute & use the issue tracker
+=========================================
+
+The issue tracker is the preferred channel for bug reports, features requests
+and submitting pull requests, but please respect the following restrictions:
+
+* Please **do not** use the issue tracker for personal support requests (use
+  [dibi forum](http://forum.dibiphp.com) or [Stack Overflow](http://stackoverflow.com)).
+
+* Please **do not** derail or troll issues. Keep the discussion on topic and
+  respect the opinions of others.
+
+* Use the GitHub **issue search** — check if the issue has already been
+   reported.
+
+A good **bug report** shouldn't leave others needing to chase you up for more
+information. Please try to be as detailed as possible in your report.
+
+**Feature requests** are welcome. But take a moment to find out whether your idea
+fits with the scope and aims of the project. It's up to *you* to make a strong
+case to convince the project's developers of the merits of this feature.
+
+We welcome **pull requests**. If you'd like to contribute, please take a moment
+to [read the guidelines](http://nette.org/en/contributing) in order to make
+the contribution process easy and effective for everyone involved.
+
+Thanks!

dibi/bridges/Nette-2.1/DibiNettePanel.php

@@ -5,10 +5,7 @@
  * Copyright (c) 2005 David Grudl (http://davidgrudl.com)
  */
 
-
-if (interface_exists('Nette\Diagnostics\IBarPanel')) {
-	class_alias('Nette\Diagnostics\IBarPanel', 'IBarPanel');
-}
+use Nette\Diagnostics\Debugger;
 
 
 /**
@@ -17,7 +14,7 @@ class_alias('Nette\Diagnostics\IBarPanel', 'IBarPanel');
  * @author     David Grudl
  * @package    dibi\nette
  */
-class DibiNettePanel extends DibiObject implements IBarPanel
+class DibiNettePanel extends DibiObject implements Nette\Diagnostics\IBarPanel
 {
 	/** @var int maximum SQL length */
 	static public $maxLength = 1000;
@@ -41,24 +38,9 @@ public function __construct($explain = TRUE, $filter = NULL)
 
 	public function register(DibiConnection $connection)
 	{
-		if (is_callable('Nette\Diagnostics\Debugger::enable') && !class_exists('NDebugger')) {
-			class_alias('Nette\Diagnostics\Debugger', 'NDebugger'); // PHP 5.2 code compatibility
-		}
-		if (is_callable('NDebugger::enable') && is_callable('NDebugger::getBlueScreen')) { // Nette Framework 2.1
-			NDebugger::getBar()->addPanel($this);
-			NDebugger::getBlueScreen()->addPanel(array(__CLASS__, 'renderException'));
-			$connection->onEvent[] = array($this, 'logEvent');
-
-		} elseif (is_callable('NDebugger::enable')) { // Nette Framework 2.0 (for PHP 5.3 or PHP 5.2 prefixed)
-			NDebugger::$bar && NDebugger::$bar->addPanel($this);
-			NDebugger::$blueScreen && NDebugger::$blueScreen->addPanel(array(__CLASS__, 'renderException'), __CLASS__);
-			$connection->onEvent[] = array($this, 'logEvent');
-
-		} elseif (is_callable('Debugger::enable') && !is_callable('Debugger::getBlueScreen')) { // Nette Framework 2.0 for PHP 5.2 non-prefixed
-			Debugger::$bar && Debugger::$bar->addPanel($this);
-			Debugger::$blueScreen && Debugger::$blueScreen->addPanel(array(__CLASS__, 'renderException'), __CLASS__);
-			$connection->onEvent[] = array($this, 'logEvent');
-		}
+		Debugger::getBar()->addPanel($this);
+		Debugger::getBlueScreen()->addPanel(array(__CLASS__, 'renderException'));
+		$connection->onEvent[] = array($this, 'logEvent');
 	}
 
 

dibi/bridges/Tracy/Panel.php

@@ -81,13 +81,14 @@ public static function renderException($e)
 	public function getTab()
 	{
 		$totalTime = 0;
+		$count = count($this->events);
 		foreach ($this->events as $event) {
 			$totalTime += $event->time;
 		}
-		return '<span title="dibi"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAEYSURBVBgZBcHPio5hGAfg6/2+R980k6wmJgsJ5U/ZOAqbSc2GnXOwUg7BESgLUeIQ1GSjLFnMwsKGGg1qxJRmPM97/1zXFAAAAEADdlfZzr26miup2svnelq7d2aYgt3rebl585wN6+K3I1/9fJe7O/uIePP2SypJkiRJ0vMhr55FLCA3zgIAOK9uQ4MS361ZOSX+OrTvkgINSjS/HIvhjxNNFGgQsbSmabohKDNoUGLohsls6BaiQIMSs2FYmnXdUsygQYmumy3Nhi6igwalDEOJEjPKP7CA2aFNK8Bkyy3fdNCg7r9/fW3jgpVJbDmy5+PB2IYp4MXFelQ7izPrhkPHB+P5/PjhD5gCgCenx+VR/dODEwD+A3T7nqbxwf1HAAAAAElFTkSuQmCC" />'
-			. count($this->events) . ' queries'
+		return '<span title="dibi"><svg viewBox="0 0 2048 2048" style="vertical-align: bottom; width:1.23em; height:1.55em"><path fill="' . ( $count ? '#b079d6' : '#aaa') . '" d="M1024 896q237 0 443-43t325-127v170q0 69-103 128t-280 93.5-385 34.5-385-34.5-280-93.5-103-128v-170q119 84 325 127t443 43zm0 768q237 0 443-43t325-127v170q0 69-103 128t-280 93.5-385 34.5-385-34.5-280-93.5-103-128v-170q119 84 325 127t443 43zm0-384q237 0 443-43t325-127v170q0 69-103 128t-280 93.5-385 34.5-385-34.5-280-93.5-103-128v-170q119 84 325 127t443 43zm0-1152q208 0 385 34.5t280 93.5 103 128v128q0 69-103 128t-280 93.5-385 34.5-385-34.5-280-93.5-103-128v-128q0-69 103-128t280-93.5 385-34.5z"/></svg><span class="tracy-label">'
+			. $count . ' queries'
 			. ($totalTime ? sprintf(' / %0.1f ms', $totalTime * 1000) : '')
-			. '</span>';
+			. '</span></span>';
 	}
 
 

dibi/dibi.php

@@ -33,7 +33,3 @@
 require_once dirname(__FILE__) . '/libs/DibiEvent.php';
 require_once dirname(__FILE__) . '/libs/DibiFileLogger.php';
 require_once dirname(__FILE__) . '/libs/DibiFirePhpLogger.php';
-
-if (interface_exists('Nette\Diagnostics\IBarPanel') || interface_exists('IBarPanel')) {
-	require_once dirname(__FILE__) . '/bridges/Nette-2.1/DibiNettePanel.php';
-}

dibi/drivers/DibiFirebirdDriver.php

@@ -402,7 +402,7 @@ public function free()
 
 	/**
 	 * Returns the result set resource.
-	 * @return mysqli_result
+	 * @return resource
 	 */
 	public function getResultResource()
 	{

dibi/drivers/DibiMySqliDriver.php

@@ -79,7 +79,7 @@ public function connect(array & $config)
 				'timezone' => date('P'),
 				'username' => ini_get('mysqli.default_user'),
 				'password' => ini_get('mysqli.default_pw'),
-				'socket' => ini_get('mysqli.default_socket'),
+				'socket' => (string) ini_get('mysqli.default_socket'),
 				'port' => NULL,
 			);
 			if (!isset($config['host'])) {
@@ -420,9 +420,10 @@ public function free()
 	public function getResultColumns()
 	{
 		static $types;
-		if (empty($types)) {
+		if ($types === NULL) {
 			$consts = get_defined_constants(TRUE);
-			foreach ($consts['mysqli'] as $key => $value) {
+			$types = array();
+			foreach (isset($consts['mysqli']) ? $consts['mysqli'] : array() as $key => $value) {
 				if (strncmp($key, 'MYSQLI_TYPE_', 12) === 0) {
 					$types[$value] = substr($key, 12);
 				}
@@ -438,7 +439,7 @@ public function getResultColumns()
 				'name' => $row['name'],
 				'table' => $row['orgtable'],
 				'fullname' => $row['table'] ? $row['table'] . '.' . $row['name'] : $row['name'],
-				'nativetype' => $types[$row['type']],
+				'nativetype' => isset($types[$row['type']]) ? $types[$row['type']] : $row['type'],
 				'vendor' => $row,
 			);
 		}
@@ -453,7 +454,7 @@ public function getResultColumns()
 	public function getResultResource()
 	{
 		$this->autoFree = FALSE;
-		return $this->resultSet === NULL || $this->resultSet->type === NULL ? NULL : $this->resultSet;
+		return $this->resultSet;
 	}
 
 }

dibi/drivers/DibiOdbcDriver.php

@@ -290,7 +290,7 @@ public function applyLimit(& $sql, $limit, $offset)
 	{
 		// offset support is missing
 		if ($limit >= 0) {
-			$sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ')';
+			$sql = 'SELECT TOP ' . (int) $limit . ' * FROM (' . $sql . ') t';
 		}
 
 		if ($offset) {

dibi/drivers/DibiOracleDriver.php

@@ -14,6 +14,7 @@
  *   - username (or user)
  *   - password (or pass)
  *   - charset => character encoding to set
+ *   - schema => alters session schema
  *   - formatDate => how to format date in SQL (@see date)
  *   - formatDateTime => how to format datetime in SQL (@see date)
  *   - resource (resource) => existing connection resource
@@ -75,6 +76,10 @@ public function connect(array & $config)
 			$err = oci_error();
 			throw new DibiDriverException($err['message'], $err['code']);
 		}
+
+		if (isset($config['schema'])) {
+			$this->query('ALTER SESSION SET CURRENT_SCHEMA=' . $config['schema']);
+		}
 	}