ef426f133bd12f32890443ed4efcbf4b16874674 angie Mon Jan 4 12:16:27 2016 -0800 Removing duplicate definition of NOSQLINJ - thx Galt. refs #16515 diff --git src/hg/lib/annoStreamDb.c src/hg/lib/annoStreamDb.c index f68f39d..0ebc36e 100644 --- src/hg/lib/annoStreamDb.c +++ src/hg/lib/annoStreamDb.c @@ -1128,33 +1128,30 @@ char *tfField = jsonStringVal(fieldEl, "field"); slAddHead(&self->relatedDtfList, joinerDtfNew(tfDb, tfTable, tfField)); } } } slReverse(&self->relatedDtfList); asObj = asdAutoSqlFromTableFields(self, asObj); } struct jsonElement *naForMissingEl = hashFindVal(config, "naForMissing"); if (naForMissingEl != NULL) self->naForMissing = jsonBooleanVal(naForMissingEl, "naForMissing"); } return asObj; } -// Why isn't this in jksql.h? -#define NOSQLINJ "NOSQLINJ " - static char *sqlExplain(struct sqlConnection *conn, char *query) /* For now, just turn the values back into a multi-line "#"-comment string. */ { char *trimmedQuery = query; if (startsWith(NOSQLINJ, trimmedQuery)) trimmedQuery = trimmedQuery + strlen(NOSQLINJ); struct dyString *dy = dyStringCreate("# Output of 'explain %s':\n", trimmedQuery); char explainQuery[PATH_LEN*8]; safef(explainQuery, sizeof(explainQuery), NOSQLINJ "explain %s", trimmedQuery); struct sqlResult *sr = sqlGetResult(conn, explainQuery); struct slName *fieldList = sqlResultFieldList(sr); int nColumns = slCount(fieldList); // Header: dyStringPrintf(dy, "# %s\n", slNameListToString(fieldList, '\t')); char **row;