keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

"lock" is a reserved MySQL keyword

Browse source
This commit is contained in:
Zach Prezkuta 2012-06-17 11:25:36 -06:00
parent 46068935d0
commit 75ed37fb3d
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/lock.php
View file

@ -10,19 +10,19 @@ function lock_function($fn_name, $block = true, $wait_sec = 2) {
$got_lock = false; $got_lock = false;
do { do {
q("LOCK TABLE lock WRITE"); q("LOCK TABLE locks WRITE");
$r = q("SELECT locked FROM lock WHERE name = '%s' LIMIT 1", $r = q("SELECT locked FROM locks WHERE name = '%s' LIMIT 1",
dbesc($fn_name) dbesc($fn_name)
); );
if((count($r)) && (! $r[0]['locked'])) { if((count($r)) && (! $r[0]['locked'])) {
q("UPDATE lock SET locked = 1 WHERE name = '%s' LIMIT 1", q("UPDATE locks SET locked = 1 WHERE name = '%s' LIMIT 1",
dbesc($fn_name) dbesc($fn_name)
); );
$got_lock = true; $got_lock = true;
} }
elseif(! $r) { // the Boolean value for count($r) should be equivalent to the Boolean value of $r elseif(! $r) { // the Boolean value for count($r) should be equivalent to the Boolean value of $r
q("INSERT INTO lock ( name, locked ) VALUES ( '%s', 1 )", q("INSERT INTO locks ( name, locked ) VALUES ( '%s', 1 )",
dbesc($fn_name) dbesc($fn_name)
); );
$got_lock = true; $got_lock = true;
@ -47,7 +47,7 @@ function block_on_function_lock($fn_name, $wait_sec = 2) {
$wait_sec = 2; // don't let the user pick a value that's likely to crash the system $wait_sec = 2; // don't let the user pick a value that's likely to crash the system
do { do {
$r = q("SELECT locked FROM lock WHERE name = '%s' LIMIT 1", $r = q("SELECT locked FROM locks WHERE name = '%s' LIMIT 1",
dbesc(fn_name) dbesc(fn_name)
); );
@ -63,7 +63,7 @@ function block_on_function_lock($fn_name, $wait_sec = 2) {
if(! function_exists('unlock_function')) { if(! function_exists('unlock_function')) {
function unlock_function(fn_name) { function unlock_function(fn_name) {
//$r = q("LOCK TABLE lock WRITE"); //$r = q("LOCK TABLE lock WRITE");
$r = q("UPDATE lock SET locked = 0 WHERE name = '%s' LIMIT 1", $r = q("UPDATE locks SET locked = 0 WHERE name = '%s' LIMIT 1",
dbesc(fn_name) dbesc(fn_name)
); );
//$r = q("UNLOCK TABLES"); //$r = q("UNLOCK TABLES");

6
update.php
View file

@ -1309,10 +1309,10 @@ function update_1150() {
function update_1151() { function update_1151() {
$r = q("CREATE TABLE IF NOT EXISTS lock ( $r = q("CREATE TABLE IF NOT EXISTS locks (
id INT NOT NULL AUTO_INCREMENT PRIMARY KEY , id INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
name CHAR(128) NOT NULL , name CHAR( 128 ) NOT NULL ,
locked TINYINT(1) NOT NULL DEFAULT '0' locked TINYINT( 1 ) NOT NULL DEFAULT '0'
) ENGINE = MYISAM DEFAULT CHARSET=utf8 "); ) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
if (!$r) if (!$r)
return UPDATE_FAILED; return UPDATE_FAILED;