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

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1043 by bh, Mon May 26 19:27:15 2003 UTC revision 1328 by bh, Tue Jul 1 12:01:58 2003 UTC
# Line 410  class TransientJoinedTable(TitledObject, Line 410  class TransientJoinedTable(TitledObject,
410    
411          self.right_table.ensure_index(self.right_field)          self.right_table.ensure_index(self.right_field)
412    
413            # determine the internal column names to join on before
414            # coalescing the column information because if the external
415            # column names are the same they will be mapped to the same
416            # internal name afterwards.
417            internal_left_col = self.left_table.orig_to_internal[self.left_field]
418            internal_right_col =self.right_table.orig_to_internal[self.right_field]
419    
420          # Coalesce the column information          # Coalesce the column information
421          visited = {}          visited = {}
422          columns = []          columns = []
# Line 420  class TransientJoinedTable(TitledObject, Line 427  class TransientJoinedTable(TitledObject,
427                  # better solution.                  # better solution.
428                  continue                  continue
429              columns.append(col)              columns.append(col)
430                visited[col.name] = 1
431          TransientTableBase.create(self, columns)          TransientTableBase.create(self, columns)
432    
433          # Copy the joined data to the table.          # Copy the joined data to the table.
# Line 437  class TransientJoinedTable(TitledObject, Line 445  class TransientJoinedTable(TitledObject,
445                     self.left_table.tablename,                     self.left_table.tablename,
446                     join_operator,                     join_operator,
447                     self.right_table.tablename,                     self.right_table.tablename,
448                     self.orig_to_internal[self.left_field],                     internal_left_col,
449                     self.orig_to_internal[self.right_field]))                     internal_right_col))
450          self.db.execute(stmt)          self.db.execute(stmt)
451    
452      def Dependencies(self):      def Dependencies(self):

Legend:
Removed from v.1043  
changed lines
  Added in v.1328

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26