Thread: [Pytrainer-svn] SF.net SVN: pytrainer:[903] pytrainer/trunk (Page 8)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 903
          http://pytrainer.svn.sourceforge.net/pytrainer/?rev=903&view=rev
Author:   ncjones
Date:     2011-10-23 11:10:12 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
Remove unnecessary "check DB integrity" function.

ticket:132

Modified Paths:
--------------
    pytrainer/trunk/glade/profile.glade
    pytrainer/trunk/pytrainer/gui/windowprofile.py
    pytrainer/trunk/pytrainer/lib/ddbb.py
    pytrainer/trunk/pytrainer/lib/mysqlUtils.py
    pytrainer/trunk/pytrainer/lib/sqliteUtils.py
    pytrainer/trunk/pytrainer/main.py
    pytrainer/trunk/pytrainer/upgrade/data.py

Modified: pytrainer/trunk/glade/profile.glade
===================================================================

--- pytrainer/trunk/glade/profile.glade	2011-10-23 11:09:38 UTC (rev 902)
+++ pytrainer/trunk/glade/profile.glade	2011-10-23 11:10:12 UTC (rev 903)
@@ -1837,51 +1837,6 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="labelCheck">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="ypad">5</property>
-                            <property name="label" translatable="yes">Check</property>
-                          </widget>
-                          <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkCheckButton" id="checkbuttonCheck">
-                            <property name="label">--check</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="on_checkbuttonCheck_toggled"/>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_padding">10</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkLabel" id="labelCheckDescription">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="xpad">5</property>
-                            <property name="label" translatable="yes">&lt;small&gt;Was a configuration and database check requested?&lt;/small&gt;</property>
-                            <property name="use_markup">True</property>
-                          </widget>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
                           <widget class="GtkLabel" id="labelNewGraph">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>

Modified: pytrainer/trunk/pytrainer/gui/windowprofile.py
===================================================================
--- pytrainer/trunk/pytrainer/gui/windowprofile.py	2011-10-23 11:09:38 UTC (rev 902)
+++ pytrainer/trunk/pytrainer/gui/windowprofile.py	2011-10-23 11:10:12 UTC (rev 903)
@@ -200,12 +200,6 @@
         else:
             self.checkbuttonValidate.set_active(False)
             
-        #Show if database and config check requested 
-        if self.pytrainer_main.startup_options.check:
-            self.checkbuttonCheck.set_active(True)
-        else:
-            self.checkbuttonCheck.set_active(False)
-            
         #Show if new graph activated
         if self.pytrainer_main.startup_options.newgraph:
             self.checkbuttonNewGraph.set_active(True)
@@ -236,18 +230,6 @@
             logging.debug("Validate deactivated")
             self.pytrainer_main.startup_options.validate = False
             
-    def on_checkbuttonCheck_toggled(self, widget):
-        if self.checkbuttonCheck.get_active():
-            logging.debug( "Check activated")
-            if self.pytrainer_main.startup_options.check is not True:
-                #Need to do sanitycheck
-                logging.debug("Need to do sanitycheck")
-                self.pytrainer_main.sanityCheck()
-            self.pytrainer_main.startup_options.check = True
-        else:
-            logging.debug("Check deactivated")
-            self.pytrainer_main.startup_options.check = False
-                
     def on_checkbuttonNewGraph_toggled(self, widget):
         if self.checkbuttonNewGraph.get_active():
             logging.debug("NewGraph activated")

Modified: pytrainer/trunk/pytrainer/lib/ddbb.py
===================================================================
--- pytrainer/trunk/pytrainer/lib/ddbb.py	2011-10-23 11:09:38 UTC (rev 902)
+++ pytrainer/trunk/pytrainer/lib/ddbb.py	2011-10-23 11:10:12 UTC (rev 903)
@@ -20,10 +20,7 @@
 #Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 import logging
-import traceback
-import commands, os
 import dateutil
-from pytrainer.lib.date import Date
 
 #Define the tables and their columns that should be in the database
 #Obviously, this is not a list but a dict -> TODO: ammend name to avoid confusion!!!
