080a160c7b9595d516c9c70e83689a09b60839d0 galt Mon Jun 3 12:16:53 2013 -0700 fix SQL Injection diff --git src/hg/inc/ggMrnaAli.h src/hg/inc/ggMrnaAli.h index c04c0c0..79f5cd0 100644 --- src/hg/inc/ggMrnaAli.h +++ src/hg/inc/ggMrnaAli.h @@ -39,42 +39,31 @@ /* Load all ggMrnaBlock from a tab-separated file. * Dispose of this with ggMrnaBlockFreeList(). */ struct ggMrnaBlock *ggMrnaBlockLoadByQuery(struct sqlConnection *conn, char *query); /* Load all ggMrnaBlock from table that satisfy the query given. * Where query is of the form 'select * from example where something=something' * or 'select example.* from example, anotherTable where example.something = * anotherTable.something'. * Dispose of this with ggMrnaBlockFreeList(). */ void ggMrnaBlockSaveToDb(struct sqlConnection *conn, struct ggMrnaBlock *el, char *tableName, int updateSize); /* Save ggMrnaBlock as a row to the table specified by tableName. * As blob fields may be arbitrary size updateSize specifies the approx size * of a string that would contain the entire query. Arrays of native types are * converted to comma separated strings and loaded as such, User defined types are - * inserted as NULL. Note that strings must be escaped to allow insertion into the database. - * For example "autosql's features include" --> "autosql\'s features include" - * If worried about this use ggMrnaBlockSaveToDbEscaped() */ - -void ggMrnaBlockSaveToDbEscaped(struct sqlConnection *conn, struct ggMrnaBlock *el, char *tableName, int updateSize); -/* Save ggMrnaBlock as a row to the table specified by tableName. - * As blob fields may be arbitrary size updateSize specifies the approx size. - * of a string that would contain the entire query. Automatically - * escapes all simple strings (not arrays of string) but may be slower than ggMrnaBlockSaveToDb(). - * For example automatically copies and converts: - * "autosql's features include" --> "autosql\'s features include" - * before inserting into database. */ + * inserted as NULL. Strings are automatically escaped to allow insertion into the database. */ struct ggMrnaBlock *ggMrnaBlockCommaIn(char **pS, struct ggMrnaBlock *ret); /* Create a ggMrnaBlock out of a comma separated string. * This will fill in ret if non-null, otherwise will * return a new ggMrnaBlock */ void ggMrnaBlockFree(struct ggMrnaBlock **pEl); /* Free a single dynamically allocated ggMrnaBlock such as created * with ggMrnaBlockLoad(). */ void ggMrnaBlockFreeList(struct ggMrnaBlock **pList); /* Free a list of dynamically allocated ggMrnaBlock's */ void ggMrnaBlockOutput(struct ggMrnaBlock *el, FILE *f, char sep, char lastSep); /* Print out ggMrnaBlock. Separate fields with sep. Follow last field with lastSep. */ @@ -113,42 +102,31 @@ /* Load all ggMrnaAli from a tab-separated file. * Dispose of this with ggMrnaAliFreeList(). */ struct ggMrnaAli *ggMrnaAliLoadByQuery(struct sqlConnection *conn, char *query); /* Load all ggMrnaAli from table that satisfy the query given. * Where query is of the form 'select * from example where something=something' * or 'select example.* from example, anotherTable where example.something = * anotherTable.something'. * Dispose of this with ggMrnaAliFreeList(). */ void ggMrnaAliSaveToDb(struct sqlConnection *conn, struct ggMrnaAli *el, char *tableName, int updateSize); /* Save ggMrnaAli as a row to the table specified by tableName. * As blob fields may be arbitrary size updateSize specifies the approx size * of a string that would contain the entire query. Arrays of native types are * converted to comma separated strings and loaded as such, User defined types are - * inserted as NULL. Note that strings must be escaped to allow insertion into the database. - * For example "autosql's features include" --> "autosql\'s features include" - * If worried about this use ggMrnaAliSaveToDbEscaped() */ - -void ggMrnaAliSaveToDbEscaped(struct sqlConnection *conn, struct ggMrnaAli *el, char *tableName, int updateSize); -/* Save ggMrnaAli as a row to the table specified by tableName. - * As blob fields may be arbitrary size updateSize specifies the approx size. - * of a string that would contain the entire query. Automatically - * escapes all simple strings (not arrays of string) but may be slower than ggMrnaAliSaveToDb(). - * For example automatically copies and converts: - * "autosql's features include" --> "autosql\'s features include" - * before inserting into database. */ + * inserted as NULL. Strings are automatically escaped to allow insertion into the database. */ struct ggMrnaAli *ggMrnaAliCommaIn(char **pS, struct ggMrnaAli *ret); /* Create a ggMrnaAli out of a comma separated string. * This will fill in ret if non-null, otherwise will * return a new ggMrnaAli */ void ggMrnaAliFree(struct ggMrnaAli **pEl); /* Free a single dynamically allocated ggMrnaAli such as created * with ggMrnaAliLoad(). */ void ggMrnaAliFreeList(struct ggMrnaAli **pList); /* Free a list of dynamically allocated ggMrnaAli's */ void ggMrnaAliOutput(struct ggMrnaAli *el, FILE *f, char sep, char lastSep); /* Print out ggMrnaAli. Separate fields with sep. Follow last field with lastSep. */