[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db TableCreator.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db
In directory jcorp2.servlets.net:/tmp/cvs-serv2512

Modified Files:
	TableCreator.java 
Log Message:
<Aucun commentaire entré>


Index: TableCreator.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/db/TableCreator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** TableCreator.java	20 Sep 2004 19:21:48 -0000	1.13
--- TableCreator.java	20 Sep 2004 19:49:15 -0000	1.14
***************
*** 26,29 ****
--- 26,32 ----
   * @author Michael Rimov
   * @version $Revision$ on  $Date$
+  *
+  * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
+  * @since $DatabaseSchema  $Date$
   */
  
***************
*** 85,88 ****
--- 88,94 ----
       * @todo Refactor this method into smaller chunks... ie creating the table.
       * Creating
+      *
+      * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
+      * @since $DatabaseSchema  $Date$
       */
      public synchronized void createTable(DBObject dbObj) throws DBException {
***************
*** 122,126 ****
                              myDBDriver.equals("org.postgresql.Driver")) {
                          sqlStatement.append(", CONSTRAINT pk");
!                         sqlStatement.append(metadata.getTargetTable());
                          sqlStatement.append(" PRIMARY KEY (");
                          addComma = false;
--- 128,132 ----
                              myDBDriver.equals("org.postgresql.Driver")) {
                          sqlStatement.append(", CONSTRAINT pk");
!                        sqlStatement.append(metadata.getTargetSQLTable(dbObj.getDataContext()));
                          sqlStatement.append(" PRIMARY KEY (");
                          addComma = false;
***************
*** 157,161 ****
                      } else {
                          pkStatement.append("alter table ");
!                         pkStatement.append(metadata.getTargetTable());
                          pkStatement.append(" add primary key(");
                          addComma = false;
--- 163,167 ----
                      } else {
                          pkStatement.append("alter table ");
!                         pkStatement.append(metadata.getTargetSQLTable(dbObj.getDataContext()));
                          pkStatement.append(" add primary key(");
                          addComma = false;
***************
*** 222,225 ****
--- 228,234 ----
       * @return FastStringBuffer with the create statements added
       * @throws DBException upon creation error
+      *
+      * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
+      * @since $DatabaseSchema  $Date$
       */
      protected FastStringBuffer createTableSQLDefinition(DBObject dbObj,
***************
*** 248,252 ****
          }
          sqlStatement.append(" TABLE ");
!         sqlStatement.append(metadata.getTargetTable());
          sqlStatement.append("(");
  
--- 257,261 ----
          }
          sqlStatement.append(" TABLE ");
!         sqlStatement.append(metadata.getTargetSQLTable(dbObj.getDataContext()));
          sqlStatement.append("(");
  
***************
*** 302,305 ****
--- 311,317 ----
       * @throws    DBException If the create process fails
       * @return A Vector containing the created dbObjects
+      *
+      * Modify by Yves Henri AMAIZO <amy_amaizo at compuserve.com>
+      * @since $DatabaseSchema  $Date$
       */
      public synchronized Vector createAsNeeded(Schema oneSchema, String dataContext)
***************
*** 334,338 ****
  
              if (log.isInfoEnabled()) {
!                 log.info("Verifying table " + metadata.getTargetTable() + " exists");
              }
  
--- 346,350 ----
  
              if (log.isInfoEnabled()) {
!                 log.info("Verifying table " + metadata.getTargetSQLTable(oneMember.getDataContext()) + " exists");
              }
  
***************
*** 344,348 ****
  
                  if (log.isInfoEnabled()) {
!                     log.info("Table " + metadata.getTargetTable() + " is OK");
                  }
              } catch (DBException de) {
--- 356,360 ----
  
                  if (log.isInfoEnabled()) {
!                     log.info("Table " + metadata.getTargetSQLTable(oneMember.getDataContext()) + " is OK");
                  }
              } catch (DBException de) {
***************
*** 360,367 ****
                      oneMember.count();
                  } catch (DBException de2) {
!                     throw new DBException("Table '" +
!                             metadata.getTargetTable() +
!                             "' was not created successfully in db '" +
!                             oneMember.getDataContext() + "'", de2);
                  }
              }
--- 372,379 ----
                      oneMember.count();
                  } catch (DBException de2) {
!                                         throw new DBException("Table '" +
!                                                         metadata.getTargetSQLTable(oneMember.getDataContext()) +
!                                                         "' was not created successfully in db '" +
!                                                         oneMember.getDataContext() + "'", de2);
                  }
              }