[cvs]
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj
AuditedSecuredDBObject.java DBField.java DBObject.java
DBObjectDef.java LOBSupport.java MultiDBObject.java
NextNumber.java NextNumberImpl.java ValidValue.java
JCorporate Ltd
jcorp at jcorp2.servlets.net
Mon Sep 20 12:20:17 PDT 2004
Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj
In directory jcorp2.servlets.net:/tmp/cvs-serv665
Modified Files:
AuditedSecuredDBObject.java DBField.java DBObject.java
DBObjectDef.java LOBSupport.java MultiDBObject.java
NextNumber.java NextNumberImpl.java ValidValue.java
Log Message:
<Aucun commentaire entré>
Index: DBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java,v
retrieving revision 1.207
retrieving revision 1.208
diff -C2 -d -r1.207 -r1.208
*** DBObject.java 18 Sep 2004 00:03:54 -0000 1.207
--- DBObject.java 20 Sep 2004 19:20:15 -0000 1.208
***************
*** 113,117 ****
import java.lang.reflect.Method;
import java.math.BigDecimal;
- import java.sql.SQLException;
import java.text.DecimalFormat;
import java.text.NumberFormat;
--- 113,116 ----
***************
*** 123,127 ****
import java.util.Hashtable;
import java.util.Iterator;
[...1142 lines suppressed...]
! return recordSet;
! } /* runStoreProcedureAndRetrieveList() */
!
! /**
* summarize DataField.isChanged() for all fields.
* isChanged() per field means that setField() has been called twice for that field,
--- 7687,7691 ----
}
! /**
* summarize DataField.isChanged() for all fields.
* isChanged() per field means that setField() has been called twice for that field,
***************
*** 8492,8496 ****
return result;
}
-
} // dbobject
--- 7707,7710 ----
Index: MultiDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/MultiDBObject.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** MultiDBObject.java 18 Sep 2004 00:03:54 -0000 1.51
--- MultiDBObject.java 20 Sep 2004 19:20:15 -0000 1.52
***************
*** 309,315 ****
*
* @return true = success.
! *
! * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
! * @since $DatabaseSchema $Date$
*/
public boolean buildFromClause() throws DBException {
--- 309,313 ----
*
* @return true = success.
! * @throws DBException
*/
public boolean buildFromClause() throws DBException {
***************
*** 380,384 ****
}
! String targetTable = oneObj.getJDBCMetaData().getTargetSQLTable(oneObj.getDataContext());
String tableName = getTableName(oneObj);
fsb.append(targetTable);
--- 378,382 ----
}
! String targetTable = oneObj.getJDBCMetaData().getTargetTable();
String tableName = getTableName(oneObj);
fsb.append(targetTable);
***************
*** 405,409 ****
}
! String targetTable = oneObj.getJDBCMetaData().getTargetSQLTable(oneObj.getDataContext());
String tableName = getTableName(oneObj);
fsb.append(targetTable);
--- 403,407 ----
}
! String targetTable = oneObj.getJDBCMetaData().getTargetTable();
String tableName = getTableName(oneObj);
fsb.append(targetTable);
***************
*** 2292,2313 ****
String name = (String) oneObj.getAttribute(SHORT_NAME);
if (name != null && shortNameAsAlias) return name;
! return oneObj.getJDBCMetaData().getTargetSQLTable(oneObj.getDataContext());
}
! /**
! * @return
! */
! public DBConnection getConnection() {
! return localConnection;
! }
!
! /**
! * @param connection
! */
! public void setConnection(DBConnection connection) {
! localConnection = connection;
! }
!
! /**
* @return true if the given field is null
*/
--- 2290,2297 ----
String name = (String) oneObj.getAttribute(SHORT_NAME);
if (name != null && shortNameAsAlias) return name;
! return oneObj.getJDBCMetaData().getTargetTable();
}
! /**
* @return true if the given field is null
*/
***************
*** 2317,2319 ****
--- 2301,2305 ----
}
+
} /* MultiDBObject */
+
Index: NextNumber.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/NextNumber.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** NextNumber.java 18 Sep 2004 00:03:54 -0000 1.21
--- NextNumber.java 20 Sep 2004 19:20:15 -0000 1.22
***************
*** 79,85 ****
*
* @author Original by Michael Nash, rewritten by Michael Rimov
- *
- * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- * @since $DatabaseSchema $Date$
*/
abstract public class NextNumber {
--- 79,82 ----
***************
*** 238,244 ****
* @return a string formatted in [callingDBObject].[fieldName]
* @throws DBException upon error
- *
- * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- * @since $DatabaseSchema $Date$
*/
protected String getKey(DBObject callingDBObject, String fieldName)
--- 235,238 ----
Index: DBObjectDef.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObjectDef.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** DBObjectDef.java 18 Sep 2004 00:03:54 -0000 1.42
--- DBObjectDef.java 20 Sep 2004 19:20:15 -0000 1.43
***************
*** 71,75 ****
import com.jcorporate.expresso.core.dataobjects.DataFieldMetaData;
import com.jcorporate.expresso.core.dataobjects.jdbc.JDBCObjectMetaData;
- import com.jcorporate.expresso.core.db.config.JDBCConfig;
import com.jcorporate.expresso.core.db.DBException;
import com.jcorporate.expresso.core.i18n.Messages;
--- 71,74 ----
***************
*** 77,81 ****
import com.jcorporate.expresso.core.misc.StringUtil;
import com.jcorporate.expresso.core.security.filters.FilterManager;
- import com.jcorporate.expresso.core.misc.ConfigurationException;
import org.apache.log4j.Logger;
import org.apache.oro.text.regex.MalformedPatternException;
--- 76,79 ----
***************
*** 113,120 ****
private static final String OBJECT_NAME_NOT_ASSIGNED = "NOT ASSIGNED";
- private static final String TABLE_OBJECT_TYPE = "TABLE";
-
- private static final String STORE_PROCEDURE_OBJECT_TYPE = "SPL";
-
/* the log */
transient private static Logger log = Logger.getLogger(DBObjectDef.class);
--- 111,114 ----
***************
*** 147,160 ****
private String objectDescription = "";
- /** Vector containing the field names in the order they were added for
- * INPUT and OUTPUT parameters for store procedure
- * @author Yves Henri AMAIZO
- */
- private Map allInParameters = new ConcurrentReaderHashMap();
- private ArrayList inParamList = new ArrayList();
- private Map allOutParameters = new ConcurrentReaderHashMap();
- private ArrayList outParamList = new ArrayList();
-
-
/**
* The detailObjsLocal local and detailObjsForeign hashtables holds one or more references to other
--- 141,144 ----
***************
*** 184,211 ****
private String tableName = "";
- /**
- * Store Procedure name of the "primary" table that this DB object refers to
- */
- private String storeProcedureName = ("");
-
- /**
- * Store Procedure name of the "primary" table that this DB object refers to
- */
- private String objectType = "NONE";
-
- private boolean returningValue = false;
-
-
- /**
- * Database schema name of the "primary" table that this DB object refers to
- */
- private String dbSchemaName = ("");
-
- /**
- * Database catalogue name of the "primary" table that this DB object refers to
- */
- private String dbCatalogName = ("");
-
-
/**
* A default characterset to filter on.
--- 168,171 ----
***************
*** 274,291 ****
fieldPrecision, allowNull, fieldDescription));
- /**
- * If we're dealing with integer datatypes, lets be helpful and make sure
- * that the field is a valid integer format. Add the mask automatically
- */
- if (fieldType.equalsIgnoreCase(DBField.INTEGER_TYPE) ||
- fieldType.equalsIgnoreCase(DBField.INT_TYPE)) {
-
- setMask(fieldName, DBObject.INT_MASK);
- setAttribute(fieldName, DBObject.ATTRIBUTE_ERROR_MESSAGE,
- "You must enter a valid integer for field: "
- + fieldDescription);
- }
-
-
fieldNamesInOrder.add(fieldName);
} /* addField(String, String, int, int, boolean, String) */
--- 234,237 ----
***************
*** 411,429 ****
fieldNamesInOrder.add(fieldName);
-
-
- /**
- * If we're dealing with integer datatypes, lets be helpful and make sure
- * that the field is a valid integer format. Add the mask automatically
- */
- if (fieldType.equalsIgnoreCase(DBField.INTEGER_TYPE) ||
- fieldType.equalsIgnoreCase(DBField.INT_TYPE)) {
-
- setMask(fieldName, DBObject.INT_MASK);
- setAttribute(fieldName, DBObject.ATTRIBUTE_ERROR_MESSAGE,
- "You must enter a valid integer for field: "
- + fieldDescription);
- }
-
} /* addField(String, String, int, boolean, String) */
--- 357,360 ----
***************
*** 1215,1241 ****
} /* getTargetTable() */
- /**
- * Return the Schema Name of the current database object.
- *
- * @return String: Schema name of the target table of this database object
- * @throws DataException upon error
- *
- * author Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- */
- public String getTargetDbSchema() {
- return dbSchemaName;
- } /* getTargetDbSchema() */
-
- /**
- * Return the Schema Name of the current database object.
- *
- * @return String: Schema name of the target table of this database object
- * @throws DataException upon error
- *
- * author Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- */
- public String getTargetDbCatalog() {
- return dbCatalogName;
- }
/**
--- 1146,1149 ----
***************
*** 1535,1591 ****
tableName = theTable;
- objectType = TABLE_OBJECT_TYPE;
} /* setTargetTable(String) */
- /**
- * Set the target database schema for this DBObject.
- *
- * @param theSchema database schema for this object
- * @throws DBException
- *
- * author Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- */
- synchronized public void setTargetDbSchema(String theSchema)
- throws DBException {
- if (theSchema.length() > 18) {
- log.warn("Schema name is over 18 characters");
- }
- if (ConfigManager.isReservedWord(theSchema)) {
- throw new DBException("You cannot have a Schema name of " +
- theSchema +
- ". It is a database reserved word. Check " +
- "com.jcorporate.expresso.core.misc.ReservedWords for a full list" +
- " of reservered words");
- }
-
- dbSchemaName = theSchema;
- } /* setTargetSchema(String) */
-
- /**
- * Set the target database schema for this DBObject.
- *
- * @param theSchema database schema for this object
- * @throws DBException
- *
- * author Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- */
- synchronized public void setTargetDbCatalog(String theCatalog)
- throws DBException {
- if (theCatalog.length() > 18) {
- log.warn("Schema name is over 18 characters");
- }
- if (ConfigManager.isReservedWord(theCatalog)) {
- throw new DBException("You cannot have a Catalog name of " +
- theCatalog +
- ". It is a database reserved word. Check " +
- "com.jcorporate.expresso.core.misc.ReservedWords for a full list" +
- " of reservered words");
- }
-
- dbCatalogName = theCatalog;
- } /* setTargetDbCatalog(String) */
-
-
/**
*
--- 1443,1449 ----
***************
*** 1693,1952 ****
return oneField.getAllAttributes();
}
-
-
- /**
- * Return the Store procedure Name of the current database object. Keep in mind
- * that a database object could update or affect other tables as well.
- *
- * @return String: Store procedure name of the target table of this database object
- * @throws DataException upon error
- *
- * @author Yves Henri AMAIZO
- * @version $Revision$ on $Date$
- */
- public String getTargetStoreProcedure()
- throws DataException {
- if (storeProcedureName == null) {
- throw new DataException("No store procedure name supplied");
- }
-
- return storeProcedureName;
- } /* getTargetTable() */
-
-
- /**
- * Set the target store procedure for this DBObject.
- *
- * @param theStoreProcedure Store procedure for this object
- * @throws DBException
- *
- * @author Yves Henri AMAIZO
- * @version $Revision$ on $Date$
- */
- synchronized public void setTargetStoreProcedure(String theStoreProcedure)
- throws DBException {
- if (theStoreProcedure.length() > 18) {
- log.warn("Strore procedure name is over 18 characters");
- }
- if (ConfigManager.isReservedWord(theStoreProcedure)) {
- throw new DBException("You cannot have a store procedure name of " +
- theStoreProcedure +
- ". It is a database reserved word. Check " +
- "com.jcorporate.expresso.core.misc.ReservedWords for a full list" +
- " of reservered words");
- }
-
- storeProcedureName = theStoreProcedure;
- tableName = theStoreProcedure;
- objectType = STORE_PROCEDURE_OBJECT_TYPE;
- } /* setTargetStoreProcedure(String) */
-
-
- /**
- * Add a new field to the list of fields that are part of this
- * object's list of input parameters. Called after all of the "addField" calls in the setupFields()
- * method to specify which fields make up the parameter fields of this object.
- *
- * @param inFieldName The name of the field to add as part of the input parameter
- * @throws DBException if the field name is not valid or the field
- * allows nulls
- *
- * @author Yves Henri AMAIZO
- * @version $Revision$ on $Date$
- */
- synchronized public void addInParam(String inFieldName)
- throws DBException {
- DBField oneField = (DBField) allFields.get(inFieldName);
-
- if (oneField == null) {
- throw new DBException("(" + getName() + ") Field " + inFieldName +
- " is not defined as a field in this DBObject - cannot add " +
- "to input list parameter");
- }
- if (oneField.allowsNull()) {
- throw new DBException("(" + getName() + ") Field " + inFieldName +
- " allows null - not suitable for inclusion " +
- "in key");
- }
- if (oneField.isVirtual()) {
- throw new DBException("(" + getName() + ") Field " + inFieldName +
- " is a virtual field - not suitable for " +
- "inclusion in input list parameter");
- }
-
- if (oneField.isLongObjectType()) {
- throw new DBException("(" + getName() + ") Field " + inFieldName +
- " allows arbitrarily long length, either text or binary - not suitable for inclusion " +
- "in the input list parameter");
- }
-
- allInParameters.put(inFieldName, oneField);
-
- /* We must keep keys in order, so we add to keyList as well */
- inParamList.add(inFieldName);
- } /* addInParam(String) */
-
-
- /**
- * Add a new field to the list of fields that are part of this
- * object's list of output parameter. Called after all of the "addField" calls in the setupFields()
- * method to specify which fields make up the parameter fields of this object.
- *
- * @param outFieldName The name of the field to add as part of the output parameter
- * @throws DBException if the field name is not valid or the field
- * allows nulls
- *
- * @author Yves Henri AMAIZO
- * @version $Revision$ on $Date$
- */
- synchronized public void addOutParam(String outFieldName)
- throws DBException {
- DBField oneField = (DBField) allFields.get(outFieldName);
-
- if (oneField == null) {
- throw new DBException("(" + getName() + ") Field " + outFieldName +
- " is not defined as a field in this DBObject - cannot add " +
- "to the output list parameter");
- }
- if (oneField.allowsNull()) {
- throw new DBException("(" + getName() + ") Field " + outFieldName +
- " allows null - not suitable for inclusion " +
- "in the output list parameter");
- }
- if (oneField.isVirtual()) {
- throw new DBException("(" + getName() + ") Field " + outFieldName +
- " is a virtual field - not suitable for " +
- "inclusion in the output list parameter");
- }
-
- if (oneField.isLongObjectType()) {
- throw new DBException("(" + getName() + ") Field " + outFieldName +
- " allows arbitrarily long length, either text or binary - not suitable for inclusion " +
- "in the output list parameter");
- }
-
- allOutParameters.put(outFieldName, oneField);
-
- /* We must keep keys in order, so we add to keyList as well */
- outParamList.add(outFieldName);
- } /* addOutParam(String) */
-
-
- public boolean isReturningValue() {
- return returningValue;
- }
-
- /**
- *
- * @param value returning value to be set
- *
- * @author Yves Henri AMAIZO
- * @version $Revision$ on $Date$
- */
- public void setReturningValue(boolean value) {
- returningValue = value;
- }
-
- /**
- * Check if a certain name is a INPUT field parameter(of any kind) in this DBOBject
- * @param fieldName the name of the field to check
- * @return true if the field name exists
- */
- public boolean isOutField(String fieldName) {
- return allOutParameters.get(fieldName) != null;
- }
-
- /**
- * Check if a certain name is a OUTPUT field parameter(of any kind) in this DBOBject
- * @param fieldName the name of the field to check
- * @return true if the field name exists
- */
- public boolean isInField(String fieldName) {
- return allInParameters.get(fieldName) != null;
- }
-
- /**
- * Return the Table Name of the current database object. Keep in mind
- * that a database object could update or affect other tables as well.
- *
- * @return String: Table name of the target table of this database object
- * @throws DataException upon error
- *
- * author Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- */
- public String getTargetSQLTable(String dataContext)
- throws DataException {
- String sqlTableName = getTargetTable();
- try {
- if (getTargetDbSchema() != null && !"".equals(getTargetDbSchema())) {
- sqlTableName = getTargetDbSchema() + "." + getTargetTable();
- } else {
- JDBCConfig myConfig = ConfigManager.getJdbcRequired(dataContext);
- if (myConfig.getDbSchema() != null && !"".equals(myConfig.getDbSchema())) {
- sqlTableName = myConfig.getDbSchema() + "." + getTargetTable();
- }
- }
- } catch (ConfigurationException ce) {
- throw new DataException(ce);
- }
- return sqlTableName;
- } /* getTargetSQLTable() */
-
-
- /**
- * Get a list of all of the names of the IN param fields in this object
- *
- * @return An ArrayList of all of the names of the IN param fields
- */
- public ArrayList getInParamListArray() {
- return inParamList;
- }
-
- /**
- * Get a list of all of the names of the OUT param fields in this object
- *
- * @return An ArrayList of all of the names of the OUT param fields
- */
- public ArrayList getOutParamListArray() {
- return outParamList;
- }
-
-
- /**
- * Retrieve an interator of IN param fields
- * @return Iterator of IN param fields. [MetaData]
- */
- public Iterator getInParamFieldListIterator() {
- return inParamList.iterator();
- }
-
-
- /**
- * Retrieve an interator of IN param fields
- * @return Iterator of IN param fields. [MetaData]
- */
- public Iterator getOutParamFieldListIterator() {
- return outParamList.iterator();
- }
-
- /**
- * This convenience method counts
- * <code>DBFields</code> belonging to this
- * <code>DBObject</code> that are set to <b>retrieve</b>.
- * author Yves Henri Amaizo <amy_amaizo at compuserve.com>
- *
- * @return int number of retrieve fields.
- *
- * @throws DBException
- */
- public synchronized int getOutParamFieldsCount()
- throws DBException {
- if (outParamList == null) {
- return 0;
- } else {
- return outParamList.size();
- }
- } /* getFieldsToRetrieveCount() */
-
}
--- 1551,1554 ----
Index: ValidValue.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/ValidValue.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ValidValue.java 18 Sep 2004 00:03:54 -0000 1.9
--- ValidValue.java 20 Sep 2004 19:20:15 -0000 1.10
***************
*** 375,377 ****
}
! /* ValidValue */
\ No newline at end of file
--- 375,377 ----
}
! /* ValidValue */
Index: NextNumberImpl.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/NextNumberImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** NextNumberImpl.java 18 Sep 2004 00:03:54 -0000 1.15
--- NextNumberImpl.java 20 Sep 2004 19:20:15 -0000 1.16
***************
*** 83,89 ****
*
* @author Original by Michael Nash, rewritten by Michael Rimov, Larry Hamel
- *
- * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- * @since $DatabaseSchema $Date$
*/
public class NextNumberImpl
--- 83,86 ----
***************
*** 184,190 ****
* @param callingDBObject - the DBObject that this nextnumber object belongs to.
* @param fieldName - the field name within the callingObject that this nextnumber belongs to.
- *
- * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- * @since $DatabaseSchema $Date$
*/
private ReusableLong getNextNumberObject(String db,
--- 181,184 ----
***************
*** 216,220 ****
if (!meta.isAutoIncremented() && log.isDebugEnabled()) {
log.debug("NextNumber.getNext() called for table.field, '"
! + ((JDBCObjectMetaData)callingDBObject.getMetaData()).getTargetSQLTable(callingDBObject.getDataContext())
+ "." + fieldName
+ "', which is not auto-incrementing type. Setting up hash entry anyway.");
--- 210,214 ----
if (!meta.isAutoIncremented() && log.isDebugEnabled()) {
log.debug("NextNumber.getNext() called for table.field, '"
! + ((JDBCObjectMetaData)callingDBObject.getMetaData()).getTargetTable()
+ "." + fieldName
+ "', which is not auto-incrementing type. Setting up hash entry anyway.");
Index: DBField.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBField.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** DBField.java 18 Sep 2004 00:03:54 -0000 1.27
--- DBField.java 20 Sep 2004 19:20:15 -0000 1.28
***************
*** 281,294 ****
private boolean isDateOnly;
- /**
- * is the field a time type?
- * This necessary for handling correctly the Database string format data
- * when retrieve data from resultSet
- * Oracle does not handlin correctly string more longer than 4000 chars
- * author Yves Henri AMAIZO
- */
- private boolean isLongBinary;
- private boolean isLongCharacter;
-
/**
* is the field a text type?
--- 281,284 ----
***************
*** 671,700 ****
/**
! * Is it a LONGVARBINARY? This is calculated by if it is a long object
* and is NOT a character long object.
* @return boolean True if it is
*/
! public boolean isLongBinaryType() {
! return this.isLongBinary;
}
- /**
- * Is it a LONGVARCHAR? This is calculated by if it is a long object
- * and is NOT a character long object.
- * @return boolean True if it is
- */
- public boolean isLongCharacterType() {
- return this.isLongCharacter;
- }
-
- /**
- * Is it a BLOB? This is calculated by if it is a long object
- * and is NOT a character long object.
- * @return boolean True if it is
- */
- public boolean isBinaryObjectType() {
- return (isLongObject & !isCharacterLongObject & !isLongBinary);
- }
-
/**
* is the field a quoted text field?
--- 661,672 ----
/**
! * Is it a BLOB? This is calculated by if it is a long object
* and is NOT a character long object.
* @return boolean True if it is
*/
! public boolean isBinaryObjectType() {
! return (isLongObject & !isCharacterLongObject);
}
/**
* is the field a quoted text field?
***************
*** 1197,1209 ****
mFilterClass = filterClass;
}
-
- /**
- * Return boolean if the field has a mask set
- *
- * @return True if the field mask is set, else false if it is not
- */
- public boolean isMasked() {
- return mask != null;
- } /* isMasked() */
--- 1169,1172 ----
Index: AuditedSecuredDBObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/AuditedSecuredDBObject.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AuditedSecuredDBObject.java 18 Sep 2004 00:03:54 -0000 1.10
--- AuditedSecuredDBObject.java 20 Sep 2004 19:20:15 -0000 1.11
***************
*** 77,84 ****
* @author Adam Rossi, PlatinumSolutions
* @version $Revision$ $Date$
! *
! * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
! * @since $DatabaseSchema $Date$
! */
public class AuditedSecuredDBObject extends SecuredDBObject {
private static final String thisClass = DBSequence.class.getName();
--- 77,81 ----
* @author Adam Rossi, PlatinumSolutions
* @version $Revision$ $Date$
! */
public class AuditedSecuredDBObject extends SecuredDBObject {
private static final String thisClass = DBSequence.class.getName();
***************
*** 111,117 ****
*
* @throws DBException Upon error
- *
- * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- * @since $DatabaseSchema $Date$
*/
public synchronized void add() throws DBException {
--- 108,111 ----
***************
*** 123,127 ****
com.jcorporate.expresso.core.dataobjects.jdbc.JDBCObjectMetaData metadata = this.getJDBCMetaData();
auditLog.setField("AUDITLOG_DES",
! metadata.getDescription() + " (Table: " + metadata.getTargetSQLTable(this.getDataContext()) + ")");
auditLog.add();
this.setField("AUDITLOG_ID", auditLog.getField("AUDITLOG_ID"));
--- 117,121 ----
com.jcorporate.expresso.core.dataobjects.jdbc.JDBCObjectMetaData metadata = this.getJDBCMetaData();
auditLog.setField("AUDITLOG_DES",
! metadata.getDescription() + " (Table: " + metadata.getTargetTable() + ")");
auditLog.add();
this.setField("AUDITLOG_ID", auditLog.getField("AUDITLOG_ID"));
***************
*** 134,140 ****
*
* @throws DBException upon error
- *
- * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- * @since $DatabaseSchema $Date$
*/
public synchronized void delete() throws DBException {
--- 128,131 ----
***************
*** 146,150 ****
com.jcorporate.expresso.core.dataobjects.jdbc.JDBCObjectMetaData metadata = this.getJDBCMetaData();
auditLog.setField("AUDITLOG_DES",
! metadata.getDescription() + " (Table: " + metadata.getTargetSQLTable(this.getDataContext()) + ")");
auditLog.add();
this.setField("AUDITLOG_ID", auditLog.getField("AUDITLOG_ID"));
--- 137,141 ----
com.jcorporate.expresso.core.dataobjects.jdbc.JDBCObjectMetaData metadata = this.getJDBCMetaData();
auditLog.setField("AUDITLOG_DES",
! metadata.getDescription() + " (Table: " + metadata.getTargetTable() + ")");
auditLog.add();
this.setField("AUDITLOG_ID", auditLog.getField("AUDITLOG_ID"));
***************
*** 157,163 ****
*
* @throws DBException Upon error
- *
- * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- * @since $DatabaseSchema $Date$
*/
public synchronized void update() throws DBException {
--- 148,151 ----
***************
*** 169,173 ****
com.jcorporate.expresso.core.dataobjects.jdbc.JDBCObjectMetaData metadata = this.getJDBCMetaData();
auditLog.setField("AUDITLOG_DES",
! metadata.getDescription() + " (Table: " + metadata.getTargetSQLTable(this.getDataContext()) + ")");
auditLog.add();
this.setField("AUDITLOG_ID", auditLog.getField("AUDITLOG_ID"));
--- 157,161 ----
com.jcorporate.expresso.core.dataobjects.jdbc.JDBCObjectMetaData metadata = this.getJDBCMetaData();
auditLog.setField("AUDITLOG_DES",
! metadata.getDescription() + " (Table: " + metadata.getTargetTable() + ")");
auditLog.add();
this.setField("AUDITLOG_ID", auditLog.getField("AUDITLOG_ID"));
Index: LOBSupport.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/LOBSupport.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** LOBSupport.java 18 Sep 2004 00:03:54 -0000 1.11
--- LOBSupport.java 20 Sep 2004 19:20:15 -0000 1.12
***************
*** 121,127 ****
* @see com.jcorporate.expresso.core.dataobjcets.jdbc.LOBField
* @see com.jcorporate.expresso.services.dbobj.MediaDBObject
- *
- * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- * @since $DatabaseSchema $Date$
*/
--- 121,124 ----
***************
*** 317,323 ****
* statement</b>
* @throws DBException upon error
- *
- * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- * @since $DatabaseSchema $Date$
*/
protected void prepSelectResultSet(DBObject baseObject,
--- 314,317 ----
***************
*** 329,333 ****
prepStatement.append(fieldName);
prepStatement.append(" from ");
! prepStatement.append(baseObject.getJDBCMetaData().getTargetSQLTable(baseObject.getDataContext()));
String whereClause = baseObject.buildWhereClause(false);
prepStatement.append(whereClause);
--- 323,327 ----
prepStatement.append(fieldName);
prepStatement.append(" from ");
! prepStatement.append(baseObject.getJDBCMetaData().getTargetTable());
String whereClause = baseObject.buildWhereClause(false);
prepStatement.append(whereClause);
***************
*** 360,366 ****
* @return a created PreparedStatement object
* @throws DBException
- *
- * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
- * @since $DatabaseSchema $Date$
*/
protected PreparedStatement prepUpdate(DBObject baseObject,
--- 354,357 ----
***************
*** 373,377 ****
try {
prepStatement.append("UPDATE ");
! prepStatement.append(baseObject.getJDBCMetaData().getTargetSQLTable(baseObject.getDataContext()));
prepStatement.append(" SET ");
prepStatement.append(fieldName);
--- 364,368 ----
try {
prepStatement.append("UPDATE ");
! prepStatement.append(baseObject.getJDBCMetaData().getTargetTable());
prepStatement.append(" SET ");
prepStatement.append(fieldName);
More information about the cvs
mailing list