From 1e09d9361c90b08dbd2998d21c7683586e71a1a4 Mon Sep 17 00:00:00 2001
From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 4 Jan 2006 20:42:27 +0000
Subject: [PATCH] fixing widget where-clause generators

git-svn-id: svn://svn.open-ils.org/ILS/trunk@2608 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/src/reporter/widgets.example.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Open-ILS/src/reporter/widgets.example.xml b/Open-ILS/src/reporter/widgets.example.xml
index c17df24bab..92f4ed038b 100644
--- a/Open-ILS/src/reporter/widgets.example.xml
+++ b/Open-ILS/src/reporter/widgets.example.xml
@@ -60,10 +60,10 @@
 				on which to report.
 			</description>
 			<filter-code type="perl">
-				$full_col = "DATE_TRUNC('month', $full_col)";
+				$full_col = "CAST(DATE_TRUNC('month', $full_col) AS DATE)";
 				$where_clause = 
-					"( $full_col = DATE_TRUNC('month', NOW() - CAST( ? || ' month' AS INTERVAL )) ".
-					"  OR $full_col = DATE_TRUNC('month', NOW() - CAST( ? || ' month' AS INTERVAL )) )";
+					"$full_col IN ( CAST(DATE_TRUNC('month', NOW() - CAST( ? || ' month' AS INTERVAL )) AS DATE), ".
+					"  CAST(DATE_TRUNC('month', NOW() - CAST( ? || ' month' AS INTERVAL )) AS DATE))";
 				push @$bind_list, $$val{target}, $$val{target} + $$val{compare};
 			</filter-code>
 		</widget>
@@ -210,8 +210,8 @@
 			</description>
 			<filter-code type="perl">
 				$where_clause = 
-					"DATE_TRUNC('day', $full_col) = ".
-						"DATE_TRUNC('day', NOW()) - CAST(? || ' day' AS INTERVAL);
+					"CAST($full_col AS DATE) = ".
+						"CAST((NOW() - CAST(? || ' day' AS INTERVAL)) AS DATE)";
 				push @$bind_list, $val;
 			</filter-code>
 		</widget>
@@ -224,8 +224,8 @@
 			</description>
 			<filter-code type="perl">
 				$where_clause =
-					"( DATE_TRUNC('week', $full_col) = ".
-					"  DATE_TRUNC('week', NOW() - CAST(? || ' weeks' AS INTERVAL) ) ";
+					"( CAST(DATE_TRUNC('week', $full_col) AS DATE) = ".
+					"  CAST(DATE_TRUNC('week', NOW() - CAST(? || ' weeks' AS INTERVAL) ) AS DATE) ";
 				push @$bind_list, $val;
 			</filter-code>
 		</widget>
@@ -238,8 +238,8 @@
 			</description>
 			<filter-code type="perl">
 				$where_clause = 
-					"DATE_TRUNC('month', $full_col) = ".
-						"DATE_TRUNC('month', NOW()) - CAST(? || ' months' AS INTERVAL);
+					"CAST(DATE_TRUNC('month', $full_col) AS DATE) = ".
+						"CAST(DATE_TRUNC('month', NOW()) - CAST(? || ' months' AS INTERVAL) AS DATE)";
 				push @$bind_list, $val;
 			</filter-code>
 		</widget>
@@ -262,8 +262,8 @@
 			</description>
 			<filter-code type="perl">
 				$where_clause = 
-					"DATE_TRUNC('year', $full_col) = ".
-						"DATE_TRUNC('year', NOW()) - CAST(? || ' years' AS INTERVAL);
+					"CAST(DATE_TRUNC('year', $full_col) AS DATE)= ".
+						"CAST(DATE_TRUNC('year', NOW()) - CAST(? || ' years' AS INTERVAL) AS DATE)";
 				push @$bind_list, $val;
 			</filter-code>
 		</widget>
-- 
2.43.2