Merge pull request #13 from ifacesoft/orm

oRm
ifacesoft · Mar 25, 2015 · 32129c8 · 32129c8
2 parents 7b150b4 + 85e1a3b
commit 32129c8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/Source/Ice/Core/Data/Scheme.php b/Source/Ice/Core/Data/Scheme.php
@@ -167,7 +167,7 @@ public static function update(Module $module, $force = false)
                     $schemeTables[$tableName]['oneToManyHash'] = crc32(Json::encode([]));
                 }
                 $table['oneToManyHash'] = crc32(Json::encode($table['oneToMany']));
-                if ($table['oneToManyHash'] != $schemeTables[$tableName]['oneToManyHash']) {
+                if ($force || $table['oneToManyHash'] != $schemeTables[$tableName]['oneToManyHash']) {
                     $references = [];
                     foreach ($table['oneToMany'] as $referenceTableName => $columnName) {
                         $referenceClassName = isset($schemeTables[$referenceTableName])
@@ -187,7 +187,7 @@ public static function update(Module $module, $force = false)
                     $schemeTables[$tableName]['manyToOneHash'] = crc32(Json::encode([]));
                 }
                 $table['manyToOneHash'] = crc32(Json::encode($table['manyToOne']));
-                if ($table['manyToOneHash'] != $schemeTables[$tableName]['manyToOneHash']) {
+                if ($force || $table['manyToOneHash'] != $schemeTables[$tableName]['manyToOneHash']) {
                     $references = [];
                     foreach ($table['manyToOne'] as $referenceTableName => $columnName) {
                         $referenceClassName = isset($schemeTables[$referenceTableName])
@@ -207,8 +207,21 @@ public static function update(Module $module, $force = false)
                     $schemeTables[$tableName]['manyToManyHash'] = crc32(Json::encode([]));
                 }
                 $table['manyToManyHash'] = crc32(Json::encode($table['manyToMany']));
-                if ($table['manyToManyHash'] != $schemeTables[$tableName]['manyToManyHash']) {
-                    Data_Scheme::getLogger()->info(['Update ManyToMany references for model {$0}: {$1}', [$schemeTables[$tableName]['modelClass'], Json::encode($table['references'])]]);
+                if ($force || $table['manyToManyHash'] != $schemeTables[$tableName]['manyToManyHash']) {
+                    $references = [];
+                    foreach ($table['manyToMany'] as $referenceTableName => $linkTableName) {
+                        $referenceClassName = isset($schemeTables[$referenceTableName])
+                            ? $schemeTables[$referenceTableName]['modelClass']
+                            : $module->getModelClass($referenceTableName, $dataSourceKey);
+
+                        $linkClassName = isset($schemeTables[$linkTableName])
+                            ? $schemeTables[$linkTableName]['modelClass']
+                            : $module->getModelClass($linkTableName, $dataSourceKey);
+
+                        $references[$referenceClassName] = $linkClassName;
+                    }
+                    $table['manyToMany'] = $references;
+                    Data_Scheme::getLogger()->info(['Update ManyToMany references for model {$0}: {$1}', [$schemeTables[$tableName]['modelClass'], Json::encode($table['manyToMany'])]]);
                     $schemeTables[$tableName]['manyToMany'] = $table['manyToMany'];
                     $schemeTables[$tableName]['manyToManyHash'] = $table['manyToManyHash'];
                     $updated = true;

diff --git a/Source/Ice/Data/Source/Mysqli.php b/Source/Ice/Data/Source/Mysqli.php
@@ -498,7 +498,7 @@ public function getTables(Module $module)
                     foreach ($data['references'] as $tableName1 => $reference1) {
                         foreach ($data['references'] as $tableName2 => $reference2) {
                             if ($tableName1 != $tableName2) {
-                                $tables[$tableName1]['manyToMany'][] = $tableName2;
+                                $tables[$tableName1]['manyToMany'][$tableName2] = $table['TABLE_NAME'];
                             }
                         }
                     }