------------------------------------------------------------
revno: 11758
committer: Lars Helge Øverland <[email protected]>
branch nick: dhis2
timestamp: Fri 2013-08-23 09:17:00 +0200
message:
Reverted r 11756
modified:
dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/EventQueryPlanner.java
dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventQueryPlannerTest.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/EventQueryPlanner.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/EventQueryPlanner.java 2013-08-23 05:09:32 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/EventQueryPlanner.java 2013-08-23 07:17:00 +0000
@@ -89,7 +89,7 @@
EventQueryParams query = new EventQueryParams( params );
query.setStartDate( startDate );
query.setEndDate( endDate );
- query.setTableName( TABLE_BASE_NAME + "temp_" + year( startDate ) + "_" + program.getUid() );
+ query.setTableName( TABLE_BASE_NAME + year( startDate ) + "_" + program.getUid() );
return query;
}
=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventQueryPlannerTest.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventQueryPlannerTest.java 2013-08-23 05:09:32 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/event/data/EventQueryPlannerTest.java 2013-08-23 07:17:00 +0000
@@ -63,9 +63,9 @@
assertEquals( new Cal( 2012, 1, 1 ).time(), queries.get( 2 ).getStartDate() );
assertEquals( new Cal( 2012, 3, 20 ).time(), queries.get( 2 ).getEndDate() );
- assertEquals( "analytics_event_temp_2010_programuidA", queries.get( 0 ).getTableName() );
- assertEquals( "analytics_event_temp_2011_programuidA", queries.get( 1 ).getTableName() );
- assertEquals( "analytics_event_temp_2012_programuidA", queries.get( 2 ).getTableName() );
+ assertEquals( "analytics_event_2010_programuidA", queries.get( 0 ).getTableName() );
+ assertEquals( "analytics_event_2011_programuidA", queries.get( 1 ).getTableName() );
+ assertEquals( "analytics_event_2012_programuidA", queries.get( 2 ).getTableName() );
}
@Test
@@ -86,6 +86,6 @@
assertEquals( new Cal( 2010, 3, 1 ).time(), queries.get( 0 ).getStartDate() );
assertEquals( new Cal( 2010, 9, 20 ).time(), queries.get( 0 ).getEndDate() );
- assertEquals( "analytics_event_temp_2010_programuidA", queries.get( 0 ).getTableName() );
+ assertEquals( "analytics_event_2010_programuidA", queries.get( 0 ).getTableName() );
}
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
