Changeset 8411

Timestamp:

26/06/12 21:44:46 (9 years ago)

Author:

mnagni

Message:

created wrong table composition

Location:

mauRepo/xmi2sqlalchemy/trunk/src/main

Files:

• java/ndg/services/newmoon/velocity/python/GenerateTablesClosure.java (modified) (1 diff)
• resources/velocity/python/sqlAlchemyTables.vm (modified) (3 diffs)

mauRepo/xmi2sqlalchemy/trunk/src/main/java/ndg/services/newmoon/velocity/python/GenerateTablesClosure.java

@@ -205 +205 @@
 
                         TableModel parent = processUMLclass(cm);
-                        String relName = parent.getAssociatedClass().getName().toLowerCase();
+                        String relName = "_" + parent.getAssociatedClass().getName().toLowerCase();
                         Relationship rl = new Relationship(child, parent, relName, false, false);                       
                         ForeignKey fk = new ForeignKey(child, relName);

mauRepo/xmi2sqlalchemy/trunk/src/main/resources/velocity/python/sqlAlchemyTables.vm

@@ -4 +4 @@
 ## tableModel - an instance of ClassModel class
 ##########################################################################
-
-##macro( attributeType $attribute)
-##if(!$attribute.associatedType.associatedClass.name.equalsIgnoreCase('boolean')
-##&& ($attribute.associatedType.isCodeList() || $attribute.associatedType.isEnumeration()))
-##${attribute.associatedType.associatedClass.name}.db_type()
-##else${vh.substituteDBType($attribute)}#end
-##end
 #macro(checkUseAlter $fk, $fkName, $relName)
 , use_alter=True, name='fk_${fkName}_${relName}'#end
@@ -27 +20 @@
 #set ($tn = ${tableModel.associatedClass.name.toLowerCase()})
 ${tab}Column('id', Integer, Sequence('${tn}_id_seq'), primary_key=True),
-##if($tableModel.inherited && $tableModel.inherited.size() > 0)
-        ##foreach( $parent in $tableModel.inherited)
-                ##set ($pn = ${parent.associatedClass.name.toLowerCase()})
-                ##${tab}Column('_${pn}', Integer, ForeignKey('${pn}.${pn}_id')),#end
-##end
 #end
 
@@ -65 +53 @@
 #column($attribute)
 #end
-##${tab}#superColumn($tableModel)
 ${tab}extend_existing=False,)
 #end