Update PostgreSqlStatementBuilder.cs

mikependon · Jan 13, 2021 · bc7f263 · bc7f263
1 parent 16da93c
commit bc7f263
Showing 1 changed file with 17 additions and 18 deletions.
diff --git a/RepoDb.PostgreSql/RepoDb.PostgreSql/StatementBuilders/PostgreSqlStatementBuilder.cs b/RepoDb.PostgreSql/RepoDb.PostgreSql/StatementBuilders/PostgreSqlStatementBuilder.cs
@@ -263,29 +263,28 @@ public override string CreateInsertAll(QueryBuilder queryBuilder,
                 }
             }
 
-            if (identityField != null)
-            {
-                // Variables needed
-                var commandTexts = new List<string>();
-                var splitted = commandText.Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
+            // Variables needed
+            var commandTexts = new List<string>();
+            var splitted = commandText.Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
 
-                // Iterate the indexes
-                for (var index = 0; index < splitted.Length; index++)
-                {
-                    var line = splitted[index].Trim();
+            // Iterate the indexes
+            for (var index = 0; index < splitted.Length; index++)
+            {
+                var line = splitted[index].Trim();
 
-                    // Set the return value
-                    var returnValue = string.IsNullOrEmpty(databaseType) ?
+                // Set the return value
+                var returnValue = identityField != null ?
+                    string.IsNullOrEmpty(databaseType) ?
                         identityField.Name.AsQuoted(DbSetting) :
-                        string.Concat($"CAST({identityField.Name.AsQuoted(DbSetting)} AS {databaseType})");
-                    commandTexts.Add(string.Concat(line, " RETURNING ", returnValue, " AS ", "Id".AsQuoted(DbSetting), ", ",
-                        $"{DbSetting.ParameterPrefix}__RepoDb_OrderColumn_{index} AS ", "OrderColumn".AsQuoted(DbSetting), " ;"));
-                }
-
-                // Set the command text
-                commandText = commandTexts.Join(" ");
+                        string.Concat($"CAST({identityField.Name.AsQuoted(DbSetting)} AS {databaseType})") :
+                    primaryField != null ? primaryField.Name.AsQuoted(DbSetting) : "NULL";
+                commandTexts.Add(string.Concat(line, " RETURNING ", returnValue, " AS ", "Id".AsQuoted(DbSetting), ", ",
+                    $"{DbSetting.ParameterPrefix}__RepoDb_OrderColumn_{index} AS ", "OrderColumn".AsQuoted(DbSetting), " ;"));
             }
 
+            // Set the command text
+            commandText = commandTexts.Join(" ");
+
             // Return the query
             return commandText;
         }