Author: mvdb
Date: Sat Nov 5 03:35:06 2005
New Revision: 330993
URL: http://svn.apache.org/viewcvs?rev=330993&view=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=330993&r1=330992&r2=330993&view=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=330993&r1=330992&r2=330993&view=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=330993&r1=330992&r2=330993&view=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=330993&r1=330992&r2=330993&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
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=330993&r1=330992&r2=330993&view=diff
==============================================================================
---
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PostgreSqlBuilder.java
(original)
+++
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PostgreSqlBuilder.java
Sat Nov 5 03:35:06 2005
@@ -52,7 +52,7 @@
print(" CASCADE");
printEndOfStatement();
- Column[] columns = table.getAutoIncrementColumn();
+ Column[] columns = table.getAutoIncrementColumns();
for (int idx = 0; idx < columns.length; idx++)
{
@@ -107,7 +107,7 @@
*/
public String getSelectLastInsertId(Table table)
{
- Column[] columns = table.getAutoIncrementColumn();
+ Column[] columns = table.getAutoIncrementColumns();
if (columns.length == 0)
{
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=330993&r1=330992&r2=330993&view=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 03:35:06 2005
@@ -93,7 +93,7 @@
table.getName());
assertEquals("Some table",
table.getDescription());
- assertEquals(0, table.getAutoIncrementColumn().length);
+ assertEquals(0, table.getAutoIncrementColumns().length);
assertEquals(1,
table.getColumnCount());
assertEquals(0,
@@ -164,7 +164,7 @@
someTable.getName());
assertEquals("Some table",
someTable.getDescription());
- assertEquals(0, someTable.getAutoIncrementColumn().length);
+ assertEquals(0, someTable.getAutoIncrementColumns().length);
assertEquals(1,
someTable.getColumnCount());
assertEquals(0,
@@ -195,7 +195,7 @@
anotherTable.getName());
assertEquals("And another table",
anotherTable.getDescription());
- assertEquals(0, anotherTable.getAutoIncrementColumn().length);
+ assertEquals(0, anotherTable.getAutoIncrementColumns().length);
assertEquals(1,
anotherTable.getColumnCount());
assertEquals(1,
@@ -293,7 +293,7 @@
assertEquals("TableWidthIndex",
table.getName());
assertNull(table.getDescription());
- assertEquals(0, table.getAutoIncrementColumn().length);
+ assertEquals(0, table.getAutoIncrementColumns().length);
assertEquals(3,
table.getColumnCount());
assertEquals(0,
@@ -452,8 +452,8 @@
assertNull(column.getDefaultValue());
assertNull(column.getDescription());
- assertEquals(1, table.getAutoIncrementColumn().length);
- assertEquals(column, table.getAutoIncrementColumn()[0]);
+ assertEquals(1, table.getAutoIncrementColumns().length);
+ assertEquals(column, table.getAutoIncrementColumns()[0]);
column = table.getColumn(1);
@@ -625,9 +625,9 @@
assertNull(column.getDefaultValue());
assertEquals("The primary key of table A",
column.getDescription());
- assertEquals(1, table.getAutoIncrementColumn().length);
+ assertEquals(1, table.getAutoIncrementColumns().length);
assertEquals(column,
- table.getAutoIncrementColumn()[0]);
+ table.getAutoIncrementColumns()[0]);
column = table.getColumn(1);
@@ -709,7 +709,7 @@
table.getName());
assertEquals("Table B",
table.getDescription());
- assertEquals(0, table.getAutoIncrementColumn().length);
+ assertEquals(0, table.getAutoIncrementColumns().length);
assertEquals(3,
table.getColumnCount());
assertEquals(2,
@@ -841,7 +841,7 @@
table.getName());
assertEquals("Table C",
table.getDescription());
- assertEquals(0, table.getAutoIncrementColumn().length);
+ assertEquals(0, table.getAutoIncrementColumns().length);
assertEquals(2,
table.getColumnCount());
assertEquals(0,