@@ -135,9 +132,9 @@
     def connect(self):
         connection_ok, connection_msg = self.ddbbObject.connect()
         if not connection_ok:
-			print "ERROR: Unable to connect to database"
-			print connection_msg
-			sys.exit(connection_ok)
+            print "ERROR: Unable to connect to database"
+            print connection_msg
+            sys.exit(connection_ok)
 
     def disconnect(self):
         self.ddbbObject.disconnect()
@@ -296,95 +293,15 @@
         return ret_val[0][0]
         
     def create_tables(self):
-        global tablesList
-        global tablesDefaultData
-        logging.debug('>>')
-        logging.info('Checking PyTrainer database')
-        #if self.ddbb_type != "sqlite":
-        #    logging.error('Support for MySQL database is decommissioned, please migrate to SQLite. Exiting check')
-        #    exit(-2)
-        try:
-            tablesDB = self.ddbbObject.getTableList()
-        except:
-            logging.error('Not able to retrieve which tables are in DB. Printing traceback')
-            traceback.print_exc()
-            exit(-1)
-
-        logging.debug('Found '+ str(len(tablesDB))+' tables in DB: '+ str(tablesDB))
-
-        # Create a compressed copy of current DB
-        try:
-            self.ddbbObject.createDatabaseBackup()
-        except:
-            logging.error('Not able to make a copy of current DB. Printing traceback and exiting')
-            traceback.print_exc()
-            exit(-1)
-
-        #Check Tables
+        """Initialise the database schema from an empty database."""
+        logging.info("Creating database tables")
         for entry in tablesList:
-            if entry not in tablesDB:
-                logging.warn('Table '+str(entry)+' does not exist in DB')
-                self.ddbbObject.createTableDefault(entry,tablesList[entry])
-                #Check if this table has default data to add..
-                if entry in tablesDefaultData:
-                    logging.debug("Adding default data to %s" % entry)
-                    for data_dict in tablesDefaultData[entry]:
-                        self.insert_dict(entry, data_dict)
-            else:
-                self.ddbbObject.checkTable(entry,tablesList[entry])
-
-    def checkDBIntegrity(self):
-        '''17.11.2009 - dgranda
-        Retrieves tables and columns from database, checks current ones and adds something if missed. New in version 1.7.0
-        args: none
-        returns: none'''
-        self.create_tables()
-
-        #Run any functions to update or correct data
-        #These functions _must_ be safe to run at any time (i.e. not be version specfic or only safe to run once)
-        self.populate_date_time_local()
-        logging.debug('<<')
-
-    def checkDBDataValues(self):
-        ''' Check all data in DB and report values that do not match the type '''
-        global tablesList
-
-        for table in tablesList.keys():
-            pass
-
-    def populate_date_time_local(self):
-        ''' Populate date_time_local and date from date_time_utc
-                only access records that date_time_local is NULL
-                using OS timezone to create local_time
-
-                also updates date if date != local_time
-
-                TODO - leaves date_time_local blank for records that have been manually created (as date_time_utc will actually be local time)
-        '''
-        logging.debug('--')
-        listOfRecords = self.ddbbObject.select("records","id_record,date,date_time_utc,date_time_local", "date_time_local is NULL")
-        logging.debug("Found %d records in DB without date_time_local field populated" % (len(listOfRecords) ) )
-        for record in listOfRecords:
-            try:
-                gpxfile = self.configuration.gpxdir+"/%s.gpx"%(record[0])
-                dateFromUTC = Date().getDateTime(record[2])
-                if os.path.isfile(gpxfile) : #GPX file exists for this record - probably not a manual record
-                    date_time_local = str(dateFromUTC[1])
-                    dateFromLocal = dateFromUTC[1].strftime("%Y-%m-%d")
-                    if record[1] != dateFromLocal:
-                        #date field incorrect - update it
-                        logging.debug("Updating record id: %s with date: %s and date_time_local: %s" % (record[0], dateFromLocal, date_time_local) )
-                        self.ddbbObject.update("records","date, date_time_local",[dateFromLocal, date_time_local], "id_record = %d" %record[0])
-                    else:
-                        #date field OK, just update date_time_local
-                        logging.debug("Updating record id: %s with date_time_local: %s" % (record[0], date_time_local) )
-                        self.ddbbObject.update("records","date_time_local",[date_time_local], "id_record = %d" %record[0])
-                else: #Manual entry?
-                    #For manual entries, the UTC time is the local time
-                    #TODO figure out a way to correct this...
-                    pass
-            except Exception as e:
-                print "Error updating record: " + str(record)
-                print e
-                logging.debug("Error updating record: " + str(record))
-                logging.debug(str(e))
+            self.ddbbObject.createTableDefault(entry, tablesList[entry])
+            if entry in tablesDefaultData:
+                logging.debug("Adding default data to %s" % entry)
+                for data_dict in tablesDefaultData[entry]:
+                    self.insert_dict(entry, data_dict)
+                
+    def create_backup(self):
+        """Create a backup of the current database."""
+        self.ddbbObject.createDatabaseBackup()

