From 939c7141c1c6448cfb62ae1a7edc8331650fe67b Mon Sep 17 00:00:00 2001 From: Barry LaFond Date: Thu, 7 Feb 2013 13:44:58 -0600 Subject: [PATCH] TEIIDDES-1010 fixed issues creating/naming indexes includes fixing the Name In Source value --- .../relational/impl/RelationalModelProcessorImpl.java | 3 +++ .../jdbc/relational/impl/custom/SybaseModelProcessor.java | 2 +- .../relational/ui/wizards/RelationalObjectProcessor.java | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/org.teiid.designer.jdbc.relational/src/org/teiid/designer/jdbc/relational/impl/RelationalModelProcessorImpl.java b/plugins/org.teiid.designer.jdbc.relational/src/org/teiid/designer/jdbc/relational/impl/RelationalModelProcessorImpl.java index f979fea066..59ada3faee 100644 --- a/plugins/org.teiid.designer.jdbc.relational/src/org/teiid/designer/jdbc/relational/impl/RelationalModelProcessorImpl.java +++ b/plugins/org.teiid.designer.jdbc.relational/src/org/teiid/designer/jdbc/relational/impl/RelationalModelProcessorImpl.java @@ -2009,6 +2009,9 @@ protected Index findIndex( final Table table, resource.getContents().add(index); } setNameAndNameInSource(index, spec.indexName, tableNode, context, problems); + String quoteStr = getQuoteString(context, problems); + String nis = index.getNameInSource() + '.' + quoteStr + spec.indexName + quoteStr; + index.setNameInSource(nis); index.setUnique(!spec.nonUnique); index.getColumns().addAll(spec.columns); index.setFilterCondition(spec.filterCondition); diff --git a/plugins/org.teiid.designer.jdbc.relational/src/org/teiid/designer/jdbc/relational/impl/custom/SybaseModelProcessor.java b/plugins/org.teiid.designer.jdbc.relational/src/org/teiid/designer/jdbc/relational/impl/custom/SybaseModelProcessor.java index 9bb074b798..17dc4960d4 100644 --- a/plugins/org.teiid.designer.jdbc.relational/src/org/teiid/designer/jdbc/relational/impl/custom/SybaseModelProcessor.java +++ b/plugins/org.teiid.designer.jdbc.relational/src/org/teiid/designer/jdbc/relational/impl/custom/SybaseModelProcessor.java @@ -94,7 +94,7 @@ protected List createIndexes( final JdbcTable tableNode, final PrimaryKey pk = theTable.getPrimaryKey(); if (pk != null) { final String pkName = pk.getName(); - if (pkName == null || pkName.trim().length() != 0) { + if (pkName == null || pkName.trim().length() == 0) { final List pkColumns = pk.getColumns(); // Iterate over the indexes for the table ... diff --git a/plugins/org.teiid.designer.relational.ui/src/org/teiid/designer/relational/ui/wizards/RelationalObjectProcessor.java b/plugins/org.teiid.designer.relational.ui/src/org/teiid/designer/relational/ui/wizards/RelationalObjectProcessor.java index 537b4684e2..5b3f7a3d1b 100644 --- a/plugins/org.teiid.designer.relational.ui/src/org/teiid/designer/relational/ui/wizards/RelationalObjectProcessor.java +++ b/plugins/org.teiid.designer.relational.ui/src/org/teiid/designer/relational/ui/wizards/RelationalObjectProcessor.java @@ -427,19 +427,19 @@ public List getOtherModifiedResources() { * handler for Create Relationships Model Button pressed */ private ModelResource createRelationalModel(IResource targetRes, String sNewRelationshipModelName ) { - ModelResource mrRelationshipModel = constructRelationalModel(targetRes , sNewRelationshipModelName ); + ModelResource mr = constructRelationalModel(targetRes , sNewRelationshipModelName ); // Save Relationship Model try { - if( mrRelationshipModel != null ) { - mrRelationshipModel.save( null, false ); + if( mr != null ) { + mr.save( null, false ); } } catch (ModelWorkspaceException mwe) { UiConstants.Util.log( mwe ); } - return mrRelationshipModel; + return mr; } /**