Changeset 2593

Timestamp:

11/29/05 12:43:34 (19 years ago)

Author:

jerome

Message:

Added support for SQLite3 database backend.
NEEDS TESTERS !

Location:

pykota/trunk

Files:

• conf/pykota.conf.sample (modified) (3 diffs)
• conf/pykotadmin.conf.sample (modified) (1 diff)
• initscripts/sqlite/README.sqlite (added)
• NEWS (modified) (1 diff)
• pykota/config.py (modified) (2 diffs)
• pykota/storages/pgstorage.py (modified) (1 diff)
• pykota/storages/sqlitestorage.py (modified) (1 diff)
• pykota/storages/sql.py (modified) (1 diff)
• pykota/version.py (modified) (1 diff)

pykota/trunk/conf/pykota.conf.sample

@@ -48 +48 @@
 [global]
 # Storage backend for quotas
-# only PGStorage (PostgreSQL) and LDAPStorage (OpenLDAP) are supported.
+# only PGStorage (PostgreSQL), LDAPStorage (OpenLDAP or else),
+# and SQLiteStorage (SQLite 3) are supported.
+#
 # MySQL and BerkeleyDB are planned.
 
-# the 'postgresql' value is deprecated, use 'pgstorage' instead.
+####################################################################
+# SQLite3 : comment this section out if you use another backend    #
+####################################################################
+
+#storagebackend : sqlitestorage
+#storagename: /etc/pykota/pykota.db
+
+####################################################################
+# PostgreSQL : comment this section out if you use another backend #
+####################################################################
 storagebackend: pgstorage
 
@@ -74 +85 @@
 # storageuserpw: Comment out if unused, or set to Quota Storage user password
 
-# Should the database caching mechanism be enabled or not ?
-# If unset, caching is disabled. Possible values Y/N/YES/NO
-# caching mechanism works with both PostgreSQL and OpenLDAP backends
-# but may be really interesting only with OpenLDAP.
-#
-# ACTIVATING CACHE MAY CAUSE PRECISION PROBLEMS IN PRINT ACCOUNTING
-# IF AN USER PRINTS ON SEVERAL PRINTERS AT THE SAME TIME.
-# YOU MAY FIND IT INTERESTING ANYWAY, ESPECIALLY FOR LDAP.
-#
-# FYI, I ALWAYS SET IT TO YES !
-#
-storagecaching: No
-
-# Should full job history be disabled ?
-# If unset or set to No, full job history is kept in the database.
-# This will be useful in the future when the report generator
-# will be written.
-# Disabling the job history can be useful with heavily loaded
-# LDAP servers, to not make the LDAP tree grow out of control.
-# Disabling the job history with the PostgreSQL backend works too
-# but it's probably less useful than with LDAP.
-disablehistory: No
-
+####################################################################
+# LDAP : comment this section out if you use another backend       #
+####################################################################
 # LDAP example, uncomment and adapt it to your own configuration :
 #storagebackend: ldapstorage
@@ -183 +174 @@
 # BETTER TO LET IT SET TO 'NO'
 # ldapcache: no
+
+#############################################################
+# ALL directives below are common to ALL storage backends   #
+#############################################################
+
+# Should the database caching mechanism be enabled or not ?
+# If unset, caching is disabled. Possible values Y/N/YES/NO
+# caching mechanism works with both PostgreSQL and OpenLDAP backends
+# but may be really interesting only with OpenLDAP.
+#
+# ACTIVATING CACHE MAY CAUSE PRECISION PROBLEMS IN PRINT ACCOUNTING
+# IF AN USER PRINTS ON SEVERAL PRINTERS AT THE SAME TIME.
+# YOU MAY FIND IT INTERESTING ANYWAY, ESPECIALLY FOR LDAP.
+#
+# FYI, I ALWAYS SET IT TO YES !
+#
+storagecaching: No
+
+# Should full job history be disabled ?
+# If unset or set to No, full job history is kept in the database.
+# This will be useful in the future when the report generator
+# will be written.
+# Disabling the job history can be useful with heavily loaded
+# LDAP servers, to not make the LDAP tree grow out of control.
+# Disabling the job history with the PostgreSQL backend works too
+# but it's probably less useful than with LDAP.
+disablehistory: No
+
 
 # Where to log ?

