litesoft

URLs

Explore

Commits

Diff Revisions 65 vs 66 for /trunk/Java/core/Server/src/org/litesoft/orsup/selection/WhereClauseColumnSupport.java

		@@ -3,9 +3,11 @@
3	3
4	4		import java.sql.*;
5	5
6		-	import org.litesoft.core.simpletypes.temporal.*;
7		-	import org.litesoft.core.*;
8	6		import org.litesoft.orsup.selection.nonpublic.*;
	7	+	import org.litesoft.core.SQLvalueable;
	8	+	import org.litesoft.core.SQLtimestampable;
	9	+	import org.litesoft.core.SQLdateable;
	10	+	import org.litesoft.core.SQLtimeable;
9	11
10	12		/**
11	13		* Utility class with a number of methods to help with the formatting of <i>WhereClause</i>s.<p>
		@@ -122,18 +124,22 @@
122	124		{
123	125		if ( pValue.getClass() == java.util.Date.class )
124	126		{
125		-	java.util.Date zDate = (java.util.Date) pValue;
126		-	if ( java.sql.Timestamp.class.equals( pColumnDefinition.getColumnType() ) \|\| SimpleTimestamp.class.equals( pColumnDefinition.getColumnType() ) )
	127	+	Class zColumnType = pColumnDefinition.getColumnType();
	128	+	if ( zColumnType != null )
127	129		{
128		-	return new java.sql.Timestamp( zDate.getTime() );
129		-	}
130		-	if ( java.sql.Date.class.equals( pColumnDefinition.getColumnType() ) \|\| SimpleDate.class.equals( pColumnDefinition.getColumnType() ) )
131		-	{
132		-	return new java.sql.Date( zDate.getTime() );
133		-	}
134		-	if ( java.sql.Time.class.equals( pColumnDefinition.getColumnType() ) \|\| SimpleTime.class.equals( pColumnDefinition.getColumnType() ) )
135		-	{
136		-	return new java.sql.Time( zDate.getTime() );
	130	+	java.util.Date zDate = (java.util.Date) pValue;
	131	+	if ( java.sql.Timestamp.class.isAssignableFrom( zColumnType ) \|\| SQLtimestampable.class.isAssignableFrom( zColumnType ) )
	132	+	{
	133	+	return new java.sql.Timestamp( zDate.getTime() );
	134	+	}
	135	+	if ( java.sql.Date.class.isAssignableFrom( zColumnType ) \|\| SQLdateable.class.isAssignableFrom( zColumnType ) )
	136	+	{
	137	+	return new java.sql.Date( zDate.getTime() );
	138	+	}
	139	+	if ( java.sql.Time.class.isAssignableFrom( zColumnType ) \|\| SQLtimeable.class.isAssignableFrom( zColumnType ) )
	140	+	{
	141	+	return new java.sql.Time( zDate.getTime() );
	142	+	}
137	143		}
138	144		}
139	145		return pValue;

View View this file contents

History View the full history

Feeds

Commits for /trunk/Java/core/Server/src/org/litesoft/orsup/selection/WhereClauseColumnSupport.java