/[thuban]/branches/WIP-pyshapelib-bramz/Thuban/Model/transientdb.py

Diff of /branches/WIP-pyshapelib-bramz/Thuban/Model/transientdb.py

Parent Directory | Revision Log | View Patch Patch

-revision 933 by jonathan,
Tue May 20 15:23:50 2003 UTC
+revision 1020 by jan,
Fri May 23 13:03:07 2003 UTC
 Line 22 
 import os
  import weakref
  from sqlite import connect
+ from base import TitledObject
  import table
  sql_type_map = {
-Line 280 
 class TransientTableBase(table.OldTableI
+Line 282 
 class TransientTableBase(table.OldTableI
              result.append(row[0])
          return result
+     def Dependencies(self):
+         """Placeholder for a method in a derived class.
+         Return a sequence with the tables and other data objects that
+         self depends on.
+         """
+         raise NotImplementedError
- class TransientTable(TransientTableBase):
+ class TransientTable(TitledObject, TransientTableBase):
      """A Table in a transient DB that starts as the copy of a Thuban Table."""
-Line 292 
 class TransientTable(TransientTableBase)
+Line 302 
 class TransientTable(TransientTableBase)
          interface.
          """
          TransientTableBase.__init__(self, transient_db)
+         TitledObject.__init__(self, table.Title())
          self.create(table)
      def create(self, table):
-Line 325 
 class TransientTable(TransientTableBase)
+Line 336 
 class TransientTable(TransientTableBase)
- class TransientJoinedTable(TransientTableBase):
+ class TransientJoinedTable(TitledObject, TransientTableBase):
      """A Table in the transient DB that contains a join of two tables"""
      def __init__(self, transient_db, left_table, left_field,
-                  right_table, right_field = None):
+                  right_table, right_field = None, outer_join = False):
          """Create a new table in the transient DB as a join of two tables.
          Both input tables, left_table and right_table must have a
          transient_table method that returns a table object for a table
-         in the trnsient database. The join is performed on the condition
+         in the transient database. The join is performed on the condition
          that the value of the left_field column the the left table is
          equal to the value of the right_field in the right_table.
-Line 347 
 class TransientJoinedTable(TransientTabl
+Line 358 
 class TransientJoinedTable(TransientTabl
          names of the input tables without having to create prefixes.
          """
          TransientTableBase.__init__(self, transient_db)
+         self.dependencies = (left_table, right_table)
          self.left_table = left_table.transient_table()
          self.left_field = left_field
          self.right_table = right_table.transient_table()
-Line 354 
 class TransientJoinedTable(TransientTabl
+Line 366 
 class TransientJoinedTable(TransientTabl
              self.right_field = right_field
          else:
              self.right_field = self.left_field
+         self.outer_join = outer_join
+         title = "Join of %(left)s and %(right)s" \
+                 % {"left": self.left_table.Title(),
+                    "right": self.right_table.Title()}
+         TitledObject.__init__(self, title)
          self.create()
      def create(self):
-Line 376 
 class TransientJoinedTable(TransientTabl
+Line 395 
 class TransientJoinedTable(TransientTabl
          # Copy the joined data to the table.
          internal_names = [col.internal_name for col in self.columns]
+         if self.outer_join:
+             join_operator = 'LEFT OUTER JOIN'
+         else:
+             join_operator = 'JOIN'
          stmt = ("INSERT INTO %s (id, %s) SELECT %s.id, %s FROM %s"
-                 " JOIN %s ON %s = %s;"
+                 " %s %s ON %s = %s;"
                  % (self.tablename,
                     ", ".join(internal_names),
                     self.left_table.tablename,
                     ", ".join(internal_names),
                     self.left_table.tablename,
+                    join_operator,
                     self.right_table.tablename,
                     self.orig_to_internal[self.left_field],
                     self.orig_to_internal[self.right_field]))
          self.db.execute(stmt)
+     def Dependencies(self):
+         """Return a tuple with the two tables the join depends on."""
+         return self.dependencies
- class AutoTransientTable(table.OldTableInterfaceMixin):
+ class AutoTransientTable(TitledObject, table.OldTableInterfaceMixin):
      """Table that copies data to a transient table on demand.
-Line 398 
 class AutoTransientTable(table.OldTableI
+Line 426 
 class AutoTransientTable(table.OldTableI
      """
      def __init__(self, transient_db, table):
+         TitledObject.__init__(self, table.Title())
          self.transient_db = transient_db
          self.table = table
          self.t_table = None
-Line 472 
 class AutoTransientTable(table.OldTableI
+Line 501 
 class AutoTransientTable(table.OldTableI
          else:
              return self.t_table.SimpleQuery(self.t_table.Column(left.name),
                                              comparison, right)
+     def Dependencies(self):
+         """Return a tuple containing the original table"""
+         return (self.table,)

 Legend:



Removed from v.933
 


changed lines


 
Added in v.1020
 Legend:



Removed from v.933
 


changed lines


 
Added in v.1020
-Removed from v.933
+Added in v.1020

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26