[Libreoffice-commits] .: 2 commits - connectivity/source hsqldb/makefile.mk hsqldb/patches

[Lionel Elie Mamane]

 connectivity/source/drivers/hsqldb/HConnection.cxx |    2 +-
 hsqldb/makefile.mk                                 |    3 ++-
 hsqldb/patches/fdo36824.patch                      |   11 +++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 2c46368432bd4f1bd86c7f3fb6c25ec5ad05dee7
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Jul 3 20:17:01 2012 +0200

    embedded HSQLDB: reclaim space occupied by deleted rows
    
    Disadvantage is that saving/closing the file may take a significantly longer time
    
    Change-Id: I1cc35c34b49e60d73e8d341549c5a3c5ef314b6d

diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 1c85dde..ee7c5b2 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -180,7 +180,7 @@ namespace connectivity { namespace hsqldb
                 if ( !m_bReadOnly )
                 {
                     Reference< XStatement > xStmt( m_xConnection->createStatement(), UNO_QUERY_THROW );
-                    xStmt->execute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CHECKPOINT" ) ) );
+                    xStmt->execute( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CHECKPOINT DEFRAG" ) ) );
                 }
             }
 
commit bed3049c4c04a202ff288189d225ca6e5941d69b
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Jul 3 20:00:06 2012 +0200

    fdo#36824 hsqldb properly escape automatically built names
    
    Change-Id: Id2c36fb24d1f7c8f8e9800c10226323594bb766e

diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
index e500462..3692403 100644
--- a/hsqldb/makefile.mk
+++ b/hsqldb/makefile.mk
@@ -58,7 +58,8 @@ CONVERTFILES=build$/build.xml \
 PATCH_FILES=patches$/i96823.patch \
             patches$/i97032.patch \
             patches$/i103528.patch \
-            patches$/i104901.patch
+            patches$/i104901.patch \
+            patches$/fdo36824.patch
 
 .IF "$(JAVANUMVER:s/.//)" >= "000100060000"
 PATCH_FILES+= \
diff --git a/hsqldb/patches/fdo36824.patch b/hsqldb/patches/fdo36824.patch
new file mode 100644
index 0000000..ad753e3
--- /dev/null
+++ b/hsqldb/patches/fdo36824.patch
@@ -0,0 +1,11 @@
+--- misc/hsqldb/src/org/hsqldb/Expression.java	2012-07-03 19:49:00.000000000 +0200
++++ misc/build/hsqldb/src/org/hsqldb/Expression.java	2012-07-03 19:39:00.000000000 +0200
+@@ -1552,7 +1552,7 @@
+             return columnQuoted;
+         }
+ 
+-        return false;
++        return true;
+     }
+ 
+     /**