Table schema support

src/main/java/com/j256/ormlite/stmt/DeleteBuilder.java

@@ -19,12 +19,20 @@
  */
 public class DeleteBuilder<T, ID> extends StatementBuilder<T, ID> {
 
+ private String tableSchema;
+
  // NOTE: any fields here should be added to the clear() method below
 
  public DeleteBuilder(DatabaseType databaseType, TableInfo<T, ID> tableInfo, Dao<T, ID> dao) {
  super(databaseType, tableInfo, dao, StatementType.DELETE);
  }
 
+ public DeleteBuilder(DatabaseType databaseType, TableInfo<T, ID> tableInfo, Dao<T, ID> dao, String schema) {
+ super(databaseType, tableInfo, dao, StatementType.DELETE);
+ this.tableSchema = schema;
+ }
+
+
  /**
  * Build and return a prepared delete that can be used by {@link Dao#delete(PreparedDelete)} method. If you change
  * the where or make other calls you will need to re-call this method to re-prepare the statement for execution.
@@ -58,6 +66,10 @@ public void reset() {
  @Override
  protected void appendStatementStart(StringBuilder sb, List<ArgumentHolder> argList) {
  sb.append("DELETE FROM ");
+ if (this.tableSchema != null){
+ databaseType.appendEscapedEntityName(sb, tableSchema);
+ sb.append(".");
+ }
  databaseType.appendEscapedEntityName(sb, tableInfo.getTableName());
  sb.append(' ');
  }
@@ -66,4 +78,13 @@ protected void appendStatementStart(StringBuilder sb, List<ArgumentHolder> argLi
  protected void appendStatementEnd(StringBuilder sb, List<ArgumentHolder> argList) {
  // noop
  }
+
+ /**
+ * Manually force table schema name to this query
+ * @return 
+ */
+ public DeleteBuilder<T, ID> setSchema(String tableSchema) {
+ this.tableSchema = tableSchema;
+ return this;
+ }
 }

src/main/java/com/j256/ormlite/stmt/QueryBuilder.java

@@ -45,6 +45,7 @@ public class QueryBuilder<T, ID> extends StatementBuilder<T, ID> {
  private Long limit;
  private Long offset;
  private List<JoinInfo> joinList;
+ private String tableSchema;
 
  // NOTE: anything added here should be added to the clear() method below
 
@@ -53,6 +54,13 @@ public QueryBuilder(DatabaseType databaseType, TableInfo<T, ID> tableInfo, Dao<T
  this.idField = tableInfo.getIdField();
  this.selectIdColumn = (idField != null);
  }
+
+ public QueryBuilder(DatabaseType databaseType, TableInfo<T, ID> tableInfo, Dao<T, ID> dao, String tableSchema) {
+ super(databaseType, tableInfo, dao, StatementType.SELECT);
+ this.idField = tableInfo.getIdField();
+ this.selectIdColumn = (idField != null);
+ this.tableSchema = tableSchema;
+ }
 
  /**
  * This is used by the internal call structure to note when a query builder is being used as an inner query. This is
@@ -472,6 +480,10 @@ protected void appendStatementStart(StringBuilder sb, List<ArgumentHolder> argLi
  appendSelects(sb);
  }
  sb.append("FROM ");
+ if (tableSchema != null){
+ databaseType.appendEscapedEntityName(sb, tableSchema);
+ sb.append(".");
+ }
  databaseType.appendEscapedEntityName(sb, tableName);
  sb.append(' ');
  if (joinList != null) {
@@ -936,4 +948,13 @@ private JoinWhereOperation(WhereOperation whereOperation) {
  this.whereOperation = whereOperation;
  }
  }
+
+ /**
+ * Manually force table schema name to this query
+ * @return 
+ */
+ public QueryBuilder<T, ID> setSchema(String tableSchema) {
+ this.tableSchema = tableSchema;
+ return this;
+ }
 }

src/main/java/com/j256/ormlite/stmt/UpdateBuilder.java

@@ -26,10 +26,16 @@ public class UpdateBuilder<T, ID> extends StatementBuilder<T, ID> {
 
  private List<Clause> updateClauseList = null;
  // NOTE: anything added here should be added to the clear() method below
+ private String tableSchema;