Modified: pytrainer/trunk/pytrainer/lib/mysqlUtils.py
===================================================================
--- pytrainer/trunk/pytrainer/lib/mysqlUtils.py	2011-10-23 11:09:38 UTC (rev 902)
+++ pytrainer/trunk/pytrainer/lib/mysqlUtils.py	2011-10-23 11:10:12 UTC (rev 903)
@@ -168,61 +168,6 @@
         sql = "update %s set %s" %(table,string)
         self.db.query(sql)
         
-    def checkTable(self,tableName,columns):
-        '''
-        Checks column names and values from table and adds something if missed. New in version 1.7.0
-        args:
-            tableName - string with name of the table
-            columns - dictionary containing column names and data types coming from definition
-        returns: none'''
-        logging.debug('>>')
-        logging.info('Inspecting '+str(tableName)+' table')
-        logging.debug('Columns definition: '+str(columns))
-
-        # Retrieving data from DB
-        tableInfo = self.retrieveTableInfo(tableName)
-        logging.debug('Raw data retrieved from DB '+str(tableName)+': '+str(tableInfo))
-        #print('Raw data retrieved from DB '+str(tableName)+': '+str(tableInfo))
-        #Raw data retrieved from DB sports: [('met', 'float', 'YES', '', None, ''), ('id_sports', 'int(11)', 'NO', 'PRI', None, 'auto_increment'), ('max_pace', 'int(11)', 'YES', '', None, ''), ('name', 'varchar(100)', 'YES', '', None, ''), ('weight', 'float', 'YES', '', None, '')]
-
-        # Comparing data retrieved from DB with what comes from definition
-        columnsDB = {}
-        for field in tableInfo:
-            newField = {field[0]:field[1]}
-            columnsDB.update(newField)
-        logging.debug('Useful data retrieved from '+str(tableName)+' in DB: '+str(columnsDB))
-        #print('Useful data retrieved from '+str(tableName)+' in DB: '+str(columnsDB))
-
-        # http://mail.python.org/pipermail/python-list/2002-May/141458.html
-        #tempDict = dict(zip(columns,columns))
-        tempDict = dict(columns)
-        #Test for columns that are in DB that shouldn't be
-        result = [x for x in columnsDB if x not in tempDict]
-        #Test for columns that are not in the DB that should be
-        result2 = [x for x in tempDict if x not in columnsDB]
-
-        logging.debug("Columns in DB that shouldnt be: "+str(result))
-        logging.debug("Columns missing from DB: "+str(result2))
-        
-        table_ok = True
-        if len(result) > 0:
-            logging.debug('Found columns in DB that should not be: '+ str(result))
-            table_ok = False
-            for entry in result:
-                logging.debug('Column '+ str(entry) +' in DB but not in definition')
-                print "Column %s in DB but not in definition - please fix manually" % (str(entry))
-                print "#TODO need to add auto fix code"
-                sys.exit(1)
-        if len(result2) > 0: # may have also different data type
-            logging.debug('Found columns missed in DB: '+ str(result2))
-            table_ok = False
-            for entry in result2:
-                logging.debug('Column '+ str(entry) +' not found in DB')
-                self.addColumn(tableName,str(entry),columns[entry])
-        if table_ok:
-            logging.info('Table '+ str(tableName) +' is OK')
-        logging.debug('<<')
-        
     def retrieveTableInfo(self,tableName):
         cur = self.db.cursor()
         sql = "desc %s;" %tableName
