7c459941c1e589297e0014bf7957599f70836096 hiram Thu Apr 4 11:08:18 2019 -0700 moving some SQL functions to jksql.c from hgTables refs #18869 #23233 diff --git src/hg/hgTables/hgTables.h src/hg/hgTables/hgTables.h index 842b5c5..e6e7af4 100644 --- src/hg/hgTables/hgTables.h +++ src/hg/hgTables/hgTables.h @@ -156,33 +156,30 @@ struct trackDb *findSelectedTrack(struct trackDb *trackList, struct grp *group, char *varName); /* Find selected track - from CGI variable if possible, else * via various defaults. */ struct trackDb *findTrack(char *name, struct trackDb *trackList); /* Find track, or return NULL if can't find it. */ struct trackDb *mustFindTrack(char *name, struct trackDb *trackList); /* Find track or squawk and die. */ struct asObject *asForTable(struct sqlConnection *conn, char *table); /* Get autoSQL description if any associated with table. */ -struct sqlFieldType *sqlFieldTypesFromAs(struct asObject *as); -/* Convert asObject to list of sqlFieldTypes */ - char *connectingTableForTrack(char *rawTable); /* Return table name to use with all.joiner for track. * You can freeMem this when done. */ char *chromTable(struct sqlConnection *conn, char *table); /* Get chr1_table if it exists, otherwise table. * You can freeMem this when done. */ char *getDbTable(char *db, char *table); /* If table already contains its real database as a dot-prefix, then * return a clone of table; otherwise alloc and return db.table . */ void doTabOutTable(char *database, char *table, FILE *f, struct sqlConnection *conn, char *fields); /* Do tab-separated output on table. */ @@ -258,41 +255,30 @@ boolean isSqlStringType(char *type); /* Return TRUE if type is a stringish SQL type. */ boolean isSqlEnumType(char *type); /* Return TRUE if type is an enum. */ boolean isSqlSetType(char *type); /* Return TRUE if type is a set. */ boolean isSqlNumType(char *type); /* Return TRUE if it is a numerical SQL type. */ boolean isSqlIntType(char *type); /* Return TRUE if it is an integer SQL type. */ -struct sqlFieldType -/* List field names and types */ - { - struct sqlFieldType *next; - char *name; /* Name of field. */ - char *type; /* Type of field (MySQL notion) */ - }; - -struct sqlFieldType *sqlFieldTypeNew(char *name, char *type); -/* Create a new sqlFieldType */ - void sqlFieldTypeFree(struct sqlFieldType **pFt); /* Free resources used by sqlFieldType */ void sqlFieldTypeFreeList(struct sqlFieldType **pList); /* Free a list of dynamically allocated sqlFieldType's */ struct sqlFieldType *sqlListFieldsAndTypes(struct sqlConnection *conn, char *table); /* Get list of fields including their names and types. The type currently is just * a MySQL type string. */ /* ------------- Functions related to joining and filtering ------------*/ void tabOutSelectedFields( char *primaryDb, /* The primary database. */ char *primaryTable, /* The primary table. */ FILE *f, /* file for output, null for stdout */