[cvs] expresso commit by lhamel: use CLOB test for special handling, not just

[JCorporate Ltd]

Log Message:
-----------
use CLOB test for special handling, not just longvarchar, which mysql uses without CLOB I/O

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects:
        DataFieldMetaData.java
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc:
        JDBCDataObject.java
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj:
        DBField.java
        DBObject.java

Revision Data
-------------
Index: DataFieldMetaData.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DataFieldMetaData.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DataFieldMetaData.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DataFieldMetaData.java -u -r1.15 -r1.16
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DataFieldMetaData.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/DataFieldMetaData.java
@@ -224,6 +224,7 @@
      * Is it a BLOB?  This is calculated by if it is a long object
      * and is NOT a character long object.
      *
+     * @deprecated 2/05 v5.6 just use test of type, like DBField.LONGVARCHAR_TYPE.equals(mytype)
      * @return boolean True if it is
      */
     public boolean isLongCharacterType();
Index: JDBCDataObject.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java -u -r1.47 -r1.48
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dataobjects/jdbc/JDBCDataObject.java
@@ -1041,10 +1041,11 @@
                 if (oneDBField.isDateType()) {
                     tmpData = getCustomStringFieldValue(myConnection, oneDBField.getName());
                 } else {
-                    if (!oneDBField.isLongBinaryType() && !oneDBField.isLongCharacterType()) {
+                    if (!oneDBField.isLongBinaryType() && !DBField.CLOB_TYPE.equals(oneDBField.getTypeString())) {
                         if (myConnection.isStringNotTrim()) {
                             tmpData = myConnection.getStringNoTrim(i);
                         } else {
+                            // default case for most types:
                             tmpData = myConnection.getString(i);
                         }
                     } else {
@@ -1060,7 +1061,7 @@
                                     tmpData = content;
                                 }
                             }
-                        } else {
+                        } else { // CLOB case
                             tmpData = myConnection.getStringNoTrim(i);
                         }
                     }
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.245
retrieving revision 1.246
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java -u -r1.245 -r1.246
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBObject.java
@@ -503,10 +503,12 @@
                 if (oneField.isDateType()) {
                     tmpData = getCustomStringFieldValue(connection, oneFieldName);
                 } else {
-                    if (!oneField.isLongBinaryType() && !oneField.isLongCharacterType()) {
+                    if (!oneField.isLongBinaryType() && !DBField.CLOB_TYPE.equals(oneField.getTypeString())) {
                         if (connection.isStringNotTrim()) {
                             tmpData = connection.getStringNoTrim(oneFieldName);
                         } else {
+
+                            // default case for most types:
                             tmpData = connection.getString(oneFieldName);
                         }
                     } else {
@@ -522,7 +524,7 @@
                                     tmpData = content;
                                 }
                             }
-                        } else {
+                        } else { // CLOB case
                             tmpData = connection.getStringNoTrim(oneFieldName);
                         }
                     }
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.32
retrieving revision 1.33
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBField.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBField.java -u -r1.32 -r1.33
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBField.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/dbobj/DBField.java
@@ -293,15 +293,11 @@
      */
     private String defaultValue;
 
-    /**
-     * 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;
 
+    /**
+     * @deprecated 2/05 v5.6 just use test of type
+     */
     private boolean isLongCharacter;
 
     /**
@@ -724,6 +720,7 @@
      * Is it a LONGVARCHAR?  This is calculated by if it is a long object
      * and is NOT a character long object.
      *
+     * @deprecated 2/05 v5.6 just use test of type, like DBField.LONGVARCHAR_TYPE.equals(mytype)
      * @return boolean True if it is
      */
     public boolean isLongCharacterType() {
@@ -786,11 +783,6 @@
     }
 
     /**
-     * is the field a date or time field?
-     * cache answer for efficiency, since field type is immutable
-     *
-     * @return true if the field is time field
-     *         author 		Yves Henri AMAIZO
      */
     public boolean isTimeType() {
         return isTime;