138139 2006-11-30 10:53:32 +0000 Incorrect export to SQL 2006-11-30 19:50:16 +0000 1 1 2 Applications umbrello general unspecified Gentoo Packages Linux RESOLVED FIXED NOR normal --- 0 alexeyp umbrello-devel 0 oldest_to_newest 490639 0 alexeyp 2006-11-30 10:53:32 +0000 Version: (using KDE KDE 3.5.5) Installed from: Gentoo Packages Compiler: gcc 4.1.1 OS: Linux The SQL export is incorrect as soon as the diagram is over about 50 objects, and associations between objects were dropped and recreated. The following problems are detected: 1) Export to SQL ignores associations when a field of the table refers to another field of the same table. 2) With the large diagram (over 70..90) objects, some associations are repeated during the export multiple times (as CONSTRAINT .. FOREIGN KEY) 3) The generated CREATE TABLE statement contains CONSTRAINTS. That requires to execute output .sql files in certain order. 4) .XMI file contains hundreds of bogus connections. Some edit+save operations cause file size to double. I've given name to all the connections, yet hundreds of connections with name="" exist in the file. I didn't find any workaround for this yet. I have a patch that fixes 1)..3). I'll try to attach it here if I find how. 490640 1 18732 alexeyp 2006-11-30 10:54:30 +0000 Created attachment 18732 Patch to fix sql export 490760 2 okellogg 2006-11-30 18:56:43 +0000 > Patch to fix sql export The attachment contains the diff for sqlwriter.cpp but apparently you have added a new member, constraintMap. Please check - did you also modify sqlwriter.h (or some other file?) 490761 3 okellogg 2006-11-30 19:00:06 +0000 Sorry, forget about Comment #2. All is fine and I will apply instantly. 490774 4 okellogg 2006-11-30 19:50:14 +0000 SVN commit 609424 by okellogg: Apply attachment 18732 from Alexey Parshin with slight modification. writeClass(): Add an auxiliary variable, constraintMap, to avoid excessive code for duplicated associations. (Those duplicated associations should not be there in the first place though.) writeAttributes(): Generate code for implementation-level attributes. BUG:138139 M +1 -0 ChangeLog M +24 -11 umbrello/codegenerators/sqlwriter.cpp --- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #609423:609424 @@ -11,6 +11,7 @@ http://www.geeksoc.org/~jr/umbrello/uml-devel/9863.html * Bugs/wishes from http://bugs.kde.org: * Artifacts of a component diagram are wrongly placed in Deployment View folder (137564) +* Incorrect export to SQL (138139) Version 1.5.52 --- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/sqlwriter.cpp #609423:609424 @@ -83,6 +83,9 @@ if (isClass) writeAttributes(c, sql); + sql << m_endl << ");" << m_endl; + + QMap<UMLAssociation*,UMLAssociation*> constraintMap; // so we don't repeat constraint UMLAssociationList aggregations = c->getAggregations(); if( forceSections() || !aggregations.isEmpty() ) { for(UMLAssociation* a = aggregations.first(); a; a = aggregations.next()) { @@ -90,18 +93,20 @@ UMLObject *objB = a->getObject(Uml::B); if (objA->getID() == c->getID() && objB->getID() != c->getID()) continue; - QString roleNameA = a->getRoleName(Uml::A); - QString roleNameB = a->getRoleName(Uml::B); - if (roleNameA.isEmpty() || roleNameB.isEmpty()) - continue; - sql << m_indentation << "," << m_endl; - sql << m_indentation << "CONSTRAINT " << a->getName() - << " FOREIGN KEY (" << roleNameB << ") REFERENCES " - << objA->getName() << " (" << roleNameA << ")"; + constraintMap[a] = a; } } + + QMap<UMLAssociation*,UMLAssociation*>::Iterator itor = constraintMap.begin(); + for (;itor != constraintMap.end();itor++) { + UMLAssociation* a = itor.data(); + sql << "ALTER TABLE "<< classname + << " ADD CONSTRAINT " << a->getName() << " FOREIGN KEY (" + << a->getRoleName(Uml::B) << ") REFERENCES " + << a->getObject(Uml::A)->getName() + << " (" << a->getRoleName(Uml::A) << ");" << m_endl; + } - sql << m_endl << ");" << m_endl; file.close(); emit codeGenerated(c, true); @@ -109,10 +114,11 @@ void SQLWriter::writeAttributes(UMLClassifier *c, QTextStream &sql) { - UMLAttributeList atpub, atprot, atpriv; + UMLAttributeList atpub, atprot, atpriv, atimp; atpub.setAutoDelete(false); atprot.setAutoDelete(false); atpriv.setAutoDelete(false); + atimp.setAutoDelete(false); //sort attributes by scope and see if they have a default value UMLAttributeList atl = c->getAttributeList(); @@ -127,7 +133,8 @@ case Uml::Visibility::Private: atpriv.append(at); break; - default: + case Uml::Visibility::Implementation: + atimp.append(at); break; } } @@ -155,6 +162,12 @@ first = false; } + if (atimp.count() > 0) + { + printAttributes(sql, atimp, first); + first = false; + } + return; } 18732 2006-11-30 10:54:30 +0000 2006-11-30 10:54:30 +0000 Patch to fix sql export umbrello-3.5.5-sqlexport.patch text/plain 2771 alexeyp ZGlmZiAtdU5yIGtkZXNkay0zLjUuNS5vcmlnL3VtYnJlbGxvL3VtYnJlbGxvL2NvZGVnZW5lcmF0 b3JzL3NxbHdyaXRlci5jcHAga2Rlc2RrLTMuNS41L3VtYnJlbGxvL3VtYnJlbGxvL2NvZGVnZW5l cmF0b3JzL3NxbHdyaXRlci5jcHAKLS0tIGtkZXNkay0zLjUuNS5vcmlnL3VtYnJlbGxvL3VtYnJl bGxvL2NvZGVnZW5lcmF0b3JzL3NxbHdyaXRlci5jcHAJMjAwNi0wNy0yMiAxODoxMTo1Ny4wMDAw MDAwMDAgKzEwMDAKKysrIGtkZXNkay0zLjUuNS91bWJyZWxsby91bWJyZWxsby9jb2RlZ2VuZXJh dG9ycy9zcWx3cml0ZXIuY3BwCTIwMDYtMTEtMzAgMjA6MjA6MDMuMDAwMDAwMDAwICsxMTAwCkBA IC04MywyMSArODMsMjggQEAKICAgICBpZiAoaXNDbGFzcykKICAgICAgICAgd3JpdGVBdHRyaWJ1 dGVzKGMsIHNxbCk7CiAKKyAgICBzcWwgPDwgbV9lbmRsIDw8ICIpOyIgPDwgbV9lbmRsOworCisg ICAgUU1hcDxRU3RyaW5nLFVNTEFzc29jaWF0aW9uKj4gY29uc3RyYWludE1hcDsgLy8gc28gd2Ug ZG9uJ3QgcmVwZWF0IGNvbnN0cmFpbnQKICAgICBVTUxBc3NvY2lhdGlvbkxpc3QgYWdncmVnYXRp b25zID0gYy0+Z2V0QWdncmVnYXRpb25zKCk7CiAgICAgaWYoIGZvcmNlU2VjdGlvbnMoKSB8fCAh YWdncmVnYXRpb25zLmlzRW1wdHkoKSApIHsKICAgICAgICAgZm9yKFVNTEFzc29jaWF0aW9uKiBh ID0gYWdncmVnYXRpb25zLmZpcnN0KCk7IGE7IGEgPSBhZ2dyZWdhdGlvbnMubmV4dCgpKSB7Ci0g ICAgICAgICAgICBpZiggYS0+Z2V0T2JqZWN0KFVtbDo6QSktPmdldElEKCkgIT0gYy0+Z2V0SUQo KSApIHsKLQotICAgICAgICAgICAgICAgIHNxbCA8PCBtX2luZGVudGF0aW9uIDw8ICIsIiA8PCBt X2VuZGwgPDwgbV9pbmRlbnRhdGlvbgotICAgICAgICAgICAgICAgIDw8ICJDT05TVFJBSU5UICIg PDwgYS0+Z2V0TmFtZSgpIDw8ICIgRk9SRUlHTiBLRVkgKCIKLSAgICAgICAgICAgICAgICA8PCBh LT5nZXRSb2xlTmFtZShVbWw6OkIpIDw8ICIpIFJFRkVSRU5DRVMgIgotICAgICAgICAgICAgICAg IDw8IGEtPmdldE9iamVjdChVbWw6OkEpLT5nZXROYW1lKCkKLSAgICAgICAgICAgICAgICA8PCAi ICgiIDw8IGEtPmdldFJvbGVOYW1lKFVtbDo6QSkgPDwgIikiOwotICAgICAgICAgICAgfQorICAg ICAgICAgICAgaWYoIGEtPmdldE9iamVjdChVbWw6OkEpLT5nZXRJRCgpID09IGMtPmdldElEKCkg JiYgYS0+Z2V0T2JqZWN0KFVtbDo6QiktPmdldElEKCkgIT0gYy0+Z2V0SUQoKSApCisJCWNvbnRp bnVlOworCSAgICBjb25zdHJhaW50TWFwW2EtPmdldE5hbWUoKV0gPSBhOwogICAgICAgICB9CiAg ICAgfQorICAgIAorICAgIFFNYXA8UVN0cmluZyxVTUxBc3NvY2lhdGlvbio+OjpJdGVyYXRvciBp dG9yID0gY29uc3RyYWludE1hcC5iZWdpbigpOworICAgIGZvciAoO2l0b3IgIT0gY29uc3RyYWlu dE1hcC5lbmQoKTtpdG9yKyspIHsKKwlVTUxBc3NvY2lhdGlvbiogYSA9IGl0b3IuZGF0YSgpOwor CXNxbCA8PCAiQUxURVIgVEFCTEUgIjw8IGNsYXNzbmFtZQorICAgICAgICAgICAgPDwgIiBBREQg Q09OU1RSQUlOVCAiIDw8IGEtPmdldE5hbWUoKSA8PCAiIEZPUkVJR04gS0VZICgiCisgICAgICAg ICAgICA8PCBhLT5nZXRSb2xlTmFtZShVbWw6OkIpIDw8ICIpIFJFRkVSRU5DRVMgIgorICAgICAg ICAgICAgPDwgYS0+Z2V0T2JqZWN0KFVtbDo6QSktPmdldE5hbWUoKQorICAgICAgICAgICAgPDwg IiAoIiA8PCBhLT5nZXRSb2xlTmFtZShVbWw6OkEpIDw8ICIpOyIgPDwgbV9lbmRsOworICAgIH0K IAotICAgIHNxbCA8PCBtX2VuZGwgPDwgIik7IiA8PCBtX2VuZGw7CiAKICAgICBmaWxlLmNsb3Nl KCk7CiAgICAgZW1pdCBjb2RlR2VuZXJhdGVkKGMsIHRydWUpOwpAQCAtMTA1LDEwICsxMTIsMTEg QEAKIAogCiB2b2lkIFNRTFdyaXRlcjo6d3JpdGVBdHRyaWJ1dGVzKFVNTENsYXNzaWZpZXIgKmMs IFFUZXh0U3RyZWFtICZzcWwpIHsKLSAgICBVTUxBdHRyaWJ1dGVMaXN0IGF0cHViLCBhdHByb3Qs IGF0cHJpdjsKKyAgICBVTUxBdHRyaWJ1dGVMaXN0IGF0cHViLCBhdHByb3QsIGF0cHJpdiwgYXRp bXA7CiAgICAgYXRwdWIuc2V0QXV0b0RlbGV0ZShmYWxzZSk7CiAgICAgYXRwcm90LnNldEF1dG9E ZWxldGUoZmFsc2UpOwogICAgIGF0cHJpdi5zZXRBdXRvRGVsZXRlKGZhbHNlKTsKKyAgICBhdGlt cC5zZXRBdXRvRGVsZXRlKGZhbHNlKTsKIAogICAgIC8vc29ydCBhdHRyaWJ1dGVzIGJ5IHNjb3Bl IGFuZCBzZWUgaWYgdGhleSBoYXZlIGEgZGVmYXVsdCB2YWx1ZQogICAgIFVNTEF0dHJpYnV0ZUxp c3QgYXRsID0gYy0+Z2V0QXR0cmlidXRlTGlzdCgpOwpAQCAtMTIzLDcgKzEzMSw5IEBACiAgICAg ICAgICAgY2FzZSBVbWw6OlZpc2liaWxpdHk6OlByaXZhdGU6CiAgICAgICAgICAgICBhdHByaXYu YXBwZW5kKGF0KTsKICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgIGRlZmF1bHQ6CisgICAg ICAgICAgY2FzZSBVbWw6OlZpc2liaWxpdHk6OkltcGxlbWVudGF0aW9uOgorICAgICAgICAgIC8v ZGVmYXVsdDoKKyAgICAgICAgICAgIGF0aW1wLmFwcGVuZChhdCk7CiAgICAgICAgICAgICBicmVh azsKICAgICAgICAgfQogICAgIH0KQEAgLTE1MSw2ICsxNjEsMTIgQEAKICAgICAgICAgZmlyc3Qg PSBmYWxzZTsKICAgICB9CiAKKyAgICBpZiAoYXRpbXAuY291bnQoKSA+IDApCisgICAgeworICAg ICAgICBwcmludEF0dHJpYnV0ZXMoc3FsLCBhdGltcCwgZmlyc3QpOworICAgICAgICBmaXJzdCA9 IGZhbHNlOworICAgIH0KKwogICAgIHJldHVybjsKIH0KIAo=