# DBIx::Class::DeploymentHandler can do its work
our $VERSION=12;
+__PACKAGE__->load_components('+Debbugs::DB::Util');
+
# You can replace this text with custom code or comments, and it will be preserved on regeneration
# override connect to handle just passing a bare service
use base 'DBIx::Class::ResultSet';
-use Debbugs::DB::Util qw(select_one);
-
-
sub insert_suite_bin_ver_association {
my ($self,$suite_id,$bin_ver_id) = @_;
- return $self->result_source->schema->storage->
- dbh_do(sub {
- my ($s,$dbh,$s_id,$bv_id) = @_;
- return select_one($dbh,<<'SQL',$s_id,$bv_id);
+ return $self->result_source->schema->
+ select_one(<<'SQL',$suite_id,$bin_ver_id);
INSERT INTO bin_associations (suite,bin)
VALUES (?,?) ON CONFLICT (suite,bin) DO
UPDATE SET modified = NOW()
RETURNING id;
SQL
- },
- $suite_id,$bin_ver_id
- );
}
1;
use base 'DBIx::Class::ResultSet';
-use Debbugs::DB::Util qw(select_one);
-
sub bin_pkg_and_ver_in_suite {
my ($self,$suite) = @_;
$suite = $self->result_source->schema->
sub get_bin_pkg_id {
my ($self,$pkg) = @_;
- return $self->result_source->schema->storage->
- dbh_do(sub {
- my ($s,$dbh,$bin_pkg) = @_;
- return select_one($dbh,<<'SQL',$bin_pkg);
+ return $self->result_source->schema->
+ select_one(<<'SQL',$pkg);
SELECT id FROM bin_pkg where pkg = ?;
SQL
- },
- $pkg
- );
}
+
sub get_or_create_bin_pkg_id {
my ($self,$pkg) = @_;
- return $self->result_source->schema->storage->
- dbh_do(sub {
- my ($s,$dbh,$bin_pkg) = @_;
- return select_one($dbh,<<'SQL',$bin_pkg,$bin_pkg);
+ return $self->result_source->schema->
+ select_one(<<'SQL',$pkg,$pkg);
WITH ins AS (
INSERT INTO bin_pkg (pkg)
VALUES (?) ON CONFLICT (pkg) DO NOTHING RETURNING id
SELECT id FROM bin_pkg where pkg = ?
LIMIT 1;
SQL
- },
- $pkg
- );
}
1;
use base 'DBIx::Class::ResultSet';
-use Debbugs::DB::Util qw(select_one);
-
-
sub get_bin_ver_id {
my ($self,$bin_pkg_id,$bin_ver,$arch_id,$src_ver_id) = @_;
- return $self->result_source->schema->storage->
- dbh_do(sub {
- my ($s,$dbh,$bp_id,$bv,$a_id,$sv_id) = @_;
- return select_one($dbh,<<'SQL',
+ return $self->result_source->schema->
+ select_one(<<'SQL',
WITH ins AS (
INSERT INTO bin_ver (bin_pkg,src_ver,arch,ver)
VALUES (?,?,?,?) ON CONFLICT (bin_pkg,arch,ver) DO NOTHING RETURNING id
SELECT id FROM bin_ver WHERE bin_pkg = ? AND arch = ? AND ver = ?
LIMIT 1;
SQL
- $bp_id,$sv_id,
- $a_id,$bv,
- $bp_id,$a_id,
- $bv);
- },
- $bin_pkg_id,$bin_ver,$arch_id,$src_ver_id
- );
+ $bin_pkg_id,$src_ver_id,
+ $arch_id,$bin_ver,
+ $bin_pkg_id,$arch_id,
+ $bin_ver);
}
1;
use base 'DBIx::Class::ResultSet';
-use Debbugs::DB::Util qw(select_one);
-
use List::AllUtils qw(natatime);
sub quick_insert_bug {
my ($self,$bug) = @_;
- return $self->result_source->schema->storage->
- dbh_do(sub {
- my ($s,$dbh,$b) = @_;
- select_one($dbh,<<'SQL',$b);
+ return $self->result_source->schema->
+ select_one(<<'SQL',$bug);
INSERT INTO bug (id,subject,severity) VALUES (?,'',1)
ON CONFLICT (id) DO NOTHING RETURNING id;
SQL
- },
- $bug
- );
-
}
use base 'DBIx::Class::ResultSet';
-use Debbugs::DB::Util qw(select_one);
-
use List::AllUtils qw(natatime);
=cut
sub update_bug_status {
- my ($self,@args) = @_;
- return $self->result_source->schema->storage->
- dbh_do(sub {
- my ($s,$dbh,$bug,$suite,$arch,$status,$modified,$asof) = @_;
- select_one($dbh,<<'SQL',$bug,$suite,$arch,$status,$status);
+ my ($self,$bug,$suite,$arch,$status,$modified,$asof) = @_;
+ return $self->result_source->schema->
+ select_one(<<'SQL',$bug,$suite,$arch,$status,$status);
INSERT INTO bug_status_cache AS bsc
(bug,suite,arch,status,modified,asof)
VALUES (?,?,?,?,NOW(),NOW())
SET asof=NOW(),modified=CASE WHEN bsc.status=? THEN bsc.modified ELSE NOW() END
RETURNING status;
SQL
- },
- @args
- );
}
use Debbugs::DB::Util qw(select_one);
use Debbugs::Common qw(getparsedaddrs);
-use Debbugs::DB::Util qw(select_one);
use Scalar::Util qw(blessed);
sub get_correspondent_id {
if (defined $rs) {
return $rs->{id};
}
- return $self->result_source->schema->storage->
- dbh_do(sub {
- my ($s,$dbh,$addr,$full_name) = @_;
- my $ci = select_one($dbh,<<'SQL',$addr,$addr);
+ my $ci =
+ $self->result_source->schema->
+ select_one(<<'SQL',$addr,$addr);
WITH ins AS (
INSERT INTO correspondent (addr) VALUES (?)
ON CONFLICT (addr) DO NOTHING RETURNING id
SELECT id FROM correspondent WHERE addr = ?
LIMIT 1;
SQL
- if (defined $full_name) {
- select_one($dbh,<<'SQL',$ci,$full_name);
+ if (defined $full_name) {
+ $self->result_source->schema->
+ select_one(<<'SQL',$ci,$full_name);
WITH ins AS (
INSERT INTO correspondent_full_name (correspondent,full_name)
VALUES (?,?) ON CONFLICT (correspondent,full_name) DO NOTHING RETURNING 1
UNION ALL
SELECT 1;
SQL
- }
- return $ci;
-},
- $addr,
- $full_name
- );
-
+ }
+ return $ci;
}
use base 'DBIx::Class::ResultSet';
-use Debbugs::DB::Util qw(select_one);
-
-
=over
=item get_maintainers
my $ci =
$self->result_source->schema->resultset('Correspondent')->
get_correspondent_id($maint);
- return $self->result_source->schema->storage->
- dbh_do(sub {
- my ($s,$dbh,$maint,$ci) = @_;
- return select_one($dbh,<<'SQL',$maint,$ci,$maint);
+ return $self->result_source->schema->
+ select_one(<<'SQL',$maint,$ci,$maint);
WITH ins AS (
INSERT INTO maintainer (name,correspondent) VALUES (?,?)
ON CONFLICT (name) DO NOTHING RETURNING id
SELECT id FROM maintainer WHERE name = ?
LIMIT 1;
SQL
- },
- $maint,$ci
- );
}
=back
use base 'DBIx::Class::ResultSet';
-use Debbugs::DB::Util qw(select_one);
-
sub get_message_id {
my ($self,$msg_id,$from,$to,$subject) = @_;
- return $self->result_source->schema->storage->
- dbh_do(sub {
- my ($dbh,$msg_id,$from,$to,$subject) = @_;
- my $mi = select_one($dbh,<<'SQL',@_[1..$#_],@_[1..$#_]);
+ return $self->result_source->schema->
+ select_one(<<'SQL',@_,@_);
WITH ins AS (
INSERT INTO message (msgid,from_complete,to_complete,subject) VALUES (?,?,?,?)
ON CONFLICT (msgid,from_complete,to_complete,subject) DO NOTHING RETURNING id
AND to_complete = ? AND subject = ?
LIMIT 1;
SQL
- return $mi;
-},
- @_[1..$#_]
- );
-
}
use base 'DBIx::Class::ResultSet';
-use Debbugs::DB::Util qw(select_one);
-
-
sub insert_suite_src_ver_association {
my ($self,$suite_id,$src_ver_id) = @_;
- return $self->result_source->schema->storage->
- dbh_do(sub {
- my ($s,$dbh,$suite_id,$src_ver_id) = @_;
- return select_one($dbh,<<'SQL',$suite_id,$src_ver_id);
+ return $self->result_source->schema->
+ select_one(<<'SQL',$suite_id,$src_ver_id);
INSERT INTO src_associations (suite,source)
VALUES (?,?) ON CONFLICT (suite,source) DO
UPDATE SET modified = NOW()
RETURNING id;
SQL
- },
- $suite_id,$src_ver_id
- );
}
1;
use base 'DBIx::Class::ResultSet';
-use Debbugs::DB::Util qw(select_one);
-
sub src_pkg_and_ver_in_suite {
my ($self,$suite) = @_;
if (ref($suite)) {
sub get_src_pkg_id {
my ($self,$source) = @_;
- return $self->result_source->schema->storage->
- dbh_do(sub {
- my ($s,$dbh,$src_pkg) = @_;
- return select_one($dbh,<<'SQL',$src_pkg);
+ return $self->result_source->schema->
+ select_one(<<'SQL',$source);
SELECT id FROM src_pkg where pkg = ?;
SQL
- },
- $source
- );
}
sub get_or_create_src_pkg_id {
my ($self,$source) = @_;
- return $self->result_source->schema->storage->
- dbh_do(sub {
- my ($s,$dbh,$source) = @_;
- return select_one($dbh,<<'SQL',$source,$source);
+ return $self->result_source->schema->
+ select_one(<<'SQL',$source,$source);
WITH ins AS (
INSERT INTO src_pkg (pkg)
VALUES (?) ON CONFLICT (pkg,disabled) DO NOTHING RETURNING id
SELECT id FROM src_pkg where pkg = ? AND disabled = 'infinity'::timestamptz
LIMIT 1;
SQL
- },
- $source
- );
}
1;
use base 'DBIx::Class::ResultSet';
-use Debbugs::DB::Util qw(select_one);
-
-
sub get_src_ver_id {
my ($self,$src_pkg_id,$src_ver,$maint_id) = @_;
- return $self->result_source->schema->storage->
- dbh_do(sub {
- my ($s,$dbh,$src_pkg_id,$src_ver,$maint_id) = @_;
- return select_one($dbh,<<'SQL',
+ return $self->result_source->schema->
+ select_one(<<'SQL',
INSERT INTO src_ver (src_pkg,ver,maintainer)
VALUES (?,?,?) ON CONFLICT (src_pkg,ver) DO
UPDATE SET maintainer = ?
RETURNING id;
SQL
- $src_pkg_id,$src_ver,
- $maint_id,$maint_id);
- },
- $src_pkg_id,$src_ver,$maint_id
- );
+ $src_pkg_id,$src_ver,
+ $maint_id,$maint_id);
}
1;
use warnings;
use strict;
-use vars qw($VERSION $DEBUG %EXPORT_TAGS @EXPORT_OK @EXPORT);
-use base qw(Exporter);
-
-BEGIN{
- ($VERSION) = q$Revision$ =~ /^Revision:\s+([^\s+])/;
- $DEBUG = 0 unless defined $DEBUG;
-
- @EXPORT = ();
- %EXPORT_TAGS = (select => [qw(select_one)],
- execute => [qw(prepare_execute)]
- );
- @EXPORT_OK = ();
- Exporter::export_ok_tags(keys %EXPORT_TAGS);
- $EXPORT_TAGS{all} = [@EXPORT_OK];
-}
+
+use base qw(DBIx::Class);
+
+use Debbugs::Common qw(open_compressed_file);
=head2 select
=item select_one
- select_one($dbh,$sql,@bind_vals)
+ $schema->select_one($sql,@bind_vals)
Returns the first column from the first row returned from a select statement
=cut
sub select_one {
- my ($dbh,$sql,@bind_vals) = @_;
- my $sth = $dbh->
+ my ($self,$sql,@bind_vals) = @_;
+ my $results =
+ $self->storage->
+ dbh_do(sub {
+ my ($s,$dbh) = @_;
+ my $sth = $dbh->
prepare_cached($sql,
{dbi_dummy => __FILE__.__LINE__ })
or die "Unable to prepare statement: $sql";
- $sth->execute(@bind_vals) or
- die "Unable to select one: ".$dbh->errstr();
- my $results = $sth->fetchall_arrayref([0]);
- $sth->finish();
+ $sth->execute(@bind_vals) or
+ die "Unable to select one: ".$dbh->errstr();
+ my $results = $sth->fetchall_arrayref([0]);
+ $sth->finish();
+ return $results;
+ });
return (ref($results) and ref($results->[0]))?$results->[0][0]:undef;
}
=item prepare_execute
- prepare_execute($dbh,$sql,@bind_vals)
+ $schema->prepare_execute($sql,@bind_vals)
Prepares and executes a statement
=cut
sub prepare_execute {
- my ($dbh,$sql,@bind_vals) = @_;
- my $sth = $dbh->
- prepare_cached($sql,
+ my ($self,$sql,@bind_vals) = @_;
+ $self->storage->
+ dbh_do(sub {
+ my ($s,$dbh) = @_;
+ my $sth = $dbh->
+ prepare_cached($sql,
{dbi_dummy => __FILE__.__LINE__ })
- or die "Unable to prepare statement: $sql";
- $sth->execute(@bind_vals) or
- die "Unable to execute statement: ".$dbh->errstr();
- $sth->finish();
+ or die "Unable to prepare statement: $sql";
+ $sth->execute(@bind_vals) or
+ die "Unable to execute statement: ".$dbh->errstr();
+ $sth->finish();
+ });
+}
+
+=item sql_file_in_txn
+
+C<sql_file_in_txn();>
+
+
+
+=cut
+sub sql_file_in_txn {
+ my ($self,$fn) = @_;
+ my $fh = open_compressed_file($fn) or
+ die "Unable to open $fn for reading: $!";
+ local $/;
+ my $sql = <$fh>;
+ defined($sql) or die "Unable to read from file: $!";
+ $self->prepare_execute($sql);
}
projects / debbugs.git / commitdiff