Skip to content

Commit

Permalink
#1: Rename 'PreparedQuery' to 'PreparedSQL'.
Browse files Browse the repository at this point in the history
  • Loading branch information
jenetics committed Jan 5, 2017
1 parent 64f58dd commit a157c13
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
*/
abstract class AbstractQuery {
final Connection _conn;
final PreparedQuery _query;
final PreparedSQL _query;

AbstractQuery(final Connection conn, final PreparedQuery query) {
AbstractQuery(final Connection conn, final PreparedSQL query) {
_conn = requireNonNull(conn);
_query = requireNonNull(query);
}

AbstractQuery(final Connection conn, final String query) {
this(conn, PreparedQuery.parse(query));
this(conn, PreparedSQL.parse(query));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
* @version !__version__!
* @since !__version__!
*/
final class PreparedQuery {
final class PreparedSQL {
private static final Pattern PARAM_PATTERN = Pattern.compile("\\{(\\w+?)\\}");

private final String _query;
private final Map<String, Integer> _params;

private PreparedQuery(
private PreparedSQL(
final String query,
final Map<String, Integer> params
) {
Expand Down Expand Up @@ -81,7 +81,7 @@ public String toString() {
* @param query the query string to parse
* @return a query string into a query for prepared statements
*/
public static PreparedQuery parse(final String query) {
public static PreparedSQL parse(final String query) {
final Matcher matcher = PARAM_PATTERN.matcher(query);

int index = 1;
Expand All @@ -93,7 +93,7 @@ public static PreparedQuery parse(final String query) {
}
matcher.appendTail(parsedQuery);

return new PreparedQuery(parsedQuery.toString(), params);
return new PreparedSQL(parsedQuery.toString(), params);
}

}
2 changes: 1 addition & 1 deletion jpx.jdbc/src/main/java/io/jenetics/jpx/jdbc/SQLQuery.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
public final class SQLQuery extends AbstractQuery {
private final List<Param> _params = new ArrayList<>();

public SQLQuery(final Connection conn, final PreparedQuery query) {
public SQLQuery(final Connection conn, final PreparedSQL query) {
super(conn, query);
}

Expand Down

0 comments on commit a157c13

Please sign in to comment.