-rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp index 175d62a..6aaa14c 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp +++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp | |||
@@ -592,10 +592,8 @@ UIDArray OPimContactAccessBackend_SQL::queryByExample ( const UIDArray& uidlist, | |||
592 | // information we need and do the query on it. | 592 | // information we need and do the query on it. |
593 | // This table is just visible for this process and will be removed | 593 | // This table is just visible for this process and will be removed |
594 | // automatically after using. | 594 | // automatically after using. |
595 | datediff_query = "CREATE TEMP TABLE bs ( uid, \"Birthday\", \"Anniversary\" );"; | 595 | datediff_query = "SELECT uid,substr(\"Birthday\", 6, 10) as \"BirthdayMD\", substr(\"Anniversary\", 6, 10) as \"AnniversaryMD\" FROM addressbook WHERE ( \"Birthday\" != '' OR \"Anniversary\" != '' ) AND "; |
596 | datediff_query += "INSERT INTO bs SELECT uid,substr(\"Birthday\", 6, 10),substr(\"Anniversary\", 6, 10) FROM addressbook WHERE ( \"Birthday\" != '' OR \"Anniversary\" != '' );"; | 596 | datediff_query += QString( " (\"%1MD\" <= '%2-%3\' AND \"%4MD\" >= '%5-%6')" ) |
597 | datediff_query += QString( "SELECT uid FROM bs WHERE " ) + uid_query; | ||
598 | datediff_query += QString( " (\"%1\" <= '%2-%3\' AND \"%4\" >= '%5-%6')" ) | ||
599 | .arg( *it ) | 597 | .arg( *it ) |
600 | //.arg( QString::number( endDate->year() ).rightJustify( 4, '0' ) ) | 598 | //.arg( QString::number( endDate->year() ).rightJustify( 4, '0' ) ) |
601 | .arg( QString::number( endDate->month() ).rightJustify( 2, '0' ) ) | 599 | .arg( QString::number( endDate->month() ).rightJustify( 2, '0' ) ) |
@@ -684,13 +682,6 @@ UIDArray OPimContactAccessBackend_SQL::queryByExample ( const UIDArray& uidlist, | |||
684 | 682 | ||
685 | UIDArray list = extractUids( res ); | 683 | UIDArray list = extractUids( res ); |
686 | 684 | ||
687 | // Remove temp table if created | ||
688 | if ( !datediff_query.isEmpty( ) ){ | ||
689 | qu = "DROP TABLE bs"; | ||
690 | OSQLRawQuery raw( qu ); | ||
691 | OSQLResult res = m_driver->query( &raw ); | ||
692 | } | ||
693 | |||
694 | return list; | 685 | return list; |
695 | } | 686 | } |
696 | 687 | ||