Unverified Commit a0e5c56f authored by gmantele's avatar gmantele Committed by GitHub
Browse files

[TAP] Bugfix: NPE in VotType & MySQL metadata issue in JDBCConnection 

Merge pull request #59 from zonia3000/master
parents e4f38c95 0af166f6

src/tap/db/JDBCConnection.java

+2 −1
Original line number Diff line number Diff line
@@ -3271,7 +3271,8 @@ public class JDBCConnection implements DBConnection { 
			int cnt = 0;

			String columnPattern = columnCaseSensitive ? columnName : null;

			while(rsT.next()){

				String rsSchema = nullifyIfNeeded(rsT.getString(2));

                                int rsTSchemaIndex = dbms.equalsIgnoreCase(DBMS_MYSQL) ? 1 : 2;

				String rsSchema = nullifyIfNeeded(rsT.getString(rsTSchemaIndex));

				String rsTable = rsT.getString(3);

				// test the schema name:

				if (!supportsSchema || schemaName == null || equals(rsSchema, schemaName, schemaCaseSensitive)){

src/tap/metadata/VotType.java

+2 −2
Original line number Diff line number Diff line
@@ -160,13 +160,13 @@ public final class VotType { 


			case CHAR:

				this.datatype = VotDatatype.CHAR;

				this.arraysize = Integer.toString(tapType.length > 0 ? tapType.length : null);

				this.arraysize = tapType.length > 0 ? Integer.toString(tapType.length) : null;

				this.xtype = null;

				break;



			case BINARY:

				this.datatype = VotDatatype.UNSIGNEDBYTE;

				this.arraysize = Integer.toString(tapType.length > 0 ? tapType.length : null);

				this.arraysize = tapType.length > 0 ? Integer.toString(tapType.length) : null;

				this.xtype = null;

				break;