From c1c96e01fab131dd48cd68cdd9b63639e269d9c8 Mon Sep 17 00:00:00 2001 From: Florian Steinel Date: Thu, 27 Oct 2016 02:41:32 +0200 Subject: sql: limit 1 for UPDATE and DELETE is not supported by the SQL standard and postgresql (see: https://www.postgresql.org/message-id/flat/1291109101.26137.35.camel%40pcd12478 ) --- Zotlabs/Module/Connedit.php | 2 +- Zotlabs/Module/Events.php | 2 +- Zotlabs/Module/Like.php | 2 +- Zotlabs/Module/Photos.php | 2 +- Zotlabs/Module/Regdir.php | 2 +- include/group.php | 2 +- include/import.php | 14 +++++++------- include/menu.php | 2 +- include/network.php | 4 ++-- include/queue_fn.php | 2 +- install/update.php | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index c11d1ea16..cee593a5f 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -448,7 +448,7 @@ class Connedit extends \Zotlabs\Web\Controller { } if($cmd === 'resetphoto') { - q("update xchan set xchan_photo_date = '2001-01-01 00:00:00' where xchan_hash = '%s' limit 1", + q("update xchan set xchan_photo_date = '2001-01-01 00:00:00' where xchan_hash = '%s'", dbesc($orig_record[0]['xchan_hash']) ); $cmd = 'refresh'; diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php index 26455cf8e..347c94c50 100644 --- a/Zotlabs/Module/Events.php +++ b/Zotlabs/Module/Events.php @@ -707,7 +707,7 @@ class Events extends \Zotlabs\Web\Controller { $sync_event = $r[0]; if($r) { - $r = q("delete from event where event_hash = '%s' and uid = %d limit 1", + $r = q("delete from event where event_hash = '%s' and uid = %d", dbesc($event_id), intval(local_channel()) ); diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php index dd0bc99d4..43d318623 100644 --- a/Zotlabs/Module/Like.php +++ b/Zotlabs/Module/Like.php @@ -226,7 +226,7 @@ class Like extends \Zotlabs\Web\Controller { $z[0]['deleted'] = 1; build_sync_packet($ch[0]['channel_id'],array('likes' => $z)); - q("delete from likes where id = %d limit 1", + q("delete from likes where id = %d", intval($z[0]['id']) ); if($z[0]['i_mid']) { diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php index 3f0ab3ab0..e459469ef 100644 --- a/Zotlabs/Module/Photos.php +++ b/Zotlabs/Module/Photos.php @@ -259,7 +259,7 @@ class Photos extends \Zotlabs\Web\Controller { @file_put_contents($r[0]['content'],$ph->imageString()); $data = $r[0]['content']; $fsize = @filesize($r[0]['content']); - q("update attach set filesize = %d where hash = '%s' and uid = %d limit 1", + q("update attach set filesize = %d where hash = '%s' and uid = %d", intval($fsize), dbesc($resource_id), intval($page_owner_uid) diff --git a/Zotlabs/Module/Regdir.php b/Zotlabs/Module/Regdir.php index 208a2b384..f4d16c562 100644 --- a/Zotlabs/Module/Regdir.php +++ b/Zotlabs/Module/Regdir.php @@ -70,7 +70,7 @@ class Regdir extends \Zotlabs\Web\Controller { if(! $result['success']) $valid = 0; - q("update site set site_valid = %d where site_url = '%s' limit 1", + q("update site set site_valid = %d where site_url = '%s'", intval($valid), strtolower($url) ); diff --git a/include/group.php b/include/group.php index 39a907336..38d9d190f 100644 --- a/include/group.php +++ b/include/group.php @@ -18,7 +18,7 @@ function group_add($uid,$name,$public = 0) { intval($r) ); if(($z) && $z[0]['deleted']) { - /*$r = q("UPDATE groups SET deleted = 0 WHERE uid = %d AND gname = '%s' LIMIT 1", + /*$r = q("UPDATE groups SET deleted = 0 WHERE uid = %d AND gname = '%s'", intval($uid), dbesc($name) );*/ diff --git a/include/import.php b/include/import.php index 49cdb2574..0d8398acb 100644 --- a/include/import.php +++ b/include/import.php @@ -227,7 +227,7 @@ function sync_objs($channel,$objs) { foreach($objs as $obj) { if(array_key_exists('obj_deleted',$obj) && $obj['obj_deleted'] && $obj['obj_obj']) { - q("delete from obj where obj_obj = '%s' and obj_channel = %d limit 1", + q("delete from obj where obj_obj = '%s' and obj_channel = %d", dbesc($obj['obj_obj']), intval($channel['channel_id']) ); @@ -351,7 +351,7 @@ function sync_apps($channel,$apps) { } if(array_key_exists('app_deleted',$app) && $app['app_deleted'] && $app['app_id']) { - q("delete from app where app_id = '%s' and app_channel = %d limit 1", + q("delete from app where app_id = '%s' and app_channel = %d", dbesc($app['app_id']), intval($channel['channel_id']) ); @@ -416,7 +416,7 @@ function sync_apps($channel,$apps) { create_table_from_array('app',$app); if($term) { - $x = q("select * from app where app_id = '%s' and app_channel = %d limit 1", + $x = q("select * from app where app_id = '%s' and app_channel = %d", dbesc($hash), intval($channel['channel_id']) ); @@ -466,7 +466,7 @@ function sync_chatrooms($channel,$chatrooms) { continue; if(array_key_exists('cr_deleted',$chatroom) && $chatroom['cr_deleted']) { - q("delete from chatroom where cr_name = '%s' and cr_uid = %d limit 1", + q("delete from chatroom where cr_name = '%s' and cr_uid = %d", dbesc($chatroom['cr_name']), intval($channel['channel_id']) ); @@ -635,7 +635,7 @@ function sync_events($channel,$events) { continue; if($event['event_deleted']) { - $r = q("delete from event where event_hash = '%s' and uid = %d limit 1", + $r = q("delete from event where event_hash = '%s' and uid = %d", dbesc($event['event_hash']), intval($channel['channel_id']) ); @@ -889,14 +889,14 @@ function import_mail($channel,$mails,$sync = false) { if($channel && $mails) { foreach($mails as $mail) { if(array_key_exists('flags',$mail) && in_array('deleted',$mail['flags'])) { - q("delete from mail where mid = '%s' and uid = %d limit 1", + q("delete from mail where mid = '%s' and uid = %d", dbesc($mail['message_id']), intval($channel['channel_id']) ); continue; } if(array_key_exists('flags',$mail) && in_array('recalled',$mail['flags'])) { - q("update mail set mail_recalled = 1 where mid = '%s' and uid = %d limit 1", + q("update mail set mail_recalled = 1 where mid = '%s' and uid = %d", dbesc($mail['message_id']), intval($channel['channel_id']) ); diff --git a/include/menu.php b/include/menu.php index 3b0180d37..b54ff7f9e 100644 --- a/include/menu.php +++ b/include/menu.php @@ -284,7 +284,7 @@ function menu_delete_id($menu_id, $uid) { intval($menu_id), intval($uid) ); - return q("delete from menu where menu_id = %d and menu_channel_id = %d limit 1", + return q("delete from menu where menu_id = %d and menu_channel_id = %d", intval($menu_id), intval($uid) ); diff --git a/include/network.php b/include/network.php index 24e77527f..7cfd3a5e6 100644 --- a/include/network.php +++ b/include/network.php @@ -1434,7 +1434,7 @@ function discover_by_webbie($webbie) { dbesc($address) ); if($r) { - $r = q("update xchan set xchan_name = '%s', xchan_network = '%s', xchan_name_date = '%s' where xchan_hash = '%s' limit 1", + $r = q("update xchan set xchan_name = '%s', xchan_network = '%s', xchan_name_date = '%s' where xchan_hash = '%s'", dbesc($fullname), dbesc($network), dbesc(datetime_convert()), @@ -2328,4 +2328,4 @@ function probe_api_path($host) { } return ''; -} \ No newline at end of file +} diff --git a/include/queue_fn.php b/include/queue_fn.php index 676620e2f..1e3126f77 100644 --- a/include/queue_fn.php +++ b/include/queue_fn.php @@ -118,7 +118,7 @@ function queue_deliver($outq, $immediate = false) { dbesc($base) ); } - q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s' limit 1", + q("update dreport set dreport_result = '%s', dreport_time = '%s' where dreport_queue = '%s'", dbesc('accepted for delivery'), dbesc(datetime_convert()), dbesc($outq['outq_hash']) diff --git a/install/update.php b/install/update.php index fc6641c55..7e7104b74 100644 --- a/install/update.php +++ b/install/update.php @@ -1095,7 +1095,7 @@ function update_r1097() { $r = q("select hubloc_id, hubloc_addr from hubloc where hubloc_addr like '%%/%%'"); if($r) { foreach($r as $rr) { - q("update hubloc set hubloc_addr = '%s' where hubloc_id = %d limit 1", + q("update hubloc set hubloc_addr = '%s' where hubloc_id = %d", dbesc(substr($rr['hubloc_addr'],0,strpos($rr['hubloc_addr'],'/'))), intval($rr['hubloc_id']) ); @@ -2462,4 +2462,4 @@ function update_r1183() { if($r1 && $r2) return UPDATE_SUCCESS; return UPDATE_FAILED; -} \ No newline at end of file +} -- cgit v1.2.3