--- loncom/interface/lonmysql.pm 2004/08/20 01:27:05 1.24
+++ loncom/interface/lonmysql.pm 2005/08/24 19:21:05 1.34
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# MySQL utility functions
#
-# $Id: lonmysql.pm,v 1.24 2004/08/20 01:27:05 matthew Exp $
+# $Id: lonmysql.pm,v 1.34 2005/08/24 19:21:05 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,14 +32,23 @@ package Apache::lonmysql;
use strict;
use DBI;
use POSIX qw(strftime mktime);
+use Apache::lonnet;
my $mysqluser;
my $mysqlpassword;
+my $mysqldatabase;
+my %db_config;
sub set_mysql_user_and_password {
# If we are running under Apache and LONCAPA, use the LON-CAPA
# user and password. Otherwise...? ? ? ?
- ($mysqluser,$mysqlpassword) = @_;
+ my ($input_mysqluser,$input_mysqlpassword,$input_mysqldatabase) = @_;
+ if (! defined($mysqldatabase)) {
+ $mysqldatabase = 'loncapa';
+ }
+ if (defined($input_mysqldatabase)) {
+ $mysqldatabase = $input_mysqldatabase;
+ }
if (! defined($mysqluser) || ! defined($mysqlpassword)) {
if (! eval 'require Apache::lonnet();') {
$mysqluser = 'www';
@@ -49,6 +58,12 @@ sub set_mysql_user_and_password {
$mysqlpassword = '';
}
}
+ if (defined($input_mysqluser)) {
+ $mysqluser = $input_mysqluser;
+ }
+ if (defined($input_mysqlpassword)) {
+ $mysqlpassword = $input_mysqlpassword;
+ }
}
######################################################################
@@ -76,7 +91,7 @@ Each table has a numeric ID that is a pa
The table id is returned by &create_table.
If you lose the table id, it is lost forever.
The table names in MySQL correspond to
-$ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.$table_id. If the table id
+$env{'user.name'}.'_'.$env{'user.domain'}.'_'.$table_id. If the table id
is non-numeric, it is assumed to be the full name of a table. If you pass
the table id in a form, you MUST ensure that what you send to lonmysql is
numeric, otherwise you are opening up all the tables in the MySQL database.
@@ -349,7 +364,7 @@ sub connect_to_db {
if (! defined($mysqluser) || ! defined($mysqlpassword)) {
&set_mysql_user_and_password();
}
- if (! ($dbh = DBI->connect("DBI:mysql:loncapa",$mysqluser,$mysqlpassword,
+ if (! ($dbh = DBI->connect("DBI:mysql:$mysqldatabase",$mysqluser,$mysqlpassword,
{ RaiseError=>0,PrintError=>0}))) {
$debugstring = "Unable to connect to loncapa database.";
if (! defined($dbh)) {
@@ -361,6 +376,22 @@ sub connect_to_db {
return undef;
}
$debugstring = "Successfully connected to loncapa database.";
+ # Determine DB configuration
+ undef(%db_config);
+ my $sth = $dbh->prepare("SHOW VARIABLES");
+ $sth->execute();
+ if ($sth->err()) {
+ $debugstring = "Unable to retrieve db config variables";
+ return undef;
+ }
+ foreach my $row (@{$sth->fetchall_arrayref}) {
+ $db_config{$row->[0]} = $row->[1];
+ }
+ #&Apache::lonnet::logthis("MySQL configuration variables");
+ #while (my ($k,$v) = each(%db_config)) {
+ # &Apache::lonnet::logthis(" '$k' => '$v'");
+ #}
+ #
return 1;
}
@@ -540,10 +571,19 @@ sub update_table_info {
#
# Get MySQLs table status information.
#
- my @tabledesc = qw/
- Name Type Row_format Rows Avg_row_length Data_length
+ my @tabledesc;
+ my ($major_version) = ($db_config{'version'} =~ /^(\d)\./);
+ if ($major_version <= 3) {
+ @tabledesc = qw/
+ Name Type Row_format Rows Avg_row_length Data_length
Max_data_length Index_length Data_free Auto_increment
- Create_time Update_time Check_time Create_options Comment /;
+ Create_time Update_time Check_time Create_options Comment/;
+ } else { # At least 4 has this structure...
+ @tabledesc = qw/
+ Name Engine Version Row_format Rows Avg_row_length Data_length
+ Max_data_length Index_length Data_free Auto_increment Create_time
+ Update_time Check_time Collation Checksum Create_options Comment/;
+ }
my $db_command = "SHOW TABLE STATUS FROM loncapa LIKE '$tablename'";
my $sth = $dbh->prepare($db_command);
$sth->execute();
@@ -556,7 +596,12 @@ sub update_table_info {
#
my @info=$sth->fetchrow_array;
for (my $i=0;$i<= $#info ; $i++) {
- $Tables{$tablename}->{$tabledesc[$i]}= $info[$i];
+ if ($tabledesc[$i] !~ /^(Create_|Update_|Check_)time$/) {
+ $Tables{$tablename}->{$tabledesc[$i]}=
+ &unsqltime($info[$i]);
+ } else {
+ $Tables{$tablename}->{$tabledesc[$i]}= $info[$i];
+ }
}
#
# Determine the column order
@@ -580,6 +625,29 @@ sub update_table_info {
$debugstring = "Retrieved table info for $tablename";
return 1;
}
+
+###############################
+
+=pod
+
+=item &table_information()
+
+Inputs: table id
+
+Returns: hash with the table status
+
+=cut
+
+###############################
+sub table_information {
+ my $table_id=shift;
+ if (&update_table_info($table_id)) {
+ return %{$Tables{$table_id}};
+ } else {
+ return ();
+ }
+}
+
###############################
=pod
@@ -592,7 +660,7 @@ Returns: array with column order
=cut
-
+###############################
sub col_order {
my $table_id=shift;
if (&update_table_info($table_id)) {
@@ -779,7 +847,7 @@ sub get_new_table_id {
my $newid = 0;
my @tables = &tables_in_db();
foreach (@tables) {
- if (/^$ENV{'user.name'}_$ENV{'user.domain'}_(\d+)$/) {
+ if (/^$env{'user.name'}_$env{'user.domain'}_(\d+)$/) {
$newid = $1 if ($1 > $newid);
}
}
@@ -935,6 +1003,7 @@ sub bulk_store_rows {
$request .= '('.join(',',@$row).'),';
}
$request =~ s/,$//;
+ # $debugstring = "Executed ".$/.$request; # commented out - this is big
$dbh->do($request);
if ($dbh->err) {
$errorstring = 'Attempted '.$/.$request.$/.'Got error '.$dbh->errstr();
@@ -1057,7 +1126,7 @@ sub translate_id {
# id should be a digit. If it is not a digit we assume the given id
# is complete and does not need to be translated.
return $id if ($id =~ /\D/);
- return $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.$id;
+ return $env{'user.name'}.'_'.$env{'user.domain'}.'_'.$id;
}
###########################################
@@ -1154,7 +1223,22 @@ sub drop_table {
return 1; # if we got here there was no error, so return a 'true' value
}
+##########################################
+
+=pod
+
+=item fix_table_name
+
+Fixes a table name so that it will work with MySQL.
+=cut
+
+##########################################
+sub fix_table_name {
+ my ($name) = @_;
+ $name =~ s/^(\d+[eE]\d+)/_$1/;
+ return $name;
+}
# ---------------------------- convert 'time' format into a datetime sql format