--- src/schema/pgDatabase.cpp.orig	Sat Oct  9 03:47:24 2004
+++ src/schema/pgDatabase.cpp	Sat Oct  9 03:49:06 2004
@@ -267,7 +267,11 @@
             + wxT("-- DROP DATABASE ") + GetQuotedIdentifier() + wxT(";")
             + wxT("\n\nCREATE DATABASE ") + GetQuotedIdentifier()
             + wxT("\n  WITH OWNER = ") + qtIdent(GetOwner())
-            + wxT("\n       ENCODING = ") + qtString(GetEncoding()) + wxT(";\n");
+            + wxT("\n       ENCODING = ") + qtString(GetEncoding());
+        if (!tablespace.IsEmpty())
+             sql += wxT("\n       TABLESPACE = ") + qtString(GetTablespace()) + wxT(";\n");
+        else
+             sql += wxT(";\n");
 
         size_t i;
         for (i=0 ; i < variables.GetCount() ; i++)