Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/main/java/com/github/jonathanhds/sqlbuilder/Context.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ public Context(Database database, Connection connection) {
parameters = new LinkedList<>();
}

public Context(Database database) {
this.database = database;
this.connection = null;
this.sql = new StringBuilder();
this.parameters = new LinkedList<>();
}

@Override
public String toString() {
return sql.toString();
Expand Down Expand Up @@ -111,14 +118,15 @@ private ResultSet execute(String sql) throws SQLException {
}

private PreparedStatement prepareStatement(String sql) throws SQLException {
PreparedStatement statement = connection.prepareStatement(sql);
try (PreparedStatement statement = connection.prepareStatement(sql)) {

int i = 1;
for (Object parameter : parameters) {
statement.setObject(i++, parameter);
}
int i = 1;
for (Object parameter : parameters) {
statement.setObject(i++, parameter);
}

return statement;
return statement;
}
}

}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package com.github.jonathanhds.sqlbuilder;

public enum Database {
ORACLE, HSQLDB
ORACLE, HSQLDB, NONE
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ public QueryBuilder(Database database, Connection connection) {
this.context = new Context(database, connection);
}

public QueryBuilder() {
this.context = new Context(Database.NONE);
}

public Select select() {
return new Select(context);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.github.jonathanhds.sqlbuilder.select;

import com.github.jonathanhds.sqlbuilder.builder.QueryBuilder;
import com.github.jonathanhds.sqlbuilder.builder.QueryBuilderHSQLDB;
import com.github.jonathanhds.sqlbuilder.builder.QueryBuilderOracle;
import com.github.jonathanhds.sqlbuilder.support.*;
Expand All @@ -9,13 +10,15 @@

import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Calendar;
import java.util.Date;
import java.util.List;

import static com.github.jonathanhds.sqlbuilder.select.OrderByType.DESC;
import static java.util.Calendar.*;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;

public class SelectTest {
Expand All @@ -25,18 +28,33 @@ public class SelectTest {
@Before
public void startConnection() throws Exception {
connection = new MemoryDatabase().getConnection();
connection.createStatement().executeQuery("SET DATABASE SQL SYNTAX ORA FALSE");
try (Statement statement = connection.createStatement()) {
statement.executeQuery("SET DATABASE SQL SYNTAX ORA FALSE");
}
}

@After
public void closeConnection() throws Exception {
connection.createStatement().execute("SHUTDOWN");
try (Statement statement = connection.createStatement()) {
statement.execute("SHUTDOWN");
}

if (!connection.isClosed()) {
connection.close();
}
}

@Test
public void selectWithoutDatabase() {
String query = new QueryBuilder()
.select()
.all()
.from()
.table("User u")
.toString();
assertEquals(query, "SELECT\n*\nFROM\nUser u\n\n\n");
}

@Test
public void selectAllFromTable() throws Exception {
List<Person> persons = new QueryBuilderHSQLDB(connection).select()
Expand Down Expand Up @@ -332,7 +350,9 @@ public void selectColumnsFromTableGroupByHavingOrderBy() throws Exception {

@Test
public void selectAllFromTableWithPagination_Oracle() throws Exception {
connection.createStatement().executeQuery("SET DATABASE SQL SYNTAX ORA TRUE");
try (Statement statement = connection.createStatement()) {
statement.executeQuery("SET DATABASE SQL SYNTAX ORA TRUE");
}
List<Person> persons = new QueryBuilderOracle(connection).select()
.all()
.from()
Expand Down