Merge pull request #31 from koriym/named

NamedPdoModule supports replication

.travis.yml

@@ -23,8 +23,8 @@ before_script:
   - if [ -z "$dependencies" ]; then composer install; fi;
   - if [ "$dependencies" = "lowest" ]; then composer update --prefer-lowest; fi;
 script:
- - if [ "$TRAVIS_PHP_VERSION" != "7.1" ]; then phpunit; fi
- - if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then phpunit --coverage-text --coverage-clover=coverage.clover; fi
+ - if [ "$TRAVIS_PHP_VERSION" == "hhvm" ]; then phpunit; fi
+ - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then phpunit --coverage-text --coverage-clover=coverage.clover; fi
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
-  - if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
+  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi

composer.json

@@ -30,5 +30,17 @@
                 "tests/Fake/"
             ]
         }
+    },
+    "scripts": {
+        "test": [
+            "phpmd src text ./phpmd.xml",
+            "phpcs src tests",
+            "phpunit"
+        ],
+        "cs-fix": [
+            "php-cs-fixer fix --config-file=./.php_cs",
+            "phpcbf src"
+        ],
+        "clean": "rm -rf var/tmp/* var/log/* tests/tmp/*"
     }
 }

src/AuraSqlConnectionInterceptor.php

@@ -71,10 +71,7 @@ private function getConnection(MethodInvocation $invocation)
         if (in_array($methodName, $this->readsMethods)) {
             return $this->connectionLocator->getRead();
         }
-        if (in_array($methodName, $this->writeMethods)) {
-            return $this->connectionLocator->getWrite();
-        }
 
-        return $this->connectionLocator->getDefault();
+        return $this->connectionLocator->getWrite();
     }
 }

src/AuraSqlModule.php

