Update of /cvsroot/fink/web/pdb
In directory sc8-pr-cvs17:/tmp/cvs-serv4052/web/pdb
Modified Files:
Tag: redesign_pdb
browse.php package.php
Log Message:
- Change name of table 'distribution_releases' to 'release'
- This involves using backticks for table names
- Use InnoDB as default database engine when creating tables
- Rearrange creation of tables in schema.sql
Index: package.php
===================================================================
RCS file: /cvsroot/fink/web/pdb/package.php,v
retrieving revision 1.43.2.26
retrieving revision 1.43.2.27
diff -u -d -r1.43.2.26 -r1.43.2.27
--- package.php 5 Sep 2007 17:29:19 -0000 1.43.2.26
+++ package.php 10 Sep 2007 18:02:20 -0000 1.43.2.27
@@ -36,9 +36,9 @@
// Get package data to display (use for version-nonspecific pkg metadata)
$qtodisplay_sel = "SELECT p.*,r.*,d.*,p.version AS pkg_version ";
-$qtodisplay_sel .= "FROM package AS p ";
-$qtodisplay_sel .= "INNER JOIN distribution_releases r ON r.rel_id = p.rel_id
";
-$qtodisplay_sel .= "INNER JOIN distribution d ON r.dist_id = d.dist_id ";
+$qtodisplay_sel .= "FROM `package` AS p ";
+$qtodisplay_sel .= "INNER JOIN `release` r ON r.rel_id = p.rel_id ";
+$qtodisplay_sel .= "INNER JOIN `distribution` d ON r.dist_id = d.dist_id ";
if (!$showall)
$qtodisplay_sel .= "AND d.visible='1' ";
@@ -172,7 +172,7 @@
print "</tr>\n";
// Fetch list of all distributions
- $q = "SELECT * FROM distribution WHERE active='1' ";
+ $q = "SELECT * FROM `distribution` WHERE active='1' ";
if (!$showall)
$q .= "AND visible='1' ";
$q .= "ORDER BY priority DESC";
@@ -195,7 +195,7 @@
$last_identifier = $dist_row['identifier'];
// Now query all releases (typically: stable, unstable, bindist) for the
given distribution.
- $q = "SELECT p.*, r.type, r.version AS rel_version FROM package p,
distribution_releases r WHERE p.name = '$package' AND p.rel_id = r.rel_id AND
r.dist_id='" . $dist_row['dist_id'] . "' AND active='1' ORDER BY r.priority
ASC";
+ $q = "SELECT p.*, r.type, r.version AS rel_version FROM `package` p,
`release` r WHERE p.name = '$package' AND p.rel_id = r.rel_id AND r.dist_id='"
. $dist_row['dist_id'] . "' AND active='1' ORDER BY r.priority ASC";
$qrel = mysql_query($q, $dbh);
if (!$qrel) {
die('<p><b>error during query:</b> '.mysql_error().'</p>');
@@ -320,7 +320,7 @@
// List the splitoffs of this package
- $q = "SELECT * FROM package WHERE rel_id='$pkg2disp[rel_id]' AND
parentname='$pkg2disp[name]' ORDER BY name";
+ $q = "SELECT * FROM `package` WHERE rel_id='$pkg2disp[rel_id]' AND
parentname='$pkg2disp[name]' ORDER BY name";
$rs = mysql_query($q, $dbh);
if (!$rs) {
print '<p><b>error during query:</b> '.mysql_error().'</p>';
Index: browse.php
===================================================================
RCS file: /cvsroot/fink/web/pdb/browse.php,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -u -d -r1.1.2.27 -r1.1.2.28
--- browse.php 6 Sep 2007 13:06:53 -0000 1.1.2.27
+++ browse.php 10 Sep 2007 18:02:20 -0000 1.1.2.28
@@ -109,7 +109,7 @@
// Distribution values
$dist_values = array();
-$q = "SELECT * FROM distribution WHERE active='1' ";
+$q = "SELECT * FROM `distribution` WHERE active='1' ";
if (!$showall)
$q .= "AND visible='1' ";
$q .= "ORDER BY priority DESC";
@@ -273,8 +273,8 @@
if ($tree == 'testing') {
$query .= ", CONCAT(p.version, '-', p.revision) AS version_unstable, ".
" CONCAT(sp.version, '-', sp.revision) AS version_stable ".
- "FROM distribution_releases r, package p ".
- "LEFT OUTER JOIN (package sp, distribution_releases sr) ".
+ "FROM `release` r, `package` p ".
+ "LEFT OUTER JOIN (`package` sp, `release` sr) ".
" ON (p.name = sp.name ".
" AND sp.rel_id = sr.rel_id ".
" AND sr.dist_id = $dist ".
@@ -283,19 +283,19 @@
" AND r.dist_id = $dist ".
" AND r.type = 'unstable' ";
} else {
- $query .= "FROM package p, distribution_releases r ".
+ $query .= "FROM `package` p, `release` r ".
"WHERE p.rel_id = r.rel_id".
" AND r.dist_id = $dist ".
" AND r.type = '$tree' ";
}
} else if ($dist && !$tree) {
// show latest pkg of specifc dist or tree
- $query .= "FROM package p, distribution_releases r ".
+ $query .= "FROM `package` p, `release` r ".
"WHERE p.rel_id = r.rel_id ".
" AND r.dist_id = $dist ".
" AND r.priority = (SELECT MAX(rX.priority) ".
- " FROM package pX, ".
- " distribution_releases rX ".
+ " FROM `package` pX, ".
+ " `release` rX ".
" WHERE p.name = pX.name ".
" AND pX.rel_id = rX.rel_id ".
" AND rX.dist_id = $dist ".
@@ -304,16 +304,16 @@
// show everything in a given tree, regardless of the dist
// Note: This query is almost identical to the (!$dist && !$tree) one.
// The only additions are the '$tree' specifiers.
- $query .= "FROM package p, distribution_releases r, distribution d ".
+ $query .= "FROM `package` p, `release` r, `distribution` d ".
"WHERE p.rel_id = r.rel_id ".
" AND r.dist_id = d.dist_id ";
if (!$showall)
$query .= "AND d.visible='1' ";
$query .= " AND r.type = '$tree' ".
" AND d.priority = (SELECT MAX(dX.priority) ".
- " FROM package pX, ".
- " distribution_releases rX, ".
- " distribution dX ".
+ " FROM `package` pX, ".
+ " `release` rX, ".
+ " `distribution` dX ".
" WHERE p.name = pX.name ".
" AND pX.rel_id = rX.rel_id ".
" AND rX.dist_id = dX.dist_id ".
@@ -322,8 +322,8 @@
$query .= " AND dX.visible='1' ";
$query .= " GROUP BY pX.name) ".
" AND r.priority = (SELECT MAX(rX.priority) ".
- " FROM package pX, ".
- " distribution_releases rX ".
+ " FROM `package` pX, ".
+ " `release` rX ".
" WHERE p.name = pX.name ".
" AND pX.rel_id = rX.rel_id ".
" AND rX.dist_id = d.dist_id ".
@@ -331,15 +331,15 @@
" GROUP BY pX.name) ";
} else if (!$dist && !$tree) {
// show latest if no specifc dist/tree
- $query .= "FROM package p, distribution_releases r, distribution d ".
+ $query .= "FROM `package` p, `release` r, `distribution` d ".
"WHERE p.rel_id = r.rel_id ".
" AND r.dist_id = d.dist_id ";
if (!$showall)
$query .= "AND d.visible='1' ";
$query .= " AND d.priority = (SELECT MAX(dX.priority) ".
- " FROM package pX, ".
- " distribution_releases rX, ".
- " distribution dX ".
+ " FROM `package` pX, ".
+ " `release` rX, ".
+ " `distribution` dX ".
" WHERE p.name = pX.name ".
" AND pX.rel_id = rX.rel_id ".
" AND rX.dist_id = dX.dist_id ";
@@ -347,8 +347,8 @@
$query .= " AND dX.visible='1' ";
$query .= " GROUP BY pX.name) ".
" AND r.priority = (SELECT MAX(rX.priority) ".
- " FROM package pX, ".
- " distribution_releases rX ".
+ " FROM `package` pX, ".
+ " `release` rX ".
" WHERE p.name = pX.name ".
" AND pX.rel_id = rX.rel_id ".
" AND rX.dist_id = d.dist_id ".
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