@@ -245,6 +190,4 @@
             traceback.print_exc()
             
     def createDatabaseBackup(self):
-        logging.debug('>>')
         logging.info("Unable to create backup for MySQL DB")
-        logging.debug('<<')

Modified: pytrainer/trunk/pytrainer/lib/sqliteUtils.py
===================================================================
--- pytrainer/trunk/pytrainer/lib/sqliteUtils.py	2011-10-23 11:09:38 UTC (rev 902)
+++ pytrainer/trunk/pytrainer/lib/sqliteUtils.py	2011-10-23 11:10:12 UTC (rev 903)
@@ -163,60 +163,6 @@
             retorno.append(row)
         return retorno
 
-    def checkTable(self,tableName,columns):
-        '''19.11.2009 - dgranda
-        Checks column names and values from table and adds something if missed. New in version 1.7.0
-        args:
-            tableName - string with name of the table
-            columns - dictionary containing column names and data types coming from definition
-        returns: none'''
-        logging.debug('>>')
-        logging.info('Inspecting '+str(tableName)+' table')
-        logging.debug('Columns definition: '+str(columns))
-
-        # Retrieving data from DB
-        tableInfo = self.retrieveTableInfo(tableName)
-        logging.debug('Raw data retrieved from DB '+str(tableName)+': '+str(tableInfo))
-        #Raw data retrieved from DB laps: [(0, u'elapsed_time', u'varchar(20)', 0, None, 0), (1, u'record', u'integer', 0, None, 0), (2, u'end_lon', u'float', 0, None, 0), (3, u'lap_number', u'integer', 0, None, 0), (4, u'end_lat', u'float', 0, None, 0), (5, u'distance', u'float', 0, None, 0), (6, u'start_lon', u'float', 0, None, 0), (7, u'id_lap', u'integer', 0, None, 1), (8, u'calories', u'int', 0, None, 0), (9, u'start_lat', u'float', 0, None, 0)]
-
-        # Comparing data retrieved from DB with what comes from definition
-        columnsDB = {}
-        for field in tableInfo:
-            newField = {field[1]:field[2]}
-            columnsDB.update(newField)
-        logging.debug('Useful data retrieved from '+str(tableName)+' in DB: '+str(columnsDB))
-        #Useful data retrieved from laps in DB: {u'elapsed_time': u'varchar(20)', u'record': u'integer', u'end_lon': u'float', u'start_lon': u'float', u'end_lat': u'float', u'distance': u'float', u'id_lap': u'integer', u'lap_number': u'integer', u'calories': u'int', u'start_lat': u'float'}
-        
-        # http://mail.python.org/pipermail/python-list/2002-May/141458.html
-        #tempDict = dict(zip(columns,columns))
-        tempDict = dict(columns)
-        #Test for columns that are in DB that shouldn't be
-        result = [x for x in columnsDB if x not in tempDict]
-        #Test for columns that are not in the DB that should be
-        result2 = [x for x in tempDict if x not in columnsDB]
-
-        logging.debug("Columns in DB that shouldnt be: "+str(result))
-        logging.debug("Columns missing from DB: "+str(result2))
-
-        table_ok = True
-        if len(result) > 0:
-            logging.debug('Found columns in DB that should not be: '+ str(result))
-            table_ok = False
-            for entry in result:
-                logging.debug('Column '+ str(entry) +' in DB but not in definition')
-                print "Column %s in DB but not in definition - please fix manually" % (str(entry))
-                print "#TODO need to add auto fix code"
-                sys.exit(1)
-        if len(result2) > 0: # may have also different data type
-            logging.debug('Found columns missed in DB: '+ str(result2))
-            table_ok = False
-            for entry in result2:
-                logging.debug('Column '+ str(entry) +' not found in DB')
-                self.addColumn(tableName,str(entry),columns[entry])
-        if table_ok:
-            logging.info('Table '+ str(tableName) +' is OK')
-        logging.debug('<<')
-
     def retrieveTableInfo(self,tableName):
         cur = self.db.cursor()
         sql = "PRAGMA table_info(%s);" %tableName
