Fix InsertIntoSelect field resolution

Author: mythz

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

@@ -584,12 +584,20 @@ public virtual SelectItem[] GetColumnNames(ModelDefinition modelDef, string tabl
         protected virtual bool ShouldSkipInsert(FieldDefinition fieldDef) => 
             fieldDef.ShouldSkipInsert();
 
+        public virtual string ColumnNameOnly(string columnExpr)
+        {
+            var nameOnly = columnExpr.LastRightPart('.');
+            var ret = nameOnly.StripDbQuotes();
+            return ret;
+        }
+
         public virtual FieldDefinition[] GetInsertFieldDefinitions(ModelDefinition modelDef, ICollection<string> insertFields)
         {
-            return insertFields != null 
+            var insertColumns = insertFields?.Map(ColumnNameOnly);
+            return insertColumns != null 
                 ? NamingStrategy.GetType() == typeof(OrmLiteNamingStrategyBase) 
-                    ? modelDef.GetOrderedFieldDefinitions(insertFields)
-                    : modelDef.GetOrderedFieldDefinitions(insertFields, name => NamingStrategy.GetColumnName(name)) 
+                    ? modelDef.GetOrderedFieldDefinitions(insertColumns)
+                    : modelDef.GetOrderedFieldDefinitions(insertColumns, name => NamingStrategy.GetColumnName(name)) 
                 : modelDef.FieldDefinitionsArray;
         }
 

src/ServiceStack.OrmLite/OrmLiteUtils.cs

@@ -812,6 +812,12 @@ public static string StripTablePrefixes(this string selectExpression)
 
         public static char[] QuotedChars = { '"', '`', '[', ']' };
 
+        public static string AliasOrColumn(this string quotedExpr)
+        {
+            var aliasOrSelectColumn = quotedExpr.LastRightPart(" AS ");
+            return aliasOrSelectColumn;
+        }
+
         public static string StripDbQuotes(this string quotedExpr)
         {
             return quotedExpr.Trim(QuotedChars);

src/ServiceStack.OrmLite/OrmLiteWriteCommandExtensions.cs

@@ -831,7 +831,7 @@ internal static void Insert<T>(this IDbCommand dbCmd, Action<IDbCommand> command
 
         internal static long InsertIntoSelect<T>(this IDbCommand dbCmd, ISqlExpression query, Action<IDbCommand> commandFilter) => 
             dbCmd.InsertIntoSelectInternal<T>(query, commandFilter).ExecNonQuery();
-
+        
         internal static IDbCommand InsertIntoSelectInternal<T>(this IDbCommand dbCmd, ISqlExpression query, Action<IDbCommand> commandFilter)
         {
             var dialectProvider = dbCmd.GetDialectProvider();
@@ -843,7 +843,7 @@ internal static IDbCommand InsertIntoSelectInternal<T>(this IDbCommand dbCmd, IS
                 .ParseCommands();
 
             var fieldsOrAliases = selectFields
-                .Map(x => x.Original.ToString().LastRightPart(" AS ").Trim().StripDbQuotes());
+                .Map(x => x.Original.ToString().AliasOrColumn());
 
             dialectProvider.PrepareParameterizedInsertStatement<T>(dbCmd, insertFields: fieldsOrAliases);
 

tests/ServiceStack.OrmLite.Tests/Issues/CustomInsertIntoSelectJoinIssue.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Net;
+using NUnit.Framework;
+using ServiceStack.DataAnnotations;
+
+namespace ServiceStack.OrmLite.Tests.Issues
+{
+    public class InsertIntoSource
+    {
+        [AutoIncrement]
+        public long Id { get; set; }
+
+        public string Url { get; set; }
+        public string Provider { get; set; }
+        public string DomainKey { get; set; }
+        public bool NoFollow { get; set; }
+        public HttpStatusCode HttpStatusCode { get; set; }
+        public DateTime? LastScanTime { get; set; }
+        public string Anchors { get; set; }
+        public int? OutboundLinks { get; set; }
+        public long TargetDomainRecordId { get; set; }
+        public long UserAuthCustomId { get; set; }
+    }
+
+    public class InertIntoTarget
+    {
+        [PrimaryKey]
+        public long WatchedUrlRecordId { get; set; }
+
+        public string Url { get; set; }
+        public string DomainKey { get; set; }
+        public long TargetDomainRecordId { get; set; }
+        public string TargetDomainKey { get; set; }
+        public DateTime CreateDate { get; set; } = DateTime.UtcNow;
+        public int Tries { get; set; }
+        public DateTime? DeferUntil { get; set; }
+        public long UserAuthCustomId { get; set; }
+        public bool FirstScan { get; set; }
+    }
+
+    public class InsertIntoJoin
+    {
+        [AutoIncrement]
+        public long Id { get; set; }
+
+        public string Url { get; set; }
+        public string DomainKey { get; set; }
+        public DateTime CreateDate { get; set; } = DateTime.Now;
+        public DateTime? DeleteDate { get; set; }
+        public bool IsDeleted { get; set; }
+        public bool Active { get; set; } = true;
+        public long UserAuthCustomId { get; set; }
+    }
+
+    public class CustomInsertIntoSelectJoinIssue : OrmLiteTestBase
+    {
+        [Test]
+        public void Can_custom_join_into_select()
+        {
+            using var db = OpenDbConnection();
+            
+            db.DropAndCreateTable<InsertIntoSource>();
+            db.DropAndCreateTable<InsertIntoJoin>();
+            db.DropAndCreateTable<InertIntoTarget>();
+           
+            var ids = new[] {1, 2, 3};
+            // OrmLiteUtils.PrintSql();
+
+            var q = db.From<InsertIntoSource>()
+                .Join<InsertIntoJoin>((w, t) => w.TargetDomainRecordId == t.Id)
+                .Where(x => Sql.In(x.Id, ids))
+                .Select<InsertIntoSource, InsertIntoJoin>((w, t) => new {
+                    UserAuthCustomId = w.UserAuthCustomId,
+                    DomainKey = w.DomainKey,
+                    CreateDate = DateTime.UtcNow,
+                    TargetDomainKey = t.DomainKey,
+                    Tries = 0,
+                    TargetDomainRecordId = w.TargetDomainRecordId,
+                    Url = w.Url,
+                    WatchedUrlRecordId = w.Id
+                });
+
+            var inserted = db.InsertIntoSelect<InertIntoTarget>(q, dbCmd => dbCmd.OnConflictIgnore());
+        }
+    }
+}