From: Reini U. <ru...@us...> - 2006-12-02 21:57:29
|
Update of /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31140 Modified Files: ADODB.php PearDB.php PearDB_mysql.php Log Message: fix WantedPages SQL: no JOIN clarify first condition in CASE WHEN Index: ADODB.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/ADODB.php,v retrieving revision 1.91 retrieving revision 1.92 diff -u -2 -b -p -d -r1.91 -r1.92 --- ADODB.php 19 Nov 2006 14:03:32 -0000 1.91 +++ ADODB.php 2 Dec 2006 21:57:27 -0000 1.92 @@ -801,5 +801,5 @@ id pagename linkrelation $qpagename = $dbh->qstr($pagename); $qlink = $dbh->qstr($link); - $row = $dbh->GetRow("SELECT CASE WHEN $want.pagename THEN 1 ELSE 0 END" + $row = $dbh->GetRow("SELECT CASE WHEN $want.pagename=$qlink THEN 1 ELSE 0 END" . " FROM $link_tbl, $page_tbl linker, $page_tbl linkee, $nonempty_tbl" . " WHERE linkfrom=linker.id AND linkto=linkee.id" @@ -1069,9 +1069,9 @@ id pagename linkrelation */ $sql = "SELECT p.pagename, pp.pagename as wantedfrom" - . " FROM $page_tbl p JOIN $link_tbl linked " - . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id" - . " LEFT JOIN $nonempty_tbl ne ON linked.linkto = ne.id" + . " FROM $page_tbl p, $link_tbl linked" + . " LEFT JOIN $page_tbl pp ON (linked.linkto = pp.id)" + . " LEFT JOIN $nonempty_tbl ne ON (linked.linkto = ne.id)" . " WHERE ne.id is NULL" - . " AND p.id = linked.linkfrom" + . " AND (p.id = linked.linkfrom)" . $exclude_from . $exclude @@ -1538,4 +1538,8 @@ class WikiDB_backend_ADODB_search extend // $Log$ +// Revision 1.92 2006/12/02 21:57:27 rurban +// fix WantedPages SQL: no JOIN +// clarify first condition in CASE WHEN +// // Revision 1.91 2006/11/19 14:03:32 rurban // Replace IF by CASE in exists_link() Index: PearDB.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/PearDB.php,v retrieving revision 1.101 retrieving revision 1.102 diff -u -2 -b -p -d -r1.101 -r1.102 --- PearDB.php 29 Nov 2006 19:49:05 -0000 1.101 +++ PearDB.php 2 Dec 2006 21:57:27 -0000 1.102 @@ -594,5 +594,5 @@ extends WikiDB_backend $qpagename = $dbh->escapeSimple($pagename); $qlink = $dbh->escapeSimple($link); - $row = $dbh->GetRow("SELECT CASE WHEN $want.pagename THEN 1 ELSE 0 END as result" + $row = $dbh->GetRow("SELECT CASE WHEN $want.pagename='$qlink' THEN 1 ELSE 0 END as result" . " FROM $link_tbl, $page_tbl linker, $page_tbl linkee, $nonempty_tbl" . " WHERE linkfrom=linker.id AND linkto=linkee.id" @@ -869,9 +869,9 @@ extends WikiDB_backend if ($exclude) // array of pagenames $exclude = " AND p.pagename NOT IN ".$this->_sql_set($exclude); - $sql = "SELECT p.pagename, pp.pagename as wantedfrom" - . " FROM $page_tbl p JOIN $link_tbl linked" + $sql = "SELECT p.pagename, pp.pagename AS wantedfrom" + . " FROM $page_tbl p, $link_tbl linked" . " LEFT JOIN $page_tbl pp ON linked.linkto = pp.id" . " LEFT JOIN $nonempty_tbl ne ON linked.linkto = ne.id" - . " WHERE ne.id is NULL" + . " WHERE ne.id IS NULL" . " AND p.id = linked.linkfrom" . $exclude_from @@ -879,4 +879,5 @@ extends WikiDB_backend . $orderby; if ($limit) { + // oci8 error: WHERE NULL = NULL appended list($from, $count) = $this->limit($limit); $result = $dbh->limitQuery($sql, $from, $count * 3); @@ -1239,4 +1240,8 @@ class WikiDB_backend_PearDB_search exten // $Log$ +// Revision 1.102 2006/12/02 21:57:27 rurban +// fix WantedPages SQL: no JOIN +// clarify first condition in CASE WHEN +// // Revision 1.101 2006/11/29 19:49:05 rurban // fix CASE WHEN SQL syntax error from previous commit Index: PearDB_mysql.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB/backend/PearDB_mysql.php,v retrieving revision 1.24 retrieving revision 1.25 diff -u -2 -b -p -d -r1.24 -r1.25 --- PearDB_mysql.php 23 Jul 2006 14:17:51 -0000 1.24 +++ PearDB_mysql.php 2 Dec 2006 21:57:27 -0000 1.25 @@ -127,5 +127,5 @@ extends WikiDB_backend_PearDB $sql = "SELECT p.pagename, pp.pagename as wantedfrom" - . " FROM $page_tbl p JOIN $link_tbl linked" + . " FROM $page_tbl p, $link_tbl linked" . " LEFT JOIN $page_tbl pp ON (linked.linkto = pp.id)" . " LEFT JOIN $nonempty_tbl ne ON (linked.linkto = ne.id)" |