monetdb-java: src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java comparison

comparison src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java @ 352:f62137dd6050

Remove spaces from static SQL predicates: 1 = 0 and 1 = 1.

author	Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date	Wed, 22 Jan 2020 16:46:21 +0100 (2020-01-22)
parents	54137aeb1f92
children	eabbc5bf7cdb

comparison

equal deleted inserted replaced

-:54137aeb1f92
+:f62137dd6050
 			.append(useCommentsTable ? "COALESCE(cm.\"remark\", cast(f.\"func\" as varchar(9999)))" : "cast(f.\"func\" as varchar(9999))").append(" AS \"REMARKS\", " +
 			// in MonetDB procedures have no return value by design.
 			"cast(").append(DatabaseMetaData.procedureNoResult).append(" AS smallint) AS \"PROCEDURE_TYPE\", " +
 			// only the id value uniquely identifies a procedure. Include it to be able to differentiate between multiple overloaded procedures with the same name
 			"cast(f.\"id\" as varchar(10)) AS \"SPECIFIC_NAME\" " +
-		"FROM \"sys\".\"functions\" f JOIN \"sys\".\"schemas\" s ON (f.\"schema_id\" = s.\"id\") ");
+		"FROM \"sys\".\"functions\" f JOIN \"sys\".\"schemas\" s ON f.\"schema_id\" = s.\"id\" ");
 		if (useCommentsTable) {
-			query.append("LEFT OUTER JOIN \"sys\".\"comments\" cm ON (f.\"id\" = cm.\"id\") ");
+			query.append("LEFT OUTER JOIN \"sys\".\"comments\" cm ON f.\"id\" = cm.\"id\" ");
 		}
 		// include procedures only (type = 2). Others will be returned via getFunctions()
 		query.append("WHERE f.\"type\" = 2");
 		if (catalog != null && !catalog.isEmpty()) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" AND 1 = 0");
+			query.append(" AND 1=0");
 		} else {
 			if (schemaPattern != null && !schemaPattern.equals("%")) {
 				query.append(" AND s.\"name\" ").append(composeMatchPart(schemaPattern));
 			}
 			if (procedureNamePattern != null && !procedureNamePattern.equals("%")) {
 			"cast(a.\"number\" + 1 as int) AS \"ORDINAL_POSITION\", " +
 			"cast('' as varchar(3)) AS \"IS_NULLABLE\", " +
 			// the specific name contains the function id, in order to be able to match the args to the correct overloaded procedure name
 			"cast(f.\"id\" as varchar(10)) AS \"SPECIFIC_NAME\" " +
 		"FROM \"sys\".\"args\" a " +
-		"JOIN \"sys\".\"functions\" f ON (a.\"func_id\" = f.\"id\") " +
+		"JOIN \"sys\".\"functions\" f ON a.\"func_id\" = f.\"id\" " +
-		"JOIN \"sys\".\"schemas\" s ON (f.\"schema_id\" = s.\"id\") " +
+		"JOIN \"sys\".\"schemas\" s ON f.\"schema_id\" = s.\"id\" " +
 		// include procedures only (type = 2). Others will be returned via getFunctionColumns()
 		"WHERE f.\"type\" = 2");
 		if (catalog != null && !catalog.isEmpty()) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" AND 1 = 0");
+			query.append(" AND 1=0");
 		} else {
 			if (schemaPattern != null && !schemaPattern.equals("%")) {
 				query.append(" AND s.\"name\" ").append(composeMatchPart(schemaPattern));
 			}
 			if (procedureNamePattern != null && !procedureNamePattern.equals("%")) {
 		}
 		query.append("JOIN \"sys\".\"schemas\" s ON t.\"schema_id\" = s.\"id\" ");
 		if (useCommentsTable) {
 			query.append("LEFT OUTER JOIN \"sys\".\"comments\" cm ON t.\"id\" = cm.\"id\" ");
 		}
-		query.append("WHERE 1 = 1");
+		query.append("WHERE 1=1");
 		if (catalog != null && !catalog.isEmpty()) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" AND 1 = 0");
