[Modeling-cvs] ProjectModeling/Modeling/tests test_SQLExpression.py,1.7,1.8

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

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

Modified Files:
	test_SQLExpression.py 
Log Message:
Fixed test_06

Index: test_SQLExpression.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/test_SQLExpression.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** test_SQLExpression.py	3 Aug 2003 10:34:15 -0000	1.7
--- test_SQLExpression.py	3 Aug 2003 14:31:27 -0000	1.8
***************
*** 167,173 ****
                                                    lock=0, fetchSpec=fs)
      self.assertEqual(sqlExpr.statement(),
!                      "SELECT DISTINCT t0.id, t0.title, t0.FK_WRITER_ID, t0.PRICE FROM BOOK t0 INNER JOIN  ( WRITER t1 INNER JOIN WRITER t2 ON t1.FK_WRITER_ID=t2.ID )  ON t0.FK_WRITER_ID=t1.ID WHERE t2.LAST_NAME = 'Rabelais'")
  
      # None/NULL value
      q=qualifierWithQualifierFormat('author.pygmalion.books.price == None"')
      fs=FetchSpecification.FetchSpecification('Book',
--- 167,174 ----
                                                    lock=0, fetchSpec=fs)
      self.assertEqual(sqlExpr.statement(),
!                      "SELECT DISTINCT t0.id, t0.title, t0.PRICE, t0.FK_WRITER_ID FROM BOOK t0 INNER JOIN  ( WRITER t1 INNER JOIN WRITER t2 ON t1.FK_WRITER_ID=t2.ID )  ON t0.FK_WRITER_ID=t1.ID WHERE t2.LAST_NAME = 'Rabelais'")
  
      # None/NULL value
+     sqlExpr=SQLExpression(book)
      q=qualifierWithQualifierFormat('author.pygmalion.books.price == None"')
      fs=FetchSpecification.FetchSpecification('Book',
***************
*** 176,180 ****
                                                    lock=0, fetchSpec=fs)
      self.assertEqual(sqlExpr.statement(),
!                      "SELECT DISTINCT t0.id, t0.title, t0.FK_WRITER_ID, t0.PRICE, t0.id, t0.title, t0.FK_WRITER_ID, t0.PRICE FROM BOOK t0 INNER JOIN  ( WRITER t1 INNER JOIN  ( WRITER t2 INNER JOIN BOOK t3 ON t2.ID=t3.FK_WRITER_ID )  ON t1.FK_WRITER_ID=t2.ID )  ON t0.FK_WRITER_ID=t1.ID WHERE t3.PRICE IS NULL")
  
    def test_07_prepareSelectExpressionWithAttributes_02(self):
--- 177,181 ----
                                                    lock=0, fetchSpec=fs)
      self.assertEqual(sqlExpr.statement(),
!                      "SELECT DISTINCT t0.id, t0.title, t0.PRICE, t0.FK_WRITER_ID FROM BOOK t0 INNER JOIN  ( WRITER t1 INNER JOIN  ( WRITER t2 INNER JOIN BOOK t3 ON t2.ID=t3.FK_WRITER_ID )  ON t1.FK_WRITER_ID=t2.ID )  ON t0.FK_WRITER_ID=t1.ID WHERE t3.PRICE IS NULL")
  
    def test_07_prepareSelectExpressionWithAttributes_02(self):
***************
*** 189,193 ****
                                                    fetchSpec=fetchSpec)
      self.assertEqual(sqlExpr.statement(),
!                      "SELECT DISTINCT t0.id, t0.title, t0.FK_WRITER_ID, t0.PRICE FROM BOOK t0 INNER JOIN  ( WRITER t1 INNER JOIN WRITER t2 ON t1.FK_WRITER_ID=t2.ID )  ON t0.FK_WRITER_ID=t1.ID WHERE t2.LAST_NAME = t1.LAST_NAME")
  
  def test_suite():
--- 190,194 ----
                                                    fetchSpec=fetchSpec)
      self.assertEqual(sqlExpr.statement(),
!                      "SELECT DISTINCT t0.id, t0.title, t0.PRICE, t0.FK_WRITER_ID FROM BOOK t0 INNER JOIN  ( WRITER t1 INNER JOIN WRITER t2 ON t1.FK_WRITER_ID=t2.ID )  ON t0.FK_WRITER_ID=t1.ID WHERE t2.LAST_NAME = t1.LAST_NAME")
  
  def test_suite():