hook_db_rewrite_sql seems to be corrupting queries where 'from' is in the column name, e.g. {field_date_from}

Hello all

Sorry if this has already been posted but I can't find any cases which resemble this. I'm using the latest -dev of Date. I accidentally installed 2.4 stable over an existing 2.x-dev install (stable version had been causing me issues for a while so was happily using -dev until I made the mistake of upgrading before my morning coffee ;o). To fix it I installed the latest -dev over the top of 2.4, doing all the necessaries like removing old code and updating the DB. I've even tried disabling all date-based modules and then re-enabling them with no luck.

The cause is that, somewhere between building the 'preview' SQL used in Views' preview function, and sending the query to the DB, the word "from" in the Date CCK field title is being capitalised. You don't see anything until you examine the event log, but - interestingly - the pagers are all working (so I see "< prev 1 2 3 next >" at the bottom of empty views - the error is occurring only in the query to fetch the data, but pager is ok.

An example of the broken SQL from the even log (tidied up a bit) - note the third line of the query:

Unknown column 'node_data_field_datetime_FROMto.field_datetime_fromto_value' in 'field list'
query: execute

SELECT node.nid AS nid,
   node.title AS node_title,
   node_data_field_datetime_FROMto.field_datetime_fromto_value AS node_data_field_datetime_fromto_field_datetime_fromto_value,
   node_data_field_datetime_fromto.field_datetime_fromto_value2 AS node_data_field_datetime_fromto_field_datetime_fromto_value2,
   node.type AS node_type,
   node.vid AS node_vid,
   location.name AS location_name,
   location.city AS location_city,
   location.province AS location_province,
   location.country AS location_country
 FROM drupal_node node 
 INNER JOIN drupal_term_node term_node ON node.vid = term_node.vid
 LEFT JOIN drupal_content_type_event node_data_field_datetime_fromto ON node.vid = node_data_field_datetime_fromto.vid
 LEFT JOIN drupal_location_instance location_instance ON node.vid = location_instance.vid
 LEFT JOIN drupal_location location ON location_instance.lid = location.lid
 WHERE ((term_node.tid = 338) AND (node.status <> 0) AND (node.type in ('event')))
    AND (DATE_FORMAT(ADDTIME(node_data_field_datetime_fromto.field_datetime_fromto_value, SEC_TO_TIME(3600)), '%Y-%m-%d\T%H:%i') >= '2009-10-13T11:15')
   ORDER BY node_data_field_datetime_fromto_field_datetime_fromto_value ASC
 LIMIT 0, 20

 in /var/....../sites/all/modules/views/includes/view.inc on line 755

This is how the query is being shown in the Views preview:

SELECT node.nid AS nid,
   node.title AS node_title,
   node_data_field_datetime_fromto.field_datetime_fromto_value AS node_data_field_datetime_fromto_field_datetime_fromto_value,
   node_data_field_datetime_fromto.field_datetime_fromto_value2 AS node_data_field_datetime_fromto_field_datetime_fromto_value2,
   node.type AS node_type,
   node.vid AS node_vid,
   location.name AS location_name,
   location.city AS location_city,
   location.province AS location_province,
   location.country AS location_country
 FROM drupal_node node 
 INNER JOIN drupal_term_node term_node ON node.vid = term_node.vid
 LEFT JOIN drupal_content_type_event node_data_field_datetime_fromto ON node.vid = node_data_field_datetime_fromto.vid
 LEFT JOIN drupal_location_instance location_instance ON node.vid = location_instance.vid
 LEFT JOIN drupal_location location ON location_instance.lid = location.lid
 WHERE ((term_node.tid = 338) AND (node.status <> 0) AND (node.type in ('event')))
    AND (DATE_FORMAT(ADDTIME(node_data_field_datetime_fromto.field_datetime_fromto_value, SEC_TO_TIME(3600)), '%Y-%m-%d\T%H:%i') >= '2009-10-13T11:14')
   ORDER BY node_data_field_datetime_fromto_field_datetime_fromto_value ASC

Other things I've checked:
- update.php has run
- this is the only (obvious) problem

If anyone could point me in the direction of where this code might be, I'd be happy to dig around and try finding out what's broken. Any help would be most gratefully appreciated!