svn commit: r331006 - /db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java
Author: mvdb
Date: Sat Nov 5 07:54:17 2005
New Revision: 331006
URL: http://svn.apache.org/viewcvs?rev=331006view=rev
Log:
Change HasMap parameters to Map parameters.
Modified:
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java
Modified:
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java
URL:
http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java?rev=331006r1=331005r2=331006view=diff
==
--- db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java
(original)
+++ db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/SqlBuilder.java Sat
Nov 5 07:54:17 2005
@@ -22,7 +22,6 @@
import java.text.DateFormat;
import java.text.NumberFormat;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
@@ -665,7 +664,7 @@
*prepared statement
* @return The insertion sql
*/
-public String getInsertSql(Table table, HashMap columnValues, boolean
genPlaceholders)
+public String getInsertSql(Table table, Map columnValues, boolean
genPlaceholders)
{
StringBuffer buffer = new StringBuffer(INSERT INTO );
boolean addComma = false;
@@ -735,7 +734,7 @@
*prepared statement (both for the pk values and
the object values)
* @return The update sql
*/
-public String getUpdateSql(Table table, HashMap columnValues, boolean
genPlaceholders)
+public String getUpdateSql(Table table, Map columnValues, boolean
genPlaceholders)
{
StringBuffer buffer = new StringBuffer(UPDATE );
boolean addSep = false;
@@ -805,7 +804,7 @@
*prepared statement
* @return The delete sql
*/
-public String getDeleteSql(Table table, HashMap pkValues, boolean
genPlaceholders)
+public String getDeleteSql(Table table, Map pkValues, boolean
genPlaceholders)
{
StringBuffer buffer = new StringBuffer(DELETE FROM );
boolean addSep = false;
[jira] Created: (DDLUTILS-43) jdbc model reader does not set the database name
jdbc model reader does not set the database name Key: DDLUTILS-43 URL: http://issues.apache.org/jira/browse/DDLUTILS-43 Project: DdlUtils Type: Bug Reporter: Thorbjørn Ravn Andersen Assigned to: Thomas Dudziak On 11/7/05, Thorbjørn Ravn Andersen [EMAIL PROTECTED] wrote: I just noticed that the method described to read from a database, put together with the method to write to XML does not produce XML-files that can be read in again with the method to read from xml. I found that a database.setName(whatever) had to be called before writing to xml to remidy this. You're right, the jdbc model reader does not set the database name yet. Could you file an issue with JIRA ? Tom -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira
svn commit: r330993 - in /db/ddlutils/trunk/src: java/org/apache/ddlutils/model/ java/org/apache/ddlutils/platform/ test/org/apache/ddlutils/io/
Author: mvdb
Date: Sat Nov 5 03:35:06 2005
New Revision: 330993
URL: http://svn.apache.org/viewcvs?rev=330993view=rev
Log:
Rename getAutoIncrementColumn to getAutoIncremntColumns
Modified:
db/ddlutils/trunk/src/java/org/apache/ddlutils/model/Table.java
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/InterbaseBuilder.java
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/OracleBuilder.java
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PostgreSqlBuilder.java
db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatabaseIO.java
Modified: db/ddlutils/trunk/src/java/org/apache/ddlutils/model/Table.java
URL:
http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/model/Table.java?rev=330993r1=330992r2=330993view=diff
==
--- db/ddlutils/trunk/src/java/org/apache/ddlutils/model/Table.java (original)
+++ db/ddlutils/trunk/src/java/org/apache/ddlutils/model/Table.java Sat Nov 5
03:35:06 2005
@@ -583,7 +583,7 @@
*
* @return The columns
*/
-public Column[] getAutoIncrementColumn()
+public Column[] getAutoIncrementColumns()
{
Collection autoIncrColumns = CollectionUtils.select(_columns, new
Predicate() {
public boolean evaluate(Object input) {
Modified:
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/InterbaseBuilder.java
URL:
http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/InterbaseBuilder.java?rev=330993r1=330992r2=330993view=diff
==
---
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/InterbaseBuilder.java
(original)
+++
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/InterbaseBuilder.java
Sat Nov 5 03:35:06 2005
@@ -76,7 +76,7 @@
printEndOfStatement();
// creating generator and trigger for auto-increment
-Column[] columns = table.getAutoIncrementColumn();
+Column[] columns = table.getAutoIncrementColumns();
for (int idx = 0; idx columns.length; idx++)
{
@@ -131,7 +131,7 @@
public void dropTable(Table table) throws IOException
{
// dropping generators for auto-increment
-Column[] columns = table.getAutoIncrementColumn();
+Column[] columns = table.getAutoIncrementColumns();
for (int idx = 0; idx columns.length; idx++)
{
Modified:
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/OracleBuilder.java
URL:
http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/OracleBuilder.java?rev=330993r1=330992r2=330993view=diff
==
--- db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/OracleBuilder.java
(original)
+++ db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/OracleBuilder.java
Sat Nov 5 03:35:06 2005
@@ -53,7 +53,7 @@
print( CASCADE CONSTRAINTS);
printEndOfStatement();
-Column[] columns = table.getAutoIncrementColumn();
+Column[] columns = table.getAutoIncrementColumns();
for (int idx = 0; idx columns.length; idx++)
{
@@ -80,7 +80,7 @@
public void createTable(Database database, Table table) throws IOException
{
// lets create any sequences
-Column[] columns = table.getAutoIncrementColumn();
+Column[] columns = table.getAutoIncrementColumns();
for (int idx = 0; idx columns.length; idx++)
{
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=330993r1=330992r2=330993view=diff
==
---
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java
(original)
+++
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java
Sat Nov 5 03:35:06 2005
@@ -660,7 +660,7 @@
return;
}
-Column[] columns =
model.findTable(dynaClass.getTableName()).getAutoIncrementColumn();
+Column[] columns =
model.findTable(dynaClass.getTableName()).getAutoIncrementColumns();
if (columns.length 0)
{
Modified:
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PostgreSqlBuilder.java
URL:
http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PostgreSqlBuilder.java?rev=330993r1=330992r2=330993view=diff
==
---
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PostgreSqlBuilder.java
(original)
+++
svn commit: r331004 - /db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatabaseIO.java
Author: mvdb
Date: Sat Nov 5 07:31:57 2005
New Revision: 331004
URL: http://svn.apache.org/viewcvs?rev=331004view=rev
Log:
Added URL to issue in bugzilla.
Modified:
db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatabaseIO.java
Modified: db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatabaseIO.java
URL:
http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatabaseIO.java?rev=331004r1=331003r2=331004view=diff
==
--- db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatabaseIO.java
(original)
+++ db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatabaseIO.java Sat
Nov 5 07:31:57 2005
@@ -1248,6 +1248,7 @@
* Need to check this with the betwixt team..
* This piece of xml will end up with a Database object with on Table
named NotATable, which
* is clearly wrong.
+ * See http://issues.apache.org/bugzilla/show_bug.cgi?id=37369 for more
info.
*/
public void testFaultReadOfTable()
{
