Salvaging fixes from primary-key branch

Author: Nik Barham

src/Database/Connection.php

@@ -71,6 +71,9 @@ public function __get($var)
     protected $options;
     protected $connection;
 
+    protected $schemaGenerator;
+    protected $dataAccess;
+    
     protected function __construct($details, $name = 'default', array $options = null, LoggerInterface $logger = null)
     {
         $this->logger = $logger;
@@ -101,6 +104,8 @@ protected function __construct($details, $name = 'default', array $options = nul
             return;
         }
 
+        $this->schemaGenerator = new SchemaGenerator($this);
+        $this->dataAccess = new DataAccess($this);
 
         throw new Ex\Database("Not enough details to construct Database object", $details);
     }
@@ -145,11 +150,11 @@ public function connect()
 
     public function getDataAccessor()
     {
-        return new DataAccess($this);
+        return $this->dataAccess;
     }
 
     public function getSchemaGenerator()
     {
-        return new SchemaGenerator($this);
+        return $this->schemaGenerator;
     }
 }

src/Interfaces/Connection.php

@@ -7,10 +7,7 @@
 interface Connection
 {
     /**
-     * Return a PDO instance based on the supplied connection details.
-     * This object should always return the same PDO instance until ->disconnect() is called.
-     *
-     * @return PDO Instance of PDO connection
+     * Return an object that can be used by the DataAccessor to retrieve results
      */
     public function connect();