--- loncom/interface/lonmysql.pm 2003/12/26 19:12:51 1.16
+++ loncom/interface/lonmysql.pm 2004/08/20 01:27:05 1.24
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# MySQL utility functions
#
-# $Id: lonmysql.pm,v 1.16 2003/12/26 19:12:51 www Exp $
+# $Id: lonmysql.pm,v 1.24 2004/08/20 01:27:05 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -31,9 +31,25 @@ package Apache::lonmysql;
use strict;
use DBI;
-use Apache::lonnet();
use POSIX qw(strftime mktime);
+my $mysqluser;
+my $mysqlpassword;
+
+sub set_mysql_user_and_password {
+ # If we are running under Apache and LONCAPA, use the LON-CAPA
+ # user and password. Otherwise...? ? ? ?
+ ($mysqluser,$mysqlpassword) = @_;
+ if (! defined($mysqluser) || ! defined($mysqlpassword)) {
+ if (! eval 'require Apache::lonnet();') {
+ $mysqluser = 'www';
+ $mysqlpassword = $Apache::lonnet::perlvar{'lonSqlAccess'};
+ } else {
+ $mysqluser = '';
+ $mysqlpassword = '';
+ }
+ }
+}
######################################################################
######################################################################
@@ -330,8 +346,10 @@ connection is established.
###############################
sub connect_to_db {
return 1 if ($dbh);
- if (! ($dbh = DBI->connect("DBI:mysql:loncapa","www",
- $Apache::lonnet::perlvar{'lonSqlAccess'},
+ if (! defined($mysqluser) || ! defined($mysqlpassword)) {
+ &set_mysql_user_and_password();
+ }
+ if (! ($dbh = DBI->connect("DBI:mysql:loncapa",$mysqluser,$mysqlpassword,
{ RaiseError=>0,PrintError=>0}))) {
$debugstring = "Unable to connect to loncapa database.";
if (! defined($dbh)) {
@@ -363,9 +381,12 @@ initialize anything in the lonmysql pack
###############################
sub verify_sql_connection {
+ if (! defined($mysqluser) || ! defined($mysqlpassword)) {
+ &set_mysql_user_and_password();
+ }
my $connection;
- if (! ($connection = DBI->connect("DBI:mysql:loncapa","www",
- $Apache::lonnet::perlvar{'lonSqlAccess'},
+ if (! ($connection = DBI->connect("DBI:mysql:loncapa",
+ $mysqluser,$mysqlpassword,
{ RaiseError=>0,PrintError=>0}))) {
return 0;
}
@@ -559,6 +580,27 @@ sub update_table_info {
$debugstring = "Retrieved table info for $tablename";
return 1;
}
+###############################
+
+=pod
+
+=item &col_order()
+
+Inputs: table id
+
+Returns: array with column order
+
+=cut
+
+
+sub col_order {
+ my $table_id=shift;
+ if (&update_table_info($table_id)) {
+ return @{$Tables{$table_id}->{'Col_order'}};
+ } else {
+ return ();
+ }
+}
###############################
@@ -567,9 +609,41 @@ sub update_table_info {
=item &create_table()
Inputs:
- table description
+ table description, see &build_table_creation_request
+Returns:
+ undef on error, table id on success.
-Input formats:
+=cut
+
+###############################
+sub create_table {
+ return undef if (!defined(&connect_to_db($dbh)));
+ my ($table_des)=@_;
+ my ($request,$table_id) = &build_table_creation_request($table_des);
+ #
+ # Execute the request to create the table
+ #############################################
+ my $count = $dbh->do($request);
+ if (! defined($count)) {
+ $errorstring = "$dbh ATTEMPTED:\n".$request."\nRESULTING ERROR:\n".
+ $dbh->errstr();
+ return undef;
+ }
+ my $tablename = &translate_id($table_id);
+ delete($Tables{$tablename}) if (exists($Tables{$tablename}));
+ return undef if (! defined(&update_table_info($table_id)));
+ $debugstring = "Created table $tablename at time ".time.
+ " with request\n$request";
+ return $table_id;
+}
+
+###############################
+
+=pod
+
+=item build_table_creation_request
+
+Input: table description
table description = {
permanent => 'yes' or 'no',
@@ -601,14 +675,12 @@ Input formats:
}
-Returns:
- undef on error, table id on success.
+Returns: scalar string containing mysql commands to create the table
=cut
###############################
-sub create_table {
- return undef if (!defined(&connect_to_db($dbh)));
+sub build_table_creation_request {
my ($table_des)=@_;
#
# Build request to create table
@@ -689,22 +761,7 @@ sub create_table {
$request.="COMMENT = 'temporary' ";
}
$request .= "TYPE=MYISAM";
- #
- # Execute the request to create the table
- #############################################
- my $count = $dbh->do($request);
- if (! defined($count)) {
- $errorstring = "$dbh ATTEMPTED:\n".$request."\nRESULTING ERROR:\n";
- return undef;
- }
- #
- # Set up the internal bookkeeping
- #############################################
- delete($Tables{$tablename}) if (exists($Tables{$tablename}));
- return undef if (! defined(&update_table_info($table_id)));
- $debugstring = "Created table $tablename at time ".time.
- " with request\n$request";
- return $table_id;
+ return $request,$table_id;
}
###############################
@@ -835,6 +892,58 @@ sub store_row {
return 1;
}
+
+###############################
+
+=pod
+
+=item &bulk_store_rows()
+
+Inputs: table id, [columns],[[row data1].[row data2],...]
+
+returns undef on error, 1 on success.
+
+=cut
+
+###############################
+sub bulk_store_rows {
+ my ($table_id,$columns,$rows) = @_;
+ #
+ return undef if (! defined(&connect_to_db()));
+ my $dbh = &get_dbh();
+ return undef if (! defined($dbh));
+ my $table_status = &check_table($table_id);
+ return undef if (! defined($table_status));
+ if (! $table_status) {
+ $errorstring = "table $table_id does not exist.";
+ return undef;
+ }
+ #
+ my $tablename = &translate_id($table_id);
+ #
+ my $request = 'INSERT IGNORE INTO '.$tablename.' ';
+ if (defined($columns) && ref($columns) eq 'ARRAY') {
+ $request .= join(',',@$columns).' ';
+ }
+ if (! defined($rows) || ref($rows) ne 'ARRAY') {
+ $errorstring = "no input rows given.";
+ return undef;
+ }
+ $request .= 'VALUES ';
+ foreach my $row (@$rows) {
+ # avoid doing row stuff here...
+ $request .= '('.join(',',@$row).'),';
+ }
+ $request =~ s/,$//;
+ $dbh->do($request);
+ if ($dbh->err) {
+ $errorstring = 'Attempted '.$/.$request.$/.'Got error '.$dbh->errstr();
+ return undef;
+ }
+ return 1;
+}
+
+
###############################
=pod
@@ -912,18 +1021,20 @@ sub tables_in_db {
return undef if (!defined(&connect_to_db()));
my $sth=$dbh->prepare('SHOW TABLES');
$sth->execute();
- if ($sth->err) {
- $errorstring = "$dbh ATTEMPTED:\n".'SHOW TABLES'.
+ $sth->execute();
+ my $aref = $sth->fetchall_arrayref;
+ if ($sth->err()) {
+ $errorstring =
+ "$dbh ATTEMPTED:\n".'fetchall_arrayref after SHOW TABLES'.
"\nRESULTING ERROR:\n".$sth->errstr;
return undef;
}
- my $aref = $sth->fetchall_arrayref;
- my @table_list=();
+ my @table_list;
foreach (@$aref) {
- push @table_list,$_->[0];
+ push(@table_list,$_->[0]);
}
- $debugstring = "Got list of tables in DB: @table_list";
- return @table_list;
+ $debugstring = "Got list of tables in DB: ".join(',',@table_list);
+ return(@table_list);
}
###########################################
@@ -1002,11 +1113,10 @@ sub remove_from_table {
return undef if (!defined(&connect_to_db()));
#
$table_id = &translate_id($table_id);
- my $command = 'DELETE FROM '.$table_id.' WHERE '.$dbh->quote($column).
+ my $command = 'DELETE FROM '.$table_id.' WHERE '.$column.
" LIKE BINARY ".$dbh->quote($value);
my $sth = $dbh->prepare($command);
- $sth->execute();
- if ($sth->err) {
+ unless ($sth->execute()) {
$errorstring = "ERROR on execution of ".$command."\n".$sth->errstr;
return undef;
}