From 1e79fcea9cd3f9f5b7ffeb6a3c5d425fa32e32ff Mon Sep 17 00:00:00 2001 From: mxd <838425805@qq.com> Date: Sat, 6 Nov 2021 18:28:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D`Oracle`=E6=89=A7=E8=A1=8C`in?= =?UTF-8?q?sert`=E6=97=B6=E5=87=BA=E7=8E=B0=E7=9A=84=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ssssssss/magicapi/modules/SQLModule.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java index 684b16a6..414a03af 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java +++ b/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java @@ -374,7 +374,7 @@ public class SQLModule extends HashMap implements MagicModule * 插入并返回主键 */ @Comment("执行insert操作,返回插入主键") - public long insert(@Comment("`SQL`语句或`xml`") String sqlOrXml) { + public Object insert(@Comment("`SQL`语句或`xml`") String sqlOrXml) { return insert(sqlOrXml, (Map) null); } @@ -382,10 +382,10 @@ public class SQLModule extends HashMap implements MagicModule * 插入并返回主键,并传入变量信息 */ @Comment("执行insert操作,并传入变量信息,返回插入主键") - public long insert(@Comment("`SQL`语句或`xml`") String sqlOrXml, @Comment("变量信息")Map params) { + public Object insert(@Comment("`SQL`语句或`xml`") String sqlOrXml, @Comment("变量信息")Map params) { MagicKeyHolder magicKeyHolder = new MagicKeyHolder(); insert(new BoundSql(sqlOrXml, params,this), magicKeyHolder); - return magicKeyHolder.getLongKey(); + return magicKeyHolder.getObjectKey(); } /** @@ -633,18 +633,7 @@ public class SQLModule extends HashMap implements MagicModule return connection.prepareStatement(sql, new String[]{primary}); } - public long getLongKey() throws InvalidDataAccessApiUsageException, DataRetrievalFailureException { - Number key = super.getKey(); - if (key == null) { - return -1; - } - return key.longValue(); - } - public Object getObjectKey() { - if (useGeneratedKeys) { - return getLongKey(); - } List> keyList = getKeyList(); if (keyList.isEmpty()) { return null;