|
@@ -24,7 +24,7 @@ discard block |
|
|
block discarded – undo |
|
24
|
24
|
{ |
|
25
|
25
|
parent::__construct($connection); |
|
26
|
26
|
if ($entityFactory) { |
|
27
|
|
- $this->setupResult('setRowFactory', function (array $data) use ($entityFactory, $entityMapping) { |
|
|
27
|
+ $this->setupResult('setRowFactory', function(array $data) use ($entityFactory, $entityMapping) { |
|
28
|
28
|
return $entityFactory->createEntity($entityMapping->getEntityClassName(), $data); |
|
29
|
29
|
}); |
|
30
|
30
|
} |
|
@@ -86,12 +86,12 @@ discard block |
|
|
block discarded – undo |
|
86
|
86
|
|
|
87
|
87
|
$additionalTables = []; |
|
88
|
88
|
if ($additionalTableList !== null) { |
|
89
|
|
- $additionalTables = array_filter($tables, function (TableInfo $tableInfo) use ($additionalTableList) { |
|
|
89
|
+ $additionalTables = array_filter($tables, function(TableInfo $tableInfo) use ($additionalTableList) { |
|
90
|
90
|
return in_array($tableInfo->getIdentifier(), $additionalTableList); |
|
91
|
91
|
}); |
|
92
|
92
|
} |
|
93
|
93
|
|
|
94
|
|
- $innerJoinTables = array_filter($tables, function (TableInfo $tableInfo) { |
|
|
94
|
+ $innerJoinTables = array_filter($tables, function(TableInfo $tableInfo) { |
|
95
|
95
|
return (strtolower(substr($tableInfo->getSqlJoinCode(), 0, 5)) === 'inner'); |
|
96
|
96
|
}); |
|
97
|
97
|
|
|
@@ -121,7 +121,7 @@ discard block |
|
|
block discarded – undo |
|
121
|
121
|
{ |
|
122
|
122
|
// tables that should not be important to select correct row (ie. left joins) |
|
123
|
123
|
/** @var TableInfo[] $optionalTables */ |
|
124
|
|
- $optionalTables = array_filter($this->entityMapping->getTables(), function (TableInfo $tableInfo) { |
|
|
124
|
+ $optionalTables = array_filter($this->entityMapping->getTables(), function(TableInfo $tableInfo) { |
|
125
|
125
|
return (strtolower(substr($tableInfo->getSqlJoinCode(), 0, 4)) === 'left'); |
|
126
|
126
|
}); |
|
127
|
127
|
|
|
@@ -130,7 +130,7 @@ discard block |
|
|
block discarded – undo |
|
130
|
130
|
foreach ($optionalTables as $tableInfo) { |
|
131
|
131
|
$propertyInfoList = $this->entityMapping->getColumnsForTable($tableInfo->getIdentifier()); |
|
132
|
132
|
|
|
133
|
|
- $tablePropertyNames = array_map(function (ColumnInfo $columnInfo) { |
|
|
133
|
+ $tablePropertyNames = array_map(function(ColumnInfo $columnInfo) { |
|
134
|
134
|
return $columnInfo->getPropertyName(); |
|
135
|
135
|
}, $propertyInfoList); |
|
136
|
136
|
|