Switch to using sqlite's own locking mechanisms...

Automatically start a new transaction on hyperdb commit().
Better RDBMS demo.py nuke handling.
(minor doc fixes)

Author: Richard Jones

CHANGES.txt

@@ -6,19 +6,16 @@ Feature:
 - added MD5 scheme for password hiding
 - added support for HTTP charset selection
 - implement __nonzero__ for HTMLProperty
+- remove "manual" locking of sqlite database
+- create a new RDBMS cursor after committing
 
-2004-??-?? 0.7.5
+
+2004-??-?? 0.7.4
 Fixed:
 - re-acquire the OTK manager when we re-open the database
 - mailgw handler can close the database on us
 
 
-2004-05-28 0.7.4
-Fixed:
-- remove "manual" locking of sqlite database
-- create a new RDBMS cursor after committing
-
-
 2004-05-28 0.7.3
 Fixed:
 - add "checked" to truth values for Boolean input

demo.py

@@ -2,7 +2,7 @@
 #
 # Copyright (c) 2003 Richard Jones ([email protected])
 # 
-# $Id: demo.py,v 1.10 2004-03-31 23:07:51 richard Exp $
+# $Id: demo.py,v 1.11 2004-05-28 01:09:10 richard Exp $
 
 import sys, os, string, re, urlparse
 import shutil, socket, errno, BaseHTTPServer
@@ -23,12 +23,14 @@ class config:
             MYSQL_DBPASSWORD = 'rounduptest'
             MYSQL_DBNAME = 'rounduptest'
             DATABASE = 'home'
-        module.db_nuke(config)
+        if module.db_exists(config):
+            module.db_nuke(config)
     elif backend == 'postgresql':
         class config:
             POSTGRESQL_DATABASE = {'database': 'rounduptest'}
             DATABASE = 'home'
-        module.db_nuke(config, 1)
+        if module.db_exists(config):
+            module.db_nuke(config)
 
     init.install(home, os.path.join('templates', 'classic'))
     # don't have email flying around

doc/upgrading.txt

@@ -44,6 +44,20 @@ Lines ``meta http-equiv`` added to the tracker templates in version 0.6.0
 are misleading and should be removed.  Actual charset is sent in the
 true http header.
 
+
+Migrating from 0.7.2 to 0.7.3
+=============================
+
+0.7.3 Configuration
+-------------------
+
+If you choose, you may specify the directory from which static files are
+served (those which use the URL component ``@@file``). Currently the
+directory defaults to the ``TEMPLATES`` configuration variable. You may
+define a new variable, ``STATIC_FILES`` which overrides this value for
+static files.
+
+
 Migrating from 0.7.0 to 0.7.2
 =============================
 

roundup/backends/back_sqlite.py

@@ -1,4 +1,4 @@
-# $Id: back_sqlite.py,v 1.28 2004-05-10 00:39:40 richard Exp $
+# $Id: back_sqlite.py,v 1.29 2004-05-28 01:09:11 richard Exp $
 '''Implements a backend for SQLite.
 
 See https://pysqlite.sourceforge.net/ for pysqlite info
@@ -50,21 +50,22 @@ class Database(rdbms_common.Database):
     }
 
     def sql_open_connection(self):
+        '''Open a standard, non-autocommitting connection.
+
+        pysqlite will automatically BEGIN TRANSACTION for us.
+        '''
         db = os.path.join(self.config.DATABASE, 'db')
         conn = sqlite.connect(db=db)
+        # set a 30 second timeout (extraordinarily generous) for handling
+        # locked database
+        conn.db.sqlite_busy_timeout(30 * 1000)
         cursor = conn.cursor()
         return (conn, cursor)
 
     def open_connection(self):
         # ensure files are group readable and writable
         os.umask(0002)
 
-        # lock the database
-        lockfilenm = os.path.join(self.dir, 'lock')
-        self.lockfile = locking.acquire_lock(lockfilenm)
-        self.lockfile.write(str(os.getpid()))
-        self.lockfile.flush()
-
         (self.conn, self.cursor) = self.sql_open_connection()
 
         try:
@@ -245,17 +246,10 @@ def sql_close(self):
             connection.
         '''
         try:
-            try:
-                self.conn.close()
-            except sqlite.ProgrammingError, value:
-                if str(value) != 'close failed - Connection is closed.':
-                    raise
-        finally:
-            # always release the lock
-            if self.lockfile is not None:
-                locking.release_lock(self.lockfile)
-                self.lockfile.close()
-                self.lockfile = None
+            self.conn.close()
+        except sqlite.ProgrammingError, value:
+            if str(value) != 'close failed - Connection is closed.':
+                raise
 
     def sql_rollback(self):
         ''' Squash any error caused by us having closed the connection (and
@@ -280,6 +274,8 @@ def sql_commit(self):
         except sqlite.DatabaseError, error:
             if str(error) != 'cannot commit - no transaction is active':
                 raise
+        # open a new cursor for subsequent work
+        self.cursor = self.conn.cursor()
 
     def sql_index_exists(self, table_name, index_name):
         self.cursor.execute('pragma index_list(%s)'%table_name)

roundup/backends/rdbms_common.py

@@ -1,4 +1,4 @@
-# $Id: rdbms_common.py,v 1.102 2004-05-23 23:24:47 richard Exp $
+# $Id: rdbms_common.py,v 1.103 2004-05-28 01:09:11 richard Exp $
 ''' Relational database (SQL) backend common code.
 
 Basics:
@@ -1110,6 +1110,9 @@ def sql_commit(self):
             print >>hyperdb.DEBUG, '+++ commit database connection +++'
         self.conn.commit()
 
+        # open a new cursor for subsequent work
+        self.cursor = self.conn.cursor()
+
     def commit(self):
         ''' Commit the current transactions.