Changeset 8041

Timestamp:

23/12/11 15:20:16 (9 years ago)

Author:

mnagni

Message:

Works fine but I have to find a way to initialize the python classes attributes

Location:

mauRepo/xmi2sqlalchemy/trunk/src/main

Files:

• java/ndg/services/newmoon/collect/CollectClassesClosure.java (modified) (4 diffs)
• java/ndg/services/newmoon/velocity/python/GenerateTables.java (modified) (3 diffs)
• resources/global_library.vm (modified) (2 diffs)
• resources/velocity/python/sqlAlchemyTables.vm (modified) (1 diff)

mauRepo/xmi2sqlalchemy/trunk/src/main/java/ndg/services/newmoon/collect/CollectClassesClosure.java

@@ -225 +225 @@
                         try {
                                 if (input instanceof UMLAttribute) {
-                                        generateSimpleKeyValues((UMLAttribute) input);
                                         ret.add(extractAttribute((UMLAttribute) input));
-                                }
-                                        
-                                        
-                                if (input instanceof UMLAssociationEnd)
+                                } else if (input instanceof UMLAssociationEnd)
                                         ret.add(extractAttribute((UMLAssociationEnd) input));
                         } catch (NewmoonException e) {
@@ -256 +252 @@
                 private AttributeModel extractAttribute(UMLAttribute umlAttribute) throws NewmoonException,
                                 IOException {
+                        generateSimpleKeyValues(umlAttribute);
                         return extractAttribute(umlAttribute.getClassifier(), umlAttribute, cm,
                                         hasMolteplicity(umlAttribute), UMLElementsArchive.getInstance().isVoidable(umlAttribute));
@@ -291 +288 @@
                                 attrClassModel = processUMLclass(attrClass);
                         }
-                                                        
+                        
                         return new AttributeModel(attrClassModel, 
                                         valueTagged.getName(), 
@@ -302 +299 @@
                 
                 private Integer extractIntegerValue(UMLValueTagged valueTagged, String bound) {
-                        String sBound = UMLElementsArchive.getInstance().getTaggedValue(valueTagged, bound);
-                        if (sBound == null)
+                        String sBound = null;
+                        if (valueTagged instanceof UMLAssociationEnd) {
+                                sBound = extractMulteplicity((UMLAssociationEnd)valueTagged, bound); 
+                        } else {
+                                sBound = UMLElementsArchive.getInstance().getTaggedValue(valueTagged, bound);
+                        } 
+                        return extractIntegerValue(sBound);
+                }
+                
+                private String extractMulteplicity(UMLAssociationEnd umlAssociationEnd, String bound){
+                        if (umlAssociationEnd.getMultiplicity().contains("..")) {
+                                String[] limits = umlAssociationEnd.getMultiplicity().split("\\.\\.");
+                                if (bound.equals(Dictionary.LOWER_BOUND)) {
+                                        return limits[0];
+                                } else {
+                                        return limits[1];
+                                }
+                        }       
+                        return null;
+                }
+                
+                private Integer extractIntegerValue(String value) {
+                        if (value == null)
                                 return 0;
-                        if (StringUtils.isNumeric(sBound))
-                                return Integer.parseInt(sBound);
-                        if (sBound.equals("*"))
+                        if (StringUtils.isNumeric(value))
+                                return Integer.parseInt(value);
+                        if (value.equals("*"))
                                 return Integer.MAX_VALUE;
                         return 0;

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

@@ -233 +233 @@
                 while (iterator.hasNext()) {
                         Relationship rl = iterator.next();
+                        if (rl.isOneToOne())
+                                return;                 
                         LoopFinder lf = new LoopFinder(rl, closure.getTableModels().size(), closure);
                         lf.search();
@@ -271 +273 @@
                 Iterator<ForeignKey> fk = parent.getFk().iterator();
                 while (fk.hasNext()) {
-                        ForeignKey tmp_fk = fk.next();
-                        if (!tmp_fk.getTableModel().equals(child))
+                        ForeignKey tmp_fk = fk.next();  
+                        if (!tmp_fk.getTableModel().equals(child) || tmp_fk.getAssociatedRelationship().isOneToOne())
                                 continue;
                         
@@ -420 +422 @@
                 for (Relationship rl : child.getRelationship()) {
                         if (!rl.getToTable().equals(onParent))
-                                continue;                       
+                                continue;       
+                        
                         rl.setRelationType(RELATION_TYPE.MANY_TO_MANY);
                         return;

mauRepo/xmi2sqlalchemy/trunk/src/main/resources/global_library.vm

@@ -33 +33 @@
 #set ($ft = $relation.fromTable.associatedClass.name)
 #set ($tmn = $tableModel.associatedClass.name)
-#if ($relation.isManyToMany())
+#if ($relation.isManyToMany() && !$relation.useList)
 '${relation.name}': relationship(${tt}, 
 secondary=${tt.toLowerCase()}_${ft.toLowerCase()}_table
@@ -49 +49 @@
 #end
 #if($relation.isOneToMany())
-, primaryjoin=${tt.toLowerCase()}_table.c.${ft.toLowerCase()}_${relation.name}==${tmn.toLowerCase()}_table.c.id
+, primaryjoin=${tt.toLowerCase()}_table.c.${ft.toLowerCase()}_${relation.name.toLowerCase()}==${tmn.toLowerCase()}_table.c.id
 #end
-#if($relation.isOneToOne())
-, primaryjoin=${tt.toLowerCase()}_table.c.${ft.toLowerCase()}_${relation.name}_id==${tmn.toLowerCase()}_table.c.id
+#if($relation.isOneToOne() || !$relation.useList)
+, primaryjoin=${tt.toLowerCase()}_table.c.${ft.toLowerCase()}_${relation.name.toLowerCase()}_id==${tmn.toLowerCase()}_table.c.id
 #end
 )#end

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

@@ -17 +17 @@
 #end
 
-#macro(checkUseAlter $fk, $fkName)
+#macro(checkUseAlter $fk, $fkName, $relName)
 #if($fk.useAlter)
-, use_alter=True, name='fk_${fkName}'#end
+, use_alter=True, name='fk_${fkName}_${relName}'#end
 #end
 
 #macro( fk $foreignKey, $tableModel)
 #set ($fkName = ${foreignKey.tableModel.associatedClass.name.toLowerCase()})
-#set ($relName = ${foreignKey.parentAttributeName})
+#set ($relName = ${foreignKey.parentAttributeName.toLowerCase()})
 #if($foreignKey.associatedRelationship.isOneToOne() || !$foreignKey.associatedRelationship.useList)
-Column('${fkName}_${relName}_id', Integer, ForeignKey('${fkName}.id'#checkUseAlter($foreignKey, $fkName))),
+Column('${fkName}_${relName}_id', Integer, ForeignKey('${fkName}.id'#checkUseAlter($foreignKey, $fkName, $relName))),
 #else
-Column('${fkName}_${relName}', Integer, ForeignKey('${fkName}.id'#checkUseAlter($foreignKey, $fkName))),
+Column('${fkName}_${relName}', Integer, ForeignKey('${fkName}.id'#checkUseAlter($foreignKey, $fkName, $relName))),
 #end
 #end