Issue 229

src/proxy/ClientBuild.php

@@ -138,7 +138,10 @@ public function getStorageFilesCount()
  }
 
  private $_tables = [];
-
+
+ /**
+ * @return ClientTable[]
+ */
  public function getTables()
  {
  return $this->_tables;

src/proxy/ClientTable.php

@@ -3,8 +3,10 @@
 namespace luya\admin\proxy;
 
 use Curl\Curl;
+use Symfony\Component\Debug\Exception\UndefinedMethodException;
 use Yii;
 use yii\base\BaseObject;
+use yii\db\Exception;
 use yii\helpers\Console;
 use yii\helpers\Json;
 
@@ -149,7 +151,7 @@ public function syncData()
  * @throws \yii\db\Exception
  * @since 1.2.1
  */
- private function prepare()
+ protected function prepare()
  {
  $sqlMode = null;
 
@@ -175,7 +177,7 @@ private function prepare()
  * @throws \yii\db\Exception
  * @since 1.2.1
  */
- private function cleanup($sqlMode)
+ protected function cleanup($sqlMode)
  {
  if (Yii::$app->db->schema instanceof \yii\db\mysql\Schema) {
  Yii::$app->db->createCommand('SET FOREIGN_KEY_CHECKS = 1;')->execute();

tests/admin/proxy/ClientTableTest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace admintests\admin\proxy;
+
+use admintests\AdminTestCase;
+use admintests\data\mocks\proxy\ClientTableMock;
+use luya\admin\proxy\ClientBuild;
+use luya\admin\proxy\ClientTable;
+use luya\admin\commands\ProxyController;
+
+class ClientTableTest extends AdminTestCase
+{
+ /**
+ * @throws \yii\db\Exception
+ * @expectedException \yii\db\Exception
+ */
+ public function testSyncDataWithConnectionLost()
+ {
+ $this->app->db->createCommand('CREATE TABLE IF NOT EXISTS temp_synctest LIKE admin_user')->execute();
+
+ $ctrl = new ProxyController('proxyctrl', $this->app);
+ $build = new ClientBuild($ctrl, [
+ 'buildConfig' => ['tables' => ['temp_synctest' => ['name' => 'temp_synctest']]],
+ ]);
+ $table = new ClientTableMock($build, ['name' => 'temp_synctest']);
+
+ try {
+ $table->syncData();
+ } catch (\yii\db\Exception $exception) {
+ $this->assertEquals('PDOStatement::execute(): MySQL server has gone away', $exception->getPrevious()->getMessage());
+ throw $exception;
+ }
+ }
+}

tests/data/mocks/proxy/ClientTableMock.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace admintests\data\mocks\proxy;
+
+use luya\admin\proxy\ClientTable;
+use Yii;
+
+class ClientTableMock extends ClientTable
+{
+ protected function cleanup($sqlMode)
+ {
+ try {
+ // provoke sql error on later cleanup
+ Yii::$app->db->createCommand('KILL (SELECT CONNECTION_ID());')->execute();
+ } catch (\Throwable $ex) {
+
+ }
+
+ parent::cleanup($sqlMode);
+ }
+
+}