src/hg/autoSql/autoSql.c 1.37

Index: src/hg/autoSql/autoSql.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/autoSql/autoSql.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -b -B -U 4 -r1.36 -r1.37
--- src/hg/autoSql/autoSql.c	24 Dec 2008 14:59:43 -0000	1.36
+++ src/hg/autoSql/autoSql.c	17 Mar 2009 23:31:45 -0000	1.37
@@ -53,60 +53,19 @@
     {"json", OPTION_BOOLEAN},
     {NULL, 0}
 };
 
-void sqlSymDef(struct asColumn *col, FILE *f)
-/* print symbolic column definition for sql */
-{
-fprintf(f, "%s(", col->lowType->sqlName);
-struct slName *val;
-for (val = col->values; val != NULL; val = val->next)
-    {
-    fprintf(f, "\"%s\"", val->name);
-    if (val->next != NULL)
-        fputs(", ", f);
-    }
-if (withNull)
-    {
-    fprintf(f, ") ");
-    }
-else
-    {
-    fprintf(f, ") not null");
-    }
-}
-
 void sqlColumn(struct asColumn *col, FILE *f)
 /* Print out column in SQL. */
 {
-struct asTypeInfo *lt = col->lowType;
 fprintf(f, "    %s ", col->name);
-
+struct dyString *type = asColumnToSqlType(col);
+fprintf(f, "%s", type->string);
 if (!withNull)
-    {
-    if ((lt->type == t_enum) || (lt->type == t_set))
-    	sqlSymDef(col, f);
-    else if (col->isList || col->isArray)
-    	fprintf(f, "longblob not null");
-    else if (lt->type == t_char)
-    	fprintf(f, "char(%d) not null", col->fixedSize ? col->fixedSize : 1);
-    else
-    	fprintf(f, "%s not null", lt->sqlName);
-    }
-else
-    {
-    if ((lt->type == t_enum) || (lt->type == t_set))
-    	sqlSymDef(col, f);
-    else if (col->isList || col->isArray)
-    	fprintf(f, "longblob");
-    else if (lt->type == t_char)
-    	fprintf(f, "char(%d)", col->fixedSize ? col->fixedSize : 1);
-    else
-    	fprintf(f, "%s", lt->sqlName);
-    }
-
+    fprintf(f, " not null");
 fputc(',', f);
 fprintf(f, "\t# %s\n", col->comment);
+dyStringFree(&type);
 }
 
 void sqlTable(struct asObject *table, FILE *f)
 /* Print out structure of table in SQL. */