@@ -237,11 +183,9 @@
 
 
     def createDatabaseBackup(self):
-        logging.debug('>>')
+        logging.info("Creating compressed copy of current DB")
         logging.debug('Database path: '+str(self.ddbb))
         result = commands.getstatusoutput('gzip -c '+self.ddbb+' > '+self.ddbb+'_`date +%Y%m%d_%H%M`.gz')
         if result[0] != 0:
             raise Exception, "Copying current database does not work, error #"+str(result[0])
-        else:
-            logging.info('Database backup successfully created')
-        logging.debug('<<')
+        logging.info('Database backup successfully created')

Modified: pytrainer/trunk/pytrainer/main.py
===================================================================
--- pytrainer/trunk/pytrainer/main.py	2011-10-23 11:09:38 UTC (rev 902)
+++ pytrainer/trunk/pytrainer/main.py	2011-10-23 11:10:12 UTC (rev 903)
@@ -77,9 +77,6 @@
         self.ddbb.connect()
         
         initialize_data(self.ddbb, self.environment.conf_dir)
-        if self.startup_options.check:
-            logging.debug("Checking DB as per user's request")
-            self.sanityCheck()
             
         self._sport_service = SportService(self.ddbb)
         self.record = Record(self._sport_service, data_path, self)
@@ -119,7 +116,6 @@
         parser.add_option("-i", "--info", action="store_const", const=logging.INFO, dest="log_level", help="enable logging at info level")
         parser.add_option("-w", "--warn", action="store_const", const=logging.WARNING, dest="log_level", help="enable logging at warning level")
         parser.add_option("--valid", action="store_true", dest="validate", help="enable validation of files imported by plugins (details at info or debug logging level) - note plugin must support validation")
-        parser.add_option("--check", action="store_true", dest="check", help="triggers database (only sqlite based) and configuration file sanity checks, adding fields if necessary. Backup of database is done before any change. Details at info or debug logging level")
         parser.add_option("--oldgraph", action="store_false", dest="newgraph", help="Turn off new graphing approach")
         parser.add_option("--newgraph", action="store_true", dest="newgraph", help="Deprecated Option: Turn on new graphing approach")
         parser.add_option("--confdir", dest="conf_dir", help="Specify the directory where application configuration will be stored.")
@@ -490,13 +486,3 @@
         self.activitypool.clear_pool()
         self.windowmain.setup()
         logging.debug('<<')
-
-    def sanityCheck(self):
-        """23.11.2009 - dgranda
-        Checks database and configuration file
-        args: none
-        returns: none"""
-        logging.debug('>>')
-        logging.info('Checking database integrity')
-        self.ddbb.checkDBIntegrity()
-        logging.debug('<<')

Modified: pytrainer/trunk/pytrainer/upgrade/data.py
===================================================================
--- pytrainer/trunk/pytrainer/upgrade/data.py	2011-10-23 11:09:38 UTC (rev 902)
+++ pytrainer/trunk/pytrainer/upgrade/data.py	2011-10-23 11:10:12 UTC (rev 903)
@@ -130,6 +130,7 @@
         
     def upgrade(self):
         logging.info("Upgrading data from version '%s' to version '%s'.", self.get_version(), self.get_available_version())
+        self._ddbb.create_backup()
         pytrainer.upgrade.context.UPGRADE_CONTEXT = self._upgrade_context
         self._migratable_db.upgrade()
         

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Pytrainer-svn] SF.net SVN: pytrainer:[903] pytrainer/trunk (Page 8)

pytrainer-svn