OrderID implementation and tests for all 3 storDBs

This commit is contained in:
DanB
2015-12-30 18:15:58 +01:00
parent fdd3bf5f58
commit dfdf8321af
6 changed files with 52 additions and 50 deletions

View File

@@ -785,7 +785,7 @@ func (self *SQLStorage) GetCDRs(qryFltr *utils.CDRsFilter) ([]*CDR, int64, error
if idx != 0 {
qIds.WriteString(" AND")
}
qIds.WriteString(fmt.Sprintf(" destination not LIKE '%%%s%%'", destPrefix))
qIds.WriteString(fmt.Sprintf(" destination not LIKE '%s%%'", destPrefix))
}
qIds.WriteString(" )")
q = q.Where(qIds.String())
@@ -834,11 +834,11 @@ func (self *SQLStorage) GetCDRs(qryFltr *utils.CDRsFilter) ([]*CDR, int64, error
qIds.WriteString(" )")
q = q.Where(qIds.String())
}
if qryFltr.OrderIDStart != 0 { // Keep backwards compatible by testing 0 value
q = q.Where(utils.TBL_CDRS+".id >= ?", qryFltr.OrderIDStart)
if qryFltr.OrderIDStart != nil { // Keep backwards compatible by testing 0 value
q = q.Where(utils.TBL_CDRS+".id >= ?", *qryFltr.OrderIDStart)
}
if qryFltr.OrderIDEnd != 0 {
q = q.Where(utils.TBL_CDRS+".id < ?", qryFltr.OrderIDEnd)
if qryFltr.OrderIDEnd != nil {
q = q.Where(utils.TBL_CDRS+".id < ?", *qryFltr.OrderIDEnd)
}
if qryFltr.SetupTimeStart != nil {
q = q.Where("setup_time >= ?", qryFltr.SetupTimeStart)