Changeset 32592 for main/trunk/greenstone2/perllib/gsmysql.pm

Timestamp:

2018-11-09T19:13:32+13:00 (5 years ago)

Author:

ak19

Message:

Renamed gssql.pm to gsmysql.pm. Not subclassing the old gssql into gsmysql yet, as there's the complex issue of sighandlers, the static singleton method _get_connection_instance(), the singleton variable _db_instance and its use in the sighandlers and DESTROY, and how all of this can be impacted when making them part of an inheritance chain. Not sure of the best way to structure inheritance around these things. Even if rollback_on_cancel ends up unnecessary, the singleton method _get_connection_instance and singleton object _db_instance still impact decisions around inheritance.

File:

• main/trunk/greenstone2/perllib/gsmysql.pm (moved) (moved from main/trunk/greenstone2/perllib/gssql.pm ) (5 diffs)

main/trunk/greenstone2/perllib/gsmysql.pm

@@ -1 +1 @@
 ###########################################################################
 #
-# gssql.pm -- DBI for SQL related utility functions used by
+# gsmysql.pm -- Uses DBI for MySQL related utility functions used by
 # GreenstoneSQLPlugout and GreenstoneSQLPlugin too.
 # A component of the Greenstone digital library software
@@ -25 +25 @@
 ###########################################################################
 
-package gssql;
+package gsmysql;
 
 use strict;
@@ -43 +43 @@
 # TODO Q: If disconnect is automatically called when object destroyed, what does that mean
 # for our file-global handle object, is disconnect only called at end of perl process?
-# Does that mean we don't need to explicitly call disconnect in gssql object's destroy during
+# Does that mean we don't need to explicitly call disconnect in gsmysql object's destroy during
 # the GLOBAL destruction phase?
 # https://perldoc.perl.org/perlobj.html#Destructors
@@ -345 +345 @@
 }
 
-# Will disconnect if this instance of gssql holds the last reference to the db connection
+# Will disconnect if this instance of gsmysql holds the last reference to the db connection
 # If disconnecting and autocommit is off, then this will commit before disconnecting
 sub finished {
@@ -385 +385 @@
     # NO: "When all the data has been fetched from a SELECT statement, the driver will automatically call finish for you. So you should not call it explicitly except when you know that you've not fetched all the data from a statement handle and the handle won't be destroyed soon."
     
-    print STDERR "    GSSQL disconnecting from database\n" if $self->{'verbosity'};
+    print STDERR "    GSMySQL disconnecting from database\n" if $self->{'verbosity'};
     # Just go through the singleton db handle to disconnect
     $_dbh_instance->disconnect or warn $_dbh_instance->errstr;
     $_dbh_instance = undef;
     }
-    # Number of gssql objects that share a live connection is now 0, as the connection's dead
-    # either because the last gssql object finished() or because connection was killed (force)
+    # Number of gsmysql objects that share a live connection is now 0, as the connection's dead
+    # either because the last gsmysql object finished() or because connection was killed (force)
     $ref_count = 0;
 }