*** misc/hsqldb/build/build.xml	Sun Oct 23 18:54:00 2005
--- misc/build/hsqldb/build/build.xml	Wed Nov  9 12:51:56 2005
***************
*** 16,28 ****
     <property file='build/build.properties'/>
     <property name="hsqldb.version" value="1.8.0"/>
  
!    <tstamp>
!        <format property="_tmpstamp" pattern="yyyy/MM/dd-hh:mm:ss"
!                locale="en"/>
!    </tstamp>
! 
!    <property name="build.label" value="private-${_tmpstamp}"/>
!    <property name="build.vendor" value="${user.name}"/>
     <property name="hsqldb.title" value="HSQLDB"/>
     <property name="hsqldb.vendor" value="The HSQLDB Development Group"/>
     <property name="src" value="${basedir}/src"/>
--- 16,23 ----
     <property file='build/build.properties'/>
     <property name="hsqldb.version" value="1.8.0"/>
  
!    <property name="build.label" value="replace-me"/>
!    <property name="build.vendor" value="OpenOffice.org"/>
     <property name="hsqldb.title" value="HSQLDB"/>
     <property name="hsqldb.vendor" value="The HSQLDB Development Group"/>
     <property name="src" value="${basedir}/src"/>
Files misc/hsqldb/lib/hsqldb.jar and misc/build/hsqldb/lib/hsqldb.jar differ
*** misc/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java	Sun Nov  6 23:01:34 2005
--- misc/build/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java	Wed Nov 30 14:55:43 2005
***************
*** 1451,1483 ****
          // in certain cases; the workaround here discards such scripted column
          // lists when used in OOo
          if (tokenizer.isGetThis(Token.T_OPENBRACKET)) {
!             try {    // added line
!                 HsqlArrayList list = Parser.getColumnNames(database, null,
!                     tokenizer, true);
! 
                  colList = new HsqlName[list.size()];
                  colList = (HsqlName[]) list.toArray(colList);
  
!                 //added lines to make sure all columns are quoted
                  if (database.isStoredFileAccess()) {
                      for (int i = 0; i < colList.length; i++) {
                          if (!colList[i].isNameQuoted) {
!                             throw (Trace.error(Trace.INVALID_IDENTIFIER));
                          }
                      }
                  }
              } catch (HsqlException e) {
! 
!                 //added lines to catch unquoted column names with spaces
                  if (database.isStoredFileAccess()) {
-                     colList = null;
- 
                      while (!tokenizer.getString().equals(
                              Token.T_CLOSEBRACKET)) {}
                  } else {
                      throw e;
                  }
!             }
          }
  
          tokenizer.getThis(Token.T_AS);
--- 1451,1482 ----
          // in certain cases; the workaround here discards such scripted column
          // lists when used in OOo
          if (tokenizer.isGetThis(Token.T_OPENBRACKET)) {
!             try {
!                 HsqlArrayList list =
!                     Parser.getColumnNames(database, null, tokenizer, true);
                  colList = new HsqlName[list.size()];
                  colList = (HsqlName[]) list.toArray(colList);
  
!                 //added lines to make sure all valid columns are quoted
                  if (database.isStoredFileAccess()) {
                      for (int i = 0; i < colList.length; i++) {
                          if (!colList[i].isNameQuoted) {
!                             colList = null;
! 
!                             break;
                          }
                      }
                  }
              } catch (HsqlException e) {
!                 //added lines to catch unquoted names with spaces
                  if (database.isStoredFileAccess()) {
                      while (!tokenizer.getString().equals(
                              Token.T_CLOSEBRACKET)) {}
+ 
                  } else {
                      throw e;
                  }
!             }            
          }
  
          tokenizer.getThis(Token.T_AS);
