Skip to content

Commit 35ab8e6

Browse files
authored
Merge pull request #8 from ZorTik/development
Development
2 parents 3864f8e + 92c0fe6 commit 35ab8e6

62 files changed

Lines changed: 1241 additions & 501 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/junit.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: JUnit
2+
3+
on: [push]
4+
5+
jobs:
6+
test:
7+
runs-on: ubuntu-latest
8+
timeout-minutes: 5
9+
steps:
10+
- uses: actions/checkout@v3
11+
- name: Set up JDK 11
12+
uses: actions/setup-java@v3
13+
with:
14+
java-version: '11'
15+
distribution: 'adopt'
16+
- name: Shutdown default MySQL
17+
run: sudo service mysql stop
18+
- name: Setup MySQL
19+
uses: mirromutth/mysql-action@v1.1
20+
with:
21+
mysql database: 'test'
22+
mysql user: 'test'
23+
mysql password: 'test'
24+
mysql port: 3306
25+
- name: Gradle Build
26+
run: ./gradlew build -x test
27+
- name: Gradle Test
28+
run: ./gradlew test
29+
- name: JUnit Report Action
30+
uses: mikepenz/action-junit-report@v3.7.1
31+
if: always()
32+
with:
33+
report_paths: '**/build/test-results/test/TEST-*.xml'

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022 ZorTik
3+
Copyright (c) 2022-2023 ZorTik
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,8 @@ Before documentation is done, here is a <a href="https://github.com/ZorTik/Advan
1515
</p>-->
1616

1717
## Installation
18-
You can add Containr to your build path using Maven or Gradle. ContainrGUI is **not a Minecraft plugin**! This means that you can use it's code directly in your project by shading it into your build path.
19-
20-
### Gradle:
21-
Add this project to your build path using Gradle with JitPack as represented below.<br>Download the sources from jitpack.
22-
```
23-
repositories {
24-
maven { url = 'https://jitpack.io' }
25-
}
26-
```
27-
```
28-
dependencies {
29-
implementation 'com.github.ZorTik:AdvancedSQLClient:Tag'
30-
}
31-
```
32-
33-
### Maven:
34-
You can also use Maven with JitPack as seen below.<br>Download the sources from jitpack.
35-
```
36-
<repositories>
37-
<repository>
38-
<id>jitpack.io</id>
39-
<url>https://jitpack.io</url>
40-
</repository>
41-
</repositories>
42-
```
43-
```
44-
<dependency>
45-
<groupId>com.github.ZorTik</groupId>
46-
<artifactId>AdvancedSQLClient</artifactId>
47-
<version>Version</version>
48-
</dependency>
49-
```
50-
51-
> Documentation soon!
18+
You can add AdvancedSQLClient to your build path using Maven or Gradle. You can also shade&relocate it using shade plugin to have it's unique build path.
19+
20+
<a href="https://github.com/ZorTik/AdvancedSQLClient/wiki/Installation">Installation on Wiki</a>
21+
22+
> Wiki in progress!

api/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ repositories {
1010
}
1111

1212
dependencies {
13+
implementation project(":shared")
1314
implementation group: 'org.jetbrains', name: 'annotations', version: '20.1.0'
1415
implementation 'com.google.code.gson:gson:2.9.0'
1516
compileOnly 'org.projectlombok:lombok:1.18.24'

api/settings.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include ":shared"
2+
project(":shared").projectDir = file("../shared")

api/src/main/java/me/zort/sqllib/api/Executive.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
public interface Executive {
44

5-
SQLDatabaseConnection getConnection();
5+
SQLConnection getConnection();
66

77
}

api/src/main/java/me/zort/sqllib/api/Query.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,8 @@ default Query getAncestor() {
1717
return this;
1818
}
1919

20+
default boolean isAncestor() {
21+
return getAncestor() == this;
22+
}
23+
2024
}

api/src/main/java/me/zort/sqllib/api/SQLDatabaseConnection.java

Lines changed: 0 additions & 84 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package me.zort.sqllib.api;
2+
3+
import java.sql.Connection;
4+
import java.sql.SQLException;
5+
import java.sql.Statement;
6+
7+
public interface StatementFactory<T extends Statement> {
8+
9+
T prepare(Connection connection) throws SQLException;
10+
11+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package me.zort.sqllib.api.data;
22

3+
import org.jetbrains.annotations.Nullable;
4+
35
public interface QueryResult {
46

57
boolean isSuccessful();
8+
@Nullable
9+
String getRejectMessage();
610

711
}

0 commit comments

Comments
 (0)