Strabon
changeset 40:788b5325ef9e
Merge with George
author | Babis Nikolaou <charnik@di.uoa.gr> |
---|---|
date | Mon Mar 05 20:36:11 2012 +0200 (2012-03-05) |
parents | 9c76014791c3 dd161fd165ea |
children | 307d80c03b27 |
files | generaldb/src/main/java/org/openrdf/sail/generaldb/managers/TransTableManager.java |
line diff
1.1 --- a/generaldb/pom.xml Mon Mar 05 20:26:53 2012 +0200 1.2 +++ b/generaldb/pom.xml Mon Mar 05 20:36:11 2012 +0200 1.3 @@ -96,12 +96,12 @@ 1.4 <version>4.7</version> 1.5 <scope>test</scope> 1.6 </dependency> 1.7 - <!-- 1.8 + 1.9 <dependency> 1.10 - <groupId>net.sf</groupId> 1.11 - <artifactId>log4jdbc3</artifactId> 1.12 - <version>1.2beta2</version> 1.13 - </dependency> 1.14 - --> 1.15 + <groupId>net.sf</groupId> 1.16 + <artifactId>log4jdbc4</artifactId> 1.17 + <version>1.2</version> 1.18 + </dependency> 1.19 + 1.20 </dependencies> 1.21 </project>
2.1 --- a/generaldb/src/main/java/org/openrdf/sail/generaldb/managers/TransTableManager.java Mon Mar 05 20:26:53 2012 +0200 2.2 +++ b/generaldb/src/main/java/org/openrdf/sail/generaldb/managers/TransTableManager.java Mon Mar 05 20:36:11 2012 +0200 2.3 @@ -6,6 +6,7 @@ 2.4 package org.openrdf.sail.generaldb.managers; 2.5 2.6 import java.sql.Connection; 2.7 +import java.sql.DatabaseMetaData; 2.8 import java.sql.SQLException; 2.9 import java.util.Collection; 2.10 import java.util.HashMap; 2.11 @@ -314,7 +315,8 @@ 2.12 sb.append(getZeroBigInt()).append(" AS subj, "); 2.13 sb.append(getZeroBigInt()).append(" AS pred, "); 2.14 sb.append(getZeroBigInt()).append(" AS obj "); 2.15 - sb.append(temp.buildDummyFromAndWhere(fromDummy)); 2.16 + sb.append(fromDummy); 2.17 + sb.append("\nWHERE 1=0"); 2.18 sb.append(")"); 2.19 return sb.toString(); 2.20 }
3.1 --- a/pom.xml Mon Mar 05 20:26:53 2012 +0200 3.2 +++ b/pom.xml Mon Mar 05 20:36:11 2012 +0200 3.3 @@ -396,19 +396,19 @@ 3.4 </scm> 3.5 3.6 <repositories> 3.7 - <!-- 3.8 - <repository> 3.9 - <releases> 3.10 - <enabled>true</enabled> 3.11 - </releases> 3.12 - <snapshots> 3.13 - <enabled>false</enabled> 3.14 - </snapshots> 3.15 - <id>strabon.testing</id> 3.16 - <name>Strabon - maven repository</name> 3.17 - <url>http://maven.strabon.di.uoa.gr/content/repositories/testing</url> 3.18 - </repository> 3.19 - --> 3.20 + 3.21 + <repository> 3.22 + <releases> 3.23 + <enabled>true</enabled> 3.24 + </releases> 3.25 + <snapshots> 3.26 + <enabled>false</enabled> 3.27 + </snapshots> 3.28 + <id>strabon.testing</id> 3.29 + <name>Strabon - maven repository</name> 3.30 + <url>http://maven.strabon.di.uoa.gr/content/repositories/testing</url> 3.31 + </repository> 3.32 + 3.33 <repository> 3.34 <releases> 3.35 <enabled>true</enabled>