Merge pull request #422 from jeffgabhart/issue/pg-json-and-arrays

Address broken PostgreSQL tests for Json and Arrays

Author: mythz

src/ServiceStack.OrmLite.PostgreSQL.Tests/PostgreSqlArrayTests.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Linq;
+using NUnit.Framework;
+using ServiceStack.DataAnnotations;
+using ServiceStack.OrmLite.Tests;
+using ServiceStack.Text;
+
+namespace ServiceStack.OrmLite.PostgreSQL.Tests
+{
+    public class ModelWithArrayType
+    {
+        public int Id { get; set; }
+
+        [CustomField("integer[]")]
+        public int[] IntegerArray { get; set; }
+
+        [CustomField("bigint[]")]
+        public long[] BigIntegerArray { get; set; }
+    }
+
+    [TestFixture]
+    public class PostgreSqlArrayTests : OrmLiteTestBase
+    {
+        public PostgreSqlArrayTests() : base(Dialect.PostgreSql) {}
+
+        [Test]
+        public void Can_save_integer_array()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<ModelWithArrayType>();
+
+                db.GetLastSql().Print();
+
+                var row = new ModelWithArrayType
+                {
+                    Id = 1,
+                    IntegerArray = new []{1,2,3}
+                };
+
+                try
+                {
+                    db.Insert(row);
+                }
+                catch (Exception e)
+                {
+                    e.Message.Print();
+                }
+
+                var result = db.Select<ModelWithArrayType>();
+
+                Assert.That(result.Count, Is.EqualTo(1));
+                Assert.That(result[0].IntegerArray.Count(), Is.EqualTo(3));
+            }
+        }
+
+        [Test]
+        public void Can_save_big_integer_array()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<ModelWithArrayType>();
+
+                db.GetLastSql().Print();
+
+                var row = new ModelWithArrayType
+                {
+                    Id = 2,
+                    BigIntegerArray = new long[] { 1, 2, 3, 4 }
+                };
+
+                try
+                {
+                    db.Insert(row);
+                }
+                catch (Exception e)
+                {
+                    e.Message.Print();
+                }
+
+                var result = db.Select<ModelWithArrayType>();
+
+                Assert.That(result.Count, Is.EqualTo(1));
+                Assert.That(result[0].BigIntegerArray.Count(), Is.EqualTo(4));
+            }
+        }
+    }
+}

src/ServiceStack.OrmLite.PostgreSQL.Tests/PostgreSqlJsonTests.cs

@@ -55,11 +55,14 @@ public void Can_save_complex_types_as_JSON()
                 db.Insert(row);
 
                 var result = db.Select<ModelWithJsonType>(
-                    "complex_type_json->'sub_type'->>'name' = 'SubType2'");
+                    "complex_type_json->'SubType'->>'Name' = 'SubType2'");
+
+                db.GetLastSql().Print();
 
                 Assert.That(result.Count, Is.EqualTo(1));
-                Assert.That(result[0].Id, Is.EqualTo(2));
-                Assert.That(result[0].ComplexTypeJson.SubType, Is.EqualTo("SubType2"));
+                Assert.That(result[0].Id, Is.EqualTo(1));
+                Assert.That(result[0].ComplexTypeJson.Id, Is.EqualTo(2));
+                Assert.That(result[0].ComplexTypeJson.SubType.Name, Is.EqualTo("SubType2"));
             }
         }
     }

src/ServiceStack.OrmLite.PostgreSQL.Tests/ServiceStack.OrmLite.PostgreSQL.Tests.csproj

@@ -103,6 +103,7 @@
     <Compile Include="OrmLiteExecuteProcedureTests.cs" />
     <Compile Include="OrmLiteInsertTests.cs" />
     <Compile Include="OrmLiteSelectTests.cs" />
+    <Compile Include="PostgreSqlArrayTests.cs" />
     <Compile Include="PostgreSqlJsonTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="OrmLiteGetScalarTests.cs" />

src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs

@@ -3,6 +3,7 @@
 using System.Data;
 using System.Text;
 using Npgsql;
+using NpgsqlTypes;
 using ServiceStack.Text;
 
 namespace ServiceStack.OrmLite.PostgreSQL
@@ -324,5 +325,40 @@ public override long InsertAndGetLastInsertId<T>(IDbCommand dbCmd)
 
             return dbCmd.ExecLongScalar();
         }
+
+        public override void SetParameter(FieldDefinition fieldDef, IDbDataParameter p)
+        {
+            if (fieldDef.CustomFieldDefinition == "json")
+            {
+                p.ParameterName = this.GetParam(SanitizeFieldNameForParamName(fieldDef.FieldName));
+                ((NpgsqlParameter) p).NpgsqlDbType = NpgsqlDbType.Json;
+                return;
+            }
+            if (fieldDef.CustomFieldDefinition == "integer[]")
+            {
+                p.ParameterName = this.GetParam(SanitizeFieldNameForParamName(fieldDef.FieldName));
+                ((NpgsqlParameter) p).NpgsqlDbType = NpgsqlDbType.Array | NpgsqlDbType.Integer;
+                return;
+            }
+            if (fieldDef.CustomFieldDefinition == "bigint[]")
+            {
+                p.ParameterName = this.GetParam(SanitizeFieldNameForParamName(fieldDef.FieldName));
+                ((NpgsqlParameter) p).NpgsqlDbType = NpgsqlDbType.Array | NpgsqlDbType.Bigint;
+                return;
+            }
+            base.SetParameter(fieldDef, p);
+        }
+        protected override object GetValue<T>(FieldDefinition fieldDef, object obj)
+        {
+            if (fieldDef.CustomFieldDefinition == "integer[]")
+            {
+                return fieldDef.GetValue(obj);
+            }
+            if (fieldDef.CustomFieldDefinition == "bigint[]")
+            {
+                return fieldDef.GetValue(obj);
+            }
+            return base.GetValue<T>(fieldDef, obj);
+        }
     }
 }