pykota/trunk/conf/pykotadmin.conf.sample

@@ -58 +58 @@
 [global]
 
+# For SQLite3, you can comment out all the lines in this file.
+
 # PostgreSQL's Quota Storage administrator's name and password
 # Please comment these lines out and see further below if you use LDAP.

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.24alpha4 :
+    
+        - Added support for the SQLite3 backend.
+          See pykota/initscripts/sqlite/README.sqlite
+        
     - 1.24alpha3 :
     

pykota/trunk/pykota/config.py

@@ -95 +95 @@
         """Returns the storage backend information as a Python mapping."""        
         backendinfo = {}
-        for option in [ "storagebackend", "storageserver", \
-                        "storagename", "storageuser", \
-                      ] :
-            backendinfo[option] = self.getGlobalOption(option)
-        backendinfo["storageuserpw"] = self.getGlobalOption("storageuserpw", ignore=1)  # password is optional
+        backend = self.getGlobalOption("storagebackend").lower()
+        backendinfo["storagebackend"] = backend
+        if backend == "sqlitestorage" :
+            issqlite = 1
+            backendinfo["storagename"] = self.getGlobalOption("storagename")
+            for option in ["storageserver", "storageuser", "storageuserpw"] :
+                backendinfo[option] = None          
+        else :
+            issqlite = 0
+            for option in ["storageserver", "storagename", "storageuser"] :
+                backendinfo[option] = self.getGlobalOption(option)
+            backendinfo["storageuserpw"] = self.getGlobalOption("storageuserpw", ignore=1)  # password is optional
+            
         backendinfo["storageadmin"] = None
         backendinfo["storageadminpw"] = None
@@ -109 +117 @@
                     backendinfo["storageadmin"] = adminconf.get("global", "storageadmin", raw=1)
                 except (ConfigParser.NoSectionError, ConfigParser.NoOptionError) :    
-                    raise PyKotaConfigError, _("Option %s not found in section global of %s") % ("storageadmin", self.adminfilename)
+                    if not issqlite :
+                        raise PyKotaConfigError, _("Option %s not found in section global of %s") % ("storageadmin", self.adminfilename)
                 try :
                     backendinfo["storageadminpw"] = adminconf.get("global", "storageadminpw", raw=1)

pykota/trunk/pykota/storages/pgstorage.py

@@ -118 +118 @@
             typ = "text"
         return pg._quote(field, typ)
+        
+    def prepareRawResult(self, result) :
+        """Prepares a raw result by including the headers."""
+        if result.ntuples() > 0 :
+            entries = [result.listfields()]
+            entries.extend(result.getresult())
+            nbfields = len(entries[0])
+            for i in range(1, len(entries)) :
+                fields = list(entries[i])
+                for j in range(nbfields) :
+                    field = fields[j]
+                    if type(field) == StringType :
+                        fields[j] = self.databaseToUserCharset(field) 
+                entries[i] = tuple(fields)    
+            return entries
+        

pykota/trunk/pykota/storages/sqlitestorage.py

@@ -123 +123 @@
         else :     
             return "NULL"
+            
+    def prepareRawResult(self, result) :
+        """Prepares a raw result by including the headers."""
+        if result :
+            entries = [tuple([f[0] for f in self.cursor.description])]
+            for entry in result :    
+                row = []
+                for value in entry :
+                    try :
+                        value = value.encode("UTF-8")
+                    except :
+                        pass
+                    row.append(value)
+                entries.append(tuple(row))    
+            return entries   
+        

pykota/trunk/pykota/storages/sql.py

@@ -30 +30 @@
 
 class SQLStorage :
-    def prepareRawResult(self, result) :
-        """Prepares a raw result by including the headers."""
-        if result.ntuples() > 0 :
-            entries = [result.listfields()]
-            entries.extend(result.getresult())
-            nbfields = len(entries[0])
-            for i in range(1, len(entries)) :
-                fields = list(entries[i])
-                for j in range(nbfields) :
-                    field = fields[j]
-                    if type(field) == StringType :
-                        fields[j] = self.databaseToUserCharset(field) 
-                entries[i] = tuple(fields)    
-            return entries
-        
     def createFilter(self, only) :    
         """Returns the appropriate SQL filter."""

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.24alpha3_unofficial"
+__version__ = "1.24alpha4_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."