Changeset 2597

Timestamp:

01/27/10 16:38:53 (2 years ago)

Author:

mswertz

Message:

bugfix: lowercase foreign key definitions provided by mysql

Location:

molgenis/3.3/src/org/molgenis/model

Files:

• JDBCModelExtractor.java (modified) (2 diffs)
• jaxb/Model.java (modified) (1 diff)

molgenis/3.3/src/org/molgenis/model/JDBCModelExtractor.java

@@ -184 +184 @@
                                         while (rsXref.next())
                                         {
+                                                
                                                 Tuple xrefInfo = new ResultSetTuple(rsXref);
+                                                logger.debug(xrefInfo);
                                                 if (xrefInfo.getString("FKCOLUMN_NAME").equals(fieldInfo.getString("COLUMN_NAME")))
                                                 {
                                                         f.setType(Field.Type.XREF_SINGLE);
+                                                        //problem: PKTABLE_NAME is lowercase, need to be corrected later?
                                                         f.setXrefField(xrefInfo.getString("PKTABLE_NAME") + "."
                                                                         + xrefInfo.getString("PKCOLUMN_NAME"));
@@ -322 +325 @@
                                                 String xrefEntityName = f.getXrefField().substring(0, f.getXrefField().indexOf("."));
                                                 String xrefFieldName = f.getXrefField().substring(f.getXrefField().indexOf(".") + 1);
+                                                logger.info("trying to find fields for "+f.getXrefField());
+                                                logger.info("finding entity "+m.getEntity(xrefEntityName));
+                                                
+                                                //reset the xref entity to the uppercase version
+                                                f.setXrefField(m.getEntity(xrefEntityName).getName()+"."+xrefFieldName);
+                                                
+//                                              if(m.getEntity(xrefEntityName) == null)
+//                                              {
+//                                                      for(Entity entity: m.getEntities())
+//                                                              logger.debug(entity.getName());
+//                                              }
+                                                
                                                 for (Field labelField : m.getEntity(xrefEntityName).getFields())
                                                 {

molgenis/3.3/src/org/molgenis/model/jaxb/Model.java

@@ -45 +45 @@
                 for (Entity entity : entities)
                 {
-                        if (entity.getName().equals(name))
+                        if (entity.getName().toLowerCase().equals(name.toLowerCase()))
                                 return entity;
                 }