forked from GNUsocial/gnu-social
Remove sequenceKey() since we now use Managed_DataObject
This commit is contained in:
parent
7c6399a51a
commit
feb9030fb9
@ -26,9 +26,6 @@ class Confirm_address extends Managed_DataObject
|
|||||||
/* the code above is auto generated do not remove the tag below */
|
/* the code above is auto generated do not remove the tag below */
|
||||||
###END_AUTOCODE
|
###END_AUTOCODE
|
||||||
|
|
||||||
function sequenceKey()
|
|
||||||
{ return array(false, false); }
|
|
||||||
|
|
||||||
public static function schemaDef()
|
public static function schemaDef()
|
||||||
{
|
{
|
||||||
return array(
|
return array(
|
||||||
|
@ -79,11 +79,6 @@ class File_oembed extends Managed_DataObject
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function sequenceKey()
|
|
||||||
{
|
|
||||||
return array(false, false, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
function _getOembed($url) {
|
function _getOembed($url) {
|
||||||
$parameters = array(
|
$parameters = array(
|
||||||
'maxwidth' => common_config('attachments', 'thumb_width'),
|
'maxwidth' => common_config('attachments', 'thumb_width'),
|
||||||
|
@ -63,11 +63,6 @@ class File_thumbnail extends Managed_DataObject
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function sequenceKey()
|
|
||||||
{
|
|
||||||
return array(false, false, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Save oEmbed-provided thumbnail data
|
* Save oEmbed-provided thumbnail data
|
||||||
*
|
*
|
||||||
|
@ -61,11 +61,6 @@ class Inbox extends Managed_DataObject
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function sequenceKey()
|
|
||||||
{
|
|
||||||
return array(false, false, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new inbox from existing Notice_inbox stuff
|
* Create a new inbox from existing Notice_inbox stuff
|
||||||
*/
|
*/
|
||||||
|
@ -58,19 +58,6 @@ class Login_token extends Managed_DataObject
|
|||||||
|
|
||||||
const TIMEOUT = 120; // seconds after which to timeout the token
|
const TIMEOUT = 120; // seconds after which to timeout the token
|
||||||
|
|
||||||
/*
|
|
||||||
DB_DataObject calculates the sequence key(s) by taking the first key returned by the keys() function.
|
|
||||||
In this case, the keys() function returns user_id as the first key. user_id is not a sequence, but
|
|
||||||
DB_DataObject's sequenceKey() will incorrectly think it is. Then, since the sequenceKey() is a numeric
|
|
||||||
type, but is not set to autoincrement in the database, DB_DataObject will create a _seq table and
|
|
||||||
manage the sequence itself. This is not the correct behavior for the user_id in this class.
|
|
||||||
So we override that incorrect behavior, and simply say there is no sequence key.
|
|
||||||
*/
|
|
||||||
function sequenceKey()
|
|
||||||
{
|
|
||||||
return array(false,false);
|
|
||||||
}
|
|
||||||
|
|
||||||
function makeNew($user)
|
function makeNew($user)
|
||||||
{
|
{
|
||||||
$login_token = Login_token::staticGet('user_id', $user->id);
|
$login_token = Login_token::staticGet('user_id', $user->id);
|
||||||
|
@ -23,11 +23,6 @@ class Remember_me extends Managed_DataObject
|
|||||||
/* the code above is auto generated do not remove the tag below */
|
/* the code above is auto generated do not remove the tag below */
|
||||||
###END_AUTOCODE
|
###END_AUTOCODE
|
||||||
|
|
||||||
function sequenceKey()
|
|
||||||
{
|
|
||||||
return array(false, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function schemaDef()
|
public static function schemaDef()
|
||||||
{
|
{
|
||||||
return array(
|
return array(
|
||||||
|
@ -80,19 +80,6 @@ class User_im_prefs extends Managed_DataObject
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
DB_DataObject calculates the sequence key(s) by taking the first key returned by the keys() function.
|
|
||||||
In this case, the keys() function returns user_id as the first key. user_id is not a sequence, but
|
|
||||||
DB_DataObject's sequenceKey() will incorrectly think it is. Then, since the sequenceKey() is a numeric
|
|
||||||
type, but is not set to autoincrement in the database, DB_DataObject will create a _seq table and
|
|
||||||
manage the sequence itself. This is not the correct behavior for the user_id in this class.
|
|
||||||
So we override that incorrect behavior, and simply say there is no sequence key.
|
|
||||||
*/
|
|
||||||
function sequenceKey()
|
|
||||||
{
|
|
||||||
return array(false,false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* We have two compound keys with unique constraints:
|
* We have two compound keys with unique constraints:
|
||||||
* (transport, user_id) which is our primary key, and
|
* (transport, user_id) which is our primary key, and
|
||||||
|
Loading…
Reference in New Issue
Block a user