[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jaxme-dev
Subject:    cvs commit: ws-jaxme/src/js/org/apache/ws/jaxme/sqls/junit CreateTest.java Oracle8Test.java
From:       jochen () apache ! org
Date:       2004-06-25 10:28:27
Message-ID: 20040625102827.34431.qmail () minotaur ! apache ! org
[Download RAW message or body]

jochen      2004/06/25 03:28:27

  Modified:    src/js/org/apache/ws/jaxme/sqls/impl StatementMetaData.java
               src/js/org/apache/ws/jaxme/sqls/junit CreateTest.java
                        Oracle8Test.java
  Log:
  Fixed a bug in the query generator.
  
  Revision  Changes    Path
  1.2       +5 -9      \
ws-jaxme/src/js/org/apache/ws/jaxme/sqls/impl/StatementMetaData.java  
  Index: StatementMetaData.java
  ===================================================================
  RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/sqls/impl/StatementMetaData.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StatementMetaData.java	25 Jun 2004 09:14:38 -0000	1.1
  +++ StatementMetaData.java	25 Jun 2004 10:28:27 -0000	1.2
  @@ -62,6 +62,8 @@
           if (subSelect != null) {
           	addSelectStatement(subSelect);
           }
  +        createTableAliases();
  +        createColumnNames();
       }
   
       public StatementMetaData(SelectStatement pQuery) {
  @@ -73,7 +75,7 @@
       protected void addSetStatement(SetStatement pQuery, ColumnReference[] \
pColumns) {  addTable(pQuery.getTableReference());
           for (int i = 0;  i < pColumns.length;  i++) {
  -            addColumn(pColumns[i], false);
  +            addColumn(pColumns[i]);
           }
           for (Iterator iter = pQuery.getSetValues();  iter.hasNext();  ) {
           	addPart(((SetStatement.SetValue) iter.next()).getValue());
  @@ -107,11 +109,11 @@
           }
           addCombinedConstraint(pQuery.getWhere());
           for (Iterator iter = pQuery.getResultColumns();  iter.hasNext();  ) {
  -            addColumn((ColumnReference) iter.next(), true);
  +            addColumn((ColumnReference) iter.next());
           }
       }
   
  -    protected void addColumn(ColumnReference pColumn, boolean pIgnoreTrueRefs) {
  +    protected void addColumn(ColumnReference pColumn) {
           if (pColumn instanceof VirtualColumn) {
               VirtualColumn vc = (VirtualColumn) pColumn;
               Object o = vc.getValue();
  @@ -125,12 +127,6 @@
                   throw new IllegalStateException("Invalid type of VirtualColumn: " \
+ o);  }
               addColumnName(vc.getName());
  -        } else if (!pIgnoreTrueRefs) {
  -        	Column.Name alias = pColumn.getAlias();
  -            if (alias == null) {
  -                alias = pColumn.getColumn().getName();
  -            }
  -            addColumnName(alias);
           }
       }
   
  
  
  
  1.9       +5 -1      ws-jaxme/src/js/org/apache/ws/jaxme/sqls/junit/CreateTest.java
  
  Index: CreateTest.java
  ===================================================================
  RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/sqls/junit/CreateTest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CreateTest.java	25 Jun 2004 09:14:38 -0000	1.8
  +++ CreateTest.java	25 Jun 2004 10:28:27 -0000	1.9
  @@ -146,6 +146,10 @@
           assertEquals("INSERT INTO MySchema.MyTable (MyIndex, MyName, MyDate) \
VALUES (?, ?, ?)", s);  }
   
  +    protected String getBulkInsertResult() {
  +        return "INSERT INTO MySchema.MyTable (MyTable.MyIndex, MyTable.MyName, \
MyTable.MyDate) (SELECT MyTable0.MyIndex, MyTable0.MyName, MyTable0.MyDate FROM \
MySchema.MyTable AS MyTable0)";  +    }
  +
       public void testBulkInsert() {
           Table table = getBasicTable();
           InsertStatement insertStatement = getSQLFactory().newInsertStatement();
  @@ -155,7 +159,7 @@
           generator.setLineTerminator("\n");
           insertStatement.setSubSelect(st);
           String got = generator.getQuery(insertStatement);
  -        String expect = "INSERT INTO MySchema.MyTable (MyIndex, MyName, MyDate) \
(SELECT MyIndex, MyName, MyDate FROM MySchema.MyTable)";  +        String expect = \
getBulkInsertResult();  assertEquals(expect, got);
       }
   
  
  
  
  1.4       +4 -0      \
ws-jaxme/src/js/org/apache/ws/jaxme/sqls/junit/Oracle8Test.java  
  Index: Oracle8Test.java
  ===================================================================
  RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/sqls/junit/Oracle8Test.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Oracle8Test.java	11 Mar 2004 11:03:13 -0000	1.3
  +++ Oracle8Test.java	25 Jun 2004 10:28:27 -0000	1.4
  @@ -72,4 +72,8 @@
           String query = gen.getQuery(selectStatement);
           assertEquals("SELECT MyIndex, MyName, MyDate FROM MySchema.MyTable START \
WITH MyIndex=1 CONNECT BY PRIOR MyIndex=MyName", query);  }
  +
  +    protected String getBulkInsertResult() {
  +    	return "INSERT INTO MySchema.MyTable (MyTable.MyIndex, MyTable.MyName, \
MyTable.MyDate) (SELECT MyTable0.MyIndex, MyTable0.MyName, MyTable0.MyDate FROM \
MySchema.MyTable MyTable0)";  +    }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]