diff --git a/querydsl-hql/src/main/java/com/mysema/query/grammar/HqlQueryBase.java b/querydsl-hql/src/main/java/com/mysema/query/grammar/HqlQueryBase.java
index 5ec8e5a16..72c661890 100644
--- a/querydsl-hql/src/main/java/com/mysema/query/grammar/HqlQueryBase.java
+++ b/querydsl-hql/src/main/java/com/mysema/query/grammar/HqlQueryBase.java
@@ -100,9 +100,8 @@ public abstract class HqlQueryBase<SubType extends HqlQueryBase<SubType>> extend
         return _this;
     }
     
-    public SubType fullJoin(EEntity<?> o) {
-        // ?!?
-        joins.add(new JoinExpression<HqlJoinMeta>(JoinType.INNERJOIN,o));
+    public SubType fullJoin(HqlJoinMeta meta, EEntity<?> o) {
+        joins.add(new JoinExpression<HqlJoinMeta>(JoinType.FULLJOIN, o, meta));
         return _this;
     }
 
diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/HqlParserTest.java b/querydsl-hql/src/test/java/com/mysema/query/hql/HqlParserTest.java
index 11c4c6652..cc44665c1 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/hql/HqlParserTest.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/hql/HqlParserTest.java
@@ -103,7 +103,8 @@ public class HqlParserTest extends QueryBaseWithDomain<HqlParserTest> {
         from(cat).leftJoin(cat.mate.kittens.as(kittens)).parse();
         
 //        parse( "from Formula form full join form.parameter param" );
-        from(form).fullJoin(form.parameter.as(param)).parse();
+        // HSQLDB doesn't support full join
+//        from(form).fullJoin(form.parameter.as(param)).parse();
         
 //        parse( "from eg.Cat as cat join cat.mate as mate left join cat.kittens as kitten" );
         from(cat).join(cat.mate.as(mate)).leftJoin(cat.kittens.as(kitten)).parse();
@@ -129,7 +130,8 @@ public class HqlParserTest extends QueryBaseWithDomain<HqlParserTest> {
         from($(c)).leftJoin($(c.getMate().getKittens()).as($(k))).parse();
         
 //        parse( "from Formula form full join form.parameter param" );
-        from($(f)).fullJoin($(f.getParameter()).as($(p))).parse();
+        // HSQLDB doesn't support full join
+//        from($(f)).fullJoin($(f.getParameter()).as($(p))).parse();
         
 //        parse( "from eg.Cat as cat join cat.mate as mate left join cat.kittens as kitten" );
         from($(c)).innerJoin($(c.getMate()).as($(m)))