From 2b92ee9e41ceeebb9764a1dd6c72b61c90ec8ee5 Mon Sep 17 00:00:00 2001
From: Fankai Liu <liufankai137@outlook.com>
Date: Wed, 22 Jan 2025 01:16:10 +0800
Subject: [PATCH] fixbug:rbatis init sql

---
 src/main.rs                                   |  2 +-
 templates/classic/_data/table_mysql.sql       |  9 -------
 templates/classic/_data/table_postgres.sql    |  9 -------
 templates/classic/_data/table_sqlite.sql      |  9 -------
 templates/classic/rbatis/data/init.sql.liquid | 26 +++++++++++++++++++
 templates/classic/rbatis/src/db/mod.rs.liquid | 10 +++----
 6 files changed, 32 insertions(+), 33 deletions(-)
 delete mode 100644 templates/classic/_data/table_mysql.sql
 delete mode 100644 templates/classic/_data/table_postgres.sql
 delete mode 100644 templates/classic/_data/table_sqlite.sql
 create mode 100644 templates/classic/rbatis/data/init.sql.liquid

diff --git a/src/main.rs b/src/main.rs
index f0fdb6c..fc1e437 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -55,4 +55,4 @@ async fn main() -> Result<()> {
         }
     }
     Ok(())
-}
\ No newline at end of file
+}
diff --git a/templates/classic/_data/table_mysql.sql b/templates/classic/_data/table_mysql.sql
deleted file mode 100644
index 7debf73..0000000
--- a/templates/classic/_data/table_mysql.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE IF NOT EXISTS users
-(
-id TEXT PRIMARY KEY NOT NULL,
-username VARCHAR(255) NOT NULL UNIQUE,
-password VARCHAR(511) NOT NULL
-);
-BEGIN;
-INSERT INTO users (id, username, password) VALUES ('cdd0e080-5bb1-4442-b6f7-2ba60dbd0555', 'zhangsan', '$argon2id$v=19$m=19456,t=2,p=1$rcosL5pOPdA2c7i4ZuLA4Q$s0JGh78UzMmu1qZMpVUA3b8kWYLXcZhw7uBfwhYDJ4A');
-COMMIT;
\ No newline at end of file
diff --git a/templates/classic/_data/table_postgres.sql b/templates/classic/_data/table_postgres.sql
deleted file mode 100644
index fde43c2..0000000
--- a/templates/classic/_data/table_postgres.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE IF NOT EXISTS users
-(
-id TEXT PRIMARY KEY NOT NULL,
-username VARCHAR(255) NOT NULL UNIQUE,
-password VARCHAR(511) NOT NULL
-);
-BEGIN;
-INSERT INTO "users" ("id", "username", "password") VALUES ('cdd0e080-5bb1-4442-b6f7-2ba60dbd0555', 'zhangsan', '$argon2id$v=19$m=19456,t=2,p=1$rcosL5pOPdA2c7i4ZuLA4Q$s0JGh78UzMmu1qZMpVUA3b8kWYLXcZhw7uBfwhYDJ4A') ON CONFLICT DO NOTHING;
-COMMIT;
diff --git a/templates/classic/_data/table_sqlite.sql b/templates/classic/_data/table_sqlite.sql
deleted file mode 100644
index b59335a..0000000
--- a/templates/classic/_data/table_sqlite.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE IF NOT EXISTS users
-(
-id TEXT PRIMARY KEY NOT NULL,
-username VARCHAR(255) NOT NULL UNIQUE,
-password VARCHAR(511) NOT NULL
-);
-BEGIN;
-INSERT OR IGNORE INTO "users" ("id", "username", "password") VALUES ('cdd0e080-5bb1-4442-b6f7-2ba60dbd0555', 'zhangsan', '$argon2id$v=19$m=19456,t=2,p=1$rcosL5pOPdA2c7i4ZuLA4Q$s0JGh78UzMmu1qZMpVUA3b8kWYLXcZhw7uBfwhYDJ4A');
-COMMIT;
diff --git a/templates/classic/rbatis/data/init.sql.liquid b/templates/classic/rbatis/data/init.sql.liquid
new file mode 100644
index 0000000..f9aad09
--- /dev/null
+++ b/templates/classic/rbatis/data/init.sql.liquid
@@ -0,0 +1,26 @@
+{% if db_type == "sqlite" %}
+CREATE TABLE IF NOT EXISTS users (
+    id TEXT PRIMARY KEY NOT NULL,
+    username VARCHAR(255) NOT NULL UNIQUE,
+    password VARCHAR(511) NOT NULL
+);
+INSERT OR IGNORE INTO users (id, username, password) 
+VALUES ('cdd0e080-5bb1-4442-b6f7-2ba60dbd0555', 'zhangsan', '$argon2id$v=19$m=19456,t=2,p=1$rcosL5pOPdA2c7i4ZuLA4Q$s0JGh78UzMmu1qZMpVUA3b8kWYLXcZhw7uBfwhYDJ4A');
+{% elsif db_type == "postgres" %}
+CREATE TABLE IF NOT EXISTS users (
+    id VARCHAR(255) PRIMARY KEY NOT NULL,
+    username VARCHAR(255) NOT NULL UNIQUE,
+    password VARCHAR(511) NOT NULL
+);
+INSERT INTO users (id, username, password) 
+VALUES ('cdd0e080-5bb1-4442-b6f7-2ba60dbd0555', 'zhangsan', '$argon2id$v=19$m=19456,t=2,p=1$rcosL5pOPdA2c7i4ZuLA4Q$s0JGh78UzMmu1qZMpVUA3b8kWYLXcZhw7uBfwhYDJ4A')
+ON CONFLICT DO NOTHING;
+{% elsif db_type == "mysql" %}
+CREATE TABLE IF NOT EXISTS users (
+    id VARCHAR(255) PRIMARY KEY NOT NULL,
+    username VARCHAR(255) NOT NULL UNIQUE,
+    password VARCHAR(511) NOT NULL
+);
+INSERT IGNORE INTO users (id, username, password) 
+VALUES ('cdd0e080-5bb1-4442-b6f7-2ba60dbd0555', 'zhangsan', '$argon2id$v=19$m=19456,t=2,p=1$rcosL5pOPdA2c7i4ZuLA4Q$s0JGh78UzMmu1qZMpVUA3b8kWYLXcZhw7uBfwhYDJ4A');
+{% endif %}
diff --git a/templates/classic/rbatis/src/db/mod.rs.liquid b/templates/classic/rbatis/src/db/mod.rs.liquid
index 2263bd2..59cfc57 100644
--- a/templates/classic/rbatis/src/db/mod.rs.liquid
+++ b/templates/classic/rbatis/src/db/mod.rs.liquid
@@ -11,15 +11,15 @@ pub async fn init(config: &DbConfig) {
     {%- if db_type == "sqlite" %}
     rb.init(rbdc_sqlite::driver::SqliteDriver {}, &config.url)
         .unwrap();
-    let sql_file = "./data/table_sqlite.sql";
+    let sql_file = "./data/init.sql";
     {%- elsif db_type == "postgres" %}
-    rb.init(rbdc_sqlite::driver::PostgresDriver {}, &config.url)
+    rb.init(rbdc_pg::driver::PgDriver {}, &config.url)
         .unwrap();
-    let sql_file = "./data/table_postgres.sql";
+    let sql_file = "./data/init.sql";
     {%- elsif db_type == "mysql" %}
-    rb.init(rbdc_sqlite::driver::SqliteDriver {}, &config.url)
+    rb.init(rbdc_mysql::driver::MysqlDriver {}, &config.url)
         .unwrap();
-    let sql_file = "./data/table_mysql.sql";
+    let sql_file = "./data/init.sql";
     {%- endif %}
 
     if sql_file != "" {