cellular-infrastructure
/
osmo-mgw
mirror of https://gerrit.osmocom.org/osmo-mgw
10
0
Fork 0
Code Issues Releases Wiki Activity

db.c: Fix some SQL queries for ambiguous column names 

Thanks to Luca Bertoncello for pointing this out

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
This commit is contained in:
Sylvain Munaut 2010-07-03 22:00:45 +02:00
parent adea4f1bf8
commit 7a7d364725
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
openbsc/src/db.c
View File

@ -307,10 +307,11 @@ static int get_equipment_by_subscr(struct gsm_subscriber *subscr)
struct gsm_equipment *equip = &subscr->equipment;
result = dbi_conn_queryf(conn,
"SELECT equipment.* FROM Equipment,EquipmentWatch "
"WHERE EquipmentWatch.equipment_id=Equipment.id "
"AND EquipmentWatch.subscriber_id = %llu "
"ORDER BY updated DESC", subscr->id);
"SELECT Equipment.* "
"FROM Equipment JOIN EquipmentWatch ON "
"EquipmentWatch.equipment_id=Equipment.id "
"WHERE EquipmentWatch.subscriber_id = %llu "
"ORDER BY EquipmentWatch.updated DESC", subscr->id);
if (!result)
return -EIO;
@ -1031,11 +1032,12 @@ struct gsm_sms *db_sms_get_unsent(struct gsm_network *net, unsigned long long mi
struct gsm_sms *sms;
result = dbi_conn_queryf(conn,
"SELECT * FROM SMS,Subscriber "
"WHERE sms.id >= %llu AND sms.sent is NULL "
"AND sms.receiver_id = subscriber.id "
"AND subscriber.lac > 0 "
"ORDER BY sms.id LIMIT 1",
"SELECT SMS.* "
"FROM SMS JOIN Subscriber ON "
"SMS.receiver_id = Subscriber.id "
"WHERE SMS.id >= %llu AND SMS.sent IS NULL "
"AND Subscriber.lac > 0 "
"ORDER BY SMS.id LIMIT 1",
min_id);
if (!result)
return NULL;
@ -1058,11 +1060,12 @@ struct gsm_sms *db_sms_get_unsent_by_subscr(struct gsm_network *net, unsigned lo
struct gsm_sms *sms;
result = dbi_conn_queryf(conn,
"SELECT * FROM SMS,Subscriber "
"WHERE sms.receiver_id >= %llu AND sms.sent is NULL "
"AND sms.receiver_id = subscriber.id "
"AND subscriber.lac > 0 "
"ORDER BY sms.receiver_id, id LIMIT 1",
"SELECT SMS.* "
"FROM SMS JOIN Subscriber ON "
"SMS.receiver_id = Subscriber.id "
"WHERE SMS.receiver_id >= %llu AND SMS.sent IS NULL "
"AND Subscriber.lac > 0 "
"ORDER BY SMS.receiver_id, SMS.id LIMIT 1",
min_subscr_id);
if (!result)
return NULL;
@ -1086,11 +1089,12 @@ struct gsm_sms *db_sms_get_unsent_for_subscr(struct gsm_subscriber *subscr)
struct gsm_sms *sms;
result = dbi_conn_queryf(conn,
"SELECT * FROM SMS,Subscriber "
"WHERE sms.receiver_id = %llu AND sms.sent is NULL "
"AND sms.receiver_id = subscriber.id "
"AND subscriber.lac > 0 "
"ORDER BY sms.id LIMIT 1",
"SELECT SMS.* "
"FROM SMS JOIN Subscriber ON "
"SMS.receiver_id = Subscriber.id "
"WHERE SMS.receiver_id = %llu AND SMS.sent IS NULL "
"AND Subscriber.lac > 0 "
"ORDER BY SMS.id LIMIT 1",
subscr->id);
if (!result)
return NULL;