From 04e935acd07dce52d9203db0c9b364833eef8b87 Mon Sep 17 00:00:00 2001
From: Rob Bygrave <robin.bygrave@gmail.com>
Date: Fri, 17 Mar 2023 17:54:25 +1300
Subject: [PATCH] #2998 - SQLServer, map java long to BIGINT for bitwise
 expressions

---
 .../test/java/org/tests/expression/bitwise/BwBean.java   | 3 ---
 .../ebean/platform/sqlserver/SqlServerBasePlatform.java  | 9 ++-------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java b/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java
index 5c7fab206..19fe7661d 100644
--- a/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java
+++ b/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java
@@ -2,7 +2,6 @@ package org.tests.expression.bitwise;
 
 import io.ebean.Model;
 
-import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Version;
@@ -15,8 +14,6 @@ public class BwBean extends Model {
 
   String name;
 
-  // sqlserver wants integer type for bitwise AND operator
-  @Column(columnDefinition = "integer")
   long flags;
 
   @Version
diff --git a/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerBasePlatform.java b/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerBasePlatform.java
index be6f3da13..9d4bb37ee 100644
--- a/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerBasePlatform.java
+++ b/platforms/sqlserver/src/main/java/io/ebean/platform/sqlserver/SqlServerBasePlatform.java
@@ -5,12 +5,7 @@ import io.ebean.Query;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebean.config.PlatformConfig;
-import io.ebean.config.dbplatform.DatabasePlatform;
-import io.ebean.config.dbplatform.DbPlatformType;
-import io.ebean.config.dbplatform.DbType;
-import io.ebean.config.dbplatform.IdType;
-import io.ebean.config.dbplatform.PlatformIdGenerator;
-import io.ebean.config.dbplatform.SqlErrorCodes;
+import io.ebean.config.dbplatform.*;
 
 import javax.sql.DataSource;
 import java.sql.Types;
@@ -59,7 +54,7 @@ abstract class SqlServerBasePlatform extends DatabasePlatform {
     this.dbDefaultValue.setNow("SYSUTCDATETIME()");
     dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("bit"));
     dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false));
-    dbTypeMap.put(DbType.BIGINT, new DbPlatformType("numeric", 19));
+    dbTypeMap.put(DbType.BIGINT, new DbPlatformType("bigint", false));
     dbTypeMap.put(DbType.REAL, new DbPlatformType("float(16)"));
     dbTypeMap.put(DbType.DOUBLE, new DbPlatformType("float(32)"));
     dbTypeMap.put(DbType.TINYINT, new DbPlatformType("smallint"));