Menu
▾
▴
[phpMyChat CVS] CVS: phpMyChat-0.15/chat users_low.php3,1.12,1.13 users.php3,1.17,1.18
|
From: Lo?c C. <lo...@us...> - 2001-04-21 14:35:44
|
Update of /cvsroot/phpmychat/phpMyChat-0.15/chat
In directory usw-pr-cvs1:/tmp/cvs-serv24000/chat
Modified Files:
users_low.php3 users.php3
Log Message:
Improve bd queries and add first draft for oci8 outer join
Index: users_low.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/users_low.php3,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** users_low.php3 2001/04/19 20:24:53 1.12
--- users_low.php3 2001/04/21 14:35:42 1.13
***************
*** 123,145 ****
. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
. 'WHERE usr.room = \'' . $slashedCurrentRoomName . '\' '
! . 'ORDER BY usr.username';
}
! else if (C_DB_TYPE == 'pgsql')
{
$currentRoomQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender '
. 'FROM ' . C_USR_TBL . ' usr, ' . C_REG_TBL . ' reg '
. 'WHERE usr.room = \'' . $slashedCurrentRoomName . '\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, NULL '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . $slashedCurrentRoomName . '\' '
! . 'ORDER BY usr.username';
}
else
{
! $currentRoomQuery = 'SELECT usr.username, usr.latin1, usr.status, NULL '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'' . $slashedCurrentRoomName . '\' '
! . 'ORDER BY usr.username';
}
--- 123,153 ----
. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
. 'WHERE usr.room = \'' . $slashedCurrentRoomName . '\' '
! . 'ORDER BY username';
}
! else if (C_DB_TYPE == 'oci8') // not yet validated
{
+ $otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender '
+ . 'FROM ' . C_USR_TBL . ' usr, ' . C_REG_TBL . ' reg '
+ . 'WHERE usr.username = reg.username (+) '
+ . 'AND usr.room = \'' . $slashedCurrentRoomName . '\' '
+ . 'ORDER BY username';
+ }
+ else if (C_DB_TYPE == 'pgsql') // Not yet validated
+ {
$currentRoomQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender '
. 'FROM ' . C_USR_TBL . ' usr, ' . C_REG_TBL . ' reg '
. 'WHERE usr.room = \'' . $slashedCurrentRoomName . '\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . $slashedCurrentRoomName . '\' '
! . 'ORDER BY username';
}
else
{
! $currentRoomQuery = 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'' . $slashedCurrentRoomName . '\' '
! . 'ORDER BY username';
}
***************
*** 221,227 ****
. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
. 'WHERE usr.room = \'%OTHER ROOM%\' '
! . 'ORDER BY usr.username';
}
! else if (C_DB_TYPE == 'pgsql')
{
$otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender '
--- 229,243 ----
. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
. 'WHERE usr.room = \'%OTHER ROOM%\' '
! . 'ORDER BY username';
! }
! else if (C_DB_TYPE == 'oci8') // Not yet validated
! {
! $otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender '
! . 'FROM ' . C_USR_TBL . ' usr, ' . C_REG_TBL . ' reg '
! . 'WHERE usr.username = reg.username (+) '
! . 'AND usr.room = \'%OTHER ROOM%\' '
! . 'ORDER BY username';
}
! else if (C_DB_TYPE == 'pgsql') // Not yet validated
{
$otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender '
***************
*** 229,243 ****
. 'WHERE usr.room = \'%OTHER ROOM%\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, 0 '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'%OTHER ROOM%\' '
! . 'ORDER BY usr.username';
}
else
{
! $otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, 0 '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'%OTHER ROOM%\' '
! . 'ORDER BY usr.username';
}
--- 245,259 ----
. 'WHERE usr.room = \'%OTHER ROOM%\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'%OTHER ROOM%\' '
! . 'ORDER BY username';
}
else
{
! $otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'%OTHER ROOM%\' '
! . 'ORDER BY username';
}
Index: users.php3
===================================================================
RCS file: /cvsroot/phpmychat/phpMyChat-0.15/chat/users.php3,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** users.php3 2001/04/19 20:24:53 1.17
--- users.php3 2001/04/21 14:35:42 1.18
***************
*** 122,144 ****
. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
. 'WHERE usr.room = \'' . $slashedCurrentRoomName . '\' '
! . 'ORDER BY usr.username';
}
! else if (C_DB_TYPE == 'pgsql')
{
$currentRoomQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender '
. 'FROM ' . C_USR_TBL . ' usr, ' . C_REG_TBL . ' reg '
. 'WHERE usr.room = \'' . $slashedCurrentRoomName . '\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, NULL '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . $slashedCurrentRoomName . '\' '
! . 'ORDER BY usr.username';
}
else
{
! $currentRoomQuery = 'SELECT usr.username, usr.latin1, usr.status, NULL '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'' . $slashedCurrentRoomName . '\' '
! . 'ORDER BY usr.username';
}
--- 122,152 ----
. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
. 'WHERE usr.room = \'' . $slashedCurrentRoomName . '\' '
! . 'ORDER BY username';
}
! else if (C_DB_TYPE == 'oci8') // not yet validated
{
+ $otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender '
+ . 'FROM ' . C_USR_TBL . ' usr, ' . C_REG_TBL . ' reg '
+ . 'WHERE usr.username = reg.username (+) '
+ . 'AND usr.room = \'' . $slashedCurrentRoomName . '\' '
+ . 'ORDER BY username';
+ }
+ else if (C_DB_TYPE == 'pgsql') // Not yet validated
+ {
$currentRoomQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender '
. 'FROM ' . C_USR_TBL . ' usr, ' . C_REG_TBL . ' reg '
. 'WHERE usr.room = \'' . $slashedCurrentRoomName . '\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'' . $slashedCurrentRoomName . '\' '
! . 'ORDER BY username';
}
else
{
! $currentRoomQuery = 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'' . $slashedCurrentRoomName . '\' '
! . 'ORDER BY username';
}
***************
*** 220,226 ****
. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
. 'WHERE usr.room = \'%OTHER ROOM%\' '
! . 'ORDER BY usr.username';
}
! else if (C_DB_TYPE == 'pgsql')
{
$otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender '
--- 228,242 ----
. 'FROM ' . C_USR_TBL . ' usr LEFT JOIN ' . C_REG_TBL . ' reg ON usr.username = reg.username '
. 'WHERE usr.room = \'%OTHER ROOM%\' '
! . 'ORDER BY username';
! }
! else if (C_DB_TYPE == 'oci8') // Not yet validated
! {
! $otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender '
! . 'FROM ' . C_USR_TBL . ' usr, ' . C_REG_TBL . ' reg '
! . 'WHERE usr.username = reg.username (+) '
! . 'AND usr.room = \'%OTHER ROOM%\' '
! . 'ORDER BY username';
}
! else if (C_DB_TYPE == 'pgsql') // Not yet validated
{
$otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, reg.gender '
***************
*** 228,242 ****
. 'WHERE usr.room = \'%OTHER ROOM%\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, 0 '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'%OTHER ROOM%\' '
! . 'ORDER BY usr.username';
}
else
{
! $otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, 0 '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'%OTHER ROOM%\' '
! . 'ORDER BY usr.username';
}
--- 244,258 ----
. 'WHERE usr.room = \'%OTHER ROOM%\' '
. 'UNION '
! . 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.username NOT IN (SELECT reg.username FROM ' . C_REG_TBL . ' reg) AND usr.room = \'%OTHER ROOM%\' '
! . 'ORDER BY username';
}
else
{
! $otherRoomsQuery = 'SELECT usr.username, usr.latin1, usr.status, NULL AS gender '
. 'FROM ' . C_USR_TBL . ' usr '
. 'WHERE usr.room = \'%OTHER ROOM%\' '
! . 'ORDER BY username';
}
***************
*** 294,298 ****
$firstOtherRoom = 'Parent' . $id;
$usersList[] = '<!-- The others rooms currently in use -->';
! $usersList[] = '<div id="Parent' . $id . '" class="parent" style="margin-top: 5px; cursor: hand">';
$usersList[] = "\t" . '<a href="#" onclick="window.parent.pmcExpandRoom(\'' . $id . '\'); return false">'
. '<img name="imEx" id="imEx' . $id . '" src="images/closed.gif" width="9" height="9" border="0" alt="' . L_EXPCOL . '" /></a>'
--- 310,314 ----
$firstOtherRoom = 'Parent' . $id;
$usersList[] = '<!-- The others rooms currently in use -->';
! $usersList[] = '<div id="Parent' . $id . '" class="parent" style="margin-top: 10px; cursor: hand">';
$usersList[] = "\t" . '<a href="#" onclick="window.parent.pmcExpandRoom(\'' . $id . '\'); return false">'
. '<img name="imEx" id="imEx' . $id . '" src="images/closed.gif" width="9" height="9" border="0" alt="' . L_EXPCOL . '" /></a>'
***************
*** 383,387 ****
$firstOtherRoom = 'Parent' . $id;
! $usersList[] = '<div id="Parent' . $id . '" class="parent" style="margin-top: 5px; cursor: hand">';
$usersList[] = "\t"
. '<a href="' . str_replace('%NEW ROOM%', urlencode($tmpRoom), $joinUrl) . '" target="_parent">' . htmlspecialchars($tmpRoom) . '</a>'
--- 399,403 ----
$firstOtherRoom = 'Parent' . $id;
! $usersList[] = '<div id="Parent' . $id . '" class="parent" style="margin-top: 10px; cursor: hand">';
$usersList[] = "\t"
. '<a href="' . str_replace('%NEW ROOM%', urlencode($tmpRoom), $joinUrl) . '" target="_parent">' . htmlspecialchars($tmpRoom) . '</a>'
|
