Tag: cws_dev300_dba30h
User: fs      
Date: 2008-08-06 11:41:16+0000
Removed:
   dba/connectivity/source/dbtools/defs/wntmsci10
   dba/connectivity/source/drivers/file/defs/wntmsci10
   dba/connectivity/source/drivers/mozab/defs/wntmsci10
   dba/connectivity/source/drivers/odbc/defs/wntmsci10

Modified:
   dba/connectivity/qa/connectivity/tools/HsqlDatabase.java
   dba/connectivity/source/parse/sqlbison.y

Log:
 RESYNC: (1.4-1.5); FILE MERGED

File Changes:

Directory: /dba/connectivity/qa/connectivity/tools/
===================================================

File [changed]: HsqlDatabase.java
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/qa/connectivity/tools/HsqlDatabase.java?r1=1.4.46.2&r2=1.4.46.3
Delta lines:  +15 -2
--------------------
--- HsqlDatabase.java   2008-07-23 12:49:53+0000        1.4.46.2
+++ HsqlDatabase.java   2008-08-06 11:40:51+0000        1.4.46.3
@@ -43,6 +43,7 @@
 import com.sun.star.sdbcx.XAppend;
 import com.sun.star.sdbcx.XTablesSupplier;
 import com.sun.star.uno.UnoRuntime;
+import com.sun.star.io.IOException;
 import java.io.File;
 
 import com.sun.star.util.CloseVetoException;
@@ -114,6 +115,18 @@
         statement.execute( statementString );
     }
 
+    /** stores the database document
+    */
+    public void store() throws IOException
+    {
+        if ( m_databaseDocument != null )
+        {
+            XStorable storeDoc = (XStorable)UnoRuntime.queryInterface( 
XStorable.class,
+                m_databaseDocument );
+            storeDoc.store();
+        }
+    }
+
     /** closes the database document
      *
      *  Any CloseVetoExceptions fired by third parties are ignored, and any 
reference to the

Directory: /dba/connectivity/source/dbtools/defs/
=================================================

File [removed]: wntmsci10

Directory: /dba/connectivity/source/drivers/file/defs/
======================================================

File [removed]: wntmsci10

Directory: /dba/connectivity/source/drivers/mozab/defs/
=======================================================

File [removed]: wntmsci10

Directory: /dba/connectivity/source/drivers/odbc/defs/
======================================================

File [removed]: wntmsci10

Directory: /dba/connectivity/source/parse/
==========================================

File [changed]: sqlbison.y
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/parse/sqlbison.y?r1=1.65.14.2&r2=1.65.14.3
Delta lines:  +3 -2
-------------------
--- sqlbison.y  2008-07-23 12:49:30+0000        1.65.14.2
+++ sqlbison.y  2008-08-06 11:41:10+0000        1.65.14.3
@@ -984,6 +984,7 @@
                        $$->append($2);
                    $$->append($3);
                }
+       |       joined_table
        |       '{' SQL_TOKEN_OJ joined_table '}'
                {
                        $$ = SQL_NEW_RULE;




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to