|
@@ -235,7 +235,7 @@ class MysqlMigrationHandler(EditorialModel.migrationhandler.dummy.DummyMigration
|
235
|
235
|
def _r2t2table_name(self, em, emfield):
|
236
|
236
|
emclass = emfield.em_class
|
237
|
237
|
emtype = em.component(emfield.rel_to_type_id)
|
238
|
|
- return self.datasource.get_r2t2table_name(emclass.name, emtype.name, emfield.name)
|
|
238
|
+ return self.datasource.get_r2t2table_name(emclass.name, emtype.name)
|
239
|
239
|
#return "%s_%s_%s"%(emclass.name, emtype.name, emfield.name)
|
240
|
240
|
|
241
|
241
|
## @brief Generate a columns_fieldtype dict given a rel2type EmField
|
|
@@ -504,7 +504,7 @@ FOR EACH ROW SET {col_val_list};""".format(
|
504
|
504
|
# @todo do it
|
505
|
505
|
@property
|
506
|
506
|
def _relation_pk(self):
|
507
|
|
- return ('id_relation', EditorialModel.fieldtypes.pk.EmFieldType())
|
|
507
|
+ return (MySQL.relation_table_pkname, EditorialModel.fieldtypes.pk.EmFieldType())
|
508
|
508
|
|
509
|
509
|
## @brief Returns a dict { colname:fieldtype } of relation table columns
|
510
|
510
|
@property
|