+			query.append(" AND 1=0");
 		} else {
 			if (schemaPattern != null && !schemaPattern.equals("%")) {
 				query.append(" AND s.\"name\" ").append(composeMatchPart(schemaPattern));
 			}
 			if (tableNamePattern != null && !tableNamePattern.equals("%")) {
 			"FROM \"sys\".\"schemas\"");
 		if (catalog != null && !catalog.isEmpty()) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" WHERE 1 = 0");
+			query.append(" WHERE 1=0");
 		} else {
 			if (schemaPattern != null && !schemaPattern.equals("%")) {
 				query.append(" WHERE \"name\" ").append(composeMatchPart(schemaPattern));
 			}
 		}
 	 */
 	@Override
 	public ResultSet getCatalogs() throws SQLException {
 		// MonetDB does NOT support catalogs.
 		// Return a resultset with no rows
-		return executeMetaDataQuery("SELECT cast(null as char(1)) AS \"TABLE_CAT\" WHERE 1 = 0");
+		return executeMetaDataQuery("SELECT cast(null as char(1)) AS \"TABLE_CAT\" WHERE 1=0");
 	}
 	/**
 	 * Get the table types available in this database.
 	 * The results are ordered by table type.
 		"JOIN \"sys\".\"tables\" t ON c.\"table_id\" = t.\"id\" " +
 		"JOIN \"sys\".\"schemas\" s ON t.\"schema_id\" = s.\"id\" ");
 		if (useCommentsTable) {
 			query.append("LEFT OUTER JOIN \"sys\".\"comments\" cm ON c.\"id\" = cm.\"id\" ");
 		}
-		query.append("WHERE 1 = 1");
+		query.append("WHERE 1=1");
 		if (catalog != null && !catalog.isEmpty()) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" AND 1 = 0");
+			query.append(" AND 1=0");
 		} else {
 			if (schemaPattern != null && !schemaPattern.equals("%")) {
 				query.append(" AND s.\"name\" ").append(composeMatchPart(schemaPattern));
 			}
 			if (tableNamePattern != null && !tableNamePattern.equals("%")) {
 		"JOIN \"sys\".\"auths\" grantors ON p.\"grantor\" = grantors.\"id\" " +
 		"JOIN \"sys\".\"auths\" grantees ON p.\"auth_id\" = grantees.\"id\" ");
 		if (usePrivilege_codesTable) {
 			query.append("JOIN \"sys\".\"privilege_codes\" pc ON p.\"privileges\" = pc.\"privilege_code_id\" ");
 		}
-		query.append("WHERE 1 = 1");
+		query.append("WHERE 1=1");
 		if (catalog != null && !catalog.isEmpty()) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" AND 1 = 0");
+			query.append(" AND 1=0");
 		} else {
 			if (schemaPattern != null && !schemaPattern.equals("%")) {
 				query.append(" AND s.\"name\" ").append(composeMatchPart(schemaPattern));
 			}
 			if (tableNamePattern != null && !tableNamePattern.equals("%")) {
 		"JOIN \"sys\".\"auths\" grantors ON p.\"grantor\" = grantors.\"id\" " +
 		"JOIN \"sys\".\"auths\" grantees ON p.\"auth_id\" = grantees.\"id\" ");
 		if (usePrivilege_codesTable) {
 			query.append("JOIN \"sys\".\"privilege_codes\" pc ON p.\"privileges\" = pc.\"privilege_code_id\" ");
 		}
-		query.append("WHERE 1 = 1");
+		query.append("WHERE 1=1");
 		if (catalog != null && !catalog.isEmpty()) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" AND 1 = 0");
+			query.append(" AND 1=0");
 		} else {
 			if (schemaPattern != null && !schemaPattern.equals("%")) {
 				query.append(" AND s.\"name\" ").append(composeMatchPart(schemaPattern));
 			}
 			if (tableNamePattern != null && !tableNamePattern.equals("%")) {
 		// TODO: when there is no PK and there are multiple unique constraints, pick only the unique constraint which has a) the least number of columns and b) the smallest total(size in bytes)
 		if (catalog != null && !catalog.isEmpty()) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" AND 1 = 0");
+			query.append(" AND 1=0");
 		} else {
 			if (scope == DatabaseMetaData.bestRowSession
 			 || scope == DatabaseMetaData.bestRowTransaction
 			 || scope == DatabaseMetaData.bestRowTemporary) {
 				if (schema != null && !schema.equals("%")) {
 				}
 				if (!nullable) {
 					query.append(" AND c.\"null\" = false");
 				}
 			} else {
-				query.append(" AND 1 = 0");
+				query.append(" AND 1=0");
 			}
 		}
 		query.append(" ORDER BY \"SCOPE\", o.\"nr\", \"COLUMN_NAME\"");
 			"cast(null as char(1)) AS \"TYPE_NAME\", " +
 			"cast(0 as int) AS \"COLUMN_SIZE\", " +
 			"cast(0 as int) AS \"BUFFER_LENGTH\", " +
 			"cast(0 as smallint) AS \"DECIMAL_DIGITS\", " +
 			"cast(0 as smallint) AS \"PSEUDO_COLUMN\" " +
-		"WHERE 1 = 0";
+		"WHERE 1=0";
 		return executeMetaDataQuery(query);
 	}
 	/**
 		"WHERE k.\"type\" = 0");	// only primary keys (type = 0)
 		if (catalog != null && !catalog.isEmpty()) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" AND 1 = 0");
+			query.append(" AND 1=0");
 		} else {
 			if (schema != null && !schema.equals("%")) {
 				query.append(" AND s.\"name\" ").append(composeMatchPart(schema));
 			}
 			if (table != null && !table.equals("%")) {
 		query.append(keyQuery);
 		if (catalog != null && !catalog.isEmpty()) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" AND 1 = 0");
+			query.append(" AND 1=0");
 		} else {
 			if (schema != null && !schema.equals("%")) {
 				query.append(" AND fkschema.\"name\" ").append(composeMatchPart(schema));
 			}
 			if (table != null && !table.equals("%")) {
 		query.append(keyQuery);
 		if (catalog != null && !catalog.isEmpty()) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" AND 1 = 0");
+			query.append(" AND 1=0");
 		} else {
 			if (schema != null && !schema.equals("%")) {
 				query.append(" AND pkschema.\"name\" ").append(composeMatchPart(schema));
 			}
 			if (table != null && !table.equals("%")) {
 		if ((pcatalog != null && !pcatalog.isEmpty())
 		 || (fcatalog != null && !fcatalog.isEmpty())) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" AND 1 = 0");
+			query.append(" AND 1=0");
 		} else {
 			if (pschema != null && !pschema.equals("%")) {
 				query.append(" AND pkschema.\"name\" ").append(composeMatchPart(pschema));
 			}
 			if (ptable != null && !ptable.equals("%")) {
 		"JOIN \"sys\".\"tables\" t ON i.\"table_id\" = t.\"id\" " +
 		"JOIN \"sys\".\"schemas\" s ON t.\"schema_id\" = s.\"id\" " +
 		"JOIN \"sys\".\"objects\" o ON i.\"id\" = o.\"id\" " +
 		"JOIN \"sys\".\"columns\" c ON (t.\"id\" = c.\"table_id\" AND o.\"name\" = c.\"name\") " +
 		"LEFT OUTER JOIN \"sys\".\"keys\" k ON (i.\"name\" = k.\"name\" AND i.\"table_id\" = k.\"table_id\" AND k.\"type\" IN (0,1)) " +	// primary (0) and unique keys (1) only
-		"WHERE 1 = 1");
+		"WHERE 1=1");
 		if (catalog != null && !catalog.isEmpty()) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" AND 1 = 0");
+			query.append(" AND 1=0");
 		} else {
 			if (schema != null && !schema.equals("%")) {
 				query.append(" AND s.\"name\" ").append(composeMatchPart(schema));
 			}
 			if (table != null && !table.equals("%")) {
 		"WHERE t.\"id\" > 99 AND t.\"eclass\" >= 15");
 		if (catalog != null && !catalog.isEmpty()) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" AND 1 = 0");
+			query.append(" AND 1=0");
 		} else {
 			if (schemaPattern != null && !schemaPattern.equals("%")) {
 				query.append(" AND s.\"name\" ").append(composeMatchPart(schemaPattern));
 			}
 			if (typeNamePattern != null && !typeNamePattern.equals("%")) {
 	) throws SQLException
 	{
 		final String query =
 		"SELECT cast(null as char(1)) AS \"TYPE_CAT\", '' AS \"TYPE_SCHEM\", '' AS \"TYPE_NAME\", " +
 			"cast(null as char(1)) AS \"SUPERTYPE_CAT\", '' AS \"SUPERTYPE_SCHEM\", '' AS \"SUPERTYPE_NAME\" " +
-		"WHERE 1 = 0";
+		"WHERE 1=0";
 		return executeMetaDataQuery(query);
 	}
 	/**
 	) throws SQLException
 	{
 		final String query =
 		"SELECT cast(null as char(1)) AS \"TABLE_CAT\", " +
 			"'' AS \"TABLE_SCHEM\", '' AS \"TABLE_NAME\", '' AS \"SUPERTABLE_NAME\" " +
-		"WHERE 1 = 0";
+		"WHERE 1=0";
 		return executeMetaDataQuery(query);
 	}
 	/**
 			"'' AS \"REMARKS\", '' AS \"ATTR_DEF\", cast(0 as int) AS \"SQL_DATA_TYPE\", " +
 			"cast(0 as int) AS \"SQL_DATETIME_SUB\", cast(0 as int) AS \"CHAR_OCTET_LENGTH\", " +
 			"cast(0 as int) AS \"ORDINAL_POSITION\", 'YES' AS \"IS_NULLABLE\", " +
 			"'' AS \"SCOPE_CATALOG\", '' AS \"SCOPE_SCHEMA\", '' AS \"SCOPE_TABLE\", " +
 			"cast(0 as smallint) AS \"SOURCE_DATA_TYPE\" " +
-		"WHERE 1 = 0";
+		"WHERE 1=0";
 		return executeMetaDataQuery(query);
 	}
 	/**
 		query.append("WHERE f.\"type\" <> 2");
 		if (catalog != null && !catalog.isEmpty()) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" AND 1 = 0");
+			query.append(" AND 1=0");
 		} else {
 			if (schemaPattern != null && !schemaPattern.equals("%")) {
 				query.append(" AND s.\"name\" ").append(composeMatchPart(schemaPattern));
 			}
 			if (functionNamePattern != null && !functionNamePattern.equals("%")) {
 		"WHERE f.\"type\" <> 2");
 		if (catalog != null && !catalog.isEmpty()) {
 			// non-empty catalog selection.
 			// as we do not support catalogs this always results in no rows returned
-			query.append(" AND 1 = 0");
+			query.append(" AND 1=0");
 		} else {
 			if (schemaPattern != null && !schemaPattern.equals("%")) {
 				query.append(" AND s.\"name\" ").append(composeMatchPart(schemaPattern));
 			}
 			if (functionNamePattern != null && !functionNamePattern.equals("%")) {
 			"cast(0 as int) AS \"NUM_PREC_RADIX\", " +
 			"'' AS \"COLUMN_USAGE\", " +
 			"'' AS \"REMARKS\", " +
 			"cast(0 as int) AS \"CHAR_OCTET_LENGTH\", " +
 			"'' AS \"IS_NULLABLE\" " +
-		"WHERE 1 = 0";
+		"WHERE 1=0";
 		return executeMetaDataQuery(query);
 	}
 	/**

Mercurial > hg > monetdb-java

comparison src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java @ 352:f62137dd6050