db-ddlutils-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject svn commit: r463025 - in /db/ddlutils/trunk: ./ src/java/org/apache/ddlutils/model/ src/java/org/apache/ddlutils/platform/ src/java/org/apache/ddlutils/platform/interbase/ src/java/org/apache/ddlutils/platform/mysql/ src/java/org/apache/ddlutils/platfo...
Date Wed, 11 Oct 2006 22:56:21 GMT
Author: tomdz
Date: Wed Oct 11 15:56:20 2006
New Revision: 463025

URL: http://svn.apache.org/viewvc?view=rev&rev=463025
Log:
Javadoc fixes

Modified:
    db/ddlutils/trunk/build.xml
    db/ddlutils/trunk/src/java/org/apache/ddlutils/model/IndexColumn.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/interbase/InterbaseModelReader.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/mysql/MySqlModelReader.java
    db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/sybase/SybasePlatform.java

Modified: db/ddlutils/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/build.xml?view=diff&rev=463025&r1=463024&r2=463025
==============================================================================
--- db/ddlutils/trunk/build.xml (original)
+++ db/ddlutils/trunk/build.xml Wed Oct 11 15:56:20 2006
@@ -57,7 +57,7 @@
     </javac>
     <copy todir="${build.java.dir}">
       <fileset dir="${src.java.dir}"
-               excludes="**/*.java"/>
+               excludes="**/*.java,**/*.html"/>
     </copy>
   </target>
 
@@ -139,12 +139,12 @@
           description="Builds the API javadocs.">
     <mkdir dir="${build.javadoc.dir}"/>
     <javadoc sourcepath="${src.java.dir}"
-    		     classpathref="compilation-classpath"
+             classpathref="compilation-classpath"
              destdir="${build.javadoc.dir}"
              doctitle="${javadoc.title}"
              windowtitle="${javadoc.title} API documentation"
              bottom="${javadoc.footer}"
-        	   protected="true"
+             protected="true"
              author="true"
              version="true"
              packagenames="org.*">
@@ -310,7 +310,7 @@
       </condition>
     </fail>
 
-    <taskdef resource="checkstyletask.properties"
+      <taskdef resource="checkstyletask.properties"
              classpathref="compilation-classpath"/>
 
     <checkstyle config="${src.check.dir}/ddlutils-checks.xml"

Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/model/IndexColumn.java
URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/java/org/apache/ddlutils/model/IndexColumn.java?view=diff&rev=463025&r1=463024&r2=463025
==============================================================================
--- db/ddlutils/trunk/src/java/org/apache/ddlutils/model/IndexColumn.java (original)
+++ db/ddlutils/trunk/src/java/org/apache/ddlutils/model/IndexColumn.java Wed Oct 11 15:56:20
2006
@@ -151,7 +151,10 @@
     }
 
     /**
-     * {@inheritDoc}
+     * Compares this index column to the given one while ignoring the case of identifiers.
+     * 
+     * @param other The other index column
+     * @return <code>true</code> if this index column is equal (ignoring case)
to the given one
      */
     public boolean equalsIgnoreCase(IndexColumn other)
     {

Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java
URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java?view=diff&rev=463025&r1=463024&r2=463025
==============================================================================
--- db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java (original)
+++ db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java Wed Oct 11 15:56:20
2006
@@ -901,7 +901,7 @@
     /**
      * Processes the changes to the structure of a single table. Database-specific
      * implementations might redefine this method, but it is usually sufficient to
-     * redefine the {@link #processTableStructureChanges(Database, Database, Table, Table)}
+     * redefine the {@link #processTableStructureChanges(Database, Database, Table, Table,
Map, List)}
      * method instead.
      * 
      * @param currentModel The current database schema

Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/interbase/InterbaseModelReader.java
URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/interbase/InterbaseModelReader.java?view=diff&rev=463025&r1=463024&r2=463025
==============================================================================
--- db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/interbase/InterbaseModelReader.java
(original)
+++ db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/interbase/InterbaseModelReader.java
Wed Oct 11 15:56:20 2006
@@ -244,7 +244,9 @@
     }
 
     /**
-     * {@inheritDoc}
+     * Adjusts the columns in the table by fixing types and default values.
+     * 
+     * @param table The table
      */
     protected void adjustColumns(Table table)
     {

Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/mysql/MySqlModelReader.java
URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/mysql/MySqlModelReader.java?view=diff&rev=463025&r1=463024&r2=463025
==============================================================================
--- db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/mysql/MySqlModelReader.java (original)
+++ db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/mysql/MySqlModelReader.java Wed
Oct 11 15:56:20 2006
@@ -51,12 +51,13 @@
 
     /**
      * {@inheritDoc}
-     * @todo This needs some more work, since table names can be case sensitive or lowercase
-     *       depending on the platform (really cute).
-     *       See http://dev.mysql.com/doc/refman/4.1/en/name-case-sensitivity.html for more
info.
      */
     protected Table readTable(DatabaseMetaDataWrapper metaData, Map values) throws SQLException
     {
+        // TODO This needs some more work, since table names can be case sensitive or lowercase
+        //      depending on the platform (really cute).
+        //      See http://dev.mysql.com/doc/refman/4.1/en/name-case-sensitivity.html for
more info.
+
         Table table = super.readTable(metaData, values);
 
         if (table != null)

Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/sybase/SybasePlatform.java
URL: http://svn.apache.org/viewvc/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/sybase/SybasePlatform.java?view=diff&rev=463025&r1=463024&r2=463025
==============================================================================
--- db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/sybase/SybasePlatform.java (original)
+++ db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/sybase/SybasePlatform.java Wed
Oct 11 15:56:20 2006
@@ -141,15 +141,16 @@
     	}
     }
 
-    
-	/**
+    /**
      * {@inheritDoc}
      */
-	protected Object extractColumnValue(ResultSet resultSet, String columnName, int jdbcType)
throws SQLException
+	protected Object extractColumnValue(ResultSet resultSet, String columnName, int columnIdx,
int jdbcType) throws SQLException
 	{
-		if (jdbcType == Types.LONGVARBINARY)
+        boolean useIdx = (columnName == null);
+
+        if (jdbcType == Types.LONGVARBINARY)
 		{
-			InputStream stream = resultSet.getBinaryStream(columnName);
+			InputStream stream = useIdx ? resultSet.getBinaryStream(columnIdx) : resultSet.getBinaryStream(columnName);
 
 			if (stream == null)
 			{
@@ -188,7 +189,7 @@
 		}
 		else
 		{
-			return super.extractColumnValue(resultSet, columnName, 0, jdbcType);
+			return super.extractColumnValue(resultSet, columnName, columnIdx, jdbcType);
 		}
 	}
 



Mime
View raw message