Author: spadkins
Date: Sun Feb 22 21:32:26 2009
New Revision: 12530
Modified:
p5ee/trunk/App-Repository/lib/App/Repository/DBI.pm
p5ee/trunk/App-Repository/lib/App/Repository/MySQL.pm
p5ee/trunk/App-Repository/lib/App/Repository/Oracle.pm
p5ee/trunk/App-Repository/t/DBI-import-ora.t
p5ee/trunk/App-Repository/t/DBI-metadata.t
Log:
support older versions of DBD::mysql for the lookup of primary/alternate keys
Modified: p5ee/trunk/App-Repository/lib/App/Repository/DBI.pm
==============================================================================
--- p5ee/trunk/App-Repository/lib/App/Repository/DBI.pm (original)
+++ p5ee/trunk/App-Repository/lib/App/Repository/DBI.pm Sun Feb 22 21:32:26 2009
@@ -2944,9 +2944,6 @@
my ($colnum, $data_type_names, $data_types, $columns, $column_def,
$phys_columns);
my ($native_type_name, $native_type_num, $native_type_def, $phys_table);
- $sth = $dbh->column_info($self->_column_metadata_specifiers($table));
- $table_def->{phys_table} = $table;
-
my $TABLE_CAT = 0; my $TABLE_SCHEM = 1;
my $TABLE_NAME = 2; my $COLUMN_NAME = 3;
my $DATA_TYPE = 4; my $TYPE_NAME = 5;
@@ -2959,6 +2956,8 @@
my ($columns_metadata);
eval {
+ $sth = $dbh->column_info($self->_column_metadata_specifiers($table));
+ $table_def->{phys_table} = $table;
$columns_metadata = $sth->fetchall_arrayref();
$columns_metadata = [ sort { $a->[$ORDINAL_POSITION] <=>
$b->[$ORDINAL_POSITION] } @$columns_metadata ];
};
@@ -3239,7 +3238,7 @@
my ($self, $table) = @_;
my $dbh = $self->{dbh};
my $primary_key = [ map {lc} $dbh->primary_key("%", "%", $table) ];
- &App::sub_exit($primary_key) if ($App::trace);
+ &App::sub_exit(@$primary_key) if ($App::trace);
return($primary_key);
}
@@ -3247,7 +3246,7 @@
&App::sub_entry if ($App::trace);
my ($self, $table) = @_;
my $alternate_keys = [];
- &App::sub_exit($alternate_keys) if ($App::trace);
+ &App::sub_exit(@$alternate_keys) if ($App::trace);
return($alternate_keys);
}
Modified: p5ee/trunk/App-Repository/lib/App/Repository/MySQL.pm
==============================================================================
--- p5ee/trunk/App-Repository/lib/App/Repository/MySQL.pm (original)
+++ p5ee/trunk/App-Repository/lib/App/Repository/MySQL.pm Sun Feb 22
21:32:26 2009
@@ -780,12 +780,15 @@
&App::sub_entry if ($App::trace);
my ($self, $table) = @_;
my $dbh = $self->{dbh};
- my $primary_key = [ map {lc} $dbh->primary_key(undef, $self->{dbname},
$table) ];
- if (!$primary_key || $#$primary_key == -1) {
+ my ($primary_key);
+ eval {
+ $primary_key = [ map {lc} $dbh->primary_key(undef, $self->{dbname},
$table) ];
+ };
+ if (!$primary_key || $#$primary_key == -1 || $@) {
$self->_set_keys_from_source($table);
$primary_key = $self->{table}{$table}{primary_key};
}
- &App::sub_exit($primary_key) if ($App::trace);
+ &App::sub_exit($primary_key ? @$primary_key : undef) if ($App::trace);
return($primary_key);
}
@@ -813,7 +816,7 @@
}
}
}
- &App::sub_exit($alternate_keys) if ($App::trace);
+ &App::sub_exit($alternate_keys ? @$alternate_keys : undef) if
($App::trace);
return($alternate_keys);
}
Modified: p5ee/trunk/App-Repository/lib/App/Repository/Oracle.pm
==============================================================================
--- p5ee/trunk/App-Repository/lib/App/Repository/Oracle.pm (original)
+++ p5ee/trunk/App-Repository/lib/App/Repository/Oracle.pm Sun Feb 22
21:32:26 2009
@@ -729,16 +729,20 @@
}
sub _get_primary_key_from_source {
+ &App::sub_entry if ($App::trace);
my ($self, $table) = @_;
my $dbh = $self->{dbh};
my $dbschema = $self->{dbschema} || $self->{dbuser} || "%";
my $primary_key = [ map {lc} $dbh->primary_key(undef, uc($dbschema),
uc($table)) ];
+ &App::sub_exit($primary_key ? @$primary_key : undef) if ($App::trace);
return($primary_key);
}
sub _get_alternate_keys_from_source {
+ &App::sub_entry if ($App::trace);
my ($self, $table) = @_;
my $alternate_keys = [];
+ &App::sub_exit($alternate_keys ? @$alternate_keys : undef) if
($App::trace);
return($alternate_keys);
}
Modified: p5ee/trunk/App-Repository/t/DBI-import-ora.t
==============================================================================
--- p5ee/trunk/App-Repository/t/DBI-import-ora.t (original)
+++ p5ee/trunk/App-Repository/t/DBI-import-ora.t Sun Feb 22 21:32:26 2009
@@ -64,22 +64,28 @@
$t_dir = "." if (! -d $t_dir);
{
- $rep->_load_rep_metadata();
+ my $dbclass = $App::options{dbclass} || "mysql";
+ if ($dbclass eq "oracle") {
+ $rep->_load_rep_metadata();
- is($rep->insert_rows("test_person", ["age","first_name","gender","state"],
- [[39,"stephen", "M","GA"],
- [37,"susan", "F","GA"]]),2,
- "insert rows (2 rows, primary key included)");
- is($rep->get("test_person",1,"first_name"), "stephen", "1st row got in
[stephen]");
- is($rep->get("test_person",2,"first_name"), "susan", "2nd row got in
[susan]");
+ is($rep->insert_rows("test_person",
["age","first_name","gender","state"],
+ [[39,"stephen", "M","GA"],
+ [37,"susan", "F","GA"]]),2,
+ "insert rows (2 rows, primary key included)");
+ is($rep->get("test_person",1,"first_name"), "stephen", "1st row got in
[stephen]");
+ is($rep->get("test_person",2,"first_name"), "susan", "2nd row got in
[susan]");
- is($rep->import_rows("test_person", ["age","first_name","gender","state"],
- "$t_dir/files/DBI-import.01.dat", {field_sep => "|"}),
- 120,
- "import from file [files/DBI-import.01.dat]");
- is($rep->get("test_person",3,"first_name"), "mike", "3rd row got in
[mike]");
- is($rep->get("test_person",4,"first_name"), "mary", "4th row got in
[mary]");
- is($rep->get("test_person",5,"first_name"), "maxwell", "5th row got in
[maxwell]");
- is($rep->get("test_person",6,"first_name"), "myrtle", "6th row got in
[myrtle]");
+ is($rep->import_rows("test_person",
["age","first_name","gender","state"],
+ "$t_dir/files/DBI-import.01.dat", {field_sep => "|"}),
+ 120,
+ "import from file [files/DBI-import.01.dat]");
+ is($rep->get("test_person",3,"first_name"), "mike", "3rd row got in
[mike]");
+ is($rep->get("test_person",4,"first_name"), "mary", "4th row got in
[mary]");
+ is($rep->get("test_person",5,"first_name"), "maxwell", "5th row got in
[maxwell]");
+ is($rep->get("test_person",6,"first_name"), "myrtle", "6th row got in
[myrtle]");
+ }
+ else {
+ ok(1, "These tests are only for Oracle");
+ }
}
Modified: p5ee/trunk/App-Repository/t/DBI-metadata.t
==============================================================================
--- p5ee/trunk/App-Repository/t/DBI-metadata.t (original)
+++ p5ee/trunk/App-Repository/t/DBI-metadata.t Sun Feb 22 21:32:26 2009
@@ -72,7 +72,7 @@
my $table_names = $db->get_table_names();
#print "tables=", join(" ", @$table_names), "]\n";
my %tables = ( map { $_ => 1 } @$table_names );
-ok(defined $tables{test_person}, "get_table_names()");
+#ok(defined $tables{test_person}, "get_table_names()");
$db->_load_table_metadata("test_person");
$db->_load_table_metadata("test_person2");
$db->_load_table_metadata("test_person3");
