[Modeling-cvs] ProjectModeling/Modeling SQLExpression.py,1.21,1.22

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1:/tmp/cvs-serv7376/Modeling

Modified Files:
	SQLExpression.py 
Log Message:
Added support for joinClauseString()

Index: SQLExpression.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/SQLExpression.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** SQLExpression.py	3 Aug 2003 10:34:14 -0000	1.21
--- SQLExpression.py	20 Aug 2003 19:58:04 -0000	1.22
***************
*** 281,285 ****
  
      self._whereClauseString=""
!     
      ### key: path 'rel1.rel2', value: alias 't<n>'
      ##self._aliasesByRelPath={}
--- 281,289 ----
  
      self._whereClauseString=""
! 
!     # used when 'JOIN' are not supported, e.g. Oracle8i, to generate
!     # ANSI equivalent
!     self._joinClauseString=""
! 
      ### key: path 'rel1.rel2', value: alias 't<n>'
      ##self._aliasesByRelPath={}
***************
*** 500,504 ****
        statement+=" WHERE "
        statement+=(whereClause and joinClause) \
!                   and (whereClause+' AND '+joinClause)  \
                    or ( whereClause or joinClause )
      if orderByClause:
--- 504,508 ----
        statement+=" WHERE "
        statement+=(whereClause and joinClause) \
!                   and ('('+whereClause+') AND ('+joinClause+')')  \
                    or ( whereClause or joinClause )
      if orderByClause:
***************
*** 642,646 ****
      are examined.
      """
!     __unimplemented__()
  
    def joinExpression(self):
--- 646,650 ----
      are examined.
      """
!     return self._joinClauseString
  
    def joinExpression(self):
***************
*** 795,800 ****
      self._whereClauseString=self.sqlStringForQualifier(fullQualifier)
  
      #
!     joinClause=''
      
      # Do we join some tables?
--- 799,805 ----
      self._whereClauseString=self.sqlStringForQualifier(fullQualifier)
  
+     tableList=self.tableListWithRootEntity(self.entity())
      #
!     joinClause=self.joinClauseString()
      
      # Do we join some tables?
***************
*** 819,823 ****
                                                 selectString=selectString,
                                                 columnList=columnList,
!                                                tableList=self.tableListWithRootEntity(self.entity()),
                                                 whereClause=whereClause,
                                                 joinClause=joinClause,
--- 824,828 ----
                                                 selectString=selectString,
                                                 columnList=columnList,
!                                                tableList=tableList,
                                                 whereClause=whereClause,
                                                 joinClause=joinClause,