1. Added support for PostgreSQL drivers.

artbits · artbits · commit 8ec0bfe8d236 · 2026-06-07T19:18:32.000+08:00
2. Fix some bugs.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 
 ## ORM-Java
-``ORM-Java`` is an ORM used for SQLite or MySQL databases. Using ``JDBC`` as the driver at the bottom level. It provides a simple and efficient API without the need to write a large number of SQL statements. You only need to know the basics of SQL to get started.
+``ORM-Java`` is an ORM used for SQLite, MySQL, PostgreSQL databases. Using ``JDBC`` as the driver at the bottom level. It provides a simple and efficient API without the need to write a large number of SQL statements. You only need to know the basics of SQL to get started.
 
 
 ## Features
@@ -22,7 +22,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.github.artbits:orm-java:2.0.0'
+    implementation 'com.github.artbits:orm-java:2.1.0'
 }
 ```
 Maven:
@@ -35,7 +35,7 @@ Maven:
 <dependency>
     <groupId>com.github.artbits</groupId>
     <artifactId>orm-java</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
 </dependency>
 ```
 
@@ -71,10 +71,7 @@ public class Book {
 
 Connect to the database and load tables (automatically add tables, columns and index).
 ```java
-Config config = Config.of(c -> {
-    c.driver = Config.Driver.SQLITE;
-    c.url = "jdbc:sqlite:example.db";
-});
+Config config = Config.of(c -> c.url = "jdbc:sqlite:example.db");
 DB db = DB.connect(config);
 db.tables(User.class, Book.class);
 ```
@@ -173,7 +170,8 @@ int min2 = db.min(User.class, "age", "vip = ?", true).intValue();
 
 
 ## Links
-+ Thanks: 
++ Thanks:
+    + [PostgreSQL JDBC Driver](https://github.com/pgjdbc/pgjdbc)
     + [MySQL Connector/J](https://github.com/mysql/mysql-connector-j)
     + [SQLite-JDBC](https://github.com/xerial/sqlite-jdbc)
     + [QuickIO](https://github.com/artbits/quickio)
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'com.github.artbits.orm-java'
-version = '2.0.0'
+version = '2.1.0'
 
 repositories {
     maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
@@ -14,6 +14,7 @@ repositories {
 dependencies {
     implementation 'org.apache.commons:commons-dbcp2:2.13.0'
     implementation 'com.mysql:mysql-connector-j:9.4.0'
+    implementation 'org.postgresql:postgresql:42.7.11'
     implementation 'org.xerial:sqlite-jdbc:3.50.3.0'
 
     testImplementation platform('org.junit:junit-bom:5.10.0')
diff --git a/src/main/java/com/github/artbits/orm/Config.java b/src/main/java/com/github/artbits/orm/Config.java
@@ -19,8 +19,8 @@
 import java.util.function.Consumer;
 
 public final class Config {
+
     public String url;
-    public String driver;
     public String username;
     public String password;
     public int initSize = 30;
@@ -29,16 +29,6 @@ public final class Config {
     public int maxIdle = 20;
 
 
-    public interface Driver {
-        String SQLITE = "org.sqlite.JDBC";
-        String MYSQL = "com.mysql.cj.jdbc.Driver";
-//        String POSTGRESQL = "org.postgresql.Driver";
-//        String SQLSERVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
-//        String ORACLE = "oracle.jdbc.driver.OracleDriver";
-//        String H2 = "org.h2.Driver";
-    }
-
-
     private Config() { }
 
 
@@ -47,4 +37,25 @@ public static Config of(Consumer<Config> consumer) {
         consumer.accept(config);
         return config;
     }
+
+
+    int type() {
+        if (url.contains("sqlite")) {
+            return Type.SQLite;
+        } else if (url.contains("mysql")) {
+            return Type.MySQL;
+        } else if (url.contains("postgresql")) {
+            return Type.PostgreSQL;
+        } else {
+            return 0;
+        }
+    }
+
+
+    interface Type {
+        int SQLite = 1;
+        int MySQL = 2;
+        int PostgreSQL = 3;
+    }
+
 }
diff --git a/src/main/java/com/github/artbits/orm/Core.java b/src/main/java/com/github/artbits/orm/Core.java
@@ -22,12 +22,12 @@
 final class Core implements DB {
 
     private final Runner runner;
-    private final Config config;
+    public static Config config;
 
 
     Core(Config config) {
-        this.config = config;
-        runner = new Runner(config);
+        Core.config = config;
+        runner = new Runner();
         Runtime.getRuntime().addShutdownHook(new Thread(this::close));
     }
 
@@ -40,7 +40,7 @@ public void close() {
 
     @Override
     public void tables(Class<?>... classes) {
-        TableManager.init(runner, config, classes);
+        TableManager.init(runner, classes);
     }
 
 
diff --git a/src/main/java/com/github/artbits/orm/Options.java b/src/main/java/com/github/artbits/orm/Options.java
@@ -56,12 +56,7 @@ public Options where(String predicate, Object... objects) {
                 if (o instanceof String || o instanceof Character) {
                     return String.format("'%s'", o);
                 } else {
-                    String s = String.valueOf(o);
-                    switch (s) {
-                        case "true": return "1";
-                        case "false": return "0";
-                        default: return s;
-                    }
+                    return String.valueOf(o);
                 }
             }).toArray());
         }
diff --git a/src/main/java/com/github/artbits/orm/Reflect.java b/src/main/java/com/github/artbits/orm/Reflect.java
@@ -22,7 +22,6 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Objects;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
@@ -87,34 +86,65 @@ Class<?> getType(String fieldName) {
 
 
     String getDatabaseType(String fieldName) {
-        switch (getType(fieldName).getSimpleName().toLowerCase()) {
-            case "int":
-            case "integer":
-            case "byte":
-            case "short":
-            case "long": return "integer";
-            case "float":
-            case "double": return "real";
-            case "char":
-            case "character":
-            case "string": return "text";
-            case "boolean" : return "blob";
-            default: throw new NullPointerException();
+        String type = getType(fieldName).getSimpleName().toLowerCase();
+        if (Core.config.type() == Config.Type.SQLite) {
+            switch (type) {
+                case "byte":
+                case "short":
+                case "int":
+                case "integer":
+                case "long":
+                case "boolean": return "integer";
+                case "float":
+                case "double": return "real";
+                case "char":
+                case "character":
+                case "string": return "text";
+                default: throw new NullPointerException();
+            }
+        } else if (Core.config.type() == Config.Type.MySQL) {
+            switch (type) {
+                case "byte": return "tinyint";
+                case "short": return "smallint";
+                case "int":
+                case "integer": return "int";
+                case "long": return "bigint";
+                case "float": return "float";
+                case "double": return "double";
+                case "char":
+                case "character":
+                case "string": return "text";
+                case "boolean": return "boolean";
+                default: throw new NullPointerException();
+            }
+        } else if (Core.config.type() == Config.Type.PostgreSQL) {
+            switch (type) {
+                case "byte":
+                case "short": return "smallint";
+                case "int":
+                case "integer": return "int";
+                case "long": return "bigint";
+                case "float": return "real";
+                case "double": return "double precision";
+                case "char":
+                case "character":
+                case "string": return "text";
+                case "boolean": return "boolean";
+                default: throw new NullPointerException();
+            }
+        } else {
+            throw new RuntimeException("Unsupported database type.");
         }
     }
 
 
-    Object getDBValue(Field field) {
+    Object getDatabaseValue(Field field) {
         try {
             String fieldName = field.getName();
             Field dbField = fieldMap.getOrDefault(fieldName, null);
             Object dbValue = (dbField != null) ? dbField.get(t) : null;
             if (dbField != null && dbValue != null) {
-                switch (getDatabaseType(fieldName)) {
-                    case "text": return String.format("'%s'", dbValue);
-                    case "blob": return (Objects.equals(dbValue, true)) ? 1 : 0;
-                    default: return dbValue;
-                }
+                return getDatabaseType(fieldName).equals("text") ? String.format("'%s'", dbValue) : dbValue;
             }
             return null;
         } catch (IllegalAccessException e) {
@@ -123,14 +153,14 @@ Object getDBValue(Field field) {
     }
 
 
-    void getDBColumnsWithValue(BiConsumer<String, Object> consumer) {
+    void getDatabaseColumnsWithValue(BiConsumer<String, Object> consumer) {
         for (Field field : fieldMap.values()) {
-            consumer.accept(field.getName(), getDBValue(field));
+            consumer.accept(field.getName(), getDatabaseValue(field));
         }
     }
 
 
-    void getDBColumnsWithType(BiConsumer<String, String> consumer) {
+    void getDatabaseColumnsWithType(BiConsumer<String, String> consumer) {
         for (Field field : fieldMap.values()) {
             consumer.accept(field.getName(), getDatabaseType(field.getName()));
         }
diff --git a/src/main/java/com/github/artbits/orm/Runner.java b/src/main/java/com/github/artbits/orm/Runner.java
@@ -21,26 +21,22 @@
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
 class Runner {
 
     private final BasicDataSource source = new BasicDataSource();
-    private final Config config;
 
 
-    Runner(Config config) {
+    Runner() {
         try {
-            this.config = config;
-            Class.forName(config.driver);
-            Optional.ofNullable(config.url).ifPresent(source::setUrl);
-            Optional.ofNullable(config.username).ifPresent(source::setUsername);
-            Optional.ofNullable(config.password).ifPresent(source::setPassword);
-            source.setInitialSize(config.initSize);
-            source.setMaxTotal(config.maxSize);
-            source.setMinIdle(config.minIdle);
-            source.setMaxIdle(config.maxIdle);
+            Optional.ofNullable(Core.config.url).ifPresent(source::setUrl);
+            Optional.ofNullable(Core.config.username).ifPresent(source::setUsername);
+            Optional.ofNullable(Core.config.password).ifPresent(source::setPassword);
+            source.setInitialSize(Core.config.initSize);
+            source.setMaxTotal(Core.config.maxSize);
+            source.setMinIdle(Core.config.minIdle);
+            source.setMaxIdle(Core.config.maxIdle);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -70,7 +66,7 @@ long insert(String sql) {
             if (statement.executeUpdate() == 0) {
                 return -1;
             }
-            if (Objects.equals(config.driver, Config.Driver.SQLITE)) {
+            if (Core.config.type() == Config.Type.SQLite) {
                 try (PreparedStatement statement1 = connection.prepareStatement("select last_insert_rowid()");
                      ResultSet set = statement1.executeQuery()) {
                     return set.next() ? set.getLong(1) : -1;
diff --git a/src/main/java/com/github/artbits/orm/SQLTemplate.java b/src/main/java/com/github/artbits/orm/SQLTemplate.java
@@ -21,15 +21,18 @@
 
 final class SQLTemplate {
 
-    static <T> String create(Class<T> tClass, Config config) {
+    static <T> String create(Class<T> tClass) {
         StringBuffer columnsString = new StringBuffer();
-        if (Objects.equals(config.driver, Config.Driver.SQLITE)) {
+        if (Core.config.type() == Config.Type.SQLite) {
             columnsString.append("id integer primary key autoincrement,");
         }
-        if (Objects.equals(config.driver, Config.Driver.MYSQL)) {
+        if (Core.config.type() == Config.Type.MySQL) {
             columnsString.append("id int primary key auto_increment,");
         }
-        new Reflect<>(tClass).getDBColumnsWithType((column, type) -> {
+        if (Core.config.type() == Config.Type.PostgreSQL) {
+            columnsString.append("id bigserial primary key,");
+        }
+        new Reflect<>(tClass).getDatabaseColumnsWithType((column, type) -> {
             if (!Objects.equals(column, "id")) {
                 columnsString.append(column).append(" ").append(type).append(",");
             }
@@ -54,7 +57,7 @@ static <T> String drop(Class<T> tClass) {
     static <T> String insert(T t) {
         StringBuffer columnsString = new StringBuffer();
         StringBuffer valueString = new StringBuffer();
-        new Reflect<>(t).getDBColumnsWithValue((column, value) -> {
+        new Reflect<>(t).getDatabaseColumnsWithValue((column, value) -> {
             if (!Objects.equals(column, "id")) {
                 columnsString.append(column).append(",");
                 valueString.append(value).append(",");
@@ -71,7 +74,7 @@ static <T> String update(T t, Options options) {
         String tableName = t.getClass().getSimpleName().toLowerCase();
         String whereString = (options.wherePredicate != null) ? $("where %s ", options.wherePredicate) : "";
         StringBuffer setString = new StringBuffer();
-        new Reflect<>(t).getDBColumnsWithValue((column, value) -> {
+        new Reflect<>(t).getDatabaseColumnsWithValue((column, value) -> {
             if (value != null && !Objects.equals(column, "id")) {
                 setString.append(column).append(" = ").append(value).append(",");
             }
@@ -134,7 +137,7 @@ static <T> String query(Class<T> tClass, Options options) {
     static <T> String createIndex(Class<T> tClass, String column) {
         String table = tClass.getSimpleName().toLowerCase();
         String index = $("idx_%s_%s", table, column);
-        return $("create index %s on %s(%s)", index, table, column);
+        return $("create unique index %s on %s(%s)", index, table, column);
     }
 
 
diff --git a/src/main/java/com/github/artbits/orm/TableManager.java b/src/main/java/com/github/artbits/orm/TableManager.java
diff --git a/src/test/java/api/APITest.java b/src/test/java/api/APITest.java

Original file line number	Diff line number	Diff line change
`@@ -56,12 +56,7 @@ public Options where(String predicate, Object... objects) {`
`56`	`56`	`if (o instanceof String \|\| o instanceof Character) {`
`57`	`57`	`return String.format("'%s'", o);`
`58`	`58`	`} else {`
`59`		`- String s = String.valueOf(o);`
`60`		`- switch (s) {`
`61`		`- case "true": return "1";`
`62`		`- case "false": return "0";`
`63`		`- default: return s;`
`64`		`- }`
	`59`	`+ return String.valueOf(o);`
`65`	`60`	`}`
`66`	`61`	`}).toArray());`
`67`	`62`	`}`