ae7d42e2e5cb513f373a5f424eaf902766388a0f max Tue Oct 27 16:00:50 2015 -0700 Taking back previous gbib-related fix to hgTables that caused a problem when filtering non-assembly tables. refs #16158, refs #16188 diff --git src/hg/hgTables/hgTables.c src/hg/hgTables/hgTables.c index 647b54f..a4c2e6c 100644 --- src/hg/hgTables/hgTables.c +++ src/hg/hgTables/hgTables.c @@ -928,40 +928,30 @@ if ( sameString(jp->b->database, db) && sameString(jp->b->table, table) ) { idField = cloneString(jp->b->field); break; } } } joinerPairFreeList(&jpList); } } /* If we haven't found the answer but this looks like a non-positional table, * use the first field. */ if (idField == NULL && !isCustomTrack(table) && (hti == NULL || !hti->isPos)) { - char *dotPos = strstr(table, "."); - if (!isHubTrack(table) && dotPos != NULL) - // if the database is part of the table name in mysql notation - // (= databaseName.tableName), split the table string and override db. - // The jksql table name/field cache cannot handle it otherwise - { - *dotPos = 0; - db = table; - table = dotPos+1; - } struct sqlConnection *conn = track ? hAllocConnTrack(db, track) : hAllocConn(db); struct slName *fieldList = sqlListFields(conn, table); if (fieldList == NULL) errAbort("getIdField: Can't find fields of table %s", table); idField = cloneString(fieldList->name); slFreeList(&fieldList); hFreeConn(&conn); } return idField; } int countTableColumns(struct sqlConnection *conn, char *table) /* Count columns in table. */ { char *splitTable = chromTable(conn, table);