Repository: empire-db Updated Branches: refs/heads/master 8d4db62fc -> 6f424a0d3
EMPIREDB-272 final change Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/6f424a0d Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/6f424a0d Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/6f424a0d Branch: refs/heads/master Commit: 6f424a0d3e6ae0d54b118492fd7f56a0d2ac7b42 Parents: 8d4db62 Author: Rainer Döbele <[email protected]> Authored: Fri Oct 19 11:51:37 2018 +0200 Committer: Rainer Döbele <[email protected]> Committed: Fri Oct 19 11:51:37 2018 +0200 ---------------------------------------------------------------------- .../org/apache/empire/commons/Attributes.java | 10 +++++ .../java/org/apache/empire/db/DBColumn.java | 39 ++++++-------------- .../java/org/apache/empire/db/DBColumnExpr.java | 2 +- .../empire/db/sqlserver/MSSqlDDLGenerator.java | 6 +-- 4 files changed, 25 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/empire-db/blob/6f424a0d/empire-db/src/main/java/org/apache/empire/commons/Attributes.java ---------------------------------------------------------------------- diff --git a/empire-db/src/main/java/org/apache/empire/commons/Attributes.java b/empire-db/src/main/java/org/apache/empire/commons/Attributes.java index a634c82..04ba57b 100644 --- a/empire-db/src/main/java/org/apache/empire/commons/Attributes.java +++ b/empire-db/src/main/java/org/apache/empire/commons/Attributes.java @@ -156,6 +156,11 @@ public class Attributes extends AbstractSet<Attributes.Attribute> implements Clo String name = (item instanceof Attribute) ? ((Attribute)item).getName() : item.toString(); return (indexOf(name)>=0); } + + public final boolean contains(String name) + { + return contains((Object)name); + } @Override public boolean add(Attribute a) @@ -178,6 +183,11 @@ public class Attributes extends AbstractSet<Attributes.Attribute> implements Clo list().remove(i); return true; } + + public final boolean remove(String name) + { + return remove((Object)name); + } /** * @param name the attribute name http://git-wip-us.apache.org/repos/asf/empire-db/blob/6f424a0d/empire-db/src/main/java/org/apache/empire/db/DBColumn.java ---------------------------------------------------------------------- diff --git a/empire-db/src/main/java/org/apache/empire/db/DBColumn.java b/empire-db/src/main/java/org/apache/empire/db/DBColumn.java index aae0b7e..82c3139 100644 --- a/empire-db/src/main/java/org/apache/empire/db/DBColumn.java +++ b/empire-db/src/main/java/org/apache/empire/db/DBColumn.java @@ -32,6 +32,7 @@ import org.apache.empire.db.exceptions.DatabaseNotOpenException; import org.apache.empire.db.expr.set.DBSetExpr; import org.apache.empire.exceptions.InvalidArgumentException; import org.apache.empire.exceptions.ItemNotFoundException; +import org.apache.empire.exceptions.ObjectNotValidException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Element; @@ -56,26 +57,6 @@ public abstract class DBColumn extends DBColumnExpr private static final Logger log = LoggerFactory.getLogger(DBColumn.class); - // Predefined column attributes - - /** - * @deprecated - * Use Column.COLATTR_MINVALUE - */ - public static final String DBCOLATTR_MINVALUE = Column.COLATTR_MINVALUE; - - /** - * @deprecated - * Use Column.COLATTR_MAXVALUE - */ - public static final String DBCOLATTR_MAXVALUE = Column.COLATTR_MAXVALUE; - - /** - * @deprecated - * Use Column.COLATTR_DATETIMEPATTERN - */ - public static final String DBCOLATTR_DATETIMEPATTERN = Column.COLATTR_DATETIMEPATTERN; - /** * Read only column (Boolean) */ @@ -360,27 +341,29 @@ public abstract class DBColumn extends DBColumnExpr public String getFullName() { if (rowset==null) - return name; + throw new ObjectNotValidException(this); return rowset.getFullName()+"."+name; } /** - * returns the qualified Name of this column + * returns the qualified alias name for this column */ - public String qualifiedAlias() + public String getAlias() { - String rsName = getRowSet().getName(); + if (rowset==null) + throw new ObjectNotValidException(this); + String rsName = rowset.getName(); if (StringUtils.isEmpty(rsName)) - return getName(); - return rsName + "_" + getName(); + return name; + return rsName + "_" + name; } /** - * returns the column as an expression with a full qualified alias + * returns an expression that renames the column with its alias name */ public DBColumnExpr qualified() { - return this.as(qualifiedAlias()); + return this.as(getAlias()); } /** http://git-wip-us.apache.org/repos/asf/empire-db/blob/6f424a0d/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java ---------------------------------------------------------------------- diff --git a/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java b/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java index 2eb0cb3..b8e6914 100644 --- a/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java +++ b/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java @@ -83,7 +83,7 @@ public abstract class DBColumnExpr extends DBExpr public abstract String getName(); /** - * Indicates wheter this function is an aggregate (sum, min, max, avg, ...) or not + * Indicates whether this function is an aggregate (sum, min, max, avg, ...) or not * @return true if the column expression represents an aggregate */ public abstract boolean isAggregate(); http://git-wip-us.apache.org/repos/asf/empire-db/blob/6f424a0d/empire-db/src/main/java/org/apache/empire/db/sqlserver/MSSqlDDLGenerator.java ---------------------------------------------------------------------- diff --git a/empire-db/src/main/java/org/apache/empire/db/sqlserver/MSSqlDDLGenerator.java b/empire-db/src/main/java/org/apache/empire/db/sqlserver/MSSqlDDLGenerator.java index 14fcd84..199a7fc 100644 --- a/empire-db/src/main/java/org/apache/empire/db/sqlserver/MSSqlDDLGenerator.java +++ b/empire-db/src/main/java/org/apache/empire/db/sqlserver/MSSqlDDLGenerator.java @@ -20,13 +20,13 @@ package org.apache.empire.db.sqlserver; import org.apache.empire.commons.ObjectUtils; import org.apache.empire.commons.StringUtils; +import org.apache.empire.data.Column; import org.apache.empire.data.DataType; -import org.apache.empire.db.DBColumn; import org.apache.empire.db.DBDDLGenerator; import org.apache.empire.db.DBDatabase; +import org.apache.empire.db.DBDatabaseDriver.DBSeqTable; import org.apache.empire.db.DBSQLScript; import org.apache.empire.db.DBTableColumn; -import org.apache.empire.db.DBDatabaseDriver.DBSeqTable; public class MSSqlDDLGenerator extends DBDDLGenerator<DBDatabaseDriverMSSQL> { @@ -64,7 +64,7 @@ public class MSSqlDDLGenerator extends DBDDLGenerator<DBDatabaseDriverMSSQL> // Check for identity column if (driver.isUseSequenceTable()==false) { // Make this column the identity column - int minValue = ObjectUtils.getInteger(c.getAttribute(DBColumn.DBCOLATTR_MINVALUE), 1); + int minValue = ObjectUtils.getInteger(c.getAttribute(Column.COLATTR_MINVALUE), 1); sql.append(" IDENTITY("); sql.append(String.valueOf(minValue)); sql.append(", 1) NOT NULL");