@@ -98,15 +98,9 @@ private function configureMasterSlaveDsn()
     private function changeHost($dsn, $host)
     {
         preg_match(self::PARSE_PDO_DSN_REGEX, $dsn, $parts);
-        if (empty($parts)) {
+        if (! $parts) {
             return $dsn;
         }
-//        [
-//            0 => 'mysql:host=localhost;port=3307;dbname=testdb',
-//            1 => 'mysql',
-//            2 => 'host',
-//            3 => 'port=3307;dbname=testdb'
-//        ]
         $dsn = sprintf('%s:%s=%s;%s', $parts[1], $parts[2], $host, $parts[3]);
 
         return $dsn;

src/AuraSqlReplicationDbProvider.php

@@ -24,7 +24,7 @@ class AuraSqlReplicationDbProvider implements ProviderInterface, SetContextInter
     private $connectionLocator;
 
     /**
-     * @param ConnectionLocatorInterface $connectionLocator
+     * @param InjectorInterface $injector
      */
     public function __construct(InjectorInterface $injector)
     {

src/NamedPdoModule.php

@@ -2,12 +2,15 @@
 
 namespace Ray\AuraSqlModule;
 
+use Aura\Sql\ConnectionLocator;
 use Aura\Sql\ExtendedPdo;
 use Aura\Sql\ExtendedPdoInterface;
 use Ray\Di\AbstractModule;
 
 class NamedPdoModule extends AbstractModule
 {
+    const PARSE_PDO_DSN_REGEX = '/(.*?)\:(host|server)=.*?;(.*)/i';
+
     /**
      * @var string
      */
@@ -26,20 +29,25 @@ class NamedPdoModule extends AbstractModule
     /**
      * @var string
      */
-    private $pass;
+    private $password;
 
+    /**
+     * @var string
+     */
+    private $slave;
     /**
      * @param string $qualifer
      * @param string $dsn
      * @param string $user
      * @param string $pass
      */
-    public function __construct($qualifer, $dsn, $user = '', $pass = '')
+    public function __construct($qualifer, $dsn, $user = '', $pass = '', $slave = '')
     {
         $this->qualifer = $qualifer;
         $this->dsn = $dsn;
         $this->user = $user;
-        $this->pass = $pass;
+        $this->password = $pass;
+        $this->slave = $slave;
         parent::__construct();
     }
 
@@ -48,10 +56,11 @@ public function __construct($qualifer, $dsn, $user = '', $pass = '')
      */
     protected function configure()
     {
-        $this->bindNamedPdo($this->qualifer, $this->dsn, $this->user, $this->pass);
+        $this->slave ? $this->configureMasterSlaveDsn($this->qualifer, $this->dsn, $this->user, $this->password, $this->slave)
+            : $this->configureSingleDsn($this->qualifer, $this->dsn, $this->user, $this->password);
     }
 
-    private function bindNamedPdo($qualifer, $dsn, $user, $pass)
+    private function configureSingleDsn($qualifer, $dsn, $user, $password)
     {
         $this->bind(ExtendedPdoInterface::class)
             ->annotatedWith($qualifer)
@@ -61,6 +70,37 @@ private function bindNamedPdo($qualifer, $dsn, $user, $pass)
             );
         $this->bind()->annotatedWith("{$qualifer}_dsn")->toInstance($dsn);
         $this->bind()->annotatedWith("{$qualifer}_username")->toInstance($user);
-        $this->bind()->annotatedWith("{$qualifer}_password")->toInstance($pass);
+        $this->bind()->annotatedWith("{$qualifer}_password")->toInstance($password);
+    }
+
+    private function configureMasterSlaveDsn($qualifer, $dsn, $user, $password, $slaveList)
+    {
+        $locator = new ConnectionLocator();
+        $locator->setWrite('master', new Connection($dsn, $user, $password));
+        $i = 1;
+        $slaves = explode(',', $slaveList);
+        foreach ($slaves as $slave) {
+            $slaveDsn = $this->changeHost($dsn, $slave);
+            $name = 'slave' . (string) $i++;
+            $locator->setRead($name, new Connection($slaveDsn, $user, $password));
+        }
+        $this->install(new AuraSqlReplicationModule($locator, $qualifer));
+    }
+
+    /**
+     * @param string $dsn
+     * @param string $host
+     *
+     * @return string
+     */
+    private function changeHost($dsn, $host)
+    {
+        preg_match(self::PARSE_PDO_DSN_REGEX, $dsn, $parts);
+        if (! $parts) {
+            return $dsn;
+        }
+        $dsn = sprintf('%s:%s=%s;%s', $parts[1], $parts[2], $host, $parts[3]);
+
+        return $dsn;
     }
 }

src/Pagerfanta/AuraSqlQueryPager.php

@@ -77,12 +77,10 @@ public function offsetGet($page)
         }
 
         $countQueryBuilderModifier = function (SelectInterface $select) {
-            if (!$select instanceof Select) {
-                throw new NotInitialized();
-            }
             foreach (array_keys($select->getCols()) as $key) {
                 $select->removeCol($key);
             }
+
             return $select->cols(['COUNT(*) AS total_results'])->limit(1);
         };
         $pagerfanta = new Pagerfanta(new AuraSqlQueryAdapter($this->pdo, $this->select, $countQueryBuilderModifier));

src/TransactionalInterceptor.php

@@ -46,6 +46,7 @@ public function invoke(MethodInvocation $invocation)
      * @param string $prop   the name of pdo property
      *
      * @return \Pdo
+     *
      * @throws InvalidTransactionalPropertyException
      */
     private function beginTransaction($object, $prop)

tests/AuraSqlModuleTest.php

@@ -33,4 +33,11 @@ public function testSlaveModule()
         $dsn = $read->getDsn();
         $this->assertContains($dsn, ['mysql:host=slave1;dbname=testdb', 'mysql:host=slave2;dbname=testdb']);
     }
+
+    public function testNoHost()
+    {
+        $instance = (new Injector(new FakeQualifierModule, $_ENV['TMP_DIR']))->getInstance(ExtendedPdoInterface::class);
+        /* @var $instance ExtendedPdo */
+        $this->assertSame('sqlite::memory:', $instance->getDsn());
+    }
 }

tests/AuraSqlReplicationModuleTest.php

