From a70e9b7a79f9daf07b64a256f95a5e52dd7bb502 Mon Sep 17 00:00:00 2001 From: Andrewkydev Date: Thu, 15 Jan 2026 22:38:46 +0300 Subject: [PATCH] first commit --- .gitignore | 43 ++ README.md | 14 + build.gradle.kts | 132 +++++ docs/api-query.md | 33 ++ docs/api-schema.md | 35 ++ docs/config.md | 40 ++ docs/examples.md | 91 +++ docs/orm-query.md | 43 ++ docs/orm-schema.md | 30 + docs/orm.md | 119 ++++ docs/overview.md | 40 ++ docs/ru/api-query.md | 33 ++ docs/ru/api-schema.md | 35 ++ docs/ru/config.md | 40 ++ docs/ru/orm-query.md | 43 ++ docs/ru/orm-schema.md | 30 + docs/ru/orm.md | 119 ++++ docs/ru/overview.md | 34 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++ gradlew.bat | 94 +++ settings.gradle.kts | 1 + src/main/java/com/andrewkydev/Loader.java | 62 ++ .../com/andrewkydev/database/DatabaseApi.java | 23 + .../database/DatabaseProvider.java | 20 + .../database/config/DatabaseConfig.java | 115 ++++ .../database/config/DatabaseConfigLoader.java | 56 ++ .../database/internal/DatabaseImpl.java | 75 +++ .../database/internal/EntityManagerImpl.java | 539 ++++++++++++++++++ .../database/internal/EntityMetadata.java | 149 +++++ .../database/internal/EntityQueryImpl.java | 329 +++++++++++ .../database/internal/JdbcQueryRunner.java | 82 +++ .../database/internal/JdbcSupport.java | 19 + .../database/internal/JdbcTransaction.java | 116 ++++ .../database/internal/JdbcUrlBuilder.java | 27 + .../database/internal/SchemaImpl.java | 271 +++++++++ .../andrewkydev/database/orm/Condition.java | 38 ++ .../andrewkydev/database/orm/Conditions.java | 85 +++ .../andrewkydev/database/orm/DbColumn.java | 20 + .../andrewkydev/database/orm/DbEntity.java | 12 + .../com/andrewkydev/database/orm/DbId.java | 12 + .../com/andrewkydev/database/orm/DbJson.java | 11 + .../andrewkydev/database/orm/DbTransient.java | 11 + .../database/orm/EntityManager.java | 73 +++ .../andrewkydev/database/orm/EntityQuery.java | 57 ++ .../andrewkydev/database/orm/OrmSchema.java | 132 +++++ .../andrewkydev/database/orm/TypeAdapter.java | 7 + .../database/query/QueryRunner.java | 23 + .../andrewkydev/database/query/RowMapper.java | 9 + .../database/query/Transaction.java | 34 ++ .../database/schema/ColumnSpec.java | 85 +++ .../database/schema/IndexSpec.java | 29 + .../andrewkydev/database/schema/Schema.java | 42 ++ .../database/schema/SqlDialect.java | 6 + .../database/schema/TableSpec.java | 80 +++ src/main/resources/config.yml | 16 + src/main/resources/plugin.yml | 8 + 58 files changed, 3980 insertions(+) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 build.gradle.kts create mode 100644 docs/api-query.md create mode 100644 docs/api-schema.md create mode 100644 docs/config.md create mode 100644 docs/examples.md create mode 100644 docs/orm-query.md create mode 100644 docs/orm-schema.md create mode 100644 docs/orm.md create mode 100644 docs/overview.md create mode 100644 docs/ru/api-query.md create mode 100644 docs/ru/api-schema.md create mode 100644 docs/ru/config.md create mode 100644 docs/ru/orm-query.md create mode 100644 docs/ru/orm-schema.md create mode 100644 docs/ru/orm.md create mode 100644 docs/ru/overview.md create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts create mode 100644 src/main/java/com/andrewkydev/Loader.java create mode 100644 src/main/java/com/andrewkydev/database/DatabaseApi.java create mode 100644 src/main/java/com/andrewkydev/database/DatabaseProvider.java create mode 100644 src/main/java/com/andrewkydev/database/config/DatabaseConfig.java create mode 100644 src/main/java/com/andrewkydev/database/config/DatabaseConfigLoader.java create mode 100644 src/main/java/com/andrewkydev/database/internal/DatabaseImpl.java create mode 100644 src/main/java/com/andrewkydev/database/internal/EntityManagerImpl.java create mode 100644 src/main/java/com/andrewkydev/database/internal/EntityMetadata.java create mode 100644 src/main/java/com/andrewkydev/database/internal/EntityQueryImpl.java create mode 100644 src/main/java/com/andrewkydev/database/internal/JdbcQueryRunner.java create mode 100644 src/main/java/com/andrewkydev/database/internal/JdbcSupport.java create mode 100644 src/main/java/com/andrewkydev/database/internal/JdbcTransaction.java create mode 100644 src/main/java/com/andrewkydev/database/internal/JdbcUrlBuilder.java create mode 100644 src/main/java/com/andrewkydev/database/internal/SchemaImpl.java create mode 100644 src/main/java/com/andrewkydev/database/orm/Condition.java create mode 100644 src/main/java/com/andrewkydev/database/orm/Conditions.java create mode 100644 src/main/java/com/andrewkydev/database/orm/DbColumn.java create mode 100644 src/main/java/com/andrewkydev/database/orm/DbEntity.java create mode 100644 src/main/java/com/andrewkydev/database/orm/DbId.java create mode 100644 src/main/java/com/andrewkydev/database/orm/DbJson.java create mode 100644 src/main/java/com/andrewkydev/database/orm/DbTransient.java create mode 100644 src/main/java/com/andrewkydev/database/orm/EntityManager.java create mode 100644 src/main/java/com/andrewkydev/database/orm/EntityQuery.java create mode 100644 src/main/java/com/andrewkydev/database/orm/OrmSchema.java create mode 100644 src/main/java/com/andrewkydev/database/orm/TypeAdapter.java create mode 100644 src/main/java/com/andrewkydev/database/query/QueryRunner.java create mode 100644 src/main/java/com/andrewkydev/database/query/RowMapper.java create mode 100644 src/main/java/com/andrewkydev/database/query/Transaction.java create mode 100644 src/main/java/com/andrewkydev/database/schema/ColumnSpec.java create mode 100644 src/main/java/com/andrewkydev/database/schema/IndexSpec.java create mode 100644 src/main/java/com/andrewkydev/database/schema/Schema.java create mode 100644 src/main/java/com/andrewkydev/database/schema/SqlDialect.java create mode 100644 src/main/java/com/andrewkydev/database/schema/TableSpec.java create mode 100644 src/main/resources/config.yml create mode 100644 src/main/resources/plugin.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a446190 --- /dev/null +++ b/.gitignore @@ -0,0 +1,43 @@ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + + + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +# End of https://mrkandreev.name/snippets/gitignore-generator/#Java,Gradle +/examples/ diff --git a/README.md b/README.md new file mode 100644 index 0000000..0bf3706 --- /dev/null +++ b/README.md @@ -0,0 +1,14 @@ +# Database Plugin (Lumi) + +SQL-oriented database plugin for Lumi with MySQL/PostgreSQL support, HikariCP pooling, +schema helpers, and a lightweight annotation-based ORM layer. + +## Docs + +- `docs/overview.md` +- `docs/config.md` +- `docs/api-schema.md` +- `docs/api-query.md` +- `docs/orm.md` +- `docs/orm-query.md` +- `docs/orm-schema.md` diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..6d2d7b5 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,132 @@ +import java.io.BufferedReader +import java.io.InputStreamReader + + +plugins { + id("java") + id("java-library") + id("com.github.johnrengelman.shadow") version "8.1.1" + id("maven-publish") +} + +group = "com.andrewkydev" +version = "1.0-SNAPSHOT" + +val copyTo = "../server/plugins" +val copyFrom = "build/libs/${project.name}-${project.version}.jar" + +repositories { + mavenCentral() + + maven { + name = "luminiadevRepositorySnapshots" + url = uri("https://repo.luminiadev.com/snapshots") + } +} + +dependencies { + compileOnly("com.koshakmine:Lumi:1.4.0-SNAPSHOT") + implementation("com.zaxxer:HikariCP:5.1.0") + implementation("com.mysql:mysql-connector-j:8.3.0") + implementation("org.postgresql:postgresql:42.7.2") + implementation("com.google.code.gson:gson:2.11.0") + +} + + +tasks.build { +// finalizedBy(tasks.shadowJar) +} + +tasks.shadowJar { +// finalizedBy(tasks.named("copyToPath")) +} + + +tasks { + shadowJar { + + setProperty("zip64", true) + mergeServiceFiles() + archiveClassifier.set("") + archiveFileName.set("${project.name}-${project.version}.jar") + + dependencies { + exclude( + "**/**.properties", + "**/*.swp", + "addons/*", + "creativeitems*.json", + "*.dat", + "*.dat", + "*.xsd", + "structures/**", + "RuntimeBlockStatesExtras/**", + "recipes/**", + "cn/nukkit/**", + "co/aikar/timings/**", + "it/uni mi/dsi/fastutil/**", + "assets/org/apache/commons/math3/random/**", + ) + } + mergeServiceFiles() + } +} + +//tasks.register("copyToPath") { +// doLast { +// copy { +// from(copyFrom) +// into(copyTo) +// } +// } +// dependsOn(tasks.named("shadowJar")) +// finalizedBy(tasks.named("reloadServer")) +//} + +tasks.register("reloadServer") { + + doLast { + val commands = listOf( + listOf("../server/mcrcon.exe", "-H", "127.0.0.1", "-p", "5MDRlOTFk1", "-w", "1", "fr"), + listOf("../server/mcrcon.exe", "-H", "127.0.0.1", "-p", "5MDRlOTFk1", "-w", "1", "reload again") + ) + + fun executeCommand(command: List) { + val processBuilder = ProcessBuilder(command) + val process = processBuilder.start() + val reader = + BufferedReader(InputStreamReader(process.inputStream)) + var line: String? + + while (reader.readLine().also { line = it } != null) { + println(line) + } + + process.waitFor() + } + + executeCommand(commands[0]) + + executeCommand(commands[1]) + executeCommand(commands[1]) + } + dependsOn(tasks.named("copyToPath")) +} + +publishing { + publications { + create("mavenJava") { + groupId = project.group.toString() + artifactId = project.name + version = project.version.toString() + + artifact(tasks.shadowJar.get()) { + classifier = null + } + } + } + repositories { + mavenLocal() + } +} diff --git a/docs/api-query.md b/docs/api-query.md new file mode 100644 index 0000000..f429cd9 --- /dev/null +++ b/docs/api-query.md @@ -0,0 +1,33 @@ +# Query API + +Raw SQL is available via `api.query()` with parameter binding. + +## Execute + +```java +int rows = api.query().execute( + "UPDATE players SET level = level + 1 WHERE id = ?", + java.util.Collections.singletonList(1) +); +``` + +## Query + +```java +List names = api.query().query( + "SELECT name FROM players WHERE level >= ?", + java.util.Collections.singletonList(10), + rs -> rs.getString("name") +); +``` + +## Transactions + +```java +try (Transaction tx = api.beginTransaction()) { + tx.execute("UPDATE players SET level = level + 1 WHERE id = ?", java.util.Collections.singletonList(1)); + tx.commit(); +} catch (Exception ex) { + // rollback on error if needed +} +``` diff --git a/docs/api-schema.md b/docs/api-schema.md new file mode 100644 index 0000000..ddb3d94 --- /dev/null +++ b/docs/api-schema.md @@ -0,0 +1,35 @@ +# Schema API + +Schema helpers let you create and update tables programmatically. + +## Example: create table + +```java +import com.andrewkydev.database.schema.ColumnSpec; +import com.andrewkydev.database.schema.IndexSpec; +import com.andrewkydev.database.schema.TableSpec; + +TableSpec table = TableSpec.builder("players") + .column(ColumnSpec.builder("id", "BIGINT").primaryKey(true).autoIncrement(true).nullable(false).build()) + .column(ColumnSpec.builder("name", "VARCHAR(32)").nullable(false).build()) + .index(new IndexSpec("players_name_idx", java.util.Arrays.asList("name"), false)) + .build(); + +api.schema().createTable(table); +``` + +## API Methods + +```java +api.schema().createDatabase("primalix"); +api.schema().dropDatabase("primalix"); +api.schema().createTable(spec); +api.schema().dropTable("players"); +api.schema().addColumn("players", ColumnSpec.builder("level", "INT").build()); +api.schema().updateColumn("players", ColumnSpec.builder("level", "INT").nullable(false).build()); +api.schema().dropColumn("players", "level"); +api.schema().addIndex("players", new IndexSpec("players_name_idx", java.util.Arrays.asList("name"), false)); +api.schema().dropIndex("players", "players_name_idx"); +``` + +All methods also have async variants returning `CompletableFuture`. diff --git a/docs/config.md b/docs/config.md new file mode 100644 index 0000000..c900522 --- /dev/null +++ b/docs/config.md @@ -0,0 +1,40 @@ +# Configuration + +The default config file is `config.yml`: + +```yaml +driver: "mysql" +host: "localhost" +port: 3306 +database: "primalix" +username: "root" +password: "" +adminDatabase: "postgres" +autoTransactions: true + +pool: + maxPoolSize: 10 + minIdle: 2 + connectionTimeoutMs: 30000 + idleTimeoutMs: 600000 + maxLifetimeMs: 1800000 +``` + +## Fields + +- `driver`: `mysql` or `postgres`. +- `host`: database host. +- `port`: database port. +- `database`: default database name for the pool. +- `username`: login user. +- `password`: login password. +- `adminDatabase`: PostgreSQL admin database used for create/drop database. +- `autoTransactions`: wrap schema operations in a transaction when possible. + +## Pool Options + +- `maxPoolSize`: maximum connections in pool. +- `minIdle`: minimum idle connections. +- `connectionTimeoutMs`: connection timeout. +- `idleTimeoutMs`: idle timeout. +- `maxLifetimeMs`: maximum connection lifetime. diff --git a/docs/examples.md b/docs/examples.md new file mode 100644 index 0000000..2926ea2 --- /dev/null +++ b/docs/examples.md @@ -0,0 +1,91 @@ +# Feature Examples + +## 1) Auto ID after insert + +```java +PlayerModel player = new PlayerModel(); +player.setName("Steve"); +api.orm().insert(player); +long id = player.getId(); +``` + +## 2) snake_case default + +```java +class PlayerStats { + private int totalKills; +} +// table: player_stats, column: total_kills +``` + +## 3) findOneWhere & deleteWhere + +```java +PlayerModel one = api.orm().findOneWhere( + PlayerModel.class, + "level >= ?", + java.util.Collections.singletonList(10) +); + +int deleted = api.orm().deleteWhere( + PlayerModel.class, + "level < ?", + java.util.Collections.singletonList(1) +); +``` + +## 4) @DbColumn(length/unique/nullable) + +```java +@DbColumn(length = 32, unique = true, nullable = false) +private String username; +``` + +## 5) findWhere with order/limit/offset + +```java +List page = api.orm().findWhere( + PlayerModel.class, + "level >= ?", + java.util.Collections.singletonList(10), + "level DESC", + 10, + 0 +); +``` + +## 6) Query Builder + +```java +List top = api.orm().query(PlayerModel.class) + .where("level >= ?", 10) + .orderBy("level DESC") + .limit(10) + .list(); +``` + +## 7) Query Builder + Fluent Conditions + Join + +```java +import static com.andrewkydev.database.orm.Conditions.*; + +List rows = api.orm().query(PlayerModel.class) + .select("players.*") + .join("LEFT JOIN clans ON clans.id = players.clan_id") + .where(eq("players.status", "ACTIVE").and(gt("players.level", 10))) + .groupBy("players.id") + .having("COUNT(clans.id) > ?", 0) + .orderBy("players.level DESC") + .limit(10, 0) + .list(); +``` + +## 8) Custom types (UUID/JSON) + +```java +@DbJson +private java.util.Map metadata; + +// UUID is built-in. Custom type example: +api.orm().registerAdapter(MyType.class, new TypeAdapter() { ... }); +``` diff --git a/docs/orm-query.md b/docs/orm-query.md new file mode 100644 index 0000000..1f6af84 --- /dev/null +++ b/docs/orm-query.md @@ -0,0 +1,43 @@ +# ORM Query Builder + +Fluent query builder on top of the ORM. + +## Basic + +```java +List top = api.orm().query(PlayerModel.class) + .where("level >= ?", 10) + .orderBy("level DESC") + .limit(10) + .list(); +``` + +## Fluent Conditions + +```java +import static com.andrewkydev.database.orm.Conditions.*; + +List players = api.orm().query(PlayerModel.class) + .where(eq("status", "ACTIVE").and(gt("level", 10))) + .orderBy("level DESC") + .list(); +``` + +## Joins + Group By + Having + +```java +List rows = api.orm().query(PlayerModel.class) + .select("players.*") + .join("LEFT JOIN clans ON clans.id = players.clan_id") + .where("players.level >= ?", 10) + .groupBy("players.id") + .having("COUNT(clans.id) > ?", 0) + .orderBy("players.level DESC") + .limit(10, 0) + .list(); +``` + +## Select Columns + +If you select a subset of columns, only those are mapped. +Missing fields keep default values. diff --git a/docs/orm-schema.md b/docs/orm-schema.md new file mode 100644 index 0000000..3653970 --- /dev/null +++ b/docs/orm-schema.md @@ -0,0 +1,30 @@ +# ORM Schema Generation + +`OrmSchema` builds a `TableSpec` from annotated entities. + +## Example + +```java +import com.andrewkydev.database.orm.OrmSchema; +import com.andrewkydev.database.schema.SqlDialect; +import com.andrewkydev.database.schema.TableSpec; + +TableSpec spec = OrmSchema.fromEntity(PlayerModel.class, SqlDialect.MYSQL); +api.schema().createTable(spec); +``` + +## Type Mapping + +Default mapping (when `@DbColumn(type = "...")` is not specified): + +- `String` -> `VARCHAR(length)` +- `int`/`Integer` -> `INT` +- `long`/`Long` -> `BIGINT` +- `short`/`Short` -> `SMALLINT` +- `boolean`/`Boolean` -> `BOOLEAN` (PostgreSQL) or `TINYINT(1)` (MySQL) +- `float`/`Float` -> `FLOAT` +- `double`/`Double` -> `DOUBLE` +- `UUID` -> `UUID` (PostgreSQL) or `CHAR(36)` (MySQL) +- `@DbJson` -> `JSON` (MySQL) or `JSONB` (PostgreSQL) + +`@DbColumn(length, unique, nullable)` is also applied. diff --git a/docs/orm.md b/docs/orm.md new file mode 100644 index 0000000..4ff2045 --- /dev/null +++ b/docs/orm.md @@ -0,0 +1,119 @@ +# ORM + +The ORM is lightweight: it maps fields to columns and does not manage complex +relationships. It supports sync and async operations. + +## Annotations + +- `@DbEntity(table = "players")` sets table name. Default: snake_case class name. +- `@DbColumn(name = "username")` overrides column name. +- `@DbColumn(type = "VARCHAR(32)")` overrides SQL type for schema generation. +- `@DbColumn(length = 32, unique = true, nullable = false)` influences schema generation. +- `@DbId(autoIncrement = true)` marks the primary key. +- `@DbJson` stores the field as JSON. +- `@DbTransient` ignores the field. + +## Example entity + +```java +@DbEntity(table = "players") +public class PlayerModel { + @DbId(autoIncrement = true) + private long id; + + @DbColumn(name = "username", nullable = false, unique = true, length = 32) + private String name; + + @DbColumn + private int level; + + @DbJson + private java.util.Map metadata; + + @DbTransient + private String temp; + + public PlayerModel() { + } +} +``` + +## CRUD + +```java +EntityManager orm = api.orm(); + +orm.insert(entity); +orm.update(entity); +orm.delete(entity); +PlayerModel player = orm.findById(PlayerModel.class, 1L); +List all = orm.findAll(PlayerModel.class); +PlayerModel one = orm.findOneWhere(PlayerModel.class, "level >= ?", java.util.Collections.singletonList(10)); +List many = orm.findWhere(PlayerModel.class, "level >= ?", java.util.Collections.singletonList(10)); +List paged = orm.findWhere(PlayerModel.class, "level >= ?", java.util.Collections.singletonList(10), "level DESC", 10, 0); +long count = orm.count(PlayerModel.class, "level >= ?", java.util.Collections.singletonList(10)); +boolean exists = orm.exists(PlayerModel.class, "username = ?", java.util.Collections.singletonList("Steve")); +int deleted = orm.deleteWhere(PlayerModel.class, "level < ?", java.util.Collections.singletonList(1)); +``` + +## Query Builder + +```java +EntityManager orm = api.orm(); + +List top = orm.query(PlayerModel.class) + .where("level >= ?", 10) + .orderBy("level DESC") + .limit(10) + .list(); + +boolean exists = orm.query(PlayerModel.class) + .where("username = ?", "Steve") + .exists(); +``` + +## Fluent Conditions + +```java +import static com.andrewkydev.database.orm.Conditions.*; + +List players = orm.query(PlayerModel.class) + .where(eq("status", "ACTIVE").and(gt("level", 10))) + .list(); +``` + +## Joins, Group By, Having + +```java +List rows = orm.query(PlayerModel.class) + .select("players.*") + .join("LEFT JOIN clans ON clans.id = players.clan_id") + .groupBy("players.id") + .having("COUNT(clans.id) > ?", 0) + .list(); +``` + +Selecting a subset of columns maps only those fields; missing fields keep default values. + +## Auto ID on insert + +If `@DbId(autoIncrement = true)` is used and the id is empty (0 or null), +`insert()` will read generated keys and set the id back on the entity. + +## Custom Type Adapters + +UUID mapping is built-in. For other types: + +```java +orm.registerAdapter(SomeType.class, new TypeAdapter() { + @Override + public Object toDatabase(SomeType value) { + return value == null ? null : value.toString(); + } + + @Override + public SomeType fromDatabase(Object value) { + return value == null ? null : SomeType.parse(value.toString()); + } +}); +``` diff --git a/docs/overview.md b/docs/overview.md new file mode 100644 index 0000000..9cc9268 --- /dev/null +++ b/docs/overview.md @@ -0,0 +1,40 @@ +# Overview + +Database is a Lumi plugin that provides: + +- HikariCP-backed MySQL/PostgreSQL connections. +- Schema helpers for creating/updating tables and indexes. +- Raw SQL queries with parameter binding. +- Lightweight ORM with annotations, fluent query builder, and async support. + +## Install + +1. Build the jar with Gradle. +2. Put the jar into your server plugins folder. +3. Start the server once to generate `config.yml`. + +## Accessing the API + +```java +import com.andrewkydev.database.DatabaseProvider; +import com.andrewkydev.database.DatabaseApi; + +DatabaseApi api = DatabaseProvider.get(); +``` + +## Feature Highlights + +### Auto ID on insert + +If an entity uses `@DbId(autoIncrement = true)` and the id value is empty (0 or null), +`insert()` will fetch generated keys and assign the id back to the object. + +### Snake case by default + +If `@DbEntity` and `@DbColumn` names are not set, class and field names are converted to +snake_case. + +### Query helpers + +`findOneWhere`, `deleteWhere`, and `findWhere` with sorting/limit/offset are available +in the ORM. diff --git a/docs/ru/api-query.md b/docs/ru/api-query.md new file mode 100644 index 0000000..3b2fcdb --- /dev/null +++ b/docs/ru/api-query.md @@ -0,0 +1,33 @@ +# Query API (RU) + +Raw SQL через `api.query()` с биндингом параметров. + +## Execute + +```java +int rows = api.query().execute( + "UPDATE players SET level = level + 1 WHERE id = ?", + java.util.Collections.singletonList(1) +); +``` + +## Query + +```java +List names = api.query().query( + "SELECT name FROM players WHERE level >= ?", + java.util.Collections.singletonList(10), + rs -> rs.getString("name") +); +``` + +## Транзакции + +```java +try (Transaction tx = api.beginTransaction()) { + tx.execute("UPDATE players SET level = level + 1 WHERE id = ?", java.util.Collections.singletonList(1)); + tx.commit(); +} catch (Exception ex) { + // rollback при ошибке +} +``` diff --git a/docs/ru/api-schema.md b/docs/ru/api-schema.md new file mode 100644 index 0000000..e59c0dd --- /dev/null +++ b/docs/ru/api-schema.md @@ -0,0 +1,35 @@ +# Schema API (RU) + +Помощники для создания и обновления таблиц. + +## Пример: create table + +```java +import com.andrewkydev.database.schema.ColumnSpec; +import com.andrewkydev.database.schema.IndexSpec; +import com.andrewkydev.database.schema.TableSpec; + +TableSpec table = TableSpec.builder("players") + .column(ColumnSpec.builder("id", "BIGINT").primaryKey(true).autoIncrement(true).nullable(false).build()) + .column(ColumnSpec.builder("name", "VARCHAR(32)").nullable(false).build()) + .index(new IndexSpec("players_name_idx", java.util.Arrays.asList("name"), false)) + .build(); + +api.schema().createTable(table); +``` + +## Методы + +```java +api.schema().createDatabase("primalix"); +api.schema().dropDatabase("primalix"); +api.schema().createTable(spec); +api.schema().dropTable("players"); +api.schema().addColumn("players", ColumnSpec.builder("level", "INT").build()); +api.schema().updateColumn("players", ColumnSpec.builder("level", "INT").nullable(false).build()); +api.schema().dropColumn("players", "level"); +api.schema().addIndex("players", new IndexSpec("players_name_idx", java.util.Arrays.asList("name"), false)); +api.schema().dropIndex("players", "players_name_idx"); +``` + +У всех методов есть async версии с `CompletableFuture`. diff --git a/docs/ru/config.md b/docs/ru/config.md new file mode 100644 index 0000000..edf23d7 --- /dev/null +++ b/docs/ru/config.md @@ -0,0 +1,40 @@ +# Конфигурация + +Файл `config.yml`: + +```yaml +driver: "mysql" +host: "localhost" +port: 3306 +database: "primalix" +username: "root" +password: "" +adminDatabase: "postgres" +autoTransactions: true + +pool: + maxPoolSize: 10 + minIdle: 2 + connectionTimeoutMs: 30000 + idleTimeoutMs: 600000 + maxLifetimeMs: 1800000 +``` + +## Поля + +- `driver`: `mysql` или `postgres`. +- `host`: адрес БД. +- `port`: порт БД. +- `database`: основная база. +- `username`: логин. +- `password`: пароль. +- `adminDatabase`: PostgreSQL админ‑база для create/drop database. +- `autoTransactions`: оборачивать schema операции в транзакцию. + +## Pool + +- `maxPoolSize`: максимум соединений. +- `minIdle`: минимум idle. +- `connectionTimeoutMs`: таймаут подключения. +- `idleTimeoutMs`: таймаут простоя. +- `maxLifetimeMs`: максимальная жизнь соединения. diff --git a/docs/ru/orm-query.md b/docs/ru/orm-query.md new file mode 100644 index 0000000..9acc2f6 --- /dev/null +++ b/docs/ru/orm-query.md @@ -0,0 +1,43 @@ +# ORM Query Builder (RU) + +Fluent builder над ORM. + +## База + +```java +List top = api.orm().query(PlayerModel.class) + .where("level >= ?", 10) + .orderBy("level DESC") + .limit(10) + .list(); +``` + +## Fluent Conditions + +```java +import static com.andrewkydev.database.orm.Conditions.*; + +List players = api.orm().query(PlayerModel.class) + .where(eq("status", "ACTIVE").and(gt("level", 10))) + .orderBy("level DESC") + .list(); +``` + +## Join + Group By + Having + +```java +List rows = api.orm().query(PlayerModel.class) + .select("players.*") + .join("LEFT JOIN clans ON clans.id = players.clan_id") + .where("players.level >= ?", 10) + .groupBy("players.id") + .having("COUNT(clans.id) > ?", 0) + .orderBy("players.level DESC") + .limit(10, 0) + .list(); +``` + +## Select Columns + +Если выбираете часть колонок, маппятся только они. +Остальные поля остаются дефолтными. diff --git a/docs/ru/orm-schema.md b/docs/ru/orm-schema.md new file mode 100644 index 0000000..f92d7fb --- /dev/null +++ b/docs/ru/orm-schema.md @@ -0,0 +1,30 @@ +# ORM Schema (RU) + +`OrmSchema` строит `TableSpec` на основе аннотаций. + +## Пример + +```java +import com.andrewkydev.database.orm.OrmSchema; +import com.andrewkydev.database.schema.SqlDialect; +import com.andrewkydev.database.schema.TableSpec; + +TableSpec spec = OrmSchema.fromEntity(PlayerModel.class, SqlDialect.MYSQL); +api.schema().createTable(spec); +``` + +## Маппинг типов + +По умолчанию: + +- `String` -> `VARCHAR(length)` +- `int`/`Integer` -> `INT` +- `long`/`Long` -> `BIGINT` +- `short`/`Short` -> `SMALLINT` +- `boolean`/`Boolean` -> `BOOLEAN` (PostgreSQL) или `TINYINT(1)` (MySQL) +- `float`/`Float` -> `FLOAT` +- `double`/`Double` -> `DOUBLE` +- `UUID` -> `UUID` (PostgreSQL) или `CHAR(36)` (MySQL) +- `@DbJson` -> `JSON` (MySQL) или `JSONB` (PostgreSQL) + +`@DbColumn(length, unique, nullable)` применяется автоматически. diff --git a/docs/ru/orm.md b/docs/ru/orm.md new file mode 100644 index 0000000..27cccc6 --- /dev/null +++ b/docs/ru/orm.md @@ -0,0 +1,119 @@ +# ORM (RU) + +Легковесный ORM: поля мапятся в колонки, без сложных связей. +Есть sync и async версии. + +## Аннотации + +- `@DbEntity(table = "players")` - имя таблицы. По умолчанию snake_case. +- `@DbColumn(name = "username")` - имя колонки. +- `@DbColumn(type = "VARCHAR(32)")` - SQL тип для генерации схемы. +- `@DbColumn(length = 32, unique = true, nullable = false)` - влияет на schema генерацию. +- `@DbId(autoIncrement = true)` - primary key. +- `@DbJson` - JSON поле. +- `@DbTransient` - игнорировать поле. + +## Пример сущности + +```java +@DbEntity(table = "players") +public class PlayerModel { + @DbId(autoIncrement = true) + private long id; + + @DbColumn(name = "username", nullable = false, unique = true, length = 32) + private String name; + + @DbColumn + private int level; + + @DbJson + private java.util.Map metadata; + + @DbTransient + private String temp; + + public PlayerModel() { + } +} +``` + +## CRUD + +```java +EntityManager orm = api.orm(); + +orm.insert(entity); +orm.update(entity); +orm.delete(entity); +PlayerModel player = orm.findById(PlayerModel.class, 1L); +List all = orm.findAll(PlayerModel.class); +PlayerModel one = orm.findOneWhere(PlayerModel.class, "level >= ?", java.util.Collections.singletonList(10)); +List many = orm.findWhere(PlayerModel.class, "level >= ?", java.util.Collections.singletonList(10)); +List paged = orm.findWhere(PlayerModel.class, "level >= ?", java.util.Collections.singletonList(10), "level DESC", 10, 0); +long count = orm.count(PlayerModel.class, "level >= ?", java.util.Collections.singletonList(10)); +boolean exists = orm.exists(PlayerModel.class, "username = ?", java.util.Collections.singletonList("Steve")); +int deleted = orm.deleteWhere(PlayerModel.class, "level < ?", java.util.Collections.singletonList(1)); +``` + +## Query Builder + +```java +EntityManager orm = api.orm(); + +List top = orm.query(PlayerModel.class) + .where("level >= ?", 10) + .orderBy("level DESC") + .limit(10) + .list(); + +boolean exists = orm.query(PlayerModel.class) + .where("username = ?", "Steve") + .exists(); +``` + +## Fluent Conditions + +```java +import static com.andrewkydev.database.orm.Conditions.*; + +List players = orm.query(PlayerModel.class) + .where(eq("status", "ACTIVE").and(gt("level", 10))) + .list(); +``` + +## Join, Group By, Having + +```java +List rows = orm.query(PlayerModel.class) + .select("players.*") + .join("LEFT JOIN clans ON clans.id = players.clan_id") + .groupBy("players.id") + .having("COUNT(clans.id) > ?", 0) + .list(); +``` + +Если выбрать часть колонок, маппятся только они, остальные остаются дефолтными. + +## Auto ID + +Если `@DbId(autoIncrement = true)` и id пустой (0/null), +`insert()` получает generated keys и прописывает id в объект. + +## Type Adapters + +UUID уже поддержан. Для других типов: + +```java +orm.registerAdapter(SomeType.class, new TypeAdapter() { + @Override + public Object toDatabase(SomeType value) { + return value == null ? null : value.toString(); + } + + @Override + public SomeType fromDatabase(Object value) { + return value == null ? null : SomeType.parse(value.toString()); + } +}); +``` diff --git a/docs/ru/overview.md b/docs/ru/overview.md new file mode 100644 index 0000000..ec42ff6 --- /dev/null +++ b/docs/ru/overview.md @@ -0,0 +1,34 @@ +# Overview (RU) + +Database - SQL plugin for Lumi with MySQL/PostgreSQL, HikariCP pooling, +schema helpers, raw SQL, and a lightweight ORM with fluent query builder. + +## Установка + +1. Соберите jar через Gradle. +2. Поместите jar в папку plugins сервера. +3. Запустите сервер один раз для генерации `config.yml`. + +## Доступ к API + +```java +import com.andrewkydev.database.DatabaseProvider; +import com.andrewkydev.database.DatabaseApi; + +DatabaseApi api = DatabaseProvider.get(); +``` + +## Основные возможности + +### Auto ID после insert + +Если у поля есть `@DbId(autoIncrement = true)` и id пустой (0 или null), +`insert()` получает generated keys и прописывает id в объект. + +### Snake case по умолчанию + +Если не задано `@DbEntity`/`@DbColumn`, имена берутся в snake_case. + +### Удобные ORM методы + +Доступны `findOneWhere`, `deleteWhere` и `findWhere` с сортировкой/лимитом/offset. diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846 GIT binary patch literal 43764 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..5522c4c --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "Database" \ No newline at end of file diff --git a/src/main/java/com/andrewkydev/Loader.java b/src/main/java/com/andrewkydev/Loader.java new file mode 100644 index 0000000..de0316f --- /dev/null +++ b/src/main/java/com/andrewkydev/Loader.java @@ -0,0 +1,62 @@ +package com.andrewkydev; + +import cn.nukkit.plugin.PluginBase; +import com.andrewkydev.database.DatabaseApi; +import com.andrewkydev.database.DatabaseProvider; +import com.andrewkydev.database.config.DatabaseConfig; +import com.andrewkydev.database.config.DatabaseConfigLoader; +import com.andrewkydev.database.internal.DatabaseImpl; +import com.andrewkydev.database.internal.JdbcUrlBuilder; +import com.andrewkydev.database.schema.SqlDialect; +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; + +public class Loader extends PluginBase { + private DatabaseApi databaseApi; + private HikariDataSource dataSource; + + @Override + public void onLoad() { + super.onLoad(); + } + + @Override + public void onEnable() { + super.onEnable(); + saveDefaultConfig(); + reloadConfig(); + + DatabaseConfig config = DatabaseConfigLoader.load(this); + HikariConfig hikariConfig = new HikariConfig(); + hikariConfig.setJdbcUrl(JdbcUrlBuilder.build(config.dialect(), config.host(), config.port(), config.database())); + hikariConfig.setUsername(config.username()); + hikariConfig.setPassword(config.password()); + hikariConfig.setDriverClassName(driverClassName(config.dialect())); + hikariConfig.setMaximumPoolSize(config.pool().maxPoolSize()); + hikariConfig.setMinimumIdle(config.pool().minIdle()); + hikariConfig.setConnectionTimeout(config.pool().connectionTimeoutMs()); + hikariConfig.setIdleTimeout(config.pool().idleTimeoutMs()); + hikariConfig.setMaxLifetime(config.pool().maxLifetimeMs()); + + dataSource = new HikariDataSource(hikariConfig); + databaseApi = new DatabaseImpl(dataSource, config); + DatabaseProvider.set(databaseApi); + } + + @Override + public void onDisable() { + super.onDisable(); + if (databaseApi != null) { + databaseApi.close(); + databaseApi = null; + } + dataSource = null; + DatabaseProvider.set(null); + } + + private String driverClassName(SqlDialect dialect) { + return dialect == SqlDialect.POSTGRESQL + ? "org.postgresql.Driver" + : "com.mysql.cj.jdbc.Driver"; + } +} diff --git a/src/main/java/com/andrewkydev/database/DatabaseApi.java b/src/main/java/com/andrewkydev/database/DatabaseApi.java new file mode 100644 index 0000000..874d5bf --- /dev/null +++ b/src/main/java/com/andrewkydev/database/DatabaseApi.java @@ -0,0 +1,23 @@ +package com.andrewkydev.database; + +import com.andrewkydev.database.query.QueryRunner; +import com.andrewkydev.database.query.Transaction; +import com.andrewkydev.database.schema.Schema; +import com.andrewkydev.database.orm.EntityManager; +import java.util.concurrent.CompletableFuture; + +public interface DatabaseApi extends AutoCloseable { + + Schema schema(); + + QueryRunner query(); + + EntityManager orm(); + + Transaction beginTransaction(); + + CompletableFuture beginTransactionAsync(); + + @Override + void close(); +} diff --git a/src/main/java/com/andrewkydev/database/DatabaseProvider.java b/src/main/java/com/andrewkydev/database/DatabaseProvider.java new file mode 100644 index 0000000..438568d --- /dev/null +++ b/src/main/java/com/andrewkydev/database/DatabaseProvider.java @@ -0,0 +1,20 @@ +package com.andrewkydev.database; + +public final class DatabaseProvider { + private static volatile DatabaseApi api; + + private DatabaseProvider() { + } + + public static void set(DatabaseApi api) { + DatabaseProvider.api = api; + } + + public static DatabaseApi get() { + DatabaseApi current = api; + if (current == null) { + throw new IllegalStateException("DatabaseApi is not initialized"); + } + return current; + } +} diff --git a/src/main/java/com/andrewkydev/database/config/DatabaseConfig.java b/src/main/java/com/andrewkydev/database/config/DatabaseConfig.java new file mode 100644 index 0000000..4798257 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/config/DatabaseConfig.java @@ -0,0 +1,115 @@ +package com.andrewkydev.database.config; + +import com.andrewkydev.database.schema.SqlDialect; + +public final class DatabaseConfig { + private final SqlDialect dialect; + private final String host; + private final int port; + private final String database; + private final String username; + private final String password; + private final String adminDatabase; + private final PoolConfig pool; + private final boolean autoTransactions; + + public DatabaseConfig( + SqlDialect dialect, + String host, + int port, + String database, + String username, + String password, + String adminDatabase, + PoolConfig pool, + boolean autoTransactions + ) { + this.dialect = dialect; + this.host = host; + this.port = port; + this.database = database; + this.username = username; + this.password = password; + this.adminDatabase = adminDatabase; + this.pool = pool; + this.autoTransactions = autoTransactions; + } + + public SqlDialect dialect() { + return dialect; + } + + public String host() { + return host; + } + + public int port() { + return port; + } + + public String database() { + return database; + } + + public String username() { + return username; + } + + public String password() { + return password; + } + + public String adminDatabase() { + return adminDatabase; + } + + public PoolConfig pool() { + return pool; + } + + public boolean autoTransactions() { + return autoTransactions; + } + + public static final class PoolConfig { + private final int maxPoolSize; + private final int minIdle; + private final long connectionTimeoutMs; + private final long idleTimeoutMs; + private final long maxLifetimeMs; + + public PoolConfig( + int maxPoolSize, + int minIdle, + long connectionTimeoutMs, + long idleTimeoutMs, + long maxLifetimeMs + ) { + this.maxPoolSize = maxPoolSize; + this.minIdle = minIdle; + this.connectionTimeoutMs = connectionTimeoutMs; + this.idleTimeoutMs = idleTimeoutMs; + this.maxLifetimeMs = maxLifetimeMs; + } + + public int maxPoolSize() { + return maxPoolSize; + } + + public int minIdle() { + return minIdle; + } + + public long connectionTimeoutMs() { + return connectionTimeoutMs; + } + + public long idleTimeoutMs() { + return idleTimeoutMs; + } + + public long maxLifetimeMs() { + return maxLifetimeMs; + } + } +} diff --git a/src/main/java/com/andrewkydev/database/config/DatabaseConfigLoader.java b/src/main/java/com/andrewkydev/database/config/DatabaseConfigLoader.java new file mode 100644 index 0000000..96d45e9 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/config/DatabaseConfigLoader.java @@ -0,0 +1,56 @@ +package com.andrewkydev.database.config; + +import cn.nukkit.plugin.PluginBase; +import cn.nukkit.utils.Config; +import cn.nukkit.utils.ConfigSection; +import com.andrewkydev.database.schema.SqlDialect; + +public final class DatabaseConfigLoader { + + private DatabaseConfigLoader() { + } + + public static DatabaseConfig load(PluginBase plugin) { + Config config = plugin.getConfig(); + + String dialectValue = config.getString("driver", "mysql"); + SqlDialect dialect = "postgres".equalsIgnoreCase(dialectValue) + ? SqlDialect.POSTGRESQL + : SqlDialect.MYSQL; + + String host = config.getString("host", "localhost"); + int port = config.getInt("port", dialect == SqlDialect.POSTGRESQL ? 5432 : 3306); + String database = config.getString("database", "primalix"); + String username = config.getString("username", "root"); + String password = config.getString("password", ""); + String adminDatabase = config.getString("adminDatabase", "postgres"); + boolean autoTransactions = config.getBoolean("autoTransactions", true); + + ConfigSection poolConfig = config.getSection("pool"); + int maxPoolSize = poolConfig.getInt("maxPoolSize", 10); + int minIdle = poolConfig.getInt("minIdle", 2); + long connectionTimeoutMs = poolConfig.getLong("connectionTimeoutMs", 30_000); + long idleTimeoutMs = poolConfig.getLong("idleTimeoutMs", 600_000); + long maxLifetimeMs = poolConfig.getLong("maxLifetimeMs", 1_800_000); + + DatabaseConfig.PoolConfig pool = new DatabaseConfig.PoolConfig( + maxPoolSize, + minIdle, + connectionTimeoutMs, + idleTimeoutMs, + maxLifetimeMs + ); + + return new DatabaseConfig( + dialect, + host, + port, + database, + username, + password, + adminDatabase, + pool, + autoTransactions + ); + } +} diff --git a/src/main/java/com/andrewkydev/database/internal/DatabaseImpl.java b/src/main/java/com/andrewkydev/database/internal/DatabaseImpl.java new file mode 100644 index 0000000..f99e41d --- /dev/null +++ b/src/main/java/com/andrewkydev/database/internal/DatabaseImpl.java @@ -0,0 +1,75 @@ +package com.andrewkydev.database.internal; + +import com.andrewkydev.database.DatabaseApi; +import com.andrewkydev.database.config.DatabaseConfig; +import com.andrewkydev.database.query.QueryRunner; +import com.andrewkydev.database.query.Transaction; +import com.andrewkydev.database.schema.Schema; +import com.andrewkydev.database.orm.EntityManager; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import javax.sql.DataSource; + +public final class DatabaseImpl implements DatabaseApi { + private final DataSource dataSource; + private final DatabaseConfig config; + private final ExecutorService executor; + private final Schema schema; + private final QueryRunner queryRunner; + private final EntityManager entityManager; + + public DatabaseImpl(DataSource dataSource, DatabaseConfig config) { + this.dataSource = dataSource; + this.config = config; + this.executor = Executors.newFixedThreadPool(Math.max(2, config.pool().maxPoolSize() / 2)); + this.schema = new SchemaImpl(dataSource, config, executor); + this.queryRunner = new JdbcQueryRunner(dataSource, executor); + this.entityManager = new EntityManagerImpl(dataSource, executor); + } + + @Override + public Schema schema() { + return schema; + } + + @Override + public QueryRunner query() { + return queryRunner; + } + + @Override + public EntityManager orm() { + return entityManager; + } + + @Override + public Transaction beginTransaction() { + try { + Connection connection = dataSource.getConnection(); + connection.setAutoCommit(false); + return new JdbcTransaction(connection, executor); + } catch (SQLException ex) { + throw new IllegalStateException("Failed to start transaction", ex); + } + } + + @Override + public CompletableFuture beginTransactionAsync() { + return CompletableFuture.supplyAsync(this::beginTransaction, executor); + } + + @Override + public void close() { + executor.shutdown(); + if (dataSource instanceof AutoCloseable) { + try { + ((AutoCloseable) dataSource).close(); + } catch (Exception ex) { + throw new IllegalStateException("Failed to close datasource", ex); + } + } + } +} diff --git a/src/main/java/com/andrewkydev/database/internal/EntityManagerImpl.java b/src/main/java/com/andrewkydev/database/internal/EntityManagerImpl.java new file mode 100644 index 0000000..176bb6c --- /dev/null +++ b/src/main/java/com/andrewkydev/database/internal/EntityManagerImpl.java @@ -0,0 +1,539 @@ +package com.andrewkydev.database.internal; + +import com.andrewkydev.database.orm.EntityManager; +import com.andrewkydev.database.orm.EntityQuery; +import com.andrewkydev.database.orm.TypeAdapter; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import java.lang.reflect.Constructor; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Executor; +import java.util.UUID; +import javax.sql.DataSource; + +public final class EntityManagerImpl implements EntityManager { + private final DataSource dataSource; + private final Executor executor; + private final Map, EntityMetadata> metadataCache = new ConcurrentHashMap<>(); + private final Map, TypeAdapter> adapters = new ConcurrentHashMap<>(); + private final Gson gson = new GsonBuilder().create(); + + public EntityManagerImpl(DataSource dataSource, Executor executor) { + this.dataSource = dataSource; + this.executor = executor; + registerDefaults(); + } + + @Override + public void insert(T entity) { + EntityMetadata metadata = metadata(entity.getClass()); + List columns = new ArrayList<>(); + List values = new ArrayList<>(); + EntityMetadata.FieldMapping idField = metadata.idFieldOrNull(); + boolean generateId = false; + + for (EntityMetadata.FieldMapping mapping : metadata.fields()) { + Object value = getValue(mapping, entity); + if (mapping.isId() && mapping.autoIncrement() && !hasExplicitValue(value)) { + generateId = true; + continue; + } + columns.add(mapping); + values.add(value); + } + + StringBuilder sql = new StringBuilder(); + sql.append("INSERT INTO ").append(metadata.table()).append(" ("); + for (int i = 0; i < columns.size(); i++) { + if (i > 0) { + sql.append(", "); + } + sql.append(columns.get(i).column()); + } + sql.append(") VALUES ("); + for (int i = 0; i < columns.size(); i++) { + if (i > 0) { + sql.append(", "); + } + sql.append("?"); + } + sql.append(")"); + + if (generateId && idField != null) { + Object generatedId = executeInsert(sql.toString(), values); + if (generatedId != null) { + setValue(idField, entity, generatedId); + } + } else { + executeUpdate(sql.toString(), values); + } + } + + @Override + public void update(T entity) { + EntityMetadata metadata = metadata(entity.getClass()); + EntityMetadata.FieldMapping idField = metadata.idField(); + Object idValue = getValue(idField, entity); + if (!hasExplicitValue(idValue)) { + throw new IllegalStateException("Entity id is required for update"); + } + + List params = new ArrayList<>(); + StringBuilder sql = new StringBuilder(); + sql.append("UPDATE ").append(metadata.table()).append(" SET "); + + boolean first = true; + for (EntityMetadata.FieldMapping mapping : metadata.fields()) { + if (mapping.isId()) { + continue; + } + if (!first) { + sql.append(", "); + } + first = false; + sql.append(mapping.column()).append("=?"); + params.add(getValue(mapping, entity)); + } + sql.append(" WHERE ").append(idField.column()).append("=?"); + params.add(idValue); + + executeUpdate(sql.toString(), params); + } + + @Override + public void delete(T entity) { + EntityMetadata metadata = metadata(entity.getClass()); + EntityMetadata.FieldMapping idField = metadata.idField(); + Object idValue = getValue(idField, entity); + if (!hasExplicitValue(idValue)) { + throw new IllegalStateException("Entity id is required for delete"); + } + String sql = "DELETE FROM " + metadata.table() + " WHERE " + idField.column() + "=?"; + executeUpdate(sql, Collections.singletonList(idValue)); + } + + @Override + public T findById(Class type, Object id) { + EntityMetadata metadata = metadata(type); + String sql = "SELECT * FROM " + metadata.table() + " WHERE " + metadata.idField().column() + "=?"; + List result = query(sql, Collections.singletonList(id), type); + return result.isEmpty() ? null : result.get(0); + } + + @Override + public List findAll(Class type) { + EntityMetadata metadata = metadata(type); + String sql = "SELECT * FROM " + metadata.table(); + return query(sql, Collections.emptyList(), type); + } + + @Override + public T findOneWhere(Class type, String where, List params) { + List results = findWhere(type, where, params, null, 1, null); + return results.isEmpty() ? null : results.get(0); + } + + @Override + public List findWhere(Class type, String where, List params) { + EntityMetadata metadata = metadata(type); + String sql = "SELECT * FROM " + metadata.table() + whereClause(where); + return query(sql, normalizeParams(params), type); + } + + @Override + public long count(Class type) { + return count(type, "", Collections.emptyList()); + } + + @Override + public long count(Class type, String where, List params) { + EntityMetadata metadata = metadata(type); + String sql = "SELECT COUNT(*) FROM " + metadata.table() + whereClause(where); + return queryCount(sql, normalizeParams(params)); + } + + @Override + public boolean exists(Class type, String where, List params) { + EntityMetadata metadata = metadata(type); + String sql = "SELECT 1 FROM " + metadata.table() + whereClause(where) + " LIMIT 1"; + List result = queryScalar(sql, normalizeParams(params)); + return !result.isEmpty(); + } + + @Override + public int deleteWhere(Class type, String where, List params) { + if (where == null || where.trim().isEmpty()) { + throw new IllegalStateException("deleteWhere requires a WHERE clause"); + } + EntityMetadata metadata = metadata(type); + String sql = "DELETE FROM " + metadata.table() + whereClause(where); + return executeUpdate(sql, normalizeParams(params)); + } + + @Override + public List findWhere( + Class type, + String where, + List params, + String orderBy, + Integer limit, + Integer offset + ) { + EntityMetadata metadata = metadata(type); + String sql = "SELECT * FROM " + metadata.table() + + whereClause(where) + + orderByClause(orderBy) + + limitClause(limit, offset); + return query(sql, normalizeParams(params), type); + } + + @Override + public CompletableFuture> findWhereAsync( + Class type, + String where, + List params, + String orderBy, + Integer limit, + Integer offset + ) { + return CompletableFuture.supplyAsync( + () -> findWhere(type, where, params, orderBy, limit, offset), + executor + ); + } + + @Override + public void registerAdapter(Class type, TypeAdapter adapter) { + adapters.put(type, adapter); + } + + @Override + public EntityQuery query(Class type) { + return new EntityQueryImpl<>(this, type); + } + + @Override + public CompletableFuture insertAsync(T entity) { + return CompletableFuture.runAsync(() -> insert(entity), executor); + } + + @Override + public CompletableFuture updateAsync(T entity) { + return CompletableFuture.runAsync(() -> update(entity), executor); + } + + @Override + public CompletableFuture deleteAsync(T entity) { + return CompletableFuture.runAsync(() -> delete(entity), executor); + } + + @Override + public CompletableFuture findByIdAsync(Class type, Object id) { + return CompletableFuture.supplyAsync(() -> findById(type, id), executor); + } + + @Override + public CompletableFuture> findAllAsync(Class type) { + return CompletableFuture.supplyAsync(() -> findAll(type), executor); + } + + @Override + public CompletableFuture findOneWhereAsync(Class type, String where, List params) { + return CompletableFuture.supplyAsync(() -> findOneWhere(type, where, params), executor); + } + + @Override + public CompletableFuture> findWhereAsync(Class type, String where, List params) { + return CompletableFuture.supplyAsync(() -> findWhere(type, where, params), executor); + } + + @Override + public CompletableFuture countAsync(Class type) { + return CompletableFuture.supplyAsync(() -> count(type), executor); + } + + @Override + public CompletableFuture countAsync(Class type, String where, List params) { + return CompletableFuture.supplyAsync(() -> count(type, where, params), executor); + } + + @Override + public CompletableFuture existsAsync(Class type, String where, List params) { + return CompletableFuture.supplyAsync(() -> exists(type, where, params), executor); + } + + @Override + public CompletableFuture deleteWhereAsync(Class type, String where, List params) { + return CompletableFuture.supplyAsync(() -> deleteWhere(type, where, params), executor); + } + + private EntityMetadata metadata(Class type) { + return metadataCache.computeIfAbsent(type, EntityMetadata::resolve); + } + + private List query(String sql, List params, Class type) { + try (Connection connection = dataSource.getConnection(); + PreparedStatement statement = connection.prepareStatement(sql)) { + JdbcSupport.bindParams(statement, params); + try (ResultSet resultSet = statement.executeQuery()) { + Set columns = resolveColumns(resultSet); + List results = new ArrayList<>(); + while (resultSet.next()) { + results.add(mapRow(resultSet, type, columns)); + } + return results; + } + } catch (SQLException ex) { + throw new IllegalStateException("Failed to query SQL: " + sql, ex); + } + } + + List queryCustom(String sql, List params, Class type) { + return query(sql, normalizeParams(params), type); + } + + long queryCountCustom(String sql, List params) { + return queryCount(sql, normalizeParams(params)); + } + + boolean queryExistsCustom(String sql, List params) { + List result = queryScalar(sql, normalizeParams(params)); + return !result.isEmpty(); + } + + Executor executor() { + return executor; + } + + String tableFor(Class type) { + return metadata(type).table(); + } + + private long queryCount(String sql, List params) { + try (Connection connection = dataSource.getConnection(); + PreparedStatement statement = connection.prepareStatement(sql)) { + JdbcSupport.bindParams(statement, params); + try (ResultSet resultSet = statement.executeQuery()) { + return resultSet.next() ? resultSet.getLong(1) : 0L; + } + } catch (SQLException ex) { + throw new IllegalStateException("Failed to query SQL: " + sql, ex); + } + } + + private List queryScalar(String sql, List params) { + try (Connection connection = dataSource.getConnection(); + PreparedStatement statement = connection.prepareStatement(sql)) { + JdbcSupport.bindParams(statement, params); + try (ResultSet resultSet = statement.executeQuery()) { + List results = new ArrayList<>(); + while (resultSet.next()) { + results.add(resultSet.getInt(1)); + } + return results; + } + } catch (SQLException ex) { + throw new IllegalStateException("Failed to query SQL: " + sql, ex); + } + } + + private int executeUpdate(String sql, List params) { + try (Connection connection = dataSource.getConnection(); + PreparedStatement statement = connection.prepareStatement(sql)) { + JdbcSupport.bindParams(statement, params); + return statement.executeUpdate(); + } catch (SQLException ex) { + throw new IllegalStateException("Failed to execute SQL: " + sql, ex); + } + } + + private Object executeInsert(String sql, List params) { + try (Connection connection = dataSource.getConnection(); + PreparedStatement statement = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) { + JdbcSupport.bindParams(statement, params); + statement.executeUpdate(); + try (ResultSet resultSet = statement.getGeneratedKeys()) { + if (resultSet.next()) { + return resultSet.getObject(1); + } + } + return null; + } catch (SQLException ex) { + throw new IllegalStateException("Failed to execute SQL: " + sql, ex); + } + } + + private String whereClause(String where) { + if (where == null || where.trim().isEmpty()) { + return ""; + } + return " WHERE " + where; + } + + private String orderByClause(String orderBy) { + if (orderBy == null || orderBy.trim().isEmpty()) { + return ""; + } + return " ORDER BY " + orderBy; + } + + private String limitClause(Integer limit, Integer offset) { + if (limit == null) { + return ""; + } + if (offset == null) { + return " LIMIT " + limit; + } + return " LIMIT " + limit + " OFFSET " + offset; + } + + private List normalizeParams(List params) { + if (params == null) { + return Collections.emptyList(); + } + return params; + } + + private boolean hasExplicitValue(Object value) { + if (value == null) { + return false; + } + if (value instanceof Number) { + return ((Number) value).longValue() != 0L; + } + return true; + } + + private Object getValue(EntityMetadata.FieldMapping mapping, T entity) { + try { + Object value = mapping.field().get(entity); + if (value == null) { + return null; + } + if (mapping.json()) { + return gson.toJson(value, mapping.field().getGenericType()); + } + TypeAdapter adapter = adapterFor(mapping.field().getType()); + if (adapter != null) { + return adapter.toDatabase(value); + } + return value; + } catch (IllegalAccessException ex) { + throw new IllegalStateException("Failed to access field " + mapping.field().getName(), ex); + } + } + + private void setValue(EntityMetadata.FieldMapping mapping, T entity, Object value) { + try { + Class targetType = mapping.field().getType(); + Object coerced; + if (mapping.json()) { + coerced = gson.fromJson(value == null ? "null" : value.toString(), mapping.field().getGenericType()); + } else { + TypeAdapter adapter = adapterFor(targetType); + coerced = adapter == null ? coerceValue(targetType, value) : adapter.fromDatabase(value); + } + mapping.field().set(entity, coerced); + } catch (IllegalAccessException ex) { + throw new IllegalStateException("Failed to set field " + mapping.field().getName(), ex); + } + } + + private Object coerceValue(Class targetType, Object value) { + if (value == null) { + return null; + } + if (targetType.isAssignableFrom(value.getClass())) { + return value; + } + if (targetType == long.class || targetType == Long.class) { + return ((Number) value).longValue(); + } + if (targetType == int.class || targetType == Integer.class) { + return ((Number) value).intValue(); + } + if (targetType == short.class || targetType == Short.class) { + return ((Number) value).shortValue(); + } + if (targetType == String.class) { + return value.toString(); + } + return value; + } + + @SuppressWarnings("unchecked") + private TypeAdapter adapterFor(Class type) { + return (TypeAdapter) adapters.get(type); + } + + private T mapRow(ResultSet resultSet, Class type, Set columns) { + EntityMetadata metadata = metadata(type); + T instance = instantiate(type); + for (EntityMetadata.FieldMapping mapping : metadata.fields()) { + if (!columns.contains(mapping.column().toLowerCase())) { + continue; + } + try { + Object value = resultSet.getObject(mapping.column()); + if (value == null && mapping.field().getType().isPrimitive()) { + continue; + } + setValue(mapping, instance, value); + } catch (SQLException ex) { + throw new IllegalStateException("Failed to read column " + mapping.column(), ex); + } + } + return instance; + } + + private Set resolveColumns(ResultSet resultSet) throws SQLException { + Set columns = new HashSet<>(); + int count = resultSet.getMetaData().getColumnCount(); + for (int i = 1; i <= count; i++) { + String label = resultSet.getMetaData().getColumnLabel(i); + if (label != null) { + columns.add(label.toLowerCase()); + } + } + return columns; + } + + private T instantiate(Class type) { + try { + Constructor constructor = type.getDeclaredConstructor(); + constructor.setAccessible(true); + return constructor.newInstance(); + } catch (Exception ex) { + throw new IllegalStateException("Entity must have a no-arg constructor: " + type.getName(), ex); + } + } + + private void registerDefaults() { + registerAdapter(UUID.class, new TypeAdapter() { + @Override + public Object toDatabase(UUID value) { + return value == null ? null : value.toString(); + } + + @Override + public UUID fromDatabase(Object value) { + if (value == null) { + return null; + } + return UUID.fromString(value.toString()); + } + }); + } +} diff --git a/src/main/java/com/andrewkydev/database/internal/EntityMetadata.java b/src/main/java/com/andrewkydev/database/internal/EntityMetadata.java new file mode 100644 index 0000000..56e0674 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/internal/EntityMetadata.java @@ -0,0 +1,149 @@ +package com.andrewkydev.database.internal; + +import com.andrewkydev.database.orm.DbColumn; +import com.andrewkydev.database.orm.DbEntity; +import com.andrewkydev.database.orm.DbId; +import com.andrewkydev.database.orm.DbJson; +import com.andrewkydev.database.orm.DbTransient; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.List; + +final class EntityMetadata { + private final String table; + private final List fields; + private final FieldMapping idField; + + private EntityMetadata(String table, List fields, FieldMapping idField) { + this.table = table; + this.fields = fields; + this.idField = idField; + } + + static EntityMetadata resolve(Class type) { + String table = resolveTable(type); + List fields = new ArrayList<>(); + FieldMapping idField = null; + + Class current = type; + while (current != null && current != Object.class) { + for (Field field : current.getDeclaredFields()) { + if (Modifier.isStatic(field.getModifiers())) { + continue; + } + if (field.isAnnotationPresent(DbTransient.class)) { + continue; + } + String columnName = resolveColumnName(field); + DbId id = field.getAnnotation(DbId.class); + DbJson json = field.getAnnotation(DbJson.class); + boolean isId = id != null; + boolean autoIncrement = id != null && id.autoIncrement(); + boolean jsonField = json != null; + FieldMapping mapping = new FieldMapping(field, columnName, isId, autoIncrement, jsonField); + fields.add(mapping); + if (isId) { + if (idField != null) { + throw new IllegalStateException("Multiple @DbId fields found for " + type.getName()); + } + idField = mapping; + } + } + current = current.getSuperclass(); + } + + if (fields.isEmpty()) { + throw new IllegalStateException("No mappable fields found for " + type.getName()); + } + return new EntityMetadata(table, fields, idField); + } + + String table() { + return table; + } + + List fields() { + return fields; + } + + FieldMapping idField() { + if (idField == null) { + throw new IllegalStateException("No @DbId field defined for entity table " + table); + } + return idField; + } + + FieldMapping idFieldOrNull() { + return idField; + } + + private static String resolveTable(Class type) { + DbEntity entity = type.getAnnotation(DbEntity.class); + if (entity != null && !entity.table().isEmpty()) { + return entity.table(); + } + return toSnakeCase(type.getSimpleName()); + } + + private static String resolveColumnName(Field field) { + DbColumn column = field.getAnnotation(DbColumn.class); + if (column != null && !column.name().isEmpty()) { + return column.name(); + } + return toSnakeCase(field.getName()); + } + + private static String toSnakeCase(String value) { + StringBuilder builder = new StringBuilder(); + for (int i = 0; i < value.length(); i++) { + char c = value.charAt(i); + if (Character.isUpperCase(c)) { + if (i > 0) { + builder.append('_'); + } + builder.append(Character.toLowerCase(c)); + } else { + builder.append(c); + } + } + return builder.toString(); + } + + static final class FieldMapping { + private final Field field; + private final String column; + private final boolean id; + private final boolean autoIncrement; + private final boolean json; + + FieldMapping(Field field, String column, boolean id, boolean autoIncrement, boolean json) { + this.field = field; + this.column = column; + this.id = id; + this.autoIncrement = autoIncrement; + this.json = json; + this.field.setAccessible(true); + } + + Field field() { + return field; + } + + String column() { + return column; + } + + boolean isId() { + return id; + } + + boolean autoIncrement() { + return autoIncrement; + } + + boolean json() { + return json; + } + } +} diff --git a/src/main/java/com/andrewkydev/database/internal/EntityQueryImpl.java b/src/main/java/com/andrewkydev/database/internal/EntityQueryImpl.java new file mode 100644 index 0000000..5f7cd5a --- /dev/null +++ b/src/main/java/com/andrewkydev/database/internal/EntityQueryImpl.java @@ -0,0 +1,329 @@ +package com.andrewkydev.database.internal; + +import com.andrewkydev.database.orm.EntityQuery; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import com.andrewkydev.database.orm.Condition; + +final class EntityQueryImpl implements EntityQuery { + private final EntityManagerImpl manager; + private final Class type; + private List selectColumns; + private String joinSql; + private String where; + private List params; + private String orderBy; + private String groupBy; + private String having; + private List havingParams; + private Integer limit; + private Integer offset; + + EntityQueryImpl(EntityManagerImpl manager, Class type) { + this.manager = manager; + this.type = type; + } + + @Override + public EntityQuery select(String... columns) { + if (columns == null || columns.length == 0) { + this.selectColumns = null; + return this; + } + this.selectColumns = new ArrayList<>(Arrays.asList(columns)); + return this; + } + + @Override + public EntityQuery join(String joinSql) { + this.joinSql = joinSql; + return this; + } + + @Override + public EntityQuery where(String where, List params) { + this.where = where; + this.params = params == null ? null : new ArrayList<>(params); + return this; + } + + @Override + public EntityQuery where(String where, Object... params) { + this.where = where; + if (params == null || params.length == 0) { + this.params = null; + } else { + this.params = new ArrayList<>(Arrays.asList(params)); + } + return this; + } + + @Override + public EntityQuery where(Condition condition) { + if (condition == null) { + this.where = null; + this.params = null; + return this; + } + this.where = condition.sql(); + this.params = new ArrayList<>(condition.params()); + return this; + } + + @Override + public EntityQuery and(Condition condition) { + if (condition == null) { + return this; + } + if (this.where == null || this.where.trim().isEmpty()) { + return where(condition); + } + this.where = "(" + this.where + " AND " + condition.sql() + ")"; + if (this.params == null) { + this.params = new ArrayList<>(); + } + this.params.addAll(condition.params()); + return this; + } + + @Override + public EntityQuery or(Condition condition) { + if (condition == null) { + return this; + } + if (this.where == null || this.where.trim().isEmpty()) { + return where(condition); + } + this.where = "(" + this.where + " OR " + condition.sql() + ")"; + if (this.params == null) { + this.params = new ArrayList<>(); + } + this.params.addAll(condition.params()); + return this; + } + + @Override + public EntityQuery orderBy(String orderBy) { + this.orderBy = orderBy; + return this; + } + + @Override + public EntityQuery groupBy(String groupBy) { + this.groupBy = groupBy; + return this; + } + + @Override + public EntityQuery having(String having, List params) { + this.having = having; + this.havingParams = params == null ? null : new ArrayList<>(params); + return this; + } + + @Override + public EntityQuery having(String having, Object... params) { + this.having = having; + if (params == null || params.length == 0) { + this.havingParams = null; + } else { + this.havingParams = new ArrayList<>(Arrays.asList(params)); + } + return this; + } + + @Override + public EntityQuery having(Condition condition) { + if (condition == null) { + this.having = null; + this.havingParams = null; + return this; + } + this.having = condition.sql(); + this.havingParams = new ArrayList<>(condition.params()); + return this; + } + + @Override + public EntityQuery limit(int limit) { + this.limit = limit; + return this; + } + + @Override + public EntityQuery offset(int offset) { + this.offset = offset; + return this; + } + + @Override + public EntityQuery limit(int limit, int offset) { + this.limit = limit; + this.offset = offset; + return this; + } + + @Override + public List list() { + return manager.queryCustom( + buildSelectSql(), + mergeParams(), + type + ); + } + + @Override + public T one() { + List results = manager.queryCustom( + buildSelectSqlWithLimit(1), + mergeParams(), + type + ); + return results.isEmpty() ? null : results.get(0); + } + + @Override + public long count() { + return manager.queryCountCustom(buildCountSql(), mergeParams()); + } + + @Override + public boolean exists() { + return manager.queryExistsCustom(buildExistsSql(), mergeParams()); + } + + @Override + public int delete() { + if (joinSql != null || groupBy != null || having != null) { + throw new IllegalStateException("delete does not support join/group/having"); + } + return manager.deleteWhere(type, where, params); + } + + @Override + public CompletableFuture> listAsync() { + return CompletableFuture.supplyAsync(this::list, manager.executor()); + } + + @Override + public CompletableFuture oneAsync() { + return CompletableFuture.supplyAsync(this::one, manager.executor()); + } + + @Override + public CompletableFuture countAsync() { + return CompletableFuture.supplyAsync(this::count, manager.executor()); + } + + @Override + public CompletableFuture existsAsync() { + return CompletableFuture.supplyAsync(this::exists, manager.executor()); + } + + @Override + public CompletableFuture deleteAsync() { + return CompletableFuture.supplyAsync(this::delete, manager.executor()); + } + + private String buildSelectSql() { + return buildSelectSqlWithLimit(null); + } + + private String buildSelectSqlWithLimit(Integer overrideLimit) { + String select = selectColumns == null || selectColumns.isEmpty() + ? "*" + : String.join(", ", selectColumns); + StringBuilder sql = new StringBuilder("SELECT "); + sql.append(select).append(" FROM ").append(manager.tableFor(type)); + if (joinSql != null && !joinSql.trim().isEmpty()) { + sql.append(" ").append(joinSql); + } + if (where != null && !where.trim().isEmpty()) { + sql.append(" WHERE ").append(where); + } + if (groupBy != null && !groupBy.trim().isEmpty()) { + sql.append(" GROUP BY ").append(groupBy); + } + if (having != null && !having.trim().isEmpty()) { + sql.append(" HAVING ").append(having); + } + if (orderBy != null && !orderBy.trim().isEmpty()) { + sql.append(" ORDER BY ").append(orderBy); + } + Integer effectiveLimit = overrideLimit == null ? limit : overrideLimit; + if (effectiveLimit != null) { + sql.append(" LIMIT ").append(effectiveLimit); + } + if (offset != null) { + if (effectiveLimit == null) { + sql.append(" LIMIT 2147483647"); + } + sql.append(" OFFSET ").append(offset); + } + return sql.toString(); + } + + private String buildCountSql() { + StringBuilder sql = new StringBuilder(); + if (groupBy == null || groupBy.trim().isEmpty()) { + sql.append("SELECT COUNT(*) FROM ").append(manager.tableFor(type)); + if (joinSql != null && !joinSql.trim().isEmpty()) { + sql.append(" ").append(joinSql); + } + if (where != null && !where.trim().isEmpty()) { + sql.append(" WHERE ").append(where); + } + if (having != null && !having.trim().isEmpty()) { + sql.append(" HAVING ").append(having); + } + return sql.toString(); + } + + sql.append("SELECT COUNT(*) FROM ("); + sql.append("SELECT 1 FROM ").append(manager.tableFor(type)); + if (joinSql != null && !joinSql.trim().isEmpty()) { + sql.append(" ").append(joinSql); + } + if (where != null && !where.trim().isEmpty()) { + sql.append(" WHERE ").append(where); + } + sql.append(" GROUP BY ").append(groupBy); + if (having != null && !having.trim().isEmpty()) { + sql.append(" HAVING ").append(having); + } + sql.append(") t"); + return sql.toString(); + } + + private String buildExistsSql() { + StringBuilder sql = new StringBuilder("SELECT 1 FROM "); + sql.append(manager.tableFor(type)); + if (joinSql != null && !joinSql.trim().isEmpty()) { + sql.append(" ").append(joinSql); + } + if (where != null && !where.trim().isEmpty()) { + sql.append(" WHERE ").append(where); + } + if (groupBy != null && !groupBy.trim().isEmpty()) { + sql.append(" GROUP BY ").append(groupBy); + } + if (having != null && !having.trim().isEmpty()) { + sql.append(" HAVING ").append(having); + } + sql.append(" LIMIT 1"); + return sql.toString(); + } + + private List mergeParams() { + List merged = new ArrayList<>(); + if (params != null) { + merged.addAll(params); + } + if (havingParams != null) { + merged.addAll(havingParams); + } + return merged; + } +} diff --git a/src/main/java/com/andrewkydev/database/internal/JdbcQueryRunner.java b/src/main/java/com/andrewkydev/database/internal/JdbcQueryRunner.java new file mode 100644 index 0000000..0b986b9 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/internal/JdbcQueryRunner.java @@ -0,0 +1,82 @@ +package com.andrewkydev.database.internal; + +import com.andrewkydev.database.query.QueryRunner; +import com.andrewkydev.database.query.RowMapper; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; +import javax.sql.DataSource; + +public final class JdbcQueryRunner implements QueryRunner { + private final DataSource dataSource; + private final Executor executor; + + public JdbcQueryRunner(DataSource dataSource, Executor executor) { + this.dataSource = dataSource; + this.executor = executor; + } + + @Override + public int execute(String sql) { + return execute(sql, Collections.emptyList()); + } + + @Override + public int execute(String sql, List params) { + try (Connection connection = dataSource.getConnection(); + PreparedStatement statement = connection.prepareStatement(sql)) { + JdbcSupport.bindParams(statement, params); + return statement.executeUpdate(); + } catch (SQLException ex) { + throw new IllegalStateException("Failed to execute SQL: " + sql, ex); + } + } + + @Override + public List query(String sql, RowMapper mapper) { + return query(sql, Collections.emptyList(), mapper); + } + + @Override + public List query(String sql, List params, RowMapper mapper) { + try (Connection connection = dataSource.getConnection(); + PreparedStatement statement = connection.prepareStatement(sql)) { + JdbcSupport.bindParams(statement, params); + try (ResultSet resultSet = statement.executeQuery()) { + List results = new ArrayList<>(); + while (resultSet.next()) { + results.add(mapper.map(resultSet)); + } + return results; + } + } catch (SQLException ex) { + throw new IllegalStateException("Failed to query SQL: " + sql, ex); + } + } + + @Override + public CompletableFuture executeAsync(String sql) { + return CompletableFuture.supplyAsync(() -> execute(sql), executor); + } + + @Override + public CompletableFuture executeAsync(String sql, List params) { + return CompletableFuture.supplyAsync(() -> execute(sql, params), executor); + } + + @Override + public CompletableFuture> queryAsync(String sql, RowMapper mapper) { + return CompletableFuture.supplyAsync(() -> query(sql, mapper), executor); + } + + @Override + public CompletableFuture> queryAsync(String sql, List params, RowMapper mapper) { + return CompletableFuture.supplyAsync(() -> query(sql, params, mapper), executor); + } +} diff --git a/src/main/java/com/andrewkydev/database/internal/JdbcSupport.java b/src/main/java/com/andrewkydev/database/internal/JdbcSupport.java new file mode 100644 index 0000000..eeeae6d --- /dev/null +++ b/src/main/java/com/andrewkydev/database/internal/JdbcSupport.java @@ -0,0 +1,19 @@ +package com.andrewkydev.database.internal; + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.List; + +final class JdbcSupport { + private JdbcSupport() { + } + + static void bindParams(PreparedStatement statement, List params) throws SQLException { + if (params == null || params.isEmpty()) { + return; + } + for (int i = 0; i < params.size(); i++) { + statement.setObject(i + 1, params.get(i)); + } + } +} diff --git a/src/main/java/com/andrewkydev/database/internal/JdbcTransaction.java b/src/main/java/com/andrewkydev/database/internal/JdbcTransaction.java new file mode 100644 index 0000000..b48500c --- /dev/null +++ b/src/main/java/com/andrewkydev/database/internal/JdbcTransaction.java @@ -0,0 +1,116 @@ +package com.andrewkydev.database.internal; + +import com.andrewkydev.database.query.RowMapper; +import com.andrewkydev.database.query.Transaction; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; + +public final class JdbcTransaction implements Transaction { + private final Connection connection; + private final Executor executor; + + public JdbcTransaction(Connection connection, Executor executor) { + this.connection = connection; + this.executor = executor; + } + + @Override + public int execute(String sql) { + return execute(sql, Collections.emptyList()); + } + + @Override + public int execute(String sql, List params) { + try (PreparedStatement statement = connection.prepareStatement(sql)) { + JdbcSupport.bindParams(statement, params); + return statement.executeUpdate(); + } catch (SQLException ex) { + throw new IllegalStateException("Failed to execute SQL: " + sql, ex); + } + } + + @Override + public List query(String sql, RowMapper mapper) { + return query(sql, Collections.emptyList(), mapper); + } + + @Override + public List query(String sql, List params, RowMapper mapper) { + try (PreparedStatement statement = connection.prepareStatement(sql)) { + JdbcSupport.bindParams(statement, params); + try (ResultSet resultSet = statement.executeQuery()) { + List results = new ArrayList<>(); + while (resultSet.next()) { + results.add(mapper.map(resultSet)); + } + return results; + } + } catch (SQLException ex) { + throw new IllegalStateException("Failed to query SQL: " + sql, ex); + } + } + + @Override + public CompletableFuture executeAsync(String sql) { + return CompletableFuture.supplyAsync(() -> execute(sql), executor); + } + + @Override + public CompletableFuture executeAsync(String sql, List params) { + return CompletableFuture.supplyAsync(() -> execute(sql, params), executor); + } + + @Override + public CompletableFuture> queryAsync(String sql, RowMapper mapper) { + return CompletableFuture.supplyAsync(() -> query(sql, mapper), executor); + } + + @Override + public CompletableFuture> queryAsync(String sql, List params, RowMapper mapper) { + return CompletableFuture.supplyAsync(() -> query(sql, params, mapper), executor); + } + + @Override + public void commit() { + try { + connection.commit(); + } catch (SQLException ex) { + throw new IllegalStateException("Failed to commit transaction", ex); + } + } + + @Override + public void rollback() { + try { + connection.rollback(); + } catch (SQLException ex) { + throw new IllegalStateException("Failed to rollback transaction", ex); + } + } + + @Override + public CompletableFuture commitAsync() { + return CompletableFuture.runAsync(this::commit, executor); + } + + @Override + public CompletableFuture rollbackAsync() { + return CompletableFuture.runAsync(this::rollback, executor); + } + + @Override + public void close() { + try { + connection.close(); + } catch (SQLException ex) { + throw new IllegalStateException("Failed to close transaction connection", ex); + } + } +} diff --git a/src/main/java/com/andrewkydev/database/internal/JdbcUrlBuilder.java b/src/main/java/com/andrewkydev/database/internal/JdbcUrlBuilder.java new file mode 100644 index 0000000..6f3f45d --- /dev/null +++ b/src/main/java/com/andrewkydev/database/internal/JdbcUrlBuilder.java @@ -0,0 +1,27 @@ +package com.andrewkydev.database.internal; + +import com.andrewkydev.database.schema.SqlDialect; + +public final class JdbcUrlBuilder { + private JdbcUrlBuilder() { + } + + public static String build(SqlDialect dialect, String host, int port, String database) { + String dbSegment = database == null ? "" : database; + return switch (dialect) { + case POSTGRESQL -> { + if (dbSegment.isEmpty()) { + dbSegment = "postgres"; + } + yield "jdbc:postgresql://" + host + ":" + port + "/" + dbSegment; + } + default -> { + if (dbSegment.isEmpty()) { + yield "jdbc:mysql://" + host + ":" + port + "/"; + } + yield "jdbc:mysql://" + host + ":" + port + "/" + dbSegment + + "?useSSL=false&allowPublicKeyRetrieval=true"; + } + }; + } +} diff --git a/src/main/java/com/andrewkydev/database/internal/SchemaImpl.java b/src/main/java/com/andrewkydev/database/internal/SchemaImpl.java new file mode 100644 index 0000000..533f380 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/internal/SchemaImpl.java @@ -0,0 +1,271 @@ +package com.andrewkydev.database.internal; + +import com.andrewkydev.database.config.DatabaseConfig; +import com.andrewkydev.database.schema.ColumnSpec; +import com.andrewkydev.database.schema.IndexSpec; +import com.andrewkydev.database.schema.Schema; +import com.andrewkydev.database.schema.SqlDialect; +import com.andrewkydev.database.schema.TableSpec; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import java.util.StringJoiner; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; +import javax.sql.DataSource; + +public final class SchemaImpl implements Schema { + private final DataSource dataSource; + private final DatabaseConfig config; + private final SqlDialect dialect; + private final Executor executor; + + public SchemaImpl(DataSource dataSource, DatabaseConfig config, Executor executor) { + this.dataSource = dataSource; + this.config = config; + this.dialect = config.dialect(); + this.executor = executor; + } + + @Override + public void createDatabase(String name) { + String sql = "CREATE DATABASE " + name; + executeAdmin(sql); + } + + @Override + public void dropDatabase(String name) { + String sql = "DROP DATABASE " + name; + executeAdmin(sql); + } + + @Override + public void createTable(TableSpec spec) { + List statements = new ArrayList<>(); + statements.add(buildCreateTable(spec)); + for (IndexSpec index : spec.indexes()) { + statements.add(buildCreateIndex(spec.name(), index)); + } + executeStatements(statements, true); + } + + @Override + public void dropTable(String table) { + executeStatements(singletonList("DROP TABLE " + table), true); + } + + @Override + public void addColumn(String table, ColumnSpec column) { + executeStatements(singletonList("ALTER TABLE " + table + " ADD COLUMN " + columnDefinition(column)), true); + } + + @Override + public void updateColumn(String table, ColumnSpec column) { + executeStatements(buildUpdateColumnStatements(table, column), true); + } + + @Override + public void dropColumn(String table, String column) { + executeStatements(singletonList("ALTER TABLE " + table + " DROP COLUMN " + column), true); + } + + @Override + public void addIndex(String table, IndexSpec index) { + executeStatements(singletonList(buildCreateIndex(table, index)), true); + } + + @Override + public void dropIndex(String table, String indexName) { + String sql = dialect == SqlDialect.POSTGRESQL + ? "DROP INDEX " + indexName + : "DROP INDEX " + indexName + " ON " + table; + executeStatements(singletonList(sql), true); + } + + @Override + public CompletableFuture createDatabaseAsync(String name) { + return CompletableFuture.runAsync(() -> createDatabase(name), executor); + } + + @Override + public CompletableFuture dropDatabaseAsync(String name) { + return CompletableFuture.runAsync(() -> dropDatabase(name), executor); + } + + @Override + public CompletableFuture createTableAsync(TableSpec spec) { + return CompletableFuture.runAsync(() -> createTable(spec), executor); + } + + @Override + public CompletableFuture dropTableAsync(String table) { + return CompletableFuture.runAsync(() -> dropTable(table), executor); + } + + @Override + public CompletableFuture addColumnAsync(String table, ColumnSpec column) { + return CompletableFuture.runAsync(() -> addColumn(table, column), executor); + } + + @Override + public CompletableFuture updateColumnAsync(String table, ColumnSpec column) { + return CompletableFuture.runAsync(() -> updateColumn(table, column), executor); + } + + @Override + public CompletableFuture dropColumnAsync(String table, String column) { + return CompletableFuture.runAsync(() -> dropColumn(table, column), executor); + } + + @Override + public CompletableFuture addIndexAsync(String table, IndexSpec index) { + return CompletableFuture.runAsync(() -> addIndex(table, index), executor); + } + + @Override + public CompletableFuture dropIndexAsync(String table, String indexName) { + return CompletableFuture.runAsync(() -> dropIndex(table, indexName), executor); + } + + private void executeAdmin(String sql) { + try (Connection connection = DriverManager.getConnection( + JdbcUrlBuilder.build(dialect, config.host(), config.port(), adminDatabase()), + config.username(), + config.password() + ); + PreparedStatement statement = connection.prepareStatement(sql)) { + statement.executeUpdate(); + } catch (SQLException ex) { + throw new IllegalStateException("Failed to execute admin SQL: " + sql, ex); + } + } + + private String adminDatabase() { + if (dialect == SqlDialect.POSTGRESQL) { + return config.adminDatabase(); + } + return ""; + } + + private void executeStatements(List statements, boolean allowTransactions) { + boolean useTransaction = allowTransactions && config.autoTransactions(); + if (!useTransaction) { + for (String statement : statements) { + executeStatement(statement); + } + return; + } + + try (Connection connection = dataSource.getConnection()) { + connection.setAutoCommit(false); + try { + for (String sql : statements) { + try (PreparedStatement statement = connection.prepareStatement(sql)) { + statement.executeUpdate(); + } + } + connection.commit(); + } catch (SQLException ex) { + connection.rollback(); + throw ex; + } + } catch (SQLException ex) { + throw new IllegalStateException("Failed to execute SQL statements", ex); + } + } + + private List singletonList(String statement) { + List statements = new ArrayList<>(1); + statements.add(statement); + return statements; + } + + private void executeStatement(String sql) { + try (Connection connection = dataSource.getConnection(); + PreparedStatement statement = connection.prepareStatement(sql)) { + statement.executeUpdate(); + } catch (SQLException ex) { + throw new IllegalStateException("Failed to execute SQL: " + sql, ex); + } + } + + private String buildCreateTable(TableSpec spec) { + StringJoiner joiner = new StringJoiner(", "); + for (ColumnSpec column : spec.columns()) { + joiner.add(columnDefinition(column)); + } + if (!spec.primaryKey().isEmpty()) { + joiner.add("PRIMARY KEY (" + String.join(", ", spec.primaryKey()) + ")"); + } else { + List inlineKeys = new ArrayList<>(); + for (ColumnSpec column : spec.columns()) { + if (column.primaryKey()) { + inlineKeys.add(column.name()); + } + } + if (!inlineKeys.isEmpty()) { + joiner.add("PRIMARY KEY (" + String.join(", ", inlineKeys) + ")"); + } + } + return "CREATE TABLE " + spec.name() + " (" + joiner + ")"; + } + + private String buildCreateIndex(String table, IndexSpec index) { + String prefix = index.unique() ? "CREATE UNIQUE INDEX " : "CREATE INDEX "; + return prefix + index.name() + " ON " + table + " (" + String.join(", ", index.columns()) + ")"; + } + + private String columnDefinition(ColumnSpec column) { + StringBuilder builder = new StringBuilder(); + builder.append(column.name()).append(" "); + builder.append(resolveColumnType(column)); + if (!column.nullable()) { + builder.append(" NOT NULL"); + } + if (column.defaultValue() != null && !column.defaultValue().isEmpty()) { + builder.append(" DEFAULT ").append(column.defaultValue()); + } + if (column.autoIncrement() && dialect == SqlDialect.MYSQL) { + builder.append(" AUTO_INCREMENT"); + } + return builder.toString(); + } + + private String resolveColumnType(ColumnSpec column) { + if (!column.autoIncrement() || dialect != SqlDialect.POSTGRESQL) { + return column.type(); + } + String type = column.type().toUpperCase(); + if (type.contains("BIG")) { + return "BIGSERIAL"; + } + if (type.contains("INT")) { + return "SERIAL"; + } + return column.type() + " GENERATED BY DEFAULT AS IDENTITY"; + } + + private List buildUpdateColumnStatements(String table, ColumnSpec column) { + List statements = new ArrayList<>(); + if (dialect == SqlDialect.MYSQL) { + statements.add("ALTER TABLE " + table + " MODIFY COLUMN " + columnDefinition(column)); + return statements; + } + + statements.add("ALTER TABLE " + table + " ALTER COLUMN " + column.name() + " TYPE " + column.type()); + if (column.nullable()) { + statements.add("ALTER TABLE " + table + " ALTER COLUMN " + column.name() + " DROP NOT NULL"); + } else { + statements.add("ALTER TABLE " + table + " ALTER COLUMN " + column.name() + " SET NOT NULL"); + } + if (column.defaultValue() == null || column.defaultValue().isEmpty()) { + statements.add("ALTER TABLE " + table + " ALTER COLUMN " + column.name() + " DROP DEFAULT"); + } else { + statements.add("ALTER TABLE " + table + " ALTER COLUMN " + column.name() + " SET DEFAULT " + column.defaultValue()); + } + return statements; + } +} diff --git a/src/main/java/com/andrewkydev/database/orm/Condition.java b/src/main/java/com/andrewkydev/database/orm/Condition.java new file mode 100644 index 0000000..2d3e756 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/orm/Condition.java @@ -0,0 +1,38 @@ +package com.andrewkydev.database.orm; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public final class Condition { + private final String sql; + private final List params; + + Condition(String sql, List params) { + this.sql = sql; + this.params = params == null ? Collections.emptyList() : params; + } + + public String sql() { + return sql; + } + + public List params() { + return params; + } + + public Condition and(Condition other) { + return combine("AND", other); + } + + public Condition or(Condition other) { + return combine("OR", other); + } + + private Condition combine(String op, Condition other) { + List combined = new ArrayList<>(params.size() + other.params.size()); + combined.addAll(params); + combined.addAll(other.params); + return new Condition("(" + sql + " " + op + " " + other.sql + ")", combined); + } +} diff --git a/src/main/java/com/andrewkydev/database/orm/Conditions.java b/src/main/java/com/andrewkydev/database/orm/Conditions.java new file mode 100644 index 0000000..e20ceb6 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/orm/Conditions.java @@ -0,0 +1,85 @@ +package com.andrewkydev.database.orm; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public final class Conditions { + private Conditions() { + } + + public static Condition raw(String sql, List params) { + return new Condition(sql, params); + } + + public static Condition raw(String sql, Object... params) { + return new Condition(sql, params == null ? Collections.emptyList() : asList(params)); + } + + public static Condition eq(String column, Object value) { + return new Condition(column + " = ?", Collections.singletonList(value)); + } + + public static Condition ne(String column, Object value) { + return new Condition(column + " <> ?", Collections.singletonList(value)); + } + + public static Condition gt(String column, Object value) { + return new Condition(column + " > ?", Collections.singletonList(value)); + } + + public static Condition gte(String column, Object value) { + return new Condition(column + " >= ?", Collections.singletonList(value)); + } + + public static Condition lt(String column, Object value) { + return new Condition(column + " < ?", Collections.singletonList(value)); + } + + public static Condition lte(String column, Object value) { + return new Condition(column + " <= ?", Collections.singletonList(value)); + } + + public static Condition like(String column, Object value) { + return new Condition(column + " LIKE ?", Collections.singletonList(value)); + } + + public static Condition in(String column, List values) { + if (values == null || values.isEmpty()) { + return new Condition("1=0", Collections.emptyList()); + } + StringBuilder builder = new StringBuilder(); + builder.append(column).append(" IN ("); + for (int i = 0; i < values.size(); i++) { + if (i > 0) { + builder.append(", "); + } + builder.append("?"); + } + builder.append(")"); + return new Condition(builder.toString(), values); + } + + public static Condition in(String column, Object... values) { + if (values == null || values.length == 0) { + return new Condition("1=0", Collections.emptyList()); + } + List list = new ArrayList<>(values.length); + Collections.addAll(list, values); + return in(column, list); + } + + public static Condition isNull(String column) { + return new Condition(column + " IS NULL", Collections.emptyList()); + } + + public static Condition isNotNull(String column) { + return new Condition(column + " IS NOT NULL", Collections.emptyList()); + } + + private static List asList(Object[] params) { + List list = new ArrayList<>(params.length); + Collections.addAll(list, params); + return list; + } +} diff --git a/src/main/java/com/andrewkydev/database/orm/DbColumn.java b/src/main/java/com/andrewkydev/database/orm/DbColumn.java new file mode 100644 index 0000000..113bf22 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/orm/DbColumn.java @@ -0,0 +1,20 @@ +package com.andrewkydev.database.orm; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface DbColumn { + String name() default ""; + + boolean nullable() default true; + + int length() default 255; + + boolean unique() default false; + + String type() default ""; +} diff --git a/src/main/java/com/andrewkydev/database/orm/DbEntity.java b/src/main/java/com/andrewkydev/database/orm/DbEntity.java new file mode 100644 index 0000000..79b1546 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/orm/DbEntity.java @@ -0,0 +1,12 @@ +package com.andrewkydev.database.orm; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface DbEntity { + String table() default ""; +} diff --git a/src/main/java/com/andrewkydev/database/orm/DbId.java b/src/main/java/com/andrewkydev/database/orm/DbId.java new file mode 100644 index 0000000..202ca90 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/orm/DbId.java @@ -0,0 +1,12 @@ +package com.andrewkydev.database.orm; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface DbId { + boolean autoIncrement() default true; +} diff --git a/src/main/java/com/andrewkydev/database/orm/DbJson.java b/src/main/java/com/andrewkydev/database/orm/DbJson.java new file mode 100644 index 0000000..aee5979 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/orm/DbJson.java @@ -0,0 +1,11 @@ +package com.andrewkydev.database.orm; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface DbJson { +} diff --git a/src/main/java/com/andrewkydev/database/orm/DbTransient.java b/src/main/java/com/andrewkydev/database/orm/DbTransient.java new file mode 100644 index 0000000..c824059 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/orm/DbTransient.java @@ -0,0 +1,11 @@ +package com.andrewkydev.database.orm; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) +public @interface DbTransient { +} diff --git a/src/main/java/com/andrewkydev/database/orm/EntityManager.java b/src/main/java/com/andrewkydev/database/orm/EntityManager.java new file mode 100644 index 0000000..dc90053 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/orm/EntityManager.java @@ -0,0 +1,73 @@ +package com.andrewkydev.database.orm; + +import java.util.List; +import java.util.concurrent.CompletableFuture; + +public interface EntityManager { + + void insert(T entity); + + void update(T entity); + + void delete(T entity); + + T findById(Class type, Object id); + + List findAll(Class type); + + T findOneWhere(Class type, String where, List params); + + List findWhere(Class type, String where, List params); + + long count(Class type); + + long count(Class type, String where, List params); + + boolean exists(Class type, String where, List params); + + int deleteWhere(Class type, String where, List params); + + List findWhere( + Class type, + String where, + List params, + String orderBy, + Integer limit, + Integer offset + ); + + CompletableFuture> findWhereAsync( + Class type, + String where, + List params, + String orderBy, + Integer limit, + Integer offset + ); + + void registerAdapter(Class type, TypeAdapter adapter); + + EntityQuery query(Class type); + + CompletableFuture insertAsync(T entity); + + CompletableFuture updateAsync(T entity); + + CompletableFuture deleteAsync(T entity); + + CompletableFuture findByIdAsync(Class type, Object id); + + CompletableFuture> findAllAsync(Class type); + + CompletableFuture findOneWhereAsync(Class type, String where, List params); + + CompletableFuture> findWhereAsync(Class type, String where, List params); + + CompletableFuture countAsync(Class type); + + CompletableFuture countAsync(Class type, String where, List params); + + CompletableFuture existsAsync(Class type, String where, List params); + + CompletableFuture deleteWhereAsync(Class type, String where, List params); +} diff --git a/src/main/java/com/andrewkydev/database/orm/EntityQuery.java b/src/main/java/com/andrewkydev/database/orm/EntityQuery.java new file mode 100644 index 0000000..a95b370 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/orm/EntityQuery.java @@ -0,0 +1,57 @@ +package com.andrewkydev.database.orm; + +import java.util.List; +import java.util.concurrent.CompletableFuture; + +public interface EntityQuery { + + EntityQuery select(String... columns); + + EntityQuery join(String joinSql); + + EntityQuery where(String where, List params); + + EntityQuery where(String where, Object... params); + + EntityQuery where(Condition condition); + + EntityQuery and(Condition condition); + + EntityQuery or(Condition condition); + + EntityQuery orderBy(String orderBy); + + EntityQuery groupBy(String groupBy); + + EntityQuery having(String having, List params); + + EntityQuery having(String having, Object... params); + + EntityQuery having(Condition condition); + + EntityQuery limit(int limit); + + EntityQuery offset(int offset); + + EntityQuery limit(int limit, int offset); + + List list(); + + T one(); + + long count(); + + boolean exists(); + + int delete(); + + CompletableFuture> listAsync(); + + CompletableFuture oneAsync(); + + CompletableFuture countAsync(); + + CompletableFuture existsAsync(); + + CompletableFuture deleteAsync(); +} diff --git a/src/main/java/com/andrewkydev/database/orm/OrmSchema.java b/src/main/java/com/andrewkydev/database/orm/OrmSchema.java new file mode 100644 index 0000000..a2f0564 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/orm/OrmSchema.java @@ -0,0 +1,132 @@ +package com.andrewkydev.database.orm; + +import com.andrewkydev.database.schema.ColumnSpec; +import com.andrewkydev.database.schema.IndexSpec; +import com.andrewkydev.database.schema.SqlDialect; +import com.andrewkydev.database.schema.TableSpec; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.List; + +public final class OrmSchema { + private OrmSchema() { + } + + public static TableSpec fromEntity(Class type, SqlDialect dialect) { + DbEntity entity = type.getAnnotation(DbEntity.class); + String table = entity != null && !entity.table().isEmpty() + ? entity.table() + : toSnakeCase(type.getSimpleName()); + + TableSpec.Builder builder = TableSpec.builder(table); + List primaryKeys = new ArrayList<>(); + List indexes = new ArrayList<>(); + + Class current = type; + while (current != null && current != Object.class) { + for (Field field : current.getDeclaredFields()) { + if (Modifier.isStatic(field.getModifiers())) { + continue; + } + if (field.isAnnotationPresent(DbTransient.class)) { + continue; + } + + DbColumn column = field.getAnnotation(DbColumn.class); + DbId id = field.getAnnotation(DbId.class); + DbJson json = field.getAnnotation(DbJson.class); + + String columnName = column != null && !column.name().isEmpty() + ? column.name() + : toSnakeCase(field.getName()); + boolean nullable = column == null || column.nullable(); + boolean unique = column != null && column.unique(); + int length = column != null ? column.length() : 255; + boolean autoIncrement = id != null && id.autoIncrement(); + boolean primaryKey = id != null; + + String typeName = column != null ? column.type() : ""; + if (typeName == null || typeName.trim().isEmpty()) { + typeName = resolveType(field.getType(), length, json != null, dialect); + } + + builder.column(ColumnSpec.builder(columnName, typeName) + .nullable(nullable) + .autoIncrement(autoIncrement) + .primaryKey(primaryKey) + .build()); + + if (primaryKey) { + primaryKeys.add(columnName); + } + if (unique) { + indexes.add(new IndexSpec(table + "_" + columnName + "_uk", listOf(columnName), true)); + } + } + current = current.getSuperclass(); + } + + if (!primaryKeys.isEmpty()) { + builder.primaryKey(primaryKeys); + } + if (!indexes.isEmpty()) { + builder.indexes(indexes); + } + + return builder.build(); + } + + private static String resolveType(Class fieldType, int length, boolean json, SqlDialect dialect) { + if (json) { + return dialect == SqlDialect.POSTGRESQL ? "JSONB" : "JSON"; + } + if (fieldType == String.class) { + return "VARCHAR(" + length + ")"; + } + if (fieldType == int.class || fieldType == Integer.class) { + return "INT"; + } + if (fieldType == long.class || fieldType == Long.class) { + return "BIGINT"; + } + if (fieldType == short.class || fieldType == Short.class) { + return "SMALLINT"; + } + if (fieldType == boolean.class || fieldType == Boolean.class) { + return dialect == SqlDialect.POSTGRESQL ? "BOOLEAN" : "TINYINT(1)"; + } + if (fieldType == float.class || fieldType == Float.class) { + return "FLOAT"; + } + if (fieldType == double.class || fieldType == Double.class) { + return "DOUBLE"; + } + if (fieldType == java.util.UUID.class) { + return dialect == SqlDialect.POSTGRESQL ? "UUID" : "CHAR(36)"; + } + return "TEXT"; + } + + private static List listOf(String value) { + List list = new ArrayList<>(1); + list.add(value); + return list; + } + + private static String toSnakeCase(String value) { + StringBuilder builder = new StringBuilder(); + for (int i = 0; i < value.length(); i++) { + char c = value.charAt(i); + if (Character.isUpperCase(c)) { + if (i > 0) { + builder.append('_'); + } + builder.append(Character.toLowerCase(c)); + } else { + builder.append(c); + } + } + return builder.toString(); + } +} diff --git a/src/main/java/com/andrewkydev/database/orm/TypeAdapter.java b/src/main/java/com/andrewkydev/database/orm/TypeAdapter.java new file mode 100644 index 0000000..2eb7dcf --- /dev/null +++ b/src/main/java/com/andrewkydev/database/orm/TypeAdapter.java @@ -0,0 +1,7 @@ +package com.andrewkydev.database.orm; + +public interface TypeAdapter { + Object toDatabase(T value); + + T fromDatabase(Object value); +} diff --git a/src/main/java/com/andrewkydev/database/query/QueryRunner.java b/src/main/java/com/andrewkydev/database/query/QueryRunner.java new file mode 100644 index 0000000..193f310 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/query/QueryRunner.java @@ -0,0 +1,23 @@ +package com.andrewkydev.database.query; + +import java.util.List; +import java.util.concurrent.CompletableFuture; + +public interface QueryRunner { + + int execute(String sql); + + int execute(String sql, List params); + + List query(String sql, RowMapper mapper); + + List query(String sql, List params, RowMapper mapper); + + CompletableFuture executeAsync(String sql); + + CompletableFuture executeAsync(String sql, List params); + + CompletableFuture> queryAsync(String sql, RowMapper mapper); + + CompletableFuture> queryAsync(String sql, List params, RowMapper mapper); +} diff --git a/src/main/java/com/andrewkydev/database/query/RowMapper.java b/src/main/java/com/andrewkydev/database/query/RowMapper.java new file mode 100644 index 0000000..e9acbdb --- /dev/null +++ b/src/main/java/com/andrewkydev/database/query/RowMapper.java @@ -0,0 +1,9 @@ +package com.andrewkydev.database.query; + +import java.sql.ResultSet; +import java.sql.SQLException; + +@FunctionalInterface +public interface RowMapper { + T map(ResultSet resultSet) throws SQLException; +} diff --git a/src/main/java/com/andrewkydev/database/query/Transaction.java b/src/main/java/com/andrewkydev/database/query/Transaction.java new file mode 100644 index 0000000..e031240 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/query/Transaction.java @@ -0,0 +1,34 @@ +package com.andrewkydev.database.query; + +import java.util.List; +import java.util.concurrent.CompletableFuture; + +public interface Transaction extends AutoCloseable { + + int execute(String sql); + + int execute(String sql, List params); + + List query(String sql, RowMapper mapper); + + List query(String sql, List params, RowMapper mapper); + + CompletableFuture executeAsync(String sql); + + CompletableFuture executeAsync(String sql, List params); + + CompletableFuture> queryAsync(String sql, RowMapper mapper); + + CompletableFuture> queryAsync(String sql, List params, RowMapper mapper); + + void commit(); + + void rollback(); + + CompletableFuture commitAsync(); + + CompletableFuture rollbackAsync(); + + @Override + void close(); +} diff --git a/src/main/java/com/andrewkydev/database/schema/ColumnSpec.java b/src/main/java/com/andrewkydev/database/schema/ColumnSpec.java new file mode 100644 index 0000000..7a23f01 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/schema/ColumnSpec.java @@ -0,0 +1,85 @@ +package com.andrewkydev.database.schema; + +public final class ColumnSpec { + private final String name; + private final String type; + private final boolean nullable; + private final String defaultValue; + private final boolean autoIncrement; + private final boolean primaryKey; + + private ColumnSpec(Builder builder) { + this.name = builder.name; + this.type = builder.type; + this.nullable = builder.nullable; + this.defaultValue = builder.defaultValue; + this.autoIncrement = builder.autoIncrement; + this.primaryKey = builder.primaryKey; + } + + public static Builder builder(String name, String type) { + return new Builder(name, type); + } + + public String name() { + return name; + } + + public String type() { + return type; + } + + public boolean nullable() { + return nullable; + } + + public String defaultValue() { + return defaultValue; + } + + public boolean autoIncrement() { + return autoIncrement; + } + + public boolean primaryKey() { + return primaryKey; + } + + public static final class Builder { + private final String name; + private final String type; + private boolean nullable = true; + private String defaultValue; + private boolean autoIncrement; + private boolean primaryKey; + + private Builder(String name, String type) { + this.name = name; + this.type = type; + } + + public Builder nullable(boolean nullable) { + this.nullable = nullable; + return this; + } + + public Builder defaultValue(String defaultValue) { + this.defaultValue = defaultValue; + return this; + } + + public Builder autoIncrement(boolean autoIncrement) { + this.autoIncrement = autoIncrement; + return this; + } + + public Builder primaryKey(boolean primaryKey) { + this.primaryKey = primaryKey; + return this; + } + + public ColumnSpec build() { + return new ColumnSpec(this); + } + } +} diff --git a/src/main/java/com/andrewkydev/database/schema/IndexSpec.java b/src/main/java/com/andrewkydev/database/schema/IndexSpec.java new file mode 100644 index 0000000..53b672e --- /dev/null +++ b/src/main/java/com/andrewkydev/database/schema/IndexSpec.java @@ -0,0 +1,29 @@ +package com.andrewkydev.database.schema; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public final class IndexSpec { + private final String name; + private final List columns; + private final boolean unique; + + public IndexSpec(String name, List columns, boolean unique) { + this.name = name; + this.columns = Collections.unmodifiableList(new ArrayList<>(columns)); + this.unique = unique; + } + + public String name() { + return name; + } + + public List columns() { + return columns; + } + + public boolean unique() { + return unique; + } +} diff --git a/src/main/java/com/andrewkydev/database/schema/Schema.java b/src/main/java/com/andrewkydev/database/schema/Schema.java new file mode 100644 index 0000000..b6eed13 --- /dev/null +++ b/src/main/java/com/andrewkydev/database/schema/Schema.java @@ -0,0 +1,42 @@ +package com.andrewkydev.database.schema; + +import java.util.concurrent.CompletableFuture; + +public interface Schema { + + void createDatabase(String name); + + void dropDatabase(String name); + + void createTable(TableSpec spec); + + void dropTable(String table); + + void addColumn(String table, ColumnSpec column); + + void updateColumn(String table, ColumnSpec column); + + void dropColumn(String table, String column); + + void addIndex(String table, IndexSpec index); + + void dropIndex(String table, String indexName); + + CompletableFuture createDatabaseAsync(String name); + + CompletableFuture dropDatabaseAsync(String name); + + CompletableFuture createTableAsync(TableSpec spec); + + CompletableFuture dropTableAsync(String table); + + CompletableFuture addColumnAsync(String table, ColumnSpec column); + + CompletableFuture updateColumnAsync(String table, ColumnSpec column); + + CompletableFuture dropColumnAsync(String table, String column); + + CompletableFuture addIndexAsync(String table, IndexSpec index); + + CompletableFuture dropIndexAsync(String table, String indexName); +} diff --git a/src/main/java/com/andrewkydev/database/schema/SqlDialect.java b/src/main/java/com/andrewkydev/database/schema/SqlDialect.java new file mode 100644 index 0000000..a859a1f --- /dev/null +++ b/src/main/java/com/andrewkydev/database/schema/SqlDialect.java @@ -0,0 +1,6 @@ +package com.andrewkydev.database.schema; + +public enum SqlDialect { + MYSQL, + POSTGRESQL +} diff --git a/src/main/java/com/andrewkydev/database/schema/TableSpec.java b/src/main/java/com/andrewkydev/database/schema/TableSpec.java new file mode 100644 index 0000000..8e9d32f --- /dev/null +++ b/src/main/java/com/andrewkydev/database/schema/TableSpec.java @@ -0,0 +1,80 @@ +package com.andrewkydev.database.schema; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public final class TableSpec { + private final String name; + private final List columns; + private final List primaryKey; + private final List indexes; + + private TableSpec(Builder builder) { + this.name = builder.name; + this.columns = Collections.unmodifiableList(new ArrayList<>(builder.columns)); + this.primaryKey = Collections.unmodifiableList(new ArrayList<>(builder.primaryKey)); + this.indexes = Collections.unmodifiableList(new ArrayList<>(builder.indexes)); + } + + public static Builder builder(String name) { + return new Builder(name); + } + + public String name() { + return name; + } + + public List columns() { + return columns; + } + + public List primaryKey() { + return primaryKey; + } + + public List indexes() { + return indexes; + } + + public static final class Builder { + private final String name; + private final List columns = new ArrayList<>(); + private final List primaryKey = new ArrayList<>(); + private final List indexes = new ArrayList<>(); + + private Builder(String name) { + this.name = name; + } + + public Builder column(ColumnSpec column) { + this.columns.add(column); + return this; + } + + public Builder columns(List columns) { + this.columns.addAll(columns); + return this; + } + + public Builder primaryKey(List columns) { + this.primaryKey.clear(); + this.primaryKey.addAll(columns); + return this; + } + + public Builder index(IndexSpec index) { + this.indexes.add(index); + return this; + } + + public Builder indexes(List indexes) { + this.indexes.addAll(indexes); + return this; + } + + public TableSpec build() { + return new TableSpec(this); + } + } +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml new file mode 100644 index 0000000..8cf8017 --- /dev/null +++ b/src/main/resources/config.yml @@ -0,0 +1,16 @@ +#support mysql | postgres +driver: "mysql" +host: "localhost" +port: 3306 +database: "primalix" +username: "root" +password: "" +adminDatabase: "postgres" +autoTransactions: true + +pool: + maxPoolSize: 10 + minIdle: 2 + connectionTimeoutMs: 30000 + idleTimeoutMs: 600000 + maxLifetimeMs: 1800000 diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml new file mode 100644 index 0000000..b6ba7da --- /dev/null +++ b/src/main/resources/plugin.yml @@ -0,0 +1,8 @@ +name: Database +description: "Database plugin for Primalix" +main: org.andrewkydev.Loader +version: "0.0.1" +api: [ 1.1.0 ] + +load: POSTWORLD +