浏览代码

Use setBoolean for bool fields in database

Required by datapack and database update. Previously, boolean fields in
the database were of type enum ('true','false'). The datapack changes
this to type bool.
HorridoJoho 1 年之前
父节点
当前提交
ddb0d85a05

+ 1 - 1
src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PetDAOMySQLImpl.java

@@ -136,7 +136,7 @@ public class PetDAOMySQLImpl implements PetDAO {
 			ps.setInt(6, pet.getSp());
 			ps.setInt(7, pet.getCurrentFed());
 			ps.setInt(8, pet.getOwner().getObjectId());
-			ps.setString(9, String.valueOf(pet.isRestoreSummon())); // True restores pet on login
+			ps.setBoolean(9, pet.isRestoreSummon()); // True restores pet on login
 			ps.setInt(10, pet.getControlObjectId());
 			ps.executeUpdate();
 		} catch (Exception e) {

+ 1 - 1
src/main/java/com/l2jserver/gameserver/data/sql/impl/CharSummonTable.java

@@ -51,7 +51,7 @@ public class CharSummonTable {
 	private static final Map<Integer, Integer> _servitors = new ConcurrentHashMap<>();
 	
 	// SQL
-	private static final String INIT_PET = "SELECT ownerId, item_obj_id FROM pets WHERE restore = 'true'";
+	private static final String INIT_PET = "SELECT ownerId, item_obj_id FROM pets WHERE restore=TRUE";
 	
 	private static final String INIT_SUMMONS = "SELECT ownerId, summonSkillId FROM character_summons";
 	

+ 4 - 4
src/main/java/com/l2jserver/gameserver/instancemanager/MailManager.java

@@ -155,7 +155,7 @@ public final class MailManager {
 	
 	public void markAsReadInDb(int msgId) {
 		try (var con = ConnectionFactory.getInstance().getConnection();
-			var ps = con.prepareStatement("UPDATE messages SET isUnread = 'false' WHERE messageId = ?")) {
+			var ps = con.prepareStatement("UPDATE messages SET isUnread=FALSE WHERE messageId = ?")) {
 			ps.setInt(1, msgId);
 			ps.execute();
 		} catch (Exception ex) {
@@ -165,7 +165,7 @@ public final class MailManager {
 	
 	public void markAsDeletedBySenderInDb(int msgId) {
 		try (var con = ConnectionFactory.getInstance().getConnection();
-			var ps = con.prepareStatement("UPDATE messages SET isDeletedBySender = 'true' WHERE messageId = ?")) {
+			var ps = con.prepareStatement("UPDATE messages SET isDeletedBySender=TRUE WHERE messageId = ?")) {
 			ps.setInt(1, msgId);
 			ps.execute();
 		} catch (Exception ex) {
@@ -175,7 +175,7 @@ public final class MailManager {
 	
 	public void markAsDeletedByReceiverInDb(int msgId) {
 		try (var con = ConnectionFactory.getInstance().getConnection();
-			var ps = con.prepareStatement("UPDATE messages SET isDeletedByReceiver = 'true' WHERE messageId = ?")) {
+			var ps = con.prepareStatement("UPDATE messages SET isDeletedByReceiver=TRUE WHERE messageId = ?")) {
 			ps.setInt(1, msgId);
 			ps.execute();
 		} catch (Exception ex) {
@@ -185,7 +185,7 @@ public final class MailManager {
 	
 	public void removeAttachmentsInDb(int msgId) {
 		try (var con = ConnectionFactory.getInstance().getConnection();
-			var ps = con.prepareStatement("UPDATE messages SET hasAttachments = 'false' WHERE messageId = ?")) {
+			var ps = con.prepareStatement("UPDATE messages SET hasAttachments=FALSE WHERE messageId = ?")) {
 			ps.setInt(1, msgId);
 			ps.execute();
 		} catch (Exception ex) {

+ 2 - 10
src/main/java/com/l2jserver/gameserver/model/L2Clan.java

@@ -947,17 +947,9 @@ public class L2Clan implements IIdentifiable, INamable {
 			var ps = con.prepareStatement("INSERT INTO clan_notices (clan_id,notice,enabled) values (?,?,?) ON DUPLICATE KEY UPDATE notice=?,enabled=?")) {
 			ps.setInt(1, getId());
 			ps.setString(2, notice);
-			if (enabled) {
-				ps.setString(3, "true");
-			} else {
-				ps.setString(3, "false");
-			}
+			ps.setBoolean(3, enabled);
 			ps.setString(4, notice);
-			if (enabled) {
-				ps.setString(5, "true");
-			} else {
-				ps.setString(5, "false");
-			}
+			ps.setBoolean(5, enabled);
 			ps.execute();
 		} catch (Exception e) {
 			_log.log(Level.WARNING, "Error could not store clan notice: " + e.getMessage(), e);

+ 1 - 1
src/main/java/com/l2jserver/gameserver/model/entity/Castle.java

@@ -806,7 +806,7 @@ public final class Castle extends AbstractResidence {
 	public void updateShowNpcCrest() {
 		try (var con = ConnectionFactory.getInstance().getConnection();
 			var ps = con.prepareStatement("UPDATE castle SET showNpcCrest = ? WHERE id = ?")) {
-			ps.setString(1, String.valueOf(getShowNpcCrest()));
+			ps.setBoolean(1, getShowNpcCrest());
 			ps.setInt(2, getResidenceId());
 			ps.execute();
 		} catch (Exception e) {

+ 2 - 2
src/main/java/com/l2jserver/gameserver/model/entity/Hero.java

@@ -121,7 +121,7 @@ public class Hero {
 				hero.set(Olympiad.CLASS_ID, rs1.getInt(Olympiad.CLASS_ID));
 				hero.set(COUNT, rs1.getInt(COUNT));
 				hero.set(PLAYED, rs1.getInt(PLAYED));
-				hero.set(CLAIMED, Boolean.parseBoolean(rs1.getString(CLAIMED)));
+				hero.set(CLAIMED, rs1.getBoolean(CLAIMED));
 				
 				loadFights(charId);
 				loadDiary(charId);
@@ -604,7 +604,7 @@ public class Hero {
 							insert.setInt(2, hero.getInt(Olympiad.CLASS_ID));
 							insert.setInt(3, hero.getInt(COUNT));
 							insert.setInt(4, hero.getInt(PLAYED));
-							insert.setString(5, String.valueOf(hero.getBoolean(CLAIMED)));
+							insert.setBoolean(5, hero.getBoolean(CLAIMED));
 							insert.execute();
 						}
 						

+ 5 - 5
src/main/java/com/l2jserver/gameserver/model/entity/Message.java

@@ -155,12 +155,12 @@ public class Message {
 		stmt.setString(5, msg._content);
 		stmt.setLong(6, msg._expiration);
 		stmt.setLong(7, msg._reqAdena);
-		stmt.setString(8, String.valueOf(msg._hasAttachments));
-		stmt.setString(9, String.valueOf(msg._unread));
-		stmt.setString(10, String.valueOf(msg._deletedBySender));
-		stmt.setString(11, String.valueOf(msg._deletedByReceiver));
+		stmt.setBoolean(8, msg._hasAttachments);
+		stmt.setBoolean(9, msg._unread);
+		stmt.setBoolean(10, msg._deletedBySender);
+		stmt.setBoolean(11, msg._deletedByReceiver);
 		stmt.setString(12, String.valueOf(msg._sendBySystem));
-		stmt.setString(13, String.valueOf(msg._returned));
+		stmt.setBoolean(13, msg._returned);
 		
 		return stmt;
 	}

+ 1 - 1
src/main/java/com/l2jserver/gameserver/model/entity/Siege.java

@@ -1069,7 +1069,7 @@ public class Siege implements Siegable {
 			var ps = con.prepareStatement("UPDATE castle SET siegeDate = ?, regTimeEnd = ?, regTimeOver = ?  WHERE id = ?")) {
 			ps.setLong(1, getSiegeDate().getTimeInMillis());
 			ps.setLong(2, getTimeRegistrationOverDate().getTimeInMillis());
-			ps.setString(3, String.valueOf(getIsTimeRegistrationOver()));
+			ps.setBoolean(3, getIsTimeRegistrationOver());
 			ps.setInt(4, getCastle().getResidenceId());
 			ps.execute();
 		} catch (Exception ex) {