empire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From doeb...@apache.org
Subject empire-db git commit: EMPIREDB-223
Date Fri, 07 Aug 2015 08:51:38 GMT
Repository: empire-db
Updated Branches:
  refs/heads/master 71c48618c -> 4be8756f7


EMPIREDB-223

Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo
Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/4be8756f
Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/4be8756f
Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/4be8756f

Branch: refs/heads/master
Commit: 4be8756f7076b790799e8a822daa9b9c8eadd536
Parents: 71c4861
Author: Rainer Döbele <doebele@apache.org>
Authored: Fri Aug 7 10:51:33 2015 +0200
Committer: Rainer Döbele <doebele@apache.org>
Committed: Fri Aug 7 10:51:33 2015 +0200

----------------------------------------------------------------------
 empire-db/src/main/java/org/apache/empire/db/DBCommand.java        | 2 +-
 .../java/org/apache/empire/db/sqlite/DBDatabaseDriverSQLite.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/empire-db/blob/4be8756f/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
----------------------------------------------------------------------
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBCommand.java b/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
index c14a355..654c290 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
@@ -434,7 +434,7 @@ public abstract class DBCommand extends DBCommandExpr
      * 
      * @return the join expression 
      */
-    public DBJoinExpr join(DBColumnExpr left, DBColumn right, DBJoinType joinType)
+    public DBJoinExpr join(DBColumnExpr left, DBColumnExpr right, DBJoinType joinType)
     {
         DBJoinExpr join = new DBJoinExpr(left, right, joinType); 
         join(join);

http://git-wip-us.apache.org/repos/asf/empire-db/blob/4be8756f/empire-db/src/main/java/org/apache/empire/db/sqlite/DBDatabaseDriverSQLite.java
----------------------------------------------------------------------
diff --git a/empire-db/src/main/java/org/apache/empire/db/sqlite/DBDatabaseDriverSQLite.java
b/empire-db/src/main/java/org/apache/empire/db/sqlite/DBDatabaseDriverSQLite.java
index 25eee0e..a5e7156 100644
--- a/empire-db/src/main/java/org/apache/empire/db/sqlite/DBDatabaseDriverSQLite.java
+++ b/empire-db/src/main/java/org/apache/empire/db/sqlite/DBDatabaseDriverSQLite.java
@@ -75,7 +75,7 @@ public class DBDatabaseDriverSQLite extends DBDatabaseDriver
         }
         
         @Override
-		public DBJoinExpr join(DBColumnExpr left, DBColumn right, DBJoinType joinType)
+		public DBJoinExpr join(DBColumnExpr left, DBColumnExpr right, DBJoinType joinType)
         {
             // http://www.sqlite.org/omitted.html
             if (joinType != DBJoinType.LEFT) { throw new NotImplementedException(joinType,
left + " join " + right); }


Mime
View raw message