Author: tomdz Date: Sun Nov 27 00:39:05 2005 New Revision: 349192 URL: http://svn.apache.org/viewcvs?rev=349192&view=rev Log: Renamed create/alter/drop tables sql methods to be more in line with the naming scheme
Clarified database support documentation Disabled comment creation in the writeSchemaToDatabase subtask Modified: db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/database-support.xml db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/site.xml db/ddlutils/trunk/src/java/org/apache/ddlutils/Platform.java db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java db/ddlutils/trunk/src/java/org/apache/ddlutils/task/WriteSchemaToDatabaseCommand.java Modified: db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/database-support.xml URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/database-support.xml?rev=349192&r1=349191&r2=349192&view=diff ============================================================================== --- db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/database-support.xml (original) +++ db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/database-support.xml Sun Nov 27 00:39:05 2005 @@ -211,23 +211,23 @@ </p> <table> <tr> - <td><code>NULL</code> is explicitly specified as default value</td> + <td>DdlUtils explicitly specifies <code>NULL</code> as default value</td> <td>no</td> </tr> <tr> - <td>Primary key definitions embedded in table definition</td> + <td>DdlUtils uses primary key definitions embedded in the table definition</td> <td>yes</td> </tr> <tr> - <td>Foreign key definitions embedded in table definition</td> + <td>DdlUtils uses foreign key definitions embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Indices embedded in table definition</td> + <td>DdlUtils uses indices embedded in the table definition</td> <td>yes</td> </tr> <tr> - <td>Uses ALTER TABLE statements for dropping tables </td> + <td>DdlUtils uses ALTER TABLE statements for dropping tables </td> <td>no</td> </tr> <tr> @@ -409,29 +409,29 @@ <a href="ext:cloudscape/manual">IBM Cloudscape Reference Manual</a>. </p> <p> - The <a href="ext:derby">Apache Derby</a> project is based upon Cloudscape. The SQL syntax and - datatypes supported by Derby are described in the Datatypes section in the - <a href="ext:derby/manual">Reference Manual</a>. + The <a href="ext:derby">Apache Derby</a> project is based upon Cloudscape version 10, which IBM + contributed to Apache in 2004. The SQL syntax and datatypes supported by Derby are described in + the Datatypes section in the <a href="ext:derby/manual">Reference Manual</a>. </p> <table> <tr> - <td><code>NULL</code> is explicitly specified as default value</td> + <td>DdlUtils explicitly specifies <code>NULL</code> as default value</td> <td>no</td> </tr> <tr> - <td>Primary key definitions embedded in table definition</td> + <td>DdlUtils uses primary key definitions embedded in the table definition</td> <td>yes</td> </tr> <tr> - <td>Foreign key definitions embedded in table definition</td> + <td>DdlUtils uses foreign key definitions embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Indices embedded in table definition</td> + <td>DdlUtils uses indices embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Uses ALTER TABLE statements for dropping tables </td> + <td>DdlUtils uses ALTER TABLE statements for dropping tables </td> <td>no</td> </tr> <tr> @@ -615,23 +615,23 @@ </p> <table> <tr> - <td><code>NULL</code> is explicitly specified as default value</td> + <td>DdlUtils explicitly specifies <code>NULL</code> as default value</td> <td>no</td> </tr> <tr> - <td>Primary key definitions embedded in table definition</td> + <td>DdlUtils uses primary key definitions embedded in the table definition</td> <td>yes</td> </tr> <tr> - <td>Foreign key definitions embedded in table definition</td> + <td>DdlUtils uses foreign key definitions embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Indices embedded in table definition</td> + <td>DdlUtils uses indices embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Uses ALTER TABLE statements for dropping tables </td> + <td>DdlUtils uses ALTER TABLE statements for dropping tables </td> <td>no</td> </tr> <tr> @@ -821,23 +821,23 @@ </note> <table> <tr> - <td><code>NULL</code> is explicitly specified as default value</td> + <td>DdlUtils explicitly specifies <code>NULL</code> as default value</td> <td>no</td> </tr> <tr> - <td>Primary key definitions embedded in table definition</td> + <td>DdlUtils uses primary key definitions embedded in the table definition</td> <td>yes</td> </tr> <tr> - <td>Foreign key definitions embedded in table definition</td> + <td>DdlUtils uses foreign key definitions embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Indices embedded in table definition</td> + <td>DdlUtils uses indices embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Uses ALTER TABLE statements for dropping tables </td> + <td>DdlUtils uses ALTER TABLE statements for dropping tables </td> <td>no</td> </tr> <tr> @@ -1020,23 +1020,23 @@ </p> <table> <tr> - <td><code>NULL</code> is explicitly specified as default value</td> + <td>DdlUtils explicitly specifies <code>NULL</code> as default value</td> <td>no</td> </tr> <tr> - <td>Primary key definitions embedded in table definition</td> + <td>DdlUtils uses primary key definitions embedded in the table definition</td> <td>yes</td> </tr> <tr> - <td>Foreign key definitions embedded in table definition</td> + <td>DdlUtils uses foreign key definitions embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Indices embedded in table definition</td> + <td>DdlUtils uses indices embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Uses ALTER TABLE statements for dropping tables </td> + <td>DdlUtils uses ALTER TABLE statements for dropping tables </td> <td>no</td> </tr> <tr> @@ -1223,23 +1223,23 @@ </p> <table> <tr> - <td><code>NULL</code> is explicitly specified as default value</td> + <td>DdlUtils explicitly specifies <code>NULL</code> as default value</td> <td>no</td> </tr> <tr> - <td>Primary key definitions embedded in table definition</td> + <td>DdlUtils uses primary key definitions embedded in the table definition</td> <td>yes</td> </tr> <tr> - <td>Foreign key definitions embedded in table definition</td> + <td>DdlUtils uses foreign key definitions embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Indices embedded in table definition</td> + <td>DdlUtils uses indices embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Uses ALTER TABLE statements for dropping tables </td> + <td>DdlUtils uses ALTER TABLE statements for dropping tables </td> <td>no</td> </tr> <tr> @@ -1422,23 +1422,23 @@ </p> <table> <tr> - <td><code>NULL</code> is explicitly specified as default value</td> + <td>DdlUtils explicitly specifies <code>NULL</code> as default value</td> <td>no</td> </tr> <tr> - <td>Primary key definitions embedded in table definition</td> + <td>DdlUtils uses primary key definitions embedded in the table definition</td> <td>yes</td> </tr> <tr> - <td>Foreign key definitions embedded in table definition</td> + <td>DdlUtils uses foreign key definitions embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Indices embedded in table definition</td> + <td>DdlUtils uses indices embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Uses ALTER TABLE statements for dropping tables </td> + <td>DdlUtils uses ALTER TABLE statements for dropping tables </td> <td>no</td> </tr> <tr> @@ -1621,23 +1621,23 @@ </p> <table> <tr> - <td><code>NULL</code> is explicitly specified as default value</td> + <td>DdlUtils explicitly specifies <code>NULL</code> as default value</td> <td>no</td> </tr> <tr> - <td>Primary key definitions embedded in table definition</td> + <td>DdlUtils uses primary key definitions embedded in the table definition</td> <td>yes</td> </tr> <tr> - <td>Foreign key definitions embedded in table definition</td> + <td>DdlUtils uses foreign key definitions embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Indices embedded in table definition</td> + <td>DdlUtils uses indices embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Uses ALTER TABLE statements for dropping tables </td> + <td>DdlUtils uses ALTER TABLE statements for dropping tables </td> <td>no</td> </tr> <tr> @@ -1821,23 +1821,23 @@ </p> <table> <tr> - <td><code>NULL</code> is explicitly specified as default value</td> + <td>DdlUtils explicitly specifies <code>NULL</code> as default value</td> <td>no</td> </tr> <tr> - <td>Primary key definitions embedded in table definition</td> + <td>DdlUtils uses primary key definitions embedded in the table definition</td> <td>yes</td> </tr> <tr> - <td>Foreign key definitions embedded in table definition</td> + <td>DdlUtils uses foreign key definitions embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Indices embedded in table definition</td> + <td>DdlUtils uses indices embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Uses ALTER TABLE statements for dropping tables </td> + <td>DdlUtils uses ALTER TABLE statements for dropping tables </td> <td>no</td> </tr> <tr> @@ -2019,23 +2019,23 @@ </p> <table> <tr> - <td><code>NULL</code> is explicitly specified as default value</td> + <td>DdlUtils explicitly specifies <code>NULL</code> as default value</td> <td>no</td> </tr> <tr> - <td>Primary key definitions embedded in table definition</td> + <td>DdlUtils uses primary key definitions embedded in the table definition</td> <td>yes</td> </tr> <tr> - <td>Foreign key definitions embedded in table definition</td> + <td>DdlUtils uses foreign key definitions embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Indices embedded in table definition</td> + <td>DdlUtils uses indices embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Uses ALTER TABLE statements for dropping tables </td> + <td>DdlUtils uses ALTER TABLE statements for dropping tables </td> <td>no</td> </tr> <tr> @@ -2219,23 +2219,23 @@ </p> <table> <tr> - <td><code>NULL</code> is explicitly specified as default value</td> + <td>DdlUtils explicitly specifies <code>NULL</code> as default value</td> <td>no</td> </tr> <tr> - <td>Primary key definitions embedded in table definition</td> + <td>DdlUtils uses primary key definitions embedded in the table definition</td> <td>yes</td> </tr> <tr> - <td>Foreign key definitions embedded in table definition</td> + <td>DdlUtils uses foreign key definitions embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Indices embedded in table definition</td> + <td>DdlUtils uses indices embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Uses ALTER TABLE statements for dropping tables </td> + <td>DdlUtils uses ALTER TABLE statements for dropping tables </td> <td>no</td> </tr> <tr> @@ -2422,23 +2422,23 @@ </p> <table> <tr> - <td><code>NULL</code> is explicitly specified as default value</td> + <td>DdlUtils explicitly specifies <code>NULL</code> as default value</td> <td>no</td> </tr> <tr> - <td>Primary key definitions embedded in table definition</td> + <td>DdlUtils uses primary key definitions embedded in the table definition</td> <td>yes</td> </tr> <tr> - <td>Foreign key definitions embedded in table definition</td> + <td>DdlUtils uses foreign key definitions embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Indices embedded in table definition</td> + <td>DdlUtils uses indices embedded in the table definition</td> <td>no</td> </tr> <tr> - <td>Uses ALTER TABLE statements for dropping tables </td> + <td>DdlUtils uses ALTER TABLE statements for dropping tables</td> <td>no</td> </tr> <tr> Modified: db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/site.xml URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/site.xml?rev=349192&r1=349191&r2=349192&view=diff ============================================================================== --- db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/site.xml (original) +++ db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/site.xml Sun Nov 27 00:39:05 2005 @@ -99,8 +99,8 @@ <manual href="ftp://ftp.software.ibm.com/ps/products/db2/info/vr7/pdf/letter/db2s0e70.pdf"/> <jdbc-mappings href="http://publib.boulder.ibm.com/infocenter/db2help/topic/com.ibm.db2.udb.doc/ad/rjvjdata.htm#jvregou"/> </db2> - <derby href="http://incubator.apache.org/derby/"> - <manual href="manuals/reference/sqlj02.html#Reference+Manual"/> + <derby href="http://db.apache.org/derby/"> + <manual href="manuals/index.html"/> </derby> <eclipse href="http://www.eclipse.org"/> <firebird href="http://firebird.sourceforge.net/"/> Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/Platform.java URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/Platform.java?rev=349192&r1=349191&r2=349192&view=diff ============================================================================== --- db/ddlutils/trunk/src/java/org/apache/ddlutils/Platform.java (original) +++ db/ddlutils/trunk/src/java/org/apache/ddlutils/Platform.java Sun Nov 27 00:39:05 2005 @@ -206,7 +206,7 @@ * @param continueOnError Whether to continue executing the sql commands when an error occurred * @return The SQL statements */ - public String createTablesSql(Database model, boolean dropTablesFirst, boolean continueOnError) throws DynaSqlException; + public String getCreateTablesSql(Database model, boolean dropTablesFirst, boolean continueOnError) throws DynaSqlException; /** * Creates the tables defined in the database model. @@ -238,7 +238,7 @@ * @param continueOnError Whether to continue executing the sql commands when an error occurred * @return The SQL statements */ - public String createTablesSql(Database model, CreationParameters params, boolean dropTablesFirst, boolean continueOnError) throws DynaSqlException; + public String getCreateTablesSql(Database model, CreationParameters params, boolean dropTablesFirst, boolean continueOnError) throws DynaSqlException; /** * Alters the database schema so that it match the given model. Drops and table modifications will @@ -270,7 +270,7 @@ * @param continueOnError Whether to continue with the next sql statement when an error occurred * @return The SQL statements */ - public String alterTablesSql(Database desiredDb, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException; + public String getAlterTablesSql(Database desiredDb, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException; /** * Alters the database schema so that it match the given model. Drops and table modifications will @@ -305,7 +305,7 @@ * @param continueOnError Whether to continue with the next sql statement when an error occurred * @return The SQL statements */ - public String alterTablesSql(Database desiredDb, CreationParameters params, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException; + public String getAlterTablesSql(Database desiredDb, CreationParameters params, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException; /** * Alters the database schema so that it match the given model. Drops and table modifications will @@ -340,7 +340,7 @@ * @param continueOnError Whether to continue with the next sql statement when an error occurred * @return The SQL statements */ - public String alterTablesSql(Connection connection, Database desiredDb, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException; + public String getAlterTablesSql(Connection connection, Database desiredDb, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException; /** * Alters the database schema so that it match the given model. Drops and table modifications will @@ -378,7 +378,7 @@ * @param continueOnError Whether to continue with the next sql statement when an error occurred * @return The SQL statements */ - public String alterTablesSql(Connection connection, Database desiredDb, CreationParameters params, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException; + public String getAlterTablesSql(Connection connection, Database desiredDb, CreationParameters params, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException; /** * Drops the tables defined in the given database. @@ -395,7 +395,7 @@ * @param continueOnError Whether to continue executing the sql commands when an error occurred * @return The SQL statements */ - public String dropTablesSql(Database model, boolean continueOnError) throws DynaSqlException; + public String getDropTablesSql(Database model, boolean continueOnError) throws DynaSqlException; /** * Drops the tables defined in the given database. Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java?rev=349192&r1=349191&r2=349192&view=diff ============================================================================== --- db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java (original) +++ db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java Sun Nov 27 00:39:05 2005 @@ -269,7 +269,7 @@ */ public void createTables(Connection connection, Database model, boolean dropTablesFirst, boolean continueOnError) throws DynaSqlException { - String sql = createTablesSql(model, dropTablesFirst, continueOnError); + String sql = getCreateTablesSql(model, dropTablesFirst, continueOnError); evaluateBatch(connection, sql, continueOnError); } @@ -277,7 +277,7 @@ /** * [EMAIL PROTECTED] */ - public String createTablesSql(Database model, boolean dropTablesFirst, boolean continueOnError) throws DynaSqlException + public String getCreateTablesSql(Database model, boolean dropTablesFirst, boolean continueOnError) throws DynaSqlException { String sql = null; @@ -318,7 +318,7 @@ */ public void createTables(Connection connection, Database model, CreationParameters params, boolean dropTablesFirst, boolean continueOnError) throws DynaSqlException { - String sql = createTablesSql(model, params, dropTablesFirst, continueOnError); + String sql = getCreateTablesSql(model, params, dropTablesFirst, continueOnError); evaluateBatch(connection, sql, continueOnError); } @@ -326,7 +326,7 @@ /** * [EMAIL PROTECTED] */ - public String createTablesSql(Database model, CreationParameters params, boolean dropTablesFirst, boolean continueOnError) throws DynaSqlException + public String getCreateTablesSql(Database model, CreationParameters params, boolean dropTablesFirst, boolean continueOnError) throws DynaSqlException { String sql = null; @@ -373,13 +373,13 @@ /** * [EMAIL PROTECTED] */ - public String alterTablesSql(Database desiredDb, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException + public String getAlterTablesSql(Database desiredDb, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException { Connection connection = borrowConnection(); try { - return alterTablesSql(connection, desiredDb, doDrops, modifyColumns, continueOnError); + return getAlterTablesSql(connection, desiredDb, doDrops, modifyColumns, continueOnError); } finally { @@ -415,13 +415,13 @@ /** * [EMAIL PROTECTED] */ - public String alterTablesSql(Database desiredDb, CreationParameters params, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException + public String getAlterTablesSql(Database desiredDb, CreationParameters params, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException { Connection connection = borrowConnection(); try { - return alterTablesSql(connection, desiredDb, params, doDrops, modifyColumns, continueOnError); + return getAlterTablesSql(connection, desiredDb, params, doDrops, modifyColumns, continueOnError); } finally { @@ -442,7 +442,7 @@ */ public void alterTables(Connection connection, Database desiredModel, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException { - String sql = alterTablesSql(connection, desiredModel, doDrops, modifyColumns, continueOnError); + String sql = getAlterTablesSql(connection, desiredModel, doDrops, modifyColumns, continueOnError); evaluateBatch(connection, sql, continueOnError); } @@ -450,7 +450,7 @@ /** * [EMAIL PROTECTED] */ - public String alterTablesSql(Connection connection, Database desiredModel, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException + public String getAlterTablesSql(Connection connection, Database desiredModel, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException { String sql = null; Database currentModel = readModelFromDatabase(connection); @@ -483,7 +483,7 @@ */ public void alterTables(Connection connection, Database desiredModel, CreationParameters params, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException { - String sql = alterTablesSql(connection, desiredModel, params, doDrops, modifyColumns, continueOnError); + String sql = getAlterTablesSql(connection, desiredModel, params, doDrops, modifyColumns, continueOnError); evaluateBatch(connection, sql, continueOnError); } @@ -491,7 +491,7 @@ /** * [EMAIL PROTECTED] */ - public String alterTablesSql(Connection connection, Database desiredModel, CreationParameters params, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException + public String getAlterTablesSql(Connection connection, Database desiredModel, CreationParameters params, boolean doDrops, boolean modifyColumns, boolean continueOnError) throws DynaSqlException { String sql = null; Database currentModel = readModelFromDatabase(connection); @@ -533,7 +533,7 @@ */ public void dropTables(Connection connection, Database model, boolean continueOnError) throws DynaSqlException { - String sql = dropTablesSql(model, continueOnError); + String sql = getDropTablesSql(model, continueOnError); evaluateBatch(connection, sql, continueOnError); } @@ -541,7 +541,7 @@ /** * [EMAIL PROTECTED] */ - public String dropTablesSql(Database model, boolean continueOnError) throws DynaSqlException + public String getDropTablesSql(Database model, boolean continueOnError) throws DynaSqlException { String sql = null; Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/task/WriteSchemaToDatabaseCommand.java URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/task/WriteSchemaToDatabaseCommand.java?rev=349192&r1=349191&r2=349192&view=diff ============================================================================== --- db/ddlutils/trunk/src/java/org/apache/ddlutils/task/WriteSchemaToDatabaseCommand.java (original) +++ db/ddlutils/trunk/src/java/org/apache/ddlutils/task/WriteSchemaToDatabaseCommand.java Sun Nov 27 00:39:05 2005 @@ -90,6 +90,8 @@ boolean isCaseSensitive = platform.getPlatformInfo().isUseDelimitedIdentifiers(); CreationParameters params = getFilteredParameters(model, platform.getName(), isCaseSensitive); + // we're disabling the comment generation as it is not interesting in this case anyway + platform.getPlatformInfo().setCommentsSupported(false); try { if (isAlterDatabase())