Modified: db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/images/model.png URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/images/model.png?rev=385311&r1=385310&r2=385311&view=diff ============================================================================== Binary files - no diff available.
Modified: db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/index.xml URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/index.xml?rev=385311&r1=385310&r2=385311&view=diff ============================================================================== --- db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/index.xml (original) +++ db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/index.xml Sun Mar 12 08:29:21 2006 @@ -39,8 +39,9 @@ datatypes which are inherently database specific. An example of such a file is: </p> <source><![CDATA[ -<?xml version="1.0"?> - <database name="testdb"> +<?xml version="1.0"?> +<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database.dtd";> +<database name="testdb"> <table name="author"> <column name="author_id" type="INTEGER" @@ -82,9 +83,8 @@ <index name="book_isbn"> <index-column name="isbn"/> </index> - </table> - </database>]]> +</database>]]> </source> </section> <section id="Learning_more"> Modified: db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/schema.xml URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/schema.xml?rev=385311&r1=385310&r2=385311&view=diff ============================================================================== --- db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/schema.xml (original) +++ db/ddlutils/trunk/src/doc/src/documentation/content/xdocs/schema.xml Sun Mar 12 08:29:21 2006 @@ -22,6 +22,7 @@ <body> <section> <title>The schema used by DdlUtils</title> + <p>The <a href="ext:torque/dtd">DTD</a>.</p> <note>Coming soon</note> </section> </body> 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=385311&r1=385310&r2=385311&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 Mar 12 08:29:21 2006 @@ -164,7 +164,9 @@ <svn-up href="http://svnup.tigris.org"/> <tortoisesvn href="http://tortoisesvn.tigris.org"/> </tigris> - <torque href="http://db.apache.org/torque"/> + <torque href="http://db.apache.org/torque/";> + <dtd href="dtd/database.dtd"/> + </torque> </external-refs> </site> Modified: db/ddlutils/trunk/src/doc/src/documentation/skinconf.xml URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/doc/src/documentation/skinconf.xml?rev=385311&r1=385310&r2=385311&view=diff ============================================================================== --- db/ddlutils/trunk/src/doc/src/documentation/skinconf.xml (original) +++ db/ddlutils/trunk/src/doc/src/documentation/skinconf.xml Sun Mar 12 08:29:21 2006 @@ -218,6 +218,22 @@ .warningmessage {font-size : 90%;} .infomessage {font-size : 90%;} .errormessage {font-size : 90%;} + + td.platformPropName { + width : 50%; + } + td.platformPropValue { + width : 50%; + } + th.typeMappingJdbcType { + width : 25%; + } + th.typeMappingNativeType { + width : 25%; + } + th.typeMappingComments { + width : 50%; + } </extra-css> <colors> Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/firebird/FirebirdPlatform.java URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/firebird/FirebirdPlatform.java?rev=385311&r1=385310&r2=385311&view=diff ============================================================================== --- db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/firebird/FirebirdPlatform.java (original) +++ db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/firebird/FirebirdPlatform.java Sun Mar 12 08:29:21 2006 @@ -62,7 +62,6 @@ info.setIndicesEmbedded(false); info.setCommentPrefix("/*"); info.setCommentSuffix("*/"); - //info.setSupportingDelimitedIdentifiers(false); info.addNativeTypeMapping(Types.ARRAY, "BLOB", Types.LONGVARBINARY); info.addNativeTypeMapping(Types.BINARY, "BLOB", Types.LONGVARBINARY); @@ -79,9 +78,9 @@ info.addNativeTypeMapping(Types.OTHER, "BLOB", Types.LONGVARBINARY); // This is back-mapped to REAL in the model reader info.addNativeTypeMapping(Types.REAL, "FLOAT"); - info.addNativeTypeMapping(Types.TINYINT, "SMALLINT", Types.SMALLINT); info.addNativeTypeMapping(Types.REF, "BLOB", Types.LONGVARBINARY); info.addNativeTypeMapping(Types.STRUCT, "BLOB", Types.LONGVARBINARY); + info.addNativeTypeMapping(Types.TINYINT, "SMALLINT", Types.SMALLINT); info.addNativeTypeMapping(Types.VARBINARY, "BLOB", Types.LONGVARBINARY); info.addNativeTypeMapping("BOOLEAN", "SMALLINT", "SMALLINT"); Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/hsqldb/HsqlDbPlatform.java URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/hsqldb/HsqlDbPlatform.java?rev=385311&r1=385310&r2=385311&view=diff ============================================================================== --- db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/hsqldb/HsqlDbPlatform.java (original) +++ db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/hsqldb/HsqlDbPlatform.java Sun Mar 12 08:29:21 2006 @@ -51,7 +51,6 @@ info.setIndicesEmbedded(false); info.setNonPKIdentityColumnsSupported(false); - info.addNativeTypeMapping(Types.BIT, "BOOLEAN"); info.addNativeTypeMapping(Types.ARRAY, "LONGVARBINARY", Types.LONGVARBINARY); info.addNativeTypeMapping(Types.BLOB, "LONGVARBINARY", Types.LONGVARBINARY); info.addNativeTypeMapping(Types.CLOB, "LONGVARCHAR", Types.LONGVARCHAR); @@ -59,13 +58,11 @@ info.addNativeTypeMapping(Types.FLOAT, "DOUBLE", Types.DOUBLE); info.addNativeTypeMapping(Types.JAVA_OBJECT, "OBJECT"); info.addNativeTypeMapping(Types.NULL, "LONGVARBINARY", Types.LONGVARBINARY); - info.addNativeTypeMapping(Types.OTHER, "OTHER"); info.addNativeTypeMapping(Types.REF, "LONGVARBINARY", Types.LONGVARBINARY); info.addNativeTypeMapping(Types.STRUCT, "LONGVARBINARY", Types.LONGVARBINARY); // JDBC's TINYINT requires a value range of -255 to 255, but HsqlDb's is only -128 to 127 info.addNativeTypeMapping(Types.TINYINT, "SMALLINT", Types.SMALLINT); - // when using JDBC3, BIT will be back-mapped to BOOLEAN info.addNativeTypeMapping("BIT", "BOOLEAN", "BOOLEAN"); info.addNativeTypeMapping("DATALINK", "LONGVARBINARY", "LONGVARBINARY"); Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/interbase/InterbasePlatform.java URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/interbase/InterbasePlatform.java?rev=385311&r1=385310&r2=385311&view=diff ============================================================================== --- db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/interbase/InterbasePlatform.java (original) +++ db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/interbase/InterbasePlatform.java Sun Mar 12 08:29:21 2006 @@ -66,9 +66,9 @@ info.addNativeTypeMapping(Types.NULL, "BLOB"); info.addNativeTypeMapping(Types.OTHER, "BLOB"); info.addNativeTypeMapping(Types.REAL, "FLOAT"); - info.addNativeTypeMapping(Types.TINYINT, "SMALLINT", Types.SMALLINT); info.addNativeTypeMapping(Types.REF, "BLOB"); info.addNativeTypeMapping(Types.STRUCT, "BLOB"); + info.addNativeTypeMapping(Types.TINYINT, "SMALLINT", Types.SMALLINT); info.addNativeTypeMapping(Types.VARBINARY, "VARCHAR {0} CHARACTER SET OCTETS"); info.addNativeTypeMapping("BOOLEAN", "SMALLINT", "SMALLINT"); info.addNativeTypeMapping("DATALINK", "BLOB"); Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/oracle/Oracle8Platform.java URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/oracle/Oracle8Platform.java?rev=385311&r1=385310&r2=385311&view=diff ============================================================================== --- db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/oracle/Oracle8Platform.java (original) +++ db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/oracle/Oracle8Platform.java Sun Mar 12 08:29:21 2006 @@ -43,7 +43,7 @@ public static final String JDBC_SUBPROTOCOL_THIN = "oracle:thin"; /** The thin subprotocol used by the standard Oracle driver. */ public static final String JDBC_SUBPROTOCOL_OCI8 = "oracle:oci8"; - /** The thin subprotocol used by the standard Oracle driver. */ + /** The old thin subprotocol used by the standard Oracle driver. */ public static final String JDBC_SUBPROTOCOL_THIN_OLD = "oracle:dnldthin"; /** @@ -70,14 +70,12 @@ info.addNativeTypeMapping(Types.DISTINCT, "BLOB", Types.BLOB); info.addNativeTypeMapping(Types.DOUBLE, "DOUBLE PRECISION"); info.addNativeTypeMapping(Types.FLOAT, "FLOAT", Types.DOUBLE); - info.addNativeTypeMapping(Types.INTEGER, "INTEGER"); info.addNativeTypeMapping(Types.JAVA_OBJECT, "BLOB", Types.BLOB); info.addNativeTypeMapping(Types.LONGVARBINARY, "BLOB", Types.BLOB); info.addNativeTypeMapping(Types.LONGVARCHAR, "CLOB", Types.CLOB); info.addNativeTypeMapping(Types.NULL, "BLOB", Types.BLOB); info.addNativeTypeMapping(Types.NUMERIC, "NUMBER", Types.DECIMAL); info.addNativeTypeMapping(Types.OTHER, "BLOB", Types.BLOB); - info.addNativeTypeMapping(Types.REAL, "REAL"); info.addNativeTypeMapping(Types.REF, "BLOB", Types.BLOB); info.addNativeTypeMapping(Types.SMALLINT, "NUMBER(5)"); info.addNativeTypeMapping(Types.STRUCT, "BLOB", Types.BLOB); Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/postgresql/PostgreSqlPlatform.java URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/postgresql/PostgreSqlPlatform.java?rev=385311&r1=385310&r2=385311&view=diff ============================================================================== --- db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/postgresql/PostgreSqlPlatform.java (original) +++ db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/postgresql/PostgreSqlPlatform.java Sun Mar 12 08:29:21 2006 @@ -60,6 +60,7 @@ info.setPrimaryKeyEmbedded(true); info.setForeignKeysEmbedded(false); info.setIndicesEmbedded(false); + info.addNativeTypeMapping(Types.ARRAY, "BYTEA", Types.BINARY); info.addNativeTypeMapping(Types.BINARY, "BYTEA", Types.BINARY); info.addNativeTypeMapping(Types.BIT, "BOOLEAN"); @@ -79,7 +80,7 @@ info.addNativeTypeMapping(Types.TINYINT, "SMALLINT", Types.SMALLINT); info.addNativeTypeMapping(Types.VARBINARY, "BYTEA", Types.BINARY); info.addNativeTypeMapping("BOOLEAN", "BOOLEAN", "BIT"); - info.addNativeTypeMapping("DATALINK", "BYTEA"); + info.addNativeTypeMapping("DATALINK", "BYTEA", "BINARY"); // no support for specifying the size for these types info.setHasSize(Types.BINARY, false);
