Merge pull request #1 from russ-p/dependabot/maven/junit-junit-4.13.1

Bump junit from 4.12 to 4.13.1

.drone.yml

@@ -0,0 +1,24 @@
+kind: pipeline
+name: default
+
+steps:
+
+- name: install
+  image: maven:3.6.1-jdk-8-slim
+  volumes:
+  - name: mvnrepo
+    path: /root/.m2  
+  commands:
+  - mvn install deploy -Ddeployment.releases.id=$DEPREPO -Ddeployment.releases.url=$DEPREPOURL -Ddeployment.snapshots.id=$DEPREPO -Ddeployment.snapshots.url=$DEPREPOSNAPURL
+  environment:
+    DEPREPO:
+      from_secret: deprepo
+    DEPREPOURL:
+      from_secret: deprepourl
+    DEPREPOSNAPURL:
+      from_secret: depreposnapurl     
+
+volumes:
+- name: mvnrepo
+  host:
+    path: /media/data/storage/.m2

.gitignore

@@ -1 +1,7 @@
+#mvn
 /target/
+
+#Eclipse
+.project
+.classpath
+.settings/

README.md

@@ -0,0 +1,27 @@
+# sqlbuilder
+simple sql builder
+
+From
+````java
+String sql = Sql.select()
+    .column("id").as("col_id")
+    .column("code").as("col_code")
+    .from("test_table")
+    .where("id = 1")
+    .groupBy("id")
+    .orderBy("id").by("code").desc()
+    .toString();
+````
+to
+````
+SELECT
+  id AS col_id,
+  code AS col_code
+FROM
+  test_table
+WHERE
+  id = 1
+GROUP BY
+  id
+ORDER BY id, code DESC
+````

pom.xml

@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>4.13.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -30,4 +30,31 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>${java.version}</source>
+					<target>${java.version}</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<distributionManagement>
+		<repository>
+			<id>${deployment.releases.id}</id>
+			<name>Releases</name>
+			<url>${deployment.releases.url}</url>
+		</repository>
+		<snapshotRepository>
+			<id>${deployment.snapshots.id}</id>
+			<name>Snapshots</name>
+			<url>${deployment.snapshots.url}</url>
+		</snapshotRepository>
+	</distributionManagement>
+
 </project>

src/main/java/com/github/russ_p/sqlbuilder/select/FromBuilder.java

@@ -1,6 +1,6 @@
 package com.github.russ_p.sqlbuilder.select;
 
