Changeset 32561 for main

Timestamp:

2018-10-31T20:12:48+13:00 (5 years ago)

Author:

ak19

Message:

Not just tables, but database names can't have hyphens in them when using MySQL.

File:

• main/trunk/greenstone2/perllib/gssql.pm (modified) (9 diffs)

main/trunk/greenstone2/perllib/gssql.pm

@@ -51 +51 @@
 
 sub new
-{
-  
+{  
     my $class = shift(@_);
     
@@ -70 +69 @@
     };
 
-    # (My)SQL doesn't like tables with - (hyphens) in their names
-    my $coll_name = $params_map->{'collection_name'};
-    $coll_name =~ s/-/_/g;
-    $self->{'tablename_prefix'} = $coll_name;
-
     # The db_encoding option is presently not passed in to this constructor as parameter.
     # Placed here to indicate it's sort of optional.
@@ -81 +75 @@
     $self->{'db_encoding'} = $params_map->{'db_encoding'} || "utf8";
     
-    return bless($self, $class);
+    $self = bless($self, $class);    
+
+    $self->{'tablename_prefix'} = $self->sanitize_name($params_map->{'collection_name'});
+    
+    return $self;
 }
 
@@ -197 +195 @@
     my ($db_name, $build_mode) = @_;
     my $dbh = $self->{'db_handle'};
+    $db_name = $self->sanitize_name($db_name);
     
     print STDERR "Attempting to use database $db_name\n" if($self->{'verbosity'});
@@ -207 +206 @@
     if(!$success && $dbh->err == 1049) { # "Unknown database" error has code 1049 (mysql only?) meaning db doesn't exist yet
 
-    print STDERR "Database $db_name didn't exist, creating it and the tables for the current collection...\n" if($self->{'verbosity'});
+    print STDERR "Database $db_name didn't exist, creating it along with the tables for the current collection...\n" if($self->{'verbosity'});
     
     # attempt to create the db and its tables
@@ -265 +264 @@
     my ($db_name) = @_;
     my $dbh = $self->{'db_handle'};
-
+    $db_name = $self->sanitize_name($db_name);
+
+    
     print STDERR "Loading database $db_name\n" if($self->{'verbosity'} > 1);
     
@@ -299 +300 @@
     my ($db_name) = @_;
     my $dbh = $self->{'db_handle'};
+    $db_name = $self->sanitize_name($db_name);
     
     # https://stackoverflow.com/questions/5025768/how-can-i-create-a-mysql-database-from-a-perl-script
@@ -358 +360 @@
     my ($db_name) = @_;
     my $dbh = $self->{'db_handle'};
-
+    $db_name = $self->sanitize_name($db_name);
+    
     print STDERR "!!! Deleting database $db_name\n" if($self->{'verbosity'});
     
@@ -511 +514 @@
 }
 
+# Attempt to make sure the name parameter (for db or table name) is acceptable syntax
+# for the db in question, e.g. for mysql. For example, (My)SQL doesn't like tables or
+# databases with '-' (hyphens) in their names
+sub sanitize_name {
+    my $self= shift (@_);
+    my ($name) = @_;
+    $name =~ s/-/_/g;
+    return $name;
+}
+
 
 # I can get my version of table_exists to work, but it's not so ideal