[Jifty-commit] jifty-dbi branch, master, updated. 0.60-22-g30214d5
Jifty commits
jifty-commit at lists.jifty.org
Fri Jun 18 20:36:28 EDT 2010
The branch, master has been updated
via 30214d525f2469ea17f7a00afc99da982331c75d (commit)
from 7a36051f0871c94159d77518b30ae29b358971e7 (commit)
Summary of changes:
lib/Jifty/DBI/Collection.pm | 45 +++++++
t/02searches_distinct_values.t | 280 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 325 insertions(+), 0 deletions(-)
create mode 100644 t/02searches_distinct_values.t
- Log -----------------------------------------------------------------
commit 30214d525f2469ea17f7a00afc99da982331c75d
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Sat Jun 19 04:35:35 2010 +0400
distinct_column_values method, docs and tests
diff --git a/lib/Jifty/DBI/Collection.pm b/lib/Jifty/DBI/Collection.pm
index bfb7264..f4d309d 100755
--- a/lib/Jifty/DBI/Collection.pm
+++ b/lib/Jifty/DBI/Collection.pm
@@ -932,6 +932,51 @@ sub last {
return ( $self->next );
}
+=head2 distinct_column_values
+
+Takes a column name and returns distinct values of the column.
+Only values in the current collection are returned.
+
+Optional arguments are C<max> and C<sort> to limit number of
+values returned and it makes sense to sort results.
+
+ $col->distinct_column_values('column');
+
+ $col->distinct_column_values(column => 'column');
+
+ $col->distinct_column_values('column', max => 10, sort => 'asc');
+
+=cut
+
+sub distinct_column_values {
+ my $self = shift;
+ my %args = (
+ column => undef,
+ sort => undef,
+ max => undef,
+ @_%2 ? (column => @_) : (@_)
+ );
+
+ return () if $self->derived;
+
+ my $query_string = $self->_build_joins;
+ if ( $self->_is_limited ) {
+ $query_string .= ' '. $self->_where_clause . " ";
+ }
+
+ my $column = 'main.'. $args{'column'};
+ $query_string = 'SELECT DISTINCT '. $column .' FROM '. $query_string;
+
+ if ( $args{'sort'} ) {
+ $query_string .= ' ORDER BY '. $column
+ .' '. ($args{'sort'} =~ /^des/i ? 'DESC' : 'ASC');
+ }
+
+ my $dbh = $self->_handle->dbh;
+ my $list = $dbh->selectcol_arrayref( $query_string, { MaxRows => $args{'max'} } );
+ return $list? @$list : ();
+}
+
=head2 items_array_ref
Return a reference to an array containing all objects found by this
diff --git a/t/02searches_distinct_values.t b/t/02searches_distinct_values.t
new file mode 100644
index 0000000..559badd
--- /dev/null
+++ b/t/02searches_distinct_values.t
@@ -0,0 +1,280 @@
+#!/usr/bin/env perl -w
+
+use strict;
+use warnings;
+
+use File::Spec;
+use Test::More;
+
+BEGIN { require "t/utils.pl" }
+our (@available_drivers);
+
+use constant TESTS_PER_DRIVER => 47;
+
+my $total = scalar(@available_drivers) * TESTS_PER_DRIVER;
+plan tests => $total;
+
+foreach my $d ( @available_drivers ) {
+SKIP: {
+ unless( has_schema( 'TestApp', $d ) ) {
+ skip "No schema for '$d' driver", TESTS_PER_DRIVER;
+ }
+ unless( should_test( $d ) ) {
+ skip "ENV is not defined for driver '$d'", TESTS_PER_DRIVER;
+ }
+
+ my $handle = get_handle( $d );
+ connect_handle( $handle );
+ isa_ok($handle->dbh, 'DBI::db');
+
+ my $ret = init_schema( 'TestApp', $handle );
+ isa_ok($ret, 'DBI::st', "Inserted the schema. got a statement handle back");
+
+ my $count_users = init_data( 'TestApp::User', $handle );
+ ok( $count_users, "init users data" );
+ my $count_groups = init_data( 'TestApp::Group', $handle );
+ ok( $count_groups, "init groups data" );
+ my $count_us2gs = init_data( 'TestApp::UserToGroup', $handle );
+ ok( $count_us2gs, "init users&groups relations data" );
+
+ my $clean_obj = TestApp::UserCollection->new( handle => $handle );
+ my $users_obj = $clean_obj->clone;
+ is_deeply( $users_obj, $clean_obj, 'after Clone looks the same');
+
+diag "distinct_column_values on clean" if $ENV{'TEST_VERBOSE'};
+{
+ is_deeply(
+ [sort $users_obj->distinct_column_values('country')],
+ [qw(br ru us)],
+ "full on non limitted collection"
+ );
+ is_deeply(
+ [$users_obj->distinct_column_values('country', sort => 'asc')],
+ [qw(br ru us)],
+ "sorting in DB"
+ );
+ is_deeply(
+ [$users_obj->distinct_column_values('country', sort => 'desc')],
+ [qw(us ru br)],
+ "reverse sorting in DB"
+ );
+ is_deeply(
+ [$users_obj->distinct_column_values('country', sort => 'desc', max => 2)],
+ [qw(us ru)],
+ "sorting and limitted"
+ );
+}
+
+
+ cleanup_schema( 'TestApp', $handle );
+}} # SKIP, foreach blocks
+
+1;
+
+
+package TestApp;
+sub schema_sqlite {
+[
+q{
+CREATE table users (
+ id integer primary key,
+ login varchar(36),
+ country varchar(36)
+) },
+q{
+CREATE table user_to_groups (
+ id integer primary key,
+ user_id integer,
+ group_id integer
+) },
+q{
+CREATE table groups (
+ id integer primary key,
+ name varchar(36)
+) },
+]
+}
+
+sub schema_mysql {
+[
+q{
+CREATE TEMPORARY table users (
+ id integer primary key AUTO_INCREMENT,
+ login varchar(36),
+ country varchar(36)
+) },
+q{
+CREATE TEMPORARY table user_to_groups (
+ id integer primary key AUTO_INCREMENT,
+ user_id integer,
+ group_id integer
+) },
+q{
+CREATE TEMPORARY table groups (
+ id integer primary key AUTO_INCREMENT,
+ name varchar(36)
+) },
+]
+}
+
+sub schema_pg {
+[
+q{
+CREATE TEMPORARY table users (
+ id serial primary key,
+ login varchar(36),
+ country varchar(36)
+) },
+q{
+CREATE TEMPORARY table user_to_groups (
+ id serial primary key,
+ user_id integer,
+ group_id integer
+) },
+q{
+CREATE TEMPORARY table groups (
+ id serial primary key,
+ name varchar(36)
+) },
+]
+}
+
+sub schema_oracle { [
+ "CREATE SEQUENCE users_seq",
+ "CREATE table users (
+ id integer CONSTRAINT users_Key PRIMARY KEY,
+ login varchar(36),
+ country varchar(36)
+ )",
+ "CREATE SEQUENCE user_to_groups_seq",
+ "CREATE table user_to_groups (
+ id integer CONSTRAINT user_to_groups_Key PRIMARY KEY,
+ user_id integer,
+ group_id integer
+ )",
+ "CREATE SEQUENCE groups_seq",
+ "CREATE table groups (
+ id integer CONSTRAINT groups_Key PRIMARY KEY,
+ name varchar(36)
+ )",
+] }
+
+sub cleanup_schema_oracle { [
+ "DROP SEQUENCE users_seq",
+ "DROP table users",
+ "DROP SEQUENCE groups_seq",
+ "DROP table groups",
+ "DROP SEQUENCE user_to_groups_seq",
+ "DROP table user_to_groups",
+] }
+
+package TestApp::User;
+
+use base qw/Jifty::DBI::Record/;
+
+BEGIN {
+use Jifty::DBI::Schema;
+use Jifty::DBI::Record schema {
+ column login => type is 'varchar(36)';
+ column country => type is 'varchar(36)';
+};
+}
+
+sub _init {
+ my $self = shift;
+ $self->table('users');
+ $self->SUPER::_init( @_ );
+}
+
+sub init_data {
+ return (
+ [ 'login', 'country' ],
+
+ [ 'ivan', 'ru' ],
+ [ 'john', 'us' ],
+ [ 'bob', 'us' ],
+ [ 'aurelia', 'br' ],
+ );
+}
+
+package TestApp::UserCollection;
+
+use base qw/Jifty::DBI::Collection/;
+
+sub _init {
+ my $self = shift;
+ $self->table('users');
+ return $self->SUPER::_init( @_ );
+}
+
+1;
+
+package TestApp::Group;
+
+use base qw/Jifty::DBI::Record/;
+
+BEGIN {
+use Jifty::DBI::Schema;
+use Jifty::DBI::Record schema {
+ column name => type is 'varchar(36)';
+};
+}
+
+sub _init {
+ my $self = shift;
+ $self->table('groups');
+ return $self->SUPER::_init( @_ );
+}
+
+sub init_data {
+ return (
+ [ 'name' ],
+
+ [ 'Developers' ],
+ [ 'Sales' ],
+ [ 'Support' ],
+ );
+}
+
+package TestApp::GroupCollection;
+
+use base qw/Jifty::DBI::Collection/;
+
+sub _init {
+ my $self = shift;
+ $self->table('groups');
+ return $self->SUPER::_init( @_ );
+}
+
+1;
+
+package TestApp::UserToGroup;
+
+use base qw/Jifty::DBI::Record/;
+
+BEGIN {
+use Jifty::DBI::Schema;
+use Jifty::DBI::Record schema {
+ column user_id => type is 'int(11)';
+ column group_id => type is 'int(11)';
+};
+}
+
+sub init_data {
+ return (
+ [ 'group_id', 'user_id' ],
+# dev group
+ [ 1, 1 ],
+ [ 1, 2 ],
+ [ 1, 4 ],
+# sales
+# [ 2, 0 ],
+# support
+ [ 3, 1 ],
+ );
+}
+
+package TestApp::UserToGroupCollection;
+use base qw/Jifty::DBI::Collection/;
+
+1;
-----------------------------------------------------------------------
More information about the Jifty-commit
mailing list