Author: spadkins
Date: Mon Apr 21 14:41:42 2008
New Revision: 11130
Modified:
p5ee/trunk/App-Repository/lib/App/Repository/DBI.pm
Log:
rolling back the realtable changes
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 Mon Apr 21
14:41:42 2008
@[EMAIL PROTECTED]
-901,9 +901,7 @[EMAIL PROTECTED]
$direction = $options->{direction} || $options->{directions}; #
{directions} is deprecated
my $modifier = $options->{distinct} ? " distinct" : "";
- my $table_def = $self->get_table_def($table);
- my $realtable = $table_def->{table} || $table;
- $sql = "select$modifier\n " . join(",\n ", @[EMAIL PROTECTED]
) . "\nfrom
$realtable\n";
+ $sql = "select$modifier\n " . join(",\n ", @[EMAIL PROTECTED]
) . "\nfrom
$table\n";
$sql .= $self->_mk_where_clause($table, $params);
if (defined $order_by && $#$order_by > -1) {
@[EMAIL PROTECTED]
-1722,11 +1720,9 @[EMAIL PROTECTED]
$self->{error} = "Database->_mk_insert_row_sql(): no columns
specified";
return();
}
- my $table_def = $self->get_table_def($table);
- my $tabcols = $table_def->{column};
+ my $tabcols = $self->{table}{$table}{column};
- my $realtable = $table_def->{table} || $table;
- $sql = "insert into $realtable\n";
+ $sql = "insert into $table\n";
$values = "values\n";
for ($colnum = 0; $colnum <= $#$cols; $colnum++) {
$col = $cols->[$colnum];
@[EMAIL PROTECTED]
-1804,9 +1800,7 @[EMAIL PROTECTED]
}
}
}
- my $table_def = $self->get_table_def($table);
- my $realtable = $table_def->{table} || $table;
- my $sql = "insert into $realtable\n (" . join(",\n ",@[EMAIL PROTECTED]
) .
")\nvalues\n (" . join(@[EMAIL PROTECTED]
) . ")\n";
+ my $sql = "insert into $table\n (" . join(",\n ",@[EMAIL PROTECTED]
) .
")\nvalues\n (" . join(@[EMAIL PROTECTED]
) . ")\n";
&App::sub_exit($sql) if ($App::trace);
$sql;
}
@[EMAIL PROTECTED]
-1942,9 +1936,7 @[EMAIL PROTECTED]
}
}
- my $table_def = $self->get_table_def($table);
- my $realtable = $table_def->{table} || $table;
- my $sql = "update $realtable set\n " . join(",\n ",@[EMAIL PROTECTED]
) . "\n" .
$where;
+ my $sql = "update $table set\n " . join(",\n ",@[EMAIL PROTECTED]
) . "\n" .
$where;
&App::sub_exit($sql) if ($App::trace);
$sql;
}
@[EMAIL PROTECTED]
-2046,9 +2038,7 @[EMAIL PROTECTED]
die "_mk_delete_sql() unrecognized params type";
}
- my $table_def = $self->get_table_def($table);
- my $realtable = $table_def->{table} || $table;
- my $sql = "delete from $realtable\n$where";
+ my $sql = "delete from $table\n$where";
&App::sub_exit($sql) if ($App::trace);
$sql;
}
@[EMAIL PROTECTED]
-2070,9 +2060,7 @[EMAIL PROTECTED]
$colused[$#$cols] = 0; # pre-extend the array
- my $table_def = $self->get_table_def($table);
- my $realtable = $table_def->{table} || $table;
- $sql = "delete from $realtable\n";
+ $sql = "delete from $table\n";
if (defined $keycolidx && $#$keycolidx > -1) {
for ($i = 0; $i <= $#$keycolidx; $i++) {
@[EMAIL PROTECTED]
-2111,9 +2099,7 @[EMAIL PROTECTED]
$self->_load_table_metadata($table) if (!defined
$self->{table}{$table}{loaded});
my ($sql);
- my $table_def = $self->get_table_def($table);
- my $realtable = $table_def->{table} || $table;
- $sql = "delete from $realtable\n";
+ $sql = "delete from $table\n";
$sql .= $self->_mk_where_clause($table, $params);
&App::sub_exit($sql) if ($App::trace);
$sql;
|
