[CIShell-SVN] SF.net SVN: cishell:[1025] trunk/core/org.cishell.utilities/src/org/cishell /utilities

[<fu...@us...>]

Revision: 1025
          http://cishell.svn.sourceforge.net/cishell/?rev=1025&view=rev
Author:   fugu13
Date:     2010-01-26 16:51:30 +0000 (Tue, 26 Jan 2010)

Log Message:
-----------
Some minor changes.

Modified Paths:
--------------
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/DatabaseUtilities.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/database/DatabaseTable.java
    trunk/core/org.cishell.utilities/src/org/cishell/utilities/database/ForeignKey.java

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/DatabaseUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/DatabaseUtilities.java	2010-01-26 16:34:27 UTC (rev 1024)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/DatabaseUtilities.java	2010-01-26 16:51:30 UTC (rev 1025)
@@ -31,8 +31,8 @@
 		}
 		return connection;
 	}
-	
-	public static String getInExpression(List<String> columns, List<Map<String, Object>> valueMaps) {
+	// TODO: I'd prefer something like createSQLInExpression
+	public static String createSQLInExpression(List<String> columns, List<Map<String, Object>> valueMaps) {
 		String columnNames = implodeAndWrap(columns);
 		
 		List<String> values = new ArrayList<String>();
@@ -62,6 +62,7 @@
 		}
 	}
 	
+	//TODO: Consider abstracting what you're wrapping with and making this a StringUtility.
 	public static String implodeAndWrap(List<String> values) {
 		return "(" + StringUtilities.implodeList(values, ", ") + ")";
 	}

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/database/DatabaseTable.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/database/DatabaseTable.java	2010-01-26 16:34:27 UTC (rev 1024)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/database/DatabaseTable.java	2010-01-26 16:51:30 UTC (rev 1025)
@@ -145,7 +145,7 @@
 
 	private String constructDeleteStatement(List<String> columns,
 			List<Map<String, Object>> otherEntities) {
-		return "DELETE FROM " + this.toString() + " WHERE " + DatabaseUtilities.getInExpression(columns, otherEntities);
+		return "DELETE FROM " + this.toString() + " WHERE " + DatabaseUtilities.createSQLInExpression(columns, otherEntities);
 	}
 
 	public void duplicateTable(Connection originalConnection,

Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/database/ForeignKey.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/database/ForeignKey.java	2010-01-26 16:34:27 UTC (rev 1024)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/database/ForeignKey.java	2010-01-26 16:51:30 UTC (rev 1025)
@@ -37,7 +37,7 @@
 	private String constructUpdateQuery(List<Map<String, Object>> from,
 			Map<String, Object> to) {
 		return "UPDATE " + otherTable.toString() + " SET "+ formatUpdates(to) + " WHERE "
-				+ DatabaseUtilities.getInExpression(getForeignColumnNames(), translateToForeignNames(from));
+				+ DatabaseUtilities.createSQLInExpression(getForeignColumnNames(), translateToForeignNames(from));
 	}
 
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.