Minor Bugfixes and Print Additions

Author: WiddleWabbit

README

@@ -25,8 +25,10 @@ orders easily and automatically from a development to a production website and v
                                         ---           TODO         ---
 
         -   Feature
+                -   Automatica flush of MySQL Log
                 -   Lock Functionality
                 -   Silent Running and Verbose
+                -   Per Database Ignore certain SQL Commands otherwise recorded (CREATE TEMPORARY TABLE etc)
 
         -   sqlrun.py
                 -   If there is a start transaction at the end of the command file with some

monitor.py

@@ -54,7 +54,7 @@
 #               ##############################
 
 # Stop script if no option is passed for the file location
-if not args.location:
+if not args.run_only and not args.location:
     parser.error("Log file not defined correctly (Use -f)")
 
 #               ################################
@@ -568,29 +568,29 @@ def main():
                     pass
                 print
 
+#               ######################################
+#               ---   IF LOG FILE DOES NOT EXIST   ---
+#               ######################################
+
+        else:
+            print("File does not exist or is a directory")
 
 #               #####################
 #               ---   RUN FILE ---
 #               #####################
 
-        # If the run flag was set then run the database changes as per the configuration
-        if args.run or args.run_only:
-            for user in configuration:
-                runsql.runSQL(user, configuration)
-
-
+    # If the run flag was set then run the database changes as per the configuration
+    if args.run or args.run_only:
 
-        print("Total time of execution: " + str(datetime.now() - startTime))
+        for user in configuration:
+            runsql.runSQL(user, configuration)
 
 
+#               ######################
+#               ---   SHOW RUNTIME ---
+#               ######################
 
-
-#               ######################################
-#               ---   IF LOG FILE DOES NOT EXIST   ---
-#               ######################################
-
-    else:
-        print("File does not exist or is a directory")
+    print("Total time of execution: " + str(datetime.now() - startTime))
 
 #               ########################
 #               ---   EXECUTE MAIN   ---

runsql.py

@@ -7,6 +7,9 @@
 from enum import Enum
 from enum import IntEnum
 
+# Import custom modules
+import conf
+
 #              ##############################
 #              ---   SCRIPT REQUIREMENTS  ---
 #              ##############################
@@ -43,8 +46,9 @@ def runSQL(user, configuration):
             db = MySQLdb.connect('localhost', dbuser, dbpass, database)
             cursor = db.cursor()
 
-            # Setup error and filename variables
+            # Setup error, counter and filename variables
             err = 0
+            count = 0
             tmp_file = configuration[user][conf.CONFIG.Export.value] + "_tmp"                   
 
             # Open the file containing sql commands ##########################NEEDS TO BE ADDED TO CONFIGURATION
@@ -60,6 +64,7 @@ def runSQL(user, configuration):
                         # Try executing the command
                         try:
                             cursor.execute(line)
+                            count += 1
 
                         # Should an error occur we stop processing commands by setting err to 1 and write the line to our tmp file
                         # To stop on a warning as well we should add ,MySQLdb.Warning inside brackets
@@ -90,9 +95,17 @@ def runSQL(user, configuration):
                 os.rename(configuration[user][conf.CONFIG.Export.value], configuration[user][conf.CONFIG.Export.value] + "_backup")
                 os.rename(tmp_file, configuration[user][conf.CONFIG.Export.value])
 
+                print("Encountered Error...")
+                print("Ran " + str(count) + " Queries before Error")
+                print("Created backup of file executed")
+                print("Saved remaining queries (including errored) as file run.")
+
             # Otherwise if there were no errors just delete both files
             else:
 
                 os.remove(configuration[user][conf.CONFIG.Export.value])
                 os.remove(tmp_file)
 
+                print("Ran " + str(count) + "Queries...")
+                print("Completed Successfully")
+