cvsuser     05/04/25 09:20:26

  Modified:    App-Repository/t DBI-connect.t DBI-delete.t DBI-getset.t
                        DBI-insert.t DBI-metadata.t DBI-select.t
                        DBI-update.t
  Added:       App-Repository/t DBI-compress.t
  Log:
  removed hard-coded db user/pass combinations
  
  Revision  Changes    Path
  1.3       +18 -6     p5ee/App-Repository/t/DBI-connect.t
  
  Index: DBI-connect.t
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Repository/t/DBI-connect.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DBI-connect.t     2 Sep 2004 20:59:16 -0000       1.2
  +++ DBI-connect.t     25 Apr 2005 16:20:26 -0000      1.3
  @@ -1,5 +1,17 @@
   #!/usr/local/bin/perl -w
   
  +use App::Options (
  +    options => [qw(dbdriver dbclass dbhost dbname dbuser dbpass)],
  +    option => {
  +        dbclass  => { default => "App::Repository::MySQL", },
  +        dbdriver => { default => "mysql", },
  +        dbhost   => { default => "localhost", },
  +        dbname   => { default => "test", },
  +        dbuser   => { default => "scott", },
  +        dbpass   => { default => "tiger", },
  +    },
  +);
  +
   use Test::More qw(no_plan);
   use lib "../App-Context/lib";
   use lib "../../App-Context/lib";
  @@ -18,12 +30,12 @@
           conf => {
               Repository => {
                   default => {
  -                    class => "App::Repository::MySQL",
  -                    dbidriver => "mysql",
  -                    dbhost => "frento",
  -                    dbname => "test",
  -                    dbuser => "dbuser",
  -                    dbpass => "dbuser7",
  +                    class => $App::options{dbclass},
  +                    dbdriver => $App::options{dbdriver},
  +                    dbhost => $App::options{dbhost},
  +                    dbname => $App::options{dbname},
  +                    dbuser => $App::options{dbuser},
  +                    dbpass => $App::options{dbpass},
                   },
               },
           },
  
  
  
  1.5       +18 -6     p5ee/App-Repository/t/DBI-delete.t
  
  Index: DBI-delete.t
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Repository/t/DBI-delete.t,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DBI-delete.t      2 Sep 2004 20:59:16 -0000       1.4
  +++ DBI-delete.t      25 Apr 2005 16:20:26 -0000      1.5
  @@ -1,5 +1,17 @@
   #!/usr/local/bin/perl -w
   
  +use App::Options (
  +    options => [qw(dbdriver dbclass dbhost dbname dbuser dbpass)],
  +    option => {
  +        dbclass  => { default => "App::Repository::MySQL", },
  +        dbdriver => { default => "mysql", },
  +        dbhost   => { default => "localhost", },
  +        dbname   => { default => "test", },
  +        dbuser   => { default => "scott", },
  +        dbpass   => { default => "tiger", },
  +    },
  +);
  +
   use Test::More qw(no_plan);
   use lib "../App-Context/lib";
   use lib "../../App-Context/lib";
  @@ -15,12 +27,12 @@
     conf => {
       Repository => {
         default => {
  -        class => "App::Repository::MySQL",
  -        dbidriver => "mysql",
  -        dbhost => "frento",
  -        dbname => "test",
  -        dbuser => "dbuser",
  -        dbpass => "dbuser7",
  +        class => $App::options{dbclass},
  +        dbdriver => $App::options{dbdriver},
  +        dbhost => $App::options{dbhost},
  +        dbname => $App::options{dbname},
  +        dbuser => $App::options{dbuser},
  +        dbpass => $App::options{dbpass},
           table => {
             test_person => {
               alias => "tp",
  
  
  
  1.7       +18 -6     p5ee/App-Repository/t/DBI-getset.t
  
  Index: DBI-getset.t
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Repository/t/DBI-getset.t,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DBI-getset.t      2 Mar 2005 17:20:06 -0000       1.6
  +++ DBI-getset.t      25 Apr 2005 16:20:26 -0000      1.7
  @@ -1,5 +1,17 @@
   #!/usr/local/bin/perl -w
   
  +use App::Options (
  +    options => [qw(dbdriver dbclass dbhost dbname dbuser dbpass)],
  +    option => {
  +        dbclass  => { default => "App::Repository::MySQL", },
  +        dbdriver => { default => "mysql", },
  +        dbhost   => { default => "localhost", },
  +        dbname   => { default => "test", },
  +        dbuser   => { default => "scott", },
  +        dbpass   => { default => "tiger", },
  +    },
  +);
  +
   use Test::More qw(no_plan);
   use lib "../App-Context/lib";
   use lib "../../App-Context/lib";
  @@ -15,12 +27,12 @@
       conf => {
           Repository => {
               default => {
  -                class => "App::Repository::MySQL",
  -                dbidriver => "mysql",
  -                dbhost => "frento",
  -                dbname => "test",
  -                dbuser => "dbuser",
  -                dbpass => "dbuser7",
  +                class => $App::options{dbclass},
  +                dbdriver => $App::options{dbdriver},
  +                dbhost => $App::options{dbhost},
  +                dbname => $App::options{dbname},
  +                dbuser => $App::options{dbuser},
  +                dbpass => $App::options{dbpass},
                   table => {
                       test_person => {
                           primary_key => ["person_id"],
  
  
  
  1.4       +18 -6     p5ee/App-Repository/t/DBI-insert.t
  
  Index: DBI-insert.t
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Repository/t/DBI-insert.t,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DBI-insert.t      2 Nov 2004 16:45:53 -0000       1.3
  +++ DBI-insert.t      25 Apr 2005 16:20:26 -0000      1.4
  @@ -1,5 +1,17 @@
   #!/usr/local/bin/perl -w
   
  +use App::Options (
  +    options => [qw(dbdriver dbclass dbhost dbname dbuser dbpass)],
  +    option => {
  +        dbclass  => { default => "App::Repository::MySQL", },
  +        dbdriver => { default => "mysql", },
  +        dbhost   => { default => "localhost", },
  +        dbname   => { default => "test", },
  +        dbuser   => { default => "scott", },
  +        dbpass   => { default => "tiger", },
  +    },
  +);
  +
   use Test::More qw(no_plan);
   use lib "../App-Context/lib";
   use lib "../../App-Context/lib";
  @@ -15,12 +27,12 @@
       conf => {
           Repository => {
               default => {
  -                class => "App::Repository::MySQL",
  -                dbidriver => "mysql",
  -                dbhost => "frento",
  -                dbname => "test",
  -                dbuser => "dbuser",
  -                dbpass => "dbuser7",
  +                class => $App::options{dbclass},
  +                dbdriver => $App::options{dbdriver},
  +                dbhost => $App::options{dbhost},
  +                dbname => $App::options{dbname},
  +                dbuser => $App::options{dbuser},
  +                dbpass => $App::options{dbpass},
                   table => {
                       test_person => {
                           primary_key => ["person_id"],
  
  
  
  1.3       +18 -6     p5ee/App-Repository/t/DBI-metadata.t
  
  Index: DBI-metadata.t
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Repository/t/DBI-metadata.t,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DBI-metadata.t    2 Sep 2004 20:59:16 -0000       1.2
  +++ DBI-metadata.t    25 Apr 2005 16:20:26 -0000      1.3
  @@ -1,5 +1,17 @@
   #!/usr/local/bin/perl -w
   
  +use App::Options (
  +    options => [qw(dbdriver dbclass dbhost dbname dbuser dbpass)],
  +    option => {
  +        dbclass  => { default => "App::Repository::MySQL", },
  +        dbdriver => { default => "mysql", },
  +        dbhost   => { default => "localhost", },
  +        dbname   => { default => "test", },
  +        dbuser   => { default => "scott", },
  +        dbpass   => { default => "tiger", },
  +    },
  +);
  +
   use Test::More qw(no_plan);
   use lib "../App-Context/lib";
   use lib "../../App-Context/lib";
  @@ -15,12 +27,12 @@
       conf => {
           Repository => {
               default => {
  -                class => "App::Repository::MySQL",
  -                dbidriver => "mysql",
  -                dbhost => "frento",
  -                dbname => "test",
  -                dbuser => "dbuser",
  -                dbpass => "dbuser7",
  +                class => $App::options{dbclass},
  +                dbdriver => $App::options{dbdriver},
  +                dbhost => $App::options{dbhost},
  +                dbname => $App::options{dbname},
  +                dbuser => $App::options{dbuser},
  +                dbpass => $App::options{dbpass},
                   table => {
                       test_person2 => {
                           primary_key => "last_name,first_name",
  
  
  
  1.11      +18 -6     p5ee/App-Repository/t/DBI-select.t
  
  Index: DBI-select.t
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Repository/t/DBI-select.t,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DBI-select.t      5 Apr 2005 18:50:36 -0000       1.10
  +++ DBI-select.t      25 Apr 2005 16:20:26 -0000      1.11
  @@ -1,5 +1,17 @@
   #!/usr/local/bin/perl -w
   
  +use App::Options (
  +    options => [qw(dbdriver dbclass dbhost dbname dbuser dbpass)],
  +    option => {
  +        dbclass  => { default => "App::Repository::MySQL", },
  +        dbdriver => { default => "mysql", },
  +        dbhost   => { default => "localhost", },
  +        dbname   => { default => "test", },
  +        dbuser   => { default => "scott", },
  +        dbpass   => { default => "tiger", },
  +    },
  +);
  +
   use Test::More qw(no_plan);
   use lib "../App-Context/lib";
   use lib "../../App-Context/lib";
  @@ -15,12 +27,12 @@
       conf => {
           Repository => {
               default => {
  -                class => "App::Repository::MySQL",
  -                dbidriver => "mysql",
  -                dbhost => "frento",
  -                dbname => "test",
  -                dbuser => "dbuser",
  -                dbpass => "dbuser7",
  +                class => $App::options{dbclass},
  +                dbdriver => $App::options{dbdriver},
  +                dbhost => $App::options{dbhost},
  +                dbname => $App::options{dbname},
  +                dbuser => $App::options{dbuser},
  +                dbpass => $App::options{dbpass},
                   table => {
                       test_person => {
                           primary_key => ["person_id"],
  
  
  
  1.4       +18 -6     p5ee/App-Repository/t/DBI-update.t
  
  Index: DBI-update.t
  ===================================================================
  RCS file: /cvs/public/p5ee/App-Repository/t/DBI-update.t,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DBI-update.t      7 Jan 2005 13:37:40 -0000       1.3
  +++ DBI-update.t      25 Apr 2005 16:20:26 -0000      1.4
  @@ -1,5 +1,17 @@
   #!/usr/local/bin/perl -w
   
  +use App::Options (
  +    options => [qw(dbdriver dbclass dbhost dbname dbuser dbpass)],
  +    option => {
  +        dbclass  => { default => "App::Repository::MySQL", },
  +        dbdriver => { default => "mysql", },
  +        dbhost   => { default => "localhost", },
  +        dbname   => { default => "test", },
  +        dbuser   => { default => "scott", },
  +        dbpass   => { default => "tiger", },
  +    },
  +);
  +
   use Test::More qw(no_plan);
   use lib "../App-Context/lib";
   use lib "../../App-Context/lib";
  @@ -15,12 +27,12 @@
       conf => {
           Repository => {
               default => {
  -                class => "App::Repository::MySQL",
  -                dbidriver => "mysql",
  -                dbhost => "frento",
  -                dbname => "test",
  -                dbuser => "dbuser",
  -                dbpass => "dbuser7",
  +                class => $App::options{dbclass},
  +                dbdriver => $App::options{dbdriver},
  +                dbhost => $App::options{dbhost},
  +                dbname => $App::options{dbname},
  +                dbuser => $App::options{dbuser},
  +                dbpass => $App::options{dbpass},
                   table => {
                       test_person => {
                           primary_key => ["person_id"],
  
  
  
  1.1                  p5ee/App-Repository/t/DBI-compress.t
  
  Index: DBI-compress.t
  ===================================================================
  #!/usr/local/bin/perl -w
  
  use App::Options (
      options => [qw(dbdriver dbclass dbhost dbname dbuser dbpass)],
      option => {
          dbclass  => { default => "App::Repository::MySQL", },
          dbdriver => { default => "mysql", },
          dbhost   => { default => "localhost", },
          dbname   => { default => "test", },
          dbuser   => { default => "scott", },
          dbpass   => { default => "tiger", },
      },
  );
  
  use Test::More qw(no_plan);
  use lib "../App-Context/lib";
  use lib "../../App-Context/lib";
  use lib "lib";
  use lib "../lib";
  
  use App;
  use App::Repository;
  use strict;
  
  my $context = App->context(
      %App::options,
      conf_file => "",
      conf => {
          Repository => {
              default => {
                  class => $App::options{dbclass},
                  dbdriver => $App::options{dbdriver},
                  dbhost => $App::options{dbhost},
                  dbname => $App::options{dbname},
                  dbuser => $App::options{dbuser},
                  dbpass => $App::options{dbpass},
                  table => {
                      test_person => {
                          primary_key => ["person_id"],
                          column => {
                              data => {
                                  dbexpr => "ifnull(uncompress(data),data)",
                                  dbexpr_update => "compress(%s)",
                              },
                          },
                      },
                  },
              },
          },
      },
  );
  
  my $rep = $context->repository();
  
  #cheating... I know its a DBI, but I have to set up the test somehow
  my $dbh     = $rep->{dbh};
  eval { $dbh->do("drop table test_person"); };
  my $ddl     = <<EOF;
  create table test_person (
      person_id          integer      not null auto_increment primary key,
      first_name         varchar(99)  null,
      last_name          varchar(99)  null,
      address            varchar(99)  null,
      city               varchar(99)  null,
      state              varchar(99)  null,
      zip                varchar(10)  null,
      country            char(2)      null,
      home_phone         varchar(99)  null,
      work_phone         varchar(99)  null,
      email_address      varchar(99)  null,
      gender             char(1)      null,
      birth_dt           date         null,
      age                integer      null,
      data               blob         null,
      index person_ie1 (last_name, first_name)
  )
  EOF
  $dbh->do($ddl);
  
  my $columns = [ "person_id", "age", "first_name", "gender", "state", 
"birth_dt", "data" ];
  my $rows = [
      [ 1, 39, "stephen",   "M", "GA", "1962-01-01", "Temperament: 
Goofy\nTalent: Minimal"],
      [ 2, 37, "susan",     "F", "GA", "1964-08-08", "Temperament: 
Organized\nHobby: Not Camping"],
      [ 3,  6, "maryalice", "F", "GA", "1996-07-07", "Temperament: 
Adventurous"],
      [ 4,  3, "paul",      "M", "GA", "1999-04-04", "Temperament: 
Enthusiastic\nToy: Game Boy"],
      [ 5,  1, "christine", "F", "GA", "2000-05-05", "Temperament: Friendly"],
      [ 6, 45, "tim",       "M", "GA", "1956-02-02", "Temperament: Gregarious"],
      [ 7, 39, "keith",     "M", "GA", "1962-03-03", "Temperament: Inspired"],
  ];
  
  my ($nrows);
  eval {
      $nrows = $rep->set_rows("test_person", undef, $columns, $rows, 
{create=>1});
  };
  ok(!$@, "set_rows() [test_person]");
  is($nrows, 7, "set_rows() [test_person]: wrote 7 rows");
  
  my $hash = $rep->get_hash("test_person",{first_name=>"stephen"});
  is($hash->{data}, "Temperament: Goofy\nTalent: Minimal", "get(data) ok");
  
  my ($data1, $data2);
  $data1 = "ouch!\nouch!";
  $nrows = 
$rep->set("test_person",{first_name=>"stephen"},"data","ouch!\nouch!");
  is($nrows, 1, "set() data");
  $data2 = $rep->get("test_person",{first_name=>"stephen"},"data");
  is($data2, $data1, "get() data");
  
  exit 0;
  
  
  
  

Reply via email to