Skip to content

Use lc_package to join tables #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
charsbar wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Use lc_package to join tables #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
996aea4
Use lc_package to join tables
charsbar Apr 27, 2024
f4de98c
Fix Test::PAUSE::Web to fill lc_package columns as well
charsbar Apr 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions lib/pause_2017/PAUSE/Web/Controller/User/Distperms.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ sub peek {
my $query = qq{SELECT packages.distname,
GROUP_CONCAT(DISTINCT primeur.userid ORDER BY primeur.userid),
GROUP_CONCAT(DISTINCT perms.userid ORDER BY perms.userid)
FROM packages LEFT JOIN primeur ON primeur.package=packages.package
LEFT JOIN perms ON perms.package=packages.package AND primeur.userid <> perms.userid
FROM packages LEFT JOIN primeur ON primeur.lc_package=packages.lc_package
LEFT JOIN perms ON perms.lc_package=packages.lc_package AND primeur.userid <> perms.userid
};

my $db = $mgr->connect;
Expand Down Expand Up @@ -127,7 +127,7 @@ sub move_dist_primary {
unless exists $all_dists->{$seldist};
my $mods = $db->selectcol_arrayref(
q{SELECT primeur.package
FROM primeur JOIN packages ON primeur.package = packages.package
FROM primeur JOIN packages ON primeur.lc_package = packages.lc_package
WHERE packages.distname=? AND primeur.userid=?},
undef, $seldist, $u->{userid});
for my $selmod (@$mods) {
Expand Down Expand Up @@ -204,7 +204,7 @@ sub remove_dist_primary {
unless exists $all_dists->{$seldist};
my $mods = $db->selectcol_arrayref(
q{SELECT primeur.package
FROM primeur JOIN packages ON primeur.package = packages.package
FROM primeur JOIN packages ON primeur.lc_package = packages.lc_package
WHERE packages.distname=? AND primeur.userid=?},
undef, $seldist, $u->{userid});
for my $selmod (@$mods) {
Expand Down Expand Up @@ -286,7 +286,7 @@ sub make_dist_comaint {
unless exists $all_dists->{$seldist};
my $mods = $db->selectcol_arrayref(
q{SELECT primeur.package
FROM primeur JOIN packages ON primeur.package = packages.package
FROM primeur JOIN packages ON primeur.lc_package = packages.lc_package
WHERE packages.distname=? AND primeur.userid=?},
undef, $seldist, $u->{userid});
for my $selmod (@$mods) {
Expand Down Expand Up @@ -369,7 +369,7 @@ sub remove_dist_comaint {
}
my $mods = $db->selectcol_arrayref(
q{SELECT primeur.package
FROM primeur JOIN packages ON primeur.package = packages.package
FROM primeur JOIN packages ON primeur.lc_package = packages.lc_package
WHERE packages.distname=? AND primeur.userid=?},
undef, $seldist, $u->{userid});
for my $selmod (@$mods) {
Expand Down Expand Up @@ -434,7 +434,7 @@ sub giveup_dist_comaint {
unless exists $all_dists->{$seldist};
my $mods = $db->selectcol_arrayref(
q{SELECT perms.package
FROM perms JOIN packages ON perms.package = packages.package
FROM perms JOIN packages ON perms.lc_package = packages.lc_package
WHERE packages.distname=? AND perms.userid=?},
undef, $seldist, $u->{userid});
for my $selmod (@$mods) {
Expand Down Expand Up @@ -489,12 +489,12 @@ sub all_pdists {
# LEFT JOIN primeur AS p3 ON p2.package = p3.package GROUP BY packages.distname});
my $sth2 = $db->prepare(
qq{SELECT packages.distname
FROM packages JOIN primeur ON primeur.userid = ? AND primeur.package=packages.package});
FROM packages JOIN primeur ON primeur.userid = ? AND primeur.lc_package=packages.lc_package});
$sth2->execute($u->{userid});
while (my($distname) = $mgr->fetchrow($sth2, "fetchrow_array")) {
next if $distname eq '';
my $owners = $db->selectcol_arrayref(
qq{SELECT DISTINCT(userid) FROM primeur JOIN packages ON packages.distname = ? AND primeur.package = packages.package},
qq{SELECT DISTINCT(userid) FROM primeur JOIN packages ON packages.distname = ? AND primeur.lc_package = packages.lc_package},
undef, $distname);
$all_dists{$distname} = join ',', @$owners;
}
Expand All @@ -509,8 +509,8 @@ sub all_cdists {
my(%all_dists);
my $sth2 = $db->prepare(qq{SELECT packages.distname, GROUP_CONCAT(DISTINCT primeur.userid ORDER BY primeur.userid)
FROM packages
JOIN perms ON perms.userid = ? AND perms.package = packages.package
LEFT JOIN primeur ON packages.package = primeur.package
JOIN perms ON perms.userid = ? AND perms.lc_package = packages.lc_package
LEFT JOIN primeur ON packages.lc_package = primeur.lc_package
GROUP BY packages.distname});
$sth2->execute($u->{userid});
while (my($id, $owner) = $mgr->fetchrow($sth2, "fetchrow_array")) {
Expand Down Expand Up @@ -539,7 +539,7 @@ sub all_comaints {
my $db = $mgr->connect;
my $or = join " OR\n", map { "packages.distname='$_'" } keys %$all_dists;
my $sth2 = $db->prepare(qq{SELECT packages.distname, userid, perms.package
FROM perms LEFT JOIN packages ON perms.package = packages.package
FROM perms LEFT JOIN packages ON perms.lc_package = packages.lc_package
WHERE userid <> '$u->{userid}' AND ( $or )
});
$sth2->execute;
Expand Down
4 changes: 2 additions & 2 deletions lib/pause_2017/PAUSE/Web/Controller/User/Perms.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ sub peek {
"co-maint",
primeur.userid
FROM perms LEFT JOIN users ON perms.userid=users.userid
LEFT JOIN primeur ON perms.package=primeur.package
LEFT JOIN primeur ON perms.lc_package=primeur.lc_package
},
);

Expand Down Expand Up @@ -582,7 +582,7 @@ sub all_cmods {
my(%all_mods);
my $sth2 = $db->prepare(qq{SELECT perms.package, primeur.userid
FROM perms LEFT JOIN primeur
ON perms.package = primeur.package
ON perms.lc_package = primeur.lc_package
WHERE perms.userid=?});
$sth2->execute($u->{userid});
while (my($id, $owner) = $mgr->fetchrow($sth2, "fetchrow_array")) {
Expand Down
4 changes: 4 additions & 0 deletions t/pause_2017/lib/Test/PAUSE/Web.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,7 @@ sub reset_module_fixture {
my $userdir = _userdir($dist->{owner});
$self->mod_db->insert("packages", {
package => $package,
lc_package => lc $package,
version => '0.01',
dist => "$userdir/$dist->{name}-0.01.tar.gz",
distname => $dist->{name},
Expand All @@ -432,6 +433,7 @@ sub reset_module_fixture {
});
$self->mod_db->insert("primeur", {
package => $package,
lc_package => lc $package,
userid => $dist->{owner},
});
}
Expand All @@ -441,13 +443,15 @@ sub reset_module_fixture {
for my $package (@$packages) {
$self->mod_db->insert("perms", {
package => $package,
lc_package => lc $package,
userid => $id,
});
}
} else {
for my $package (@{$dist->{packages}}) {
$self->mod_db->insert("perms", {
package => $package,
lc_package => lc $package,
userid => $comaint,
});
}
Expand Down