From b41a48c3b4dc9f355100f3afc50efdf66d4dd219 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Sun, 13 Aug 2023 16:06:34 +0800 Subject: [PATCH] Update pgsql newid --- .../SqlSugar/ExpressionsToSql/DbMethods/DefaultDbMethod.cs | 2 +- .../PostgreSQL/SqlBuilder/PostgreSQLQueryBuilder.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/DbMethods/DefaultDbMethod.cs b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/DbMethods/DefaultDbMethod.cs index af002d949..972d38cf1 100644 --- a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/DbMethods/DefaultDbMethod.cs +++ b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/DbMethods/DefaultDbMethod.cs @@ -1066,7 +1066,7 @@ namespace SqlSugar } public virtual string NewUid(MethodCallExpressionModel mode) { - return " REPLACE(\r\n REPLACE(\r\n REPLACE(\r\n REPLACE(\r\n REPLACE(\r\n REPLACE(\r\n REPLACE(\r\n REPLACE(\r\n REPLACE(\r\n REPLACE(\r\n '6C050346-B632-47B4-B29F-9CE39AC22792',\r\n '6', SUBSTRING('0123456789ABCDEF', (FLOOR(RANDOM() * 16)::INTEGER % 16) + 1, 1)\r\n ),\r\n 'C', SUBSTRING('0123456789ABCDEF', (FLOOR(RANDOM() * 16)::INTEGER % 16) + 1, 1)\r\n ),\r\n '0', SUBSTRING('0123456789ABCDEF', (FLOOR(RANDOM() * 16)::INTEGER % 16) + 1, 1)\r\n ),\r\n '5', SUBSTRING('0123456789ABCDEF', (FLOOR(RANDOM() * 16)::INTEGER % 16) + 1, 1)\r\n ),\r\n '0', SUBSTRING('0123456789ABCDEF', (FLOOR(RANDOM() * 16)::INTEGER % 16) + 1, 1)\r\n ),\r\n '3', SUBSTRING('0123456789ABCDEF', (FLOOR(RANDOM() * 16)::INTEGER % 16) + 1, 1)\r\n ),\r\n '4', SUBSTRING('0123456789ABCDEF', (FLOOR(RANDOM() * 16)::INTEGER % 16) + 1, 1)\r\n ),\r\n 'B', SUBSTRING('0123456789ABCDEF', (FLOOR(RANDOM() * 16)::INTEGER % 16) + 1, 1)\r\n ),\r\n '2', SUBSTRING('0123456789ABCDEF', (FLOOR(RANDOM() * 16)::INTEGER % 16) + 1, 1)\r\n ),\r\n '9', SUBSTRING('0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ', (FLOOR(RANDOM() * 16)::INTEGER % 16) + 1, 1)\r\n ) "; + return $" uuid_generate_v4() "; } } diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLQueryBuilder.cs b/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLQueryBuilder.cs index 403d9859e..304a380b6 100644 --- a/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLQueryBuilder.cs +++ b/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLQueryBuilder.cs @@ -86,6 +86,10 @@ namespace SqlSugar { result = result + TranLock; } + if (result.Contains("uuid_generate_v4()")) + { + result=" CREATE EXTENSION IF NOT EXISTS pgcrypto;CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\"; "+ result; + } return result; }