From: Michael Wallner <mike@php.net>
Date: Wed, 20 May 2015 15:42:36 +0000 (+0200)
Subject: Merge branch 'async'
X-Git-Tag: v2.1.0~1
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fpq-gateway;a=commitdiff_plain;h=0861b6cd0d8f86add1a068fd3d9740428c8418cd;hp=-c

Merge branch 'async'
---

0861b6cd0d8f86add1a068fd3d9740428c8418cd
diff --combined tests/setup.inc
index 9c7a932,ec2236b..bdee9d3
--- a/tests/setup.inc
+++ b/tests/setup.inc
@@@ -3,7 -3,7 +3,7 @@@
  ini_set("date.timezone", "UTC");
  ini_set("error_reporting", E_ALL);
  
 -const PQ_TEST_DSN = "";
 +define("PQ_TEST_DSN", getenv("PQ_TEST_DSN"));
  
  const PQ_TEST_SETUP_SQL = <<<SQL
  	create extension if not exists hstore;
@@@ -39,7 -39,7 +39,7 @@@ const PQ_TEST_TEARDOWN_SQL = <<<SQ
  	drop table if exists reftest cascade;
  SQL;
  
- include_once __DIR__ . "/../lib/autoload.php";
+ require_once __DIR__ . "/../vendor/autoload.php";
  
  function executeInConcurrentTransaction(\pq\Query\ExecutorInterface $exec, $sql, array $params = null) {
  	$conn = $exec->getConnection();