From 48576bcf4a38f497eeb233e36ceaf8c6248caaa9 Mon Sep 17 00:00:00 2001 From: Dima Nagorniy Date: Tue, 3 Jan 2017 11:23:46 +0200 Subject: [PATCH 1/3] AUD-81 --- src/MySql/AuditAlter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MySql/AuditAlter.php b/src/MySql/AuditAlter.php index 536a648..9e3063f 100755 --- a/src/MySql/AuditAlter.php +++ b/src/MySql/AuditAlter.php @@ -89,7 +89,7 @@ public function createSqlStatement($tableName, $columns) { $editCharSet = false; $charSet = ''; - $this->codeStore->append(sprintf('ALTER TABLE %s CHANGE', $tableName)); + $this->codeStore->append(sprintf('ALTER TABLE %s.`%s` CHANGE', $this->config['database']['audit_schema'], $tableName)); $countMax = $columns->getNumberOfColumns(); $count = 1; /** @var MultiSourceColumnMetadata $rowMetadata */ @@ -131,7 +131,7 @@ public function createSqlStatement($tableName, $columns) $this->codeStore->append(';'); if ($editCharSet) { - $this->codeStore->append(sprintf('ALTER TABLE %s DEFAULT CHARACTER SET %s;', $tableName, $charSet)); + $this->codeStore->append(sprintf('ALTER TABLE %s.`%s` DEFAULT CHARACTER SET %s;', $this->config['database']['audit_schema'], $tableName, $charSet)); } } From 4defc8d90a3795e80879ca5b578aa731c446a1cc Mon Sep 17 00:00:00 2001 From: Dima Nagorniy Date: Tue, 3 Jan 2017 11:39:48 +0200 Subject: [PATCH 2/3] AUD-81AUD-81 --- src/MySql/AuditAlter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MySql/AuditAlter.php b/src/MySql/AuditAlter.php index 9e3063f..c4302fb 100755 --- a/src/MySql/AuditAlter.php +++ b/src/MySql/AuditAlter.php @@ -111,7 +111,7 @@ public function createSqlStatement($tableName, $columns) $editCharSet = true; $charSet = $configMetadata['character_set_name']; } - $line = sprintf('%s %s %s', $columnName, $columnName, $configMetadata['column_type']); + $line = sprintf('`%s` `%s` %s', $columnName, $columnName, $configMetadata['column_type']); if ($count!=$countMax) $line .= ','; $this->codeStore->append($line); } From 8c4f6fe9223070022a733b348361ef36dbc27373 Mon Sep 17 00:00:00 2001 From: Dima Nagorniy Date: Thu, 5 Jan 2017 13:35:30 +0200 Subject: [PATCH 3/3] AUD-81: Alter table SQL commands command. back quotes fix --- src/MySql/AuditAlter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MySql/AuditAlter.php b/src/MySql/AuditAlter.php index c4302fb..b271b31 100755 --- a/src/MySql/AuditAlter.php +++ b/src/MySql/AuditAlter.php @@ -89,7 +89,7 @@ public function createSqlStatement($tableName, $columns) { $editCharSet = false; $charSet = ''; - $this->codeStore->append(sprintf('ALTER TABLE %s.`%s` CHANGE', $this->config['database']['audit_schema'], $tableName)); + $this->codeStore->append(sprintf('ALTER TABLE `%s`.`%s` CHANGE', $this->config['database']['audit_schema'], $tableName)); $countMax = $columns->getNumberOfColumns(); $count = 1; /** @var MultiSourceColumnMetadata $rowMetadata */ @@ -131,7 +131,7 @@ public function createSqlStatement($tableName, $columns) $this->codeStore->append(';'); if ($editCharSet) { - $this->codeStore->append(sprintf('ALTER TABLE %s.`%s` DEFAULT CHARACTER SET %s;', $this->config['database']['audit_schema'], $tableName, $charSet)); + $this->codeStore->append(sprintf('ALTER TABLE `%s`.`%s` DEFAULT CHARACTER SET %s;', $this->config['database']['audit_schema'], $tableName, $charSet)); } }