Changeset 40:788b5325ef9e


Ignore:
Timestamp:
03/05/12 20:36:11 (6 years ago)
Author:
Babis Nikolaou <charnik@…>
Branch:
default
Parents:
39:9c76014791c3 (diff), 38:dd161fd165ea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge with George

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • generaldb/src/main/java/org/openrdf/sail/generaldb/managers/TransTableManager.java

    r38 r40  
    240240                return "0"; 
    241241        } 
    242  
     242         
    243243        protected TransactionTable getTable(Number pred) 
    244244        throws SQLException 
     
    247247                        TransactionTable table = tables.get(pred); 
    248248                        if (table == null) { 
     249                                triples.flushManagers();// charnik's addition (see flushManagers() method for details) 
    249250                                TripleTable predicate = triples.getPredicateTable(pred); 
    250251                                Number key = pred; 
  • generaldb/src/main/java/org/openrdf/sail/generaldb/managers/TransTableManager.java

    r39 r40  
    77 
    88import java.sql.Connection; 
     9import java.sql.DatabaseMetaData; 
    910import java.sql.SQLException; 
    1011import java.util.Collection; 
     
    315316                sb.append(getZeroBigInt()).append(" AS pred, "); 
    316317                sb.append(getZeroBigInt()).append(" AS obj "); 
    317                 sb.append(temp.buildDummyFromAndWhere(fromDummy)); 
     318                sb.append(fromDummy); 
     319            sb.append("\nWHERE 1=0"); 
    318320                sb.append(")"); 
    319321                return sb.toString(); 
Note: See TracChangeset for help on using the changeset viewer.