Fixing PG

Jetski5822 · Oct 17, 2019 · 13b7f1b · 13b7f1b
1 parent 8e05dd6
commit 13b7f1b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/YesSql.Core/Commands/CreateIndexCommand.cs b/src/YesSql.Core/Commands/CreateIndexCommand.cs
@@ -28,11 +28,13 @@ public override async Task ExecuteAsync(DbConnection connection, DbTransaction t
             var type = Index.GetType();
             var documentTable = CollectionHelper.Current.GetPrefixedName(Store.DocumentTable);
 
+            var sql = Inserts(type, dialect);
+            logger.LogTrace(sql);
+            Index.Id = await connection.ExecuteScalarAsync<int>(sql, Index, transaction);
+
+
             if (Index is MapIndex)
             {
-                var sql = Inserts(type, dialect);
-                logger.LogTrace(sql);
-                Index.Id = await connection.ExecuteScalarAsync<int>(sql, Index, transaction);
                 var command = "update " + dialect.QuoteForTableName(_tablePrefix + type.Name) + " set " + dialect.QuoteForColumnName("DocumentId") + " = @mapid where " + dialect.QuoteForColumnName("Id") + " = @Id";
                 logger.LogTrace(command);
                 await connection.ExecuteAsync(command, new { mapid = Index.GetAddedDocuments().Single().Id, Id = Index.Id }, transaction);
@@ -41,10 +43,6 @@ public override async Task ExecuteAsync(DbConnection connection, DbTransaction t
             {
                 var reduceIndex = Index as ReduceIndex;
 
-                var sql = Inserts(type, dialect) + " " + dialect.IdentitySelectString + " " + dialect.QuoteForColumnName("Id");
-                logger.LogTrace(sql);
-                Index.Id = await connection.ExecuteScalarAsync<int>(sql, Index, transaction);
-
                 var bridgeTableName = type.Name + "_" + documentTable;
                 var columnList = dialect.QuoteForColumnName(type.Name + "Id") +", " + dialect.QuoteForColumnName("DocumentId");
                 var bridgeSql = "insert into " + dialect.QuoteForTableName(_tablePrefix + bridgeTableName) + " (" + columnList + ") values (@Id, @DocumentId);";

diff --git a/src/YesSql.Provider.Common/SqlBuilder.cs b/src/YesSql.Provider.Common/SqlBuilder.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 
 namespace YesSql.Sql

diff --git a/src/YesSql.Provider.PostgreSql/PostgreSqlDialect.cs b/src/YesSql.Provider.PostgreSql/PostgreSqlDialect.cs
@@ -49,7 +49,7 @@ public PostgreSqlDialect()
         public override string Name => "PostgreSql";
         public override string InOperator(string values) => " = any(array[" + values + "])";
         public override string NotInOperator(string values) => " <> all(array[" + values + "])";
-        public override string IdentitySelectString => "RETURNING ";
+        public override string IdentitySelectString => "RETURNING";
         public override string IdentityColumnString => "SERIAL PRIMARY KEY";
         public override bool SupportsIfExistsBeforeTableName => true;
         public override bool PrefixIndex => true;