Commit 17f0ec65 authored by gmantele's avatar gmantele
Browse files

[ADQL] Add NULL tests over the ADQL schema and catalog names.

parent 9eaf1026

src/adql/db/SearchColumnList.java

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import cds.utils.TextualSearchList; 
 * </i></p>

 * 

 * @author Gr&eacute;gory Mantelet (CDS;ARI)

 * @version 1.2 (11/2013)

 * @version 1.3 (02/2015)

 */

public class SearchColumnList extends TextualSearchList<DBColumn> {

	private static final long serialVersionUID = 1L;
@@ -284,7 +284,7 @@ public class SearchColumnList extends TextualSearchList<DBColumn> { 
					}



					// test the schema name:

					if (schema != null){

					if (schema != null && matchTable.getADQLSchemaName() != null){

						if (IdentifierField.SCHEMA.isCaseSensitive(caseSensitivity)){

							if (!matchTable.getADQLSchemaName().equals(schema))

								continue;

src/adql/db/SearchTableList.java

+15 −13
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import cds.utils.TextualSearchList; 
 * </p>

 * 

 * @author Gr&eacute;gory Mantelet (CDS;ARI)

 * @version 1.3 (08/2014)

 * @version 1.3 (02/2015)

 */

public class SearchTableList extends TextualSearchList<DBTable> {

	private static final long serialVersionUID = 1L;
@@ -156,6 +156,7 @@ public class SearchTableList extends TextualSearchList<DBTable> { 
			ArrayList<DBTable> result = new ArrayList<DBTable>();



			for(DBTable match : tmpResult){

				if (match.getADQLSchemaName() != null){

					if (IdentifierField.SCHEMA.isCaseSensitive(caseSensitivity)){

						if (!match.getADQLSchemaName().equals(schema))

							continue;
@@ -164,7 +165,7 @@ public class SearchTableList extends TextualSearchList<DBTable> { 
							continue;

					}



				if (catalog != null){

					if (catalog != null && match.getADQLCatalogName() != null){

						if (IdentifierField.CATALOG.isCaseSensitive(caseSensitivity)){

							if (!match.getADQLCatalogName().equals(catalog))

								continue;
@@ -173,6 +174,7 @@ public class SearchTableList extends TextualSearchList<DBTable> { 
								continue;

						}

					}

				}



				result.add(match);

			}