Skip to content

Aud 76: Diff command not working #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from Dec 12, 2016
Merged

Aud 76: Diff command not working #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37d36da
AUD-76: Diff command not working. Fixed some warnings.
DmitriyNagorniy Dec 12, 2016
c9900a2
AUD-76
DmitriyNagorniy Dec 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/MySql/AuditDiff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ private function getDiff()
$this->config['database']['audit_schema'],
$table['table_name'],
$this->config['audit_columns'],
$this->configMetadata['table_columns'][$table['table_name']]);
$this->configMetadata[$table['table_name']]);
}
}
}
Expand Down Expand Up @@ -218,7 +218,7 @@ private function printDiff()
$columns = $diffTable->removeMatchingColumns();
}

if (!empty($columns))
if ($columns->getNumberOfColumns()>0)
{
// Add an empty line between tables.
if ($first)
Expand Down
22 changes: 17 additions & 5 deletions src/MySql/AuditDiffTable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ class AuditDiffTable
*/
private $auditSchema;

/**
* Audit columns from config file.
*
* @var array[]
*/
private $configAuditColumns;

/**
* Audit columns from config file
*
Expand Down Expand Up @@ -61,10 +68,11 @@ class AuditDiffTable
*/
public function __construct($dataSchema, $auditSchema, $tableName, $configAuditColumns, $configColumns)
{
$this->dataSchema = $dataSchema;
$this->auditSchema = $auditSchema;
$this->tableName = $tableName;
$this->configColumns = array_merge($configAuditColumns, $configColumns);
$this->dataSchema = $dataSchema;
$this->auditSchema = $auditSchema;
$this->tableName = $tableName;
$this->configAuditColumns = $configAuditColumns;
$this->configColumns = array_merge($configAuditColumns, $configColumns);

$dataColumns = new TableColumnsMetadata(AuditDataLayer::getTableColumns($this->dataSchema, $this->tableName));
$auditColumns = AuditDataLayer::getTableColumns($this->auditSchema, $this->tableName);
Expand Down Expand Up @@ -104,13 +112,17 @@ public function removeMatchingColumns()
/** @var MultiSourceColumnMetadata $config */
$config = $column->getProperty('config');

$auditColumn = StaticDataLayer::searchInRowSet('column_name', $columnName, $this->configAuditColumns);
if (!isset($data))
{
if (isset($audit) && isset($config))
{
if ($audit->getProperty('column_type')==$config->getProperty('column_type'))
{
$metadata->removeColumn($columnName);
if (isset($auditColumn))
{
$metadata->removeColumn($columnName);
}
}
}
}
Expand Down
16 changes: 12 additions & 4 deletions src/MySql/Helper/DiffTableHelper.php
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public function addHighlighting()
$styledColumn = $column;
if (is_array($column))
{
$auditColumn = StaticDataLayer::searchInRowSet('column_name', $column['column_name'], $this->auditColumns);
// Highlighting for data table column types and audit.
if (!empty($column['data']))
{
Expand Down Expand Up @@ -116,6 +117,10 @@ public function addHighlighting()
}
else
{
if (!isset($column['data']) && isset($column['audit']) && !isset($auditColumn))
{
$styledColumn['audit'] = sprintf('<mm_type>%s</>', $styledColumn['audit']);
}
// Highlighting for audit table column types and audit_columns in config file.
$searchColumn = StaticDataLayer::searchInRowSet('column_name', $styledColumn['column_name'], $this->auditColumns);
if (isset($searchColumn))
Expand All @@ -141,10 +146,13 @@ public function addHighlighting()
{
if (strcmp($styledColumn['audit'], $styledColumn['config']))
{
$styledColumns[$key - 1]['column_name'] = sprintf('<mm_column>%s</>', $styledColumns[$key - 1]['column_name']);
$styledColumn['column_name'] = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
$styledColumn['audit'] = sprintf('<mm_type>%s</>', $column['audit']);
$styledColumn['config'] = sprintf('<mm_type>%s</>', $styledColumn['config']);
if (!isset($column['column_name']))
{
$styledColumns[$key - 1]['column_name'] = sprintf('<mm_column>%s</>', $styledColumns[$key - 1]['column_name']);
}
$styledColumn['column_name'] = sprintf('<mm_column>%s</>', $styledColumn['column_name']);
$styledColumn['audit'] = sprintf('<mm_type>%s</>', $column['audit']);
$styledColumn['config'] = sprintf('<mm_type>%s</>', $styledColumn['config']);
}
}
}
Expand Down
30 changes: 16 additions & 14 deletions src/MySql/Helper/DiffTableRowHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,15 @@ public static function createColumnOptionsRow($rowMetadata)
{
$columnProperties = $rowMetadata->getProperties();
/** @var ColumnMetadata $data */
$data = $columnProperties['data'];
$data = isset($columnProperties['data']) ? $columnProperties['data'] : null;
/** @var ColumnMetadata $audit */
$audit = $columnProperties['audit'];
$audit = isset($columnProperties['audit']) ? $columnProperties['audit'] : null;
/** @var ColumnMetadata $config */
$config = $columnProperties['config'];
$dataMetadata = isset($columnProperties['data']) ? $data->getProperties() : null;
$auditMetadata = isset($columnProperties['audit']) ? $audit->getProperties() : null;
$configMetadata = isset($columnProperties['config']) ? $config->getProperties() : null;
$config = isset($columnProperties['config']) ? $columnProperties['config'] : null;

$dataMetadata = isset($data) ? $data->getProperties() : null;
$auditMetadata = isset($audit) ? $audit->getProperties() : null;
$configMetadata = isset($config) ? $config->getProperties() : null;

$dataCharsetName = isset($dataMetadata['character_set_name']) ? $dataMetadata['character_set_name'] : null;
$dataCollationName = isset($dataMetadata['collation_name']) ? $dataMetadata['collation_name'] : null;
Expand Down Expand Up @@ -79,14 +80,15 @@ public static function createTableRow($rowMetadata, $columnName)
{
$columnProperties = $rowMetadata->getProperties();
/** @var ColumnMetadata $data */
$data = $columnProperties['data'];
$data = isset($columnProperties['data']) ? $columnProperties['data'] : null;
/** @var ColumnMetadata $audit */
$audit = $columnProperties['audit'];
$audit = isset($columnProperties['audit']) ? $columnProperties['audit'] : null;
/** @var ColumnMetadata $config */
$config = $columnProperties['config'];
$dataMetadata = isset($columnProperties['data']) ? $data->getProperties() : null;
$auditMetadata = isset($columnProperties['audit']) ? $audit->getProperties() : null;
$configMetadata = isset($columnProperties['config']) ? $config->getProperties() : null;
$config = isset($columnProperties['config']) ? $columnProperties['config'] : null;

$dataMetadata = isset($data) ? $data->getProperties() : null;
$auditMetadata = isset($audit) ? $audit->getProperties() : null;
$configMetadata = isset($config) ? $config->getProperties() : null;

return ['column_name' => $columnName,
'data' => isset($dataMetadata['column_type']) ? $dataMetadata['column_type'] : null,
Expand Down Expand Up @@ -125,8 +127,8 @@ private static function checkOptions($rowMetadata)
foreach ($rowMetadata->getProperties() as $sourceName => $metadata)
{
/** @var ColumnMetadata $source */
$source = $columnProperties[$sourceName];
$data = isset($columnProperties[$sourceName]) ? $source->getProperties() : null;
$source = isset($columnProperties[$sourceName]) ? $columnProperties[$sourceName] : null;
$data = isset($source) ? $source->getProperties() : null;
if (isset($data['character_set_name']) || isset($data['collation_name']))
{
return true;
Expand Down