Skip to content

Commit 632f589

Browse files
committed
tds: Add more types to tds_get_column_declaration
XML and UNITEXT support. Add some missing cases to the switch, just for completeness. Show warnings if new types are added and --enable-extra-checks is used. Signed-off-by: Frediano Ziglio <freddy77@gmail.com>
1 parent c971b43 commit 632f589

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

src/tds/query.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,7 @@ tds_get_column_declaration(TDSSOCKET * tds, TDSCOLUMN * curcol, char *out)
782782
fmt = "INT";
783783
break;
784784
case SYBINT8:
785+
case SYB5INT8:
785786
/* TODO even for Sybase ?? */
786787
fmt = "BIGINT";
787788
break;
@@ -915,17 +916,33 @@ tds_get_column_declaration(TDSSOCKET * tds, TDSCOLUMN * curcol, char *out)
915916
case SYBUINT8:
916917
fmt = "UNSIGNED BIGINT";
917918
break;
919+
case SYBXML:
920+
case SYBMSXML:
921+
fmt = "XML";
922+
break;
923+
case SYBUNITEXT:
924+
fmt = "UNITEXT";
925+
break;
918926
/* nullable types should not occur here... */
919927
case SYBFLTN:
920928
case SYBMONEYN:
921929
case SYBDATETIMN:
922930
case SYBBITN:
923931
case SYBINTN:
932+
case SYBUINTN:
933+
case SYBDATEN:
934+
case SYBTIMEN:
924935
assert(0);
925936
/* TODO... */
937+
#if ENABLE_EXTRA_CHECKS
926938
case SYBVOID:
927939
case SYBSINT1:
940+
case SYBMSUDT:
941+
case SYBMSTABLE:
942+
case SYBINTERVAL:
943+
#else
928944
default:
945+
#endif
929946
tdsdump_log(TDS_DBG_ERROR, "Unknown type %d\n", conversion_type);
930947
break;
931948
}

0 commit comments

Comments
 (0)