Merge branch 'async'

diff --combined tests/setup.inc
index 9c7a93237a20cbf62f6b89fd9a716412f6ee63a9,ec2236bf19f9d0131bbf7ecf3dc6511311c72354..bdee9d3ac2da135ab436f61e7644b14ac4df6296
--- 1/tests/setup.inc
--- 2/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();