From 2a8d043445fe180380f9dbd1ec01c2f29dc1ce81 Mon Sep 17 00:00:00 2001
From: nzdev <834725+nzdev@users.noreply.github.com>
Date: Fri, 12 Feb 2021 15:01:46 +1300
Subject: [PATCH] support bulk insert for binary in sql ce. Fix column ordering
 in contentnudto.

---
 src/Umbraco.Core/Persistence/Dtos/ContentNuDto.cs     |  6 ++++--
 .../Persistence/NPocoDatabaseExtensions-Bulk.cs       | 11 ++++++++++-
 .../Persistence/SqlSyntax/SqlCeSyntaxProvider.cs      |  9 ++++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Dtos/ContentNuDto.cs b/src/Umbraco.Core/Persistence/Dtos/ContentNuDto.cs
index 664d188a10..a2f36584e0 100644
--- a/src/Umbraco.Core/Persistence/Dtos/ContentNuDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/ContentNuDto.cs
@@ -28,11 +28,13 @@ namespace Umbraco.Core.Persistence.Dtos
         [NullSetting(NullSetting = NullSettings.Null)]
         public string Data { get; set; }
 
+        [Column("rv")]
+        public long Rv { get; set; }
+
         [Column("dataRaw")]
         [NullSetting(NullSetting = NullSettings.Null)]
         public byte[] RawData { get; set; }
 
-        [Column("rv")]
-        public long Rv { get; set; }
+       
     }
 }
diff --git a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
index 10db1ca18e..bff682d095 100644
--- a/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
+++ b/src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Data.SqlServerCe;
+using System.Data.SqlTypes;
 using System.Linq;
 using NPoco;
 using Umbraco.Core.Persistence.SqlSyntax;
@@ -210,7 +211,15 @@ namespace Umbraco.Core.Persistence
                             if (IncludeColumn(pocoData, columns[i]))
                             {
                                 var val = columns[i].Value.GetValue(record);
-                                updatableRecord.SetValue(i, val);
+                                if (val is byte[])
+                                {
+                                    var bytes = val as byte[];
+                                    updatableRecord.SetSqlBinary(i, new SqlBinary(bytes));
+                                }
+                                else
+                                {
+                                    updatableRecord.SetValue(i, val);
+                                }
                             }
                         }
                         resultSet.Insert(updatableRecord);
diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs b/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
index 0b564212ce..9c5edf595b 100644
--- a/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
+++ b/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
@@ -261,6 +261,13 @@ where table_name=@0 and column_name=@1", tableName, columnName).FirstOrDefault()
                 return "NTEXT";
             return base.GetSpecialDbType(dbTypes);
         }
-
+        public override SqlDbType GetSqlDbType(DbType dbType)
+        {
+            if (DbType.Binary == dbType)
+            {
+                return SqlDbType.Image;
+            }
+            return base.GetSqlDbType(dbType);
+        }
     }
 }