@@ -42,6 +42,7 @@ public function connectionProvider()
      */
     public function testLocatorSlave(ConnectionLocator $locator, ExtendedPdo $masterPdo, ExtendedPdo $slavePdo)
     {
+        unset($masterPdo);
         $_SERVER['REQUEST_METHOD'] = 'GET';
         /* @var  $model FakeRepModel */
         $model = (new Injector(new AuraSqlReplicationModule($locator), $_ENV['TMP_DIR']))->getInstance(FakeRepModel::class);
@@ -54,6 +55,7 @@ public function testLocatorSlave(ConnectionLocator $locator, ExtendedPdo $master
      */
     public function testLocatorMaster(ConnectionLocator $locator, ExtendedPdo $masterPdo, ExtendedPdo $slavePdo)
     {
+        unset($slavePdo);
         $_SERVER['REQUEST_METHOD'] = 'POST';
         /* @var  $model FakeRepModel */
         $model = (new Injector(new AuraSqlReplicationModule($locator), $_ENV['TMP_DIR']))->getInstance(FakeRepModel::class);
@@ -66,6 +68,8 @@ public function testLocatorMaster(ConnectionLocator $locator, ExtendedPdo $maste
      */
     public function testLocatorMasterWithQualifer(ConnectionLocator $locator, ExtendedPdo $masterPdo, ExtendedPdo $slavePdo)
     {
+        unset($masterPdo);
+        unset($slavePdo);
         $_SERVER['REQUEST_METHOD'] = 'POST';
         /* @var  $db1Master ExtendedPdo */
         /* @var  $db2Master ExtendedPdo */

tests/Fake/FakeNamedQualifierModule.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Ray\AuraSqlModule;
+
+use Ray\Di\AbstractModule;
+
+class FakeNamedQualifierModule extends AbstractModule
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->install(new NamedPdoModule('log_db', 'sqlite::memory:', '', '', 'slave1'));
+    }
+}

tests/Fake/FakeNamedReplicationModule.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Ray\AuraSqlModule;
+
+use Ray\Di\AbstractModule;
+
+class FakeNamedReplicationModule extends AbstractModule
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $user = $password = '';
+        $slave = 'slave1,slave2,slave2';
+        $this->install(new NamedPdoModule('log_db', 'mysql:host=localhost;dbname=db', $user, $password, $slave));
+    }
+}

tests/Fake/FakeQualifierModule.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Ray\AuraSqlModule;
+
+use Ray\Di\AbstractModule;
+
+class FakeQualifierModule extends AbstractModule
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->install(new AuraSqlModule('sqlite::memory:', '', '', 'slave1'));
+    }
+}

tests/NamedPdoModuleTest.php

@@ -23,4 +23,32 @@ public function testFakeName()
         $this->assertInstanceOf(ExtendedPdo::class, $fakeName->pdoAnno);
         $this->assertInstanceOf(ExtendedPdo::class, $fakeName->pdoSetterInject);
     }
+
+    public function testReplicationMaster()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+        $qualifer = 'log_db';
+        $instance = (new Injector(new FakeNamedReplicationModule, $_ENV['TMP_DIR']))->getInstance(ExtendedPdoInterface::class, $qualifer);
+        $this->assertInstanceOf(ExtendedPdo::class, $instance);
+        /* @var $instance ExtendedPdo */
+        $this->assertSame('mysql:host=localhost;dbname=db', $instance->getDsn());
+    }
+
+    public function testReplicationSlave()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        $qualifer = 'log_db';
+        $instance = (new Injector(new FakeNamedReplicationModule, $_ENV['TMP_DIR']))->getInstance(ExtendedPdoInterface::class, $qualifer);
+        $this->assertInstanceOf(ExtendedPdo::class, $instance);
+        /* @var $instance ExtendedPdo */
+        $this->assertContains('mysql:host=slave', $instance->getDsn());
+    }
+
+    public function testNoHost()
+    {
+        $qualifer = 'log_db';
+        $instance = (new Injector(new FakeNamedQualifierModule, $_ENV['TMP_DIR']))->getInstance(ExtendedPdoInterface::class, $qualifer);
+        /* @var $instance ExtendedPdo */
+        $this->assertSame('sqlite::memory:', $instance->getDsn());
+    }
 }

tests/Pagerfanta/AuraSqlQueryAdapterTest.php

@@ -76,6 +76,7 @@ private function createAdapterToTestGetNbResults()
             foreach (array_keys($select->getCols()) as $key) {
                 $select->removeCol($key);
             }
+
             return $select->cols(['COUNT(*) AS total_results'])->limit(1);
         };
 

tests/Pagerfanta/AuraSqlQueryPagerTest.php

@@ -56,4 +56,12 @@ public function testOffsetGet()
         $expected = [['username' => 'Jon Doe']];
         $this->assertSame($expected, $post->data);
     }
+
+    public function estOffsetGetWithoutInit()
+    {
+        $this->select = $this->qf->newSelect();
+        $this->select->cols(['p.username'])->from('posts as p');
+        $pager = new AuraSqlQueryPager(new DefaultView, []);
+        $post = $pager[2];
+    }
 }