Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mark computed columns as IS_GENERATEDCOLUMN in the result set returned by getColumns() #695

Merged
merged 3 commits into from
May 15, 2018
Merged

Mark computed columns as IS_GENERATEDCOLUMN in the result set returned by getColumns() #695

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
858fcd9
Fix | getColumns() API, changed column name from SS_IS_COMPUTED to IS…
ulvii May 9, 2018
d4dc74f
Fix | getColumns() API, changed column name from SS_IS_COMPUTED to IS…
ulvii May 9, 2018
d78cfde
Merge branch 'issue600' of https://github.com/ulvii/mssql-jdbc into i…
ulvii May 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDatabaseMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ private void checkClosed() throws SQLServerException {
private static final String FUNCTION_TYPE = "FUNCTION_TYPE";
private static final String SS_IS_SPARSE = "SS_IS_SPARSE";
private static final String SS_IS_COLUMN_SET = "SS_IS_COLUMN_SET";
private static final String SS_IS_COMPUTED = "SS_IS_COMPUTED";
private static final String IS_GENERATEDCOLUMN = "IS_GENERATEDCOLUMN";
private static final String IS_AUTOINCREMENT = "IS_AUTOINCREMENT";

/**
Expand Down Expand Up @@ -565,7 +565,7 @@ private static String EscapeIDName(String inID) throws SQLServerException {
private static final String[] getColumnsColumnNamesKatmai = {/* 1 */ TABLE_CAT, /* 2 */ TABLE_SCHEM, /* 3 */ TABLE_NAME, /* 4 */ COLUMN_NAME,
/* 5 */ DATA_TYPE, /* 6 */ TYPE_NAME, /* 7 */ COLUMN_SIZE, /* 8 */ BUFFER_LENGTH, /* 9 */ DECIMAL_DIGITS, /* 10 */ NUM_PREC_RADIX,
/* 11 */ NULLABLE, /* 12 */ REMARKS, /* 13 */ COLUMN_DEF, /* 14 */ SQL_DATA_TYPE, /* 15 */ SQL_DATETIME_SUB, /* 16 */ CHAR_OCTET_LENGTH,
/* 17 */ ORDINAL_POSITION, /* 18 */ IS_NULLABLE, /* 20 */ SS_IS_SPARSE, /* 20 */ SS_IS_COLUMN_SET, /* 21 */ SS_IS_COMPUTED,
/* 17 */ ORDINAL_POSITION, /* 18 */ IS_NULLABLE, /* 20 */ SS_IS_SPARSE, /* 20 */ SS_IS_COLUMN_SET, /* 21 */ IS_GENERATEDCOLUMN,
/* 22 */ IS_AUTOINCREMENT};

/* L0 */ public java.sql.ResultSet getColumns(String catalog,
Expand Down