principal, indexed and std written in the code for tap_schema (c31a1ec4) · Commits · Marco Molinaro / tap_schema_manager

src/java/it/inaf/oats/ia2/tap/utils/SchemaPage.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -283,7 +283,8 @@ public class SchemaPage extends BasePage{
		String column_name = column.column_name;

		String primary_key = "";
		if (column.indexed == 1)
		//if (column.indexed == 1)
		if (column.principal == 1)
		{
		primary_key = "pk";
		}

src/java/it/inaf/oats/ia2/tap/utils/UpdateTapSchema.java

+55 −36

Original line number	Diff line number	Diff line
		@@ -211,10 +211,18 @@ public class UpdateTapSchema {
		while (columnsResultSet.next())
		{
		// updates variables of current column structure
		int indexed = 0;
		int principal = 0;
		if (columnsResultSet.getString("Key").equals("PRI"))
		{
		indexed = 1; //this column is primary key
		principal = 1; //this column is primary key
		}

		int indexed = 0;
		if (columnsResultSet.getString("Key").equals("PRI") \|\|
		columnsResultSet.getString("Key").equals("UNI") \|\|
		columnsResultSet.getString("Key").equals("MUL"))
		{
		indexed = 1;
		}

		int size;
		@@ -275,14 +283,25 @@ public class UpdateTapSchema {
		datatype = "adql:" + columnsResultSet.getString(2).toUpperCase();
		}

		int std = 0;
		if ((databaseName.equals(tapschemaName)) &&
		!((columnsResultSet.getString(1).equals("schemaID")) \|\|
		(columnsResultSet.getString(1).equals("tableID")) \|\|
		(columnsResultSet.getString(1).equals("columnID")) \|\|
		(columnsResultSet.getString(1).equals("keyID")) \|\|
		(columnsResultSet.getString(1).equals("key_columnID"))))
		{
		std = 1;
		}

		Column column = new Column();
		column.table_name = table.table_name;
		column.column_name = columnsResultSet.getString(1);
		column.datatype = datatype;
		column.size = size;
		column.principal = 0;
		column.principal = principal;
		column.indexed = indexed;
		column.std = 1;
		column.std = std;

		table.columnsMap.put(column.column_name, column);
		} //end while columnsResultSet
		@@ -1250,38 +1269,38 @@ public class UpdateTapSchema {
		// inserts tapschema default metadata into columns table
		queryString = "INSERT INTO " + tapschemaName + ".columns " +
		"(table_name, column_name, description, utype, ucd, unit, datatype, size, principal, indexed, std, columnID) VALUES " +
		"('" + tapschemaName + ".schemas', 'schema_name', 'schema name for reference to TAP_SCHEMA.schemas', null, null, null, 'adql:VARCHAR', 64, 1, 1, 0, null), " +
		"('" + tapschemaName + ".schemas', 'utype', 'lists the utypes of schemas in the tableset', null, null, null, 'adql:VARCHAR', 512, 1, 0, 0, null), " +
		"('" + tapschemaName + ".schemas', 'description', 'describes schemas in the tableset', null, null, null, 'adql:VARCHAR', 512, 1, 0, 0, null), " +
		"('" + tapschemaName + ".schemas', 'schemaID', null, null, null, null, 'adql:BIGINT', 0, 1, 0, 0, null), " +
		"('" + tapschemaName + ".tables', 'schema_name', 'the schema this table belongs to', null, null, null, 'adql:VARCHAR', 64, 1, 0, 0, null), " +
		"('" + tapschemaName + ".tables', 'table_name', 'the fully qualified table name', null, null, null, 'adql:VARCHAR', 128, 1, 1, 0, null), " +
		"('" + tapschemaName + ".tables', 'table_type', 'one of: table view', null, null, null, 'adql:VARCHAR', 8, 1, 0, 0, null), " +
		"('" + tapschemaName + ".tables', 'utype', 'lists the utype of tables in the tableset', null, null, null, 'adql:VARCHAR', 512, 1, 0, 0, null), " +
		"('" + tapschemaName + ".tables', 'description', 'describes tables in the tableset', null, null, null, 'adql:VARCHAR', 512, 1, 0, 0, null), " +
		"('" + tapschemaName + ".tables', 'tableID', null, null, null, null, 'adql:BIGINT', 0, 1, 0, 0, null), " +
		"('" + tapschemaName + ".columns', 'table_name', 'the table this column belongs to', null, null, null, 'adql:VARCHAR', 128, 1, 1, 0, null), " +
		"('" + tapschemaName + ".columns', 'column_name', 'the column name', null, null, null, 'adql:VARCHAR', 64, 1, 1, 0, null), " +
		"('" + tapschemaName + ".columns', 'utype', 'lists the utypes of columns in the tableset', null, null, null, 'adql:VARCHAR', 512, 1, 0, 0, null), " +
		"('" + tapschemaName + ".columns', 'ucd', 'lists the UCDs of columns in the tableset', null, null, null, 'adql:VARCHAR', 64, 1, 0, 0, null), " +
		"('" + tapschemaName + ".columns', 'unit', 'lists the unit used for column values in the tableset', null, null, null, 'adql:VARCHAR', 64, 1, 0, 0, null), " +
		"('" + tapschemaName + ".columns', 'description', 'describes the columns in the tableset', null, null, null, 'adql:VARCHAR', 512, 1, 0, 0, null), " +
		"('" + tapschemaName + ".columns', 'datatype', 'lists the ADQL datatype of columns in the tableset', null, null, null, 'adql:VARCHAR', 64, 1, 0, 0, null), " +
		"('" + tapschemaName + ".columns', 'size', 'lists the size of variable-length columns in the tableset', null, null, null, 'adql:INTEGER', null, 1, 0, 0, null), " +
		"('" + tapschemaName + ".columns', 'principal', 'a principal column; 1 means 1, 0 means 0', null, null, null, 'adql:INTEGER', null, 1, 0, 0, null), " +
		"('" + tapschemaName + ".columns', 'indexed', 'an indexed column; 1 means 1, 0 means 0', null, null, null, 'adql:INTEGER', null, 1, 0, 0, null), " +
		"('" + tapschemaName + ".columns', 'std', 'a standard column; 1 means 1, 0 means 0', null, null, null, 'adql:INTEGER', null, 1, 0, 0, null), " +
		"('" + tapschemaName + ".columns', 'columnID', null, null, null, null, 'adql:BIGINT', 0, 1, 0, 0, null), " +
		"('" + tapschemaName + ".keys', 'key_id', 'unique key to join to TAP_SCHEMA.key_columns', null, null, null, 'adql:VARCHAR', 64, 1, 1, 0, null), " +
		"('" + tapschemaName + ".keys', 'from_table', 'the table with the foreign key', null, null, null, 'adql:VARCHAR', 128, 1, 0, 0, null), " +
		"('" + tapschemaName + ".keys', 'target_table', 'the table with the primary key', null, null, null, 'adql:VARCHAR', 128, 1, 0, 0, null), " +
		"('" + tapschemaName + ".keys', 'utype', 'lists the utype of keys in the tableset', null, null, null, 'adql:VARCHAR', 512, 1, 0, 0, null), " +
		"('" + tapschemaName + ".keys', 'description', 'describes keys in the tableset', null, null, null, 'adql:VARCHAR', 512, 1, 0, 0, null), " +
		"('" + tapschemaName + ".keys', 'keyID', null, null, null, null, 'adql:BIGINT', 0, 1, 0, 0, null), " +
		"('" + tapschemaName + ".key_columns', 'key_id', 'key to join to TAP_SCHEMA.keys', null, null, null, 'adql:VARCHAR', 64, 1, 0, 0, null), " +
		"('" + tapschemaName + ".key_columns', 'from_column', 'column in the from_table', null, null, null, 'adql:VARCHAR', 64, 1, 0, 0, null), " +
		"('" + tapschemaName + ".key_columns', 'target_column', 'column in the target_table', null, null, null, 'adql:VARCHAR', 64, 1, 0, 0, null), " +
		"('" + tapschemaName + ".key_columns', 'key_columnID', null, null, null, null, 'adql:BIGINT', 0, 1, 0, 0, null);";
		"('" + tapschemaName + ".schemas', 'schema_name', 'schema name for reference to TAP_SCHEMA.schemas', null, null, null, 'adql:VARCHAR', 64, 1, 1, 1, null), " +
		"('" + tapschemaName + ".schemas', 'utype', 'lists the utypes of schemas in the tableset', null, null, null, 'adql:VARCHAR', 512, 0, 0, 1, null), " +
		"('" + tapschemaName + ".schemas', 'description', 'describes schemas in the tableset', null, null, null, 'adql:VARCHAR', 512, 0, 0, 1, null), " +
		"('" + tapschemaName + ".schemas', 'schemaID', null, null, null, null, 'adql:BIGINT', 0, 0, 0, 0, null), " +
		"('" + tapschemaName + ".tables', 'schema_name', 'the schema this table belongs to', null, null, null, 'adql:VARCHAR', 64, 0, 0, 1, null), " +
		"('" + tapschemaName + ".tables', 'table_name', 'the fully qualified table name', null, null, null, 'adql:VARCHAR', 128, 1, 1, 1, null), " +
		"('" + tapschemaName + ".tables', 'table_type', 'one of: table view', null, null, null, 'adql:VARCHAR', 8, 0, 0, 1, null), " +
		"('" + tapschemaName + ".tables', 'utype', 'lists the utype of tables in the tableset', null, null, null, 'adql:VARCHAR', 512, 0, 0, 1, null), " +
		"('" + tapschemaName + ".tables', 'description', 'describes tables in the tableset', null, null, null, 'adql:VARCHAR', 512, 0, 0, 1, null), " +
		"('" + tapschemaName + ".tables', 'tableID', null, null, null, null, 'adql:BIGINT', 0, 0, 0, 0, null), " +
		"('" + tapschemaName + ".columns', 'table_name', 'the table this column belongs to', null, null, null, 'adql:VARCHAR', 128, 1, 1, 1, null), " +
		"('" + tapschemaName + ".columns', 'column_name', 'the column name', null, null, null, 'adql:VARCHAR', 64, 1, 1, 1, null), " +
		"('" + tapschemaName + ".columns', 'utype', 'lists the utypes of columns in the tableset', null, null, null, 'adql:VARCHAR', 512, 0, 0, 1, null), " +
		"('" + tapschemaName + ".columns', 'ucd', 'lists the UCDs of columns in the tableset', null, null, null, 'adql:VARCHAR', 64, 0, 0, 1, null), " +
		"('" + tapschemaName + ".columns', 'unit', 'lists the unit used for column values in the tableset', null, null, null, 'adql:VARCHAR', 64, 0, 0, 1, null), " +
		"('" + tapschemaName + ".columns', 'description', 'describes the columns in the tableset', null, null, null, 'adql:VARCHAR', 512, 0, 0, 1, null), " +
		"('" + tapschemaName + ".columns', 'datatype', 'lists the ADQL datatype of columns in the tableset', null, null, null, 'adql:VARCHAR', 64, 0, 0, 1, null), " +
		"('" + tapschemaName + ".columns', 'size', 'lists the size of variable-length columns in the tableset', null, null, null, 'adql:INTEGER', null, 0, 0, 1, null), " +
		"('" + tapschemaName + ".columns', 'principal', 'a principal column; 1 means 1, 0 means 0', null, null, null, 'adql:INTEGER', null, 0, 0, 1, null), " +
		"('" + tapschemaName + ".columns', 'indexed', 'an indexed column; 1 means 1, 0 means 0', null, null, null, 'adql:INTEGER', null, 0, 0, 1, null), " +
		"('" + tapschemaName + ".columns', 'std', 'a standard column; 1 means 1, 0 means 0', null, null, null, 'adql:INTEGER', null, 0, 0, 1, null), " +
		"('" + tapschemaName + ".columns', 'columnID', null, null, null, null, 'adql:BIGINT', 0, 0, 0, 0, null), " +
		"('" + tapschemaName + ".keys', 'key_id', 'unique key to join to TAP_SCHEMA.key_columns', null, null, null, 'adql:VARCHAR', 64, 1, 1, 1, null), " +
		"('" + tapschemaName + ".keys', 'from_table', 'the table with the foreign key', null, null, null, 'adql:VARCHAR', 128, 0, 0, 1, null), " +
		"('" + tapschemaName + ".keys', 'target_table', 'the table with the primary key', null, null, null, 'adql:VARCHAR', 128, 0, 0, 1, null), " +
		"('" + tapschemaName + ".keys', 'utype', 'lists the utype of keys in the tableset', null, null, null, 'adql:VARCHAR', 512, 0, 0, 1, null), " +
		"('" + tapschemaName + ".keys', 'description', 'describes keys in the tableset', null, null, null, 'adql:VARCHAR', 512, 0, 0, 1, null), " +
		"('" + tapschemaName + ".keys', 'keyID', null, null, null, null, 'adql:BIGINT', 0, 0, 0, 0, null), " +
		"('" + tapschemaName + ".key_columns', 'key_id', 'key to join to TAP_SCHEMA.keys', null, null, null, 'adql:VARCHAR', 64, 0, 0, 1, null), " +
		"('" + tapschemaName + ".key_columns', 'from_column', 'column in the from_table', null, null, null, 'adql:VARCHAR', 64, 0, 0, 1, null), " +
		"('" + tapschemaName + ".key_columns', 'target_column', 'column in the target_table', null, null, null, 'adql:VARCHAR', 64, 0, 0, 1, null), " +
		"('" + tapschemaName + ".key_columns', 'key_columnID', null, null, null, null, 'adql:BIGINT', 0, 0, 0, 0, null);";
		statement.executeUpdate(queryString);

		// inserts tapschema default metadata into keys table