-public class FromBuilder extends AbstractQueryBuilder<SelectQuery> {
+public class FromBuilder extends AbstractQueryBuilder<SelectQuery> implements JoinMixin {
 
 	FromBuilder(SelectQuery query, String table) {
 		super(query);
@@ -15,23 +15,9 @@ public class FromBuilder extends AbstractQueryBuilder<SelectQuery> {
 		return new WhereBuilder(query, condition);
 	}
 
-	public JoinBuilder join(String table) {
+	@Override
-		return innerJoin(table);
+	public SelectQuery getQuery() {
+		return query;
 	}
 
-	public JoinBuilder innerJoin(String table) {
-		return new JoinBuilder(query, "inner", table);
-	}
-
-	public JoinBuilder leftJoin(String table) {
-		return new JoinBuilder(query, "left", table);
-	}
-
-	public JoinBuilder rightJoin(String table) {
-		return new JoinBuilder(query, "right", table);
-	}
-
-	public JoinBuilder crossJoin(String table) {
-		return new JoinBuilder(query, "cross", table);
-	}
 }

src/main/java/com/github/russ_p/sqlbuilder/select/JoinBuilder.java

@@ -2,13 +2,41 @@ package com.github.russ_p.sqlbuilder.select;
 
 public class JoinBuilder extends AbstractQueryBuilder<SelectQuery> {
 
-	public JoinBuilder(SelectQuery query, String joinType, String table) {
+	JoinBuilder(SelectQuery query, JoinType joinType, String table) {
 		super(query);
-		query.addJoin("\n " + joinType.toUpperCase() + " JOIN " + table);
+		join(joinType, table);
 	}
 
 	public JoinConditionBuilder on(String condition) {
 		return new JoinConditionBuilder(query, condition);
 	}
 
+	public JoinBuilder join(String table) {
+		return innerJoin(table);
+	}
+
+	public JoinBuilder innerJoin(String table) {
+		return join(JoinType.INNER, table);
+	}
+
+	public JoinBuilder leftJoin(String table) {
+		return join(JoinType.LEFT, table);
+	}
+
+	public JoinBuilder rightJoin(String table) {
+		return join(JoinType.RIGHT, table);
+	}
+
+	public JoinBuilder crossJoin(String table) {
+		return join(JoinType.CROSS, table);
+	}
+
+	public WhereBuilder where(String condition) {
+		return new WhereBuilder(query, condition);
+	}
+
+	private JoinBuilder join(JoinType joinType, String table) {
+		query.addJoin(" " + joinType.toString() + " JOIN " + table);
+		return this;
+	}
 }

src/main/java/com/github/russ_p/sqlbuilder/select/JoinConditionBuilder.java

@@ -1,6 +1,6 @@
 package com.github.russ_p.sqlbuilder.select;
 
-public class JoinConditionBuilder extends AbstractQueryBuilder<SelectQuery> {
+public class JoinConditionBuilder extends AbstractQueryBuilder<SelectQuery> implements JoinMixin {
 
 	public JoinConditionBuilder(SelectQuery query, String condition) {
 		super(query);
@@ -11,23 +11,9 @@ public class JoinConditionBuilder extends AbstractQueryBuilder<SelectQuery> {
 		return new WhereBuilder(query, condition);
 	}
 
-	public JoinBuilder join(String table) {
+	@Override
-		return innerJoin(table);
+	public SelectQuery getQuery() {
+		return query;
 	}
 
-	public JoinBuilder innerJoin(String table) {
-		return new JoinBuilder(query, "inner", table);
-	}
-
-	public JoinBuilder leftJoin(String table) {
-		return new JoinBuilder(query, "left", table);
-	}
-
-	public JoinBuilder rightJoin(String table) {
-		return new JoinBuilder(query, "right", table);
-	}
-
-	public JoinBuilder crossJoin(String table) {
-		return new JoinBuilder(query, "cross", table);
-	}
 }

src/main/java/com/github/russ_p/sqlbuilder/select/JoinMixin.java

@@ -0,0 +1,26 @@
+package com.github.russ_p.sqlbuilder.select;
+
+interface JoinMixin {
+
+	default JoinBuilder join(String table) {
+		return innerJoin(table);
+	}
+
+	default JoinBuilder innerJoin(String table) {
+		return new JoinBuilder(getQuery(), JoinType.INNER, table);
+	}
+
+	default JoinBuilder leftJoin(String table) {
+		return new JoinBuilder(getQuery(), JoinType.LEFT, table);
+	}
+
+	default JoinBuilder rightJoin(String table) {
+		return new JoinBuilder(getQuery(), JoinType.RIGHT, table);
+	}
+
+	default JoinBuilder crossJoin(String table) {
+		return new JoinBuilder(getQuery(), JoinType.CROSS, table);
+	}
+
+	SelectQuery getQuery();
+}

src/main/java/com/github/russ_p/sqlbuilder/select/JoinType.java

@@ -0,0 +1,10 @@
+package com.github.russ_p.sqlbuilder.select;
+
+enum JoinType {
+
+	INNER,
+	LEFT,
+	RIGHT,
+	CROSS,
+
+}

src/main/java/com/github/russ_p/sqlbuilder/select/SelectQuery.java

@@ -79,6 +79,7 @@ class SelectQuery {
 		sb.append(tables.stream().collect(Collectors.joining(", ")));
 
 		if (!join.isEmpty()) {
+			sb.append("\n");
 			sb.append(join.stream().collect(Collectors.joining("\n  ")));
 		}