Merge pull request #423 from jeffgabhart/issue/pg-text-array-functions

Support postgresql text array and execute function example

Author: mythz

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

@@ -1,6 +1,7 @@
 using NUnit.Framework;
 using ServiceStack.DataAnnotations;
 using ServiceStack.OrmLite.Tests;
+using ServiceStack.Text;
 
 namespace ServiceStack.OrmLite.PostgreSQL.Tests
 {
@@ -11,8 +12,8 @@ public OrmLiteExecuteProcedureTests() : base(Dialect.PostgreSql) { }
 
         private const string Create = @"
             CREATE OR REPLACE FUNCTION f_service_stack(
-                v_string_values CHARACTER VARYING[],
-                v_integer_values INTEGER[]
+                v_string_values text[],
+                v_integer_values integer[]
             ) RETURNS BOOLEAN AS
             $BODY$
             BEGIN
@@ -37,12 +38,14 @@ IF v_integer_values[3] <> 3 THEN
             LANGUAGE plpgsql VOLATILE COST 100;
             ";
 
-        private const string Drop = "DROP FUNCTION f_service_stack(CHARACTER VARYING[], INTEGER[]);";
+        private const string Drop = "DROP FUNCTION f_service_stack(text[], integer[]);";
 
         [Alias("f_service_stack")]
         public class ServiceStackFunction
         {
+            [CustomField("text[]")]
             public string[] StringValues { get; set; }
+            [CustomField("integer[]")]
             public int[] IntegerValues { get; set; }
         }
 
@@ -52,12 +55,14 @@ public void Can_execute_stored_procedure_with_array_arguments()
             using (var db = OpenDbConnection())
             {
                 db.ExecuteSql(Create);
+                db.GetLastSql().Print();
 
                 db.ExecuteProcedure(new ServiceStackFunction
-                                        {
-                                            StringValues = new[] { "ServiceStack", "Thoughtfully Architected" },
-                                            IntegerValues = new[] { 1, 2, 3 }
-                                        });
+                {
+                    StringValues = new[] { "ServiceStack", "Thoughtfully Architected" },
+                    IntegerValues = new[] { 1, 2, 3 }
+                });
+
                 db.ExecuteSql(Drop);
             }
         }

src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs

@@ -334,6 +334,12 @@ public override void SetParameter(FieldDefinition fieldDef, IDbDataParameter p)
                 ((NpgsqlParameter) p).NpgsqlDbType = NpgsqlDbType.Json;
                 return;
             }
+            if (fieldDef.CustomFieldDefinition == "text[]")
+            {
+                p.ParameterName = this.GetParam(SanitizeFieldNameForParamName(fieldDef.FieldName));
+                ((NpgsqlParameter)p).NpgsqlDbType = NpgsqlDbType.Array | NpgsqlDbType.Text;
+                return;
+            }
             if (fieldDef.CustomFieldDefinition == "integer[]")
             {
                 p.ParameterName = this.GetParam(SanitizeFieldNameForParamName(fieldDef.FieldName));
@@ -350,6 +356,10 @@ public override void SetParameter(FieldDefinition fieldDef, IDbDataParameter p)
         }
         protected override object GetValue<T>(FieldDefinition fieldDef, object obj)
         {
+            if (fieldDef.CustomFieldDefinition == "text[]")
+            {
+                return fieldDef.GetValue(obj);
+            }
             if (fieldDef.CustomFieldDefinition == "integer[]")
             {
                 return fieldDef.GetValue(obj);
@@ -360,5 +370,23 @@ protected override object GetValue<T>(FieldDefinition fieldDef, object obj)
             }
             return base.GetValue<T>(fieldDef, obj);
         }
+
+        public override void PrepareStoredProcedureStatement<T>(IDbCommand cmd, T obj)
+        {
+            var tableType = obj.GetType();
+            var modelDef = GetModel(tableType);
+
+            cmd.CommandText = GetQuotedTableName(modelDef);
+            cmd.CommandType = CommandType.StoredProcedure;
+
+            foreach (var fieldDef in modelDef.FieldDefinitions)
+            {
+                var p = cmd.CreateParameter();
+                SetParameter(fieldDef, p);
+                cmd.Parameters.Add(p);
+            }
+
+            SetParameterValues<T>(cmd, obj);
+        }
     }
 }

src/ServiceStack.OrmLite/IOrmLiteDialectProvider.cs

@@ -86,6 +86,8 @@ string GetColumnDefinition(
 
         bool PrepareParameterizedDeleteStatement<T>(IDbCommand cmd, ICollection<string> deleteFields = null);
 
+        void PrepareStoredProcedureStatement<T>(IDbCommand cmd, T obj);
+
         void SetParameterValues<T>(IDbCommand dbCmd, object obj);
 
         Dictionary<string, FieldDefinition> GetFieldDefinitionMap(ModelDefinition modelDef);

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

@@ -668,6 +668,12 @@ public virtual bool PrepareParameterizedDeleteStatement<T>(IDbCommand cmd, IColl
             return hadRowVesion;
         }
 
+        public virtual void PrepareStoredProcedureStatement<T>(IDbCommand cmd, T obj)
+        {
+            cmd.CommandText = ToExecuteProcedureStatement(obj);
+            cmd.CommandType = CommandType.StoredProcedure;
+        }
+
         protected void AddParameter(IDbCommand cmd, FieldDefinition fieldDef)
         {
             var p = cmd.CreateParameter();

src/ServiceStack.OrmLite/OrmLiteWriteCommandExtensions.cs

@@ -907,9 +907,8 @@ internal static void SaveReferences<T, TRef>(this IDbCommand dbCmd, T instance,
         internal static void ExecuteProcedure<T>(this IDbCommand dbCmd, T obj)
         {
             var dialectProvider = dbCmd.GetDialectProvider();
-            string sql = dialectProvider.ToExecuteProcedureStatement(obj);
-            dbCmd.CommandType = CommandType.StoredProcedure;
-            dbCmd.ExecuteSql(sql);
+            dialectProvider.PrepareStoredProcedureStatement(dbCmd, obj);
+            dbCmd.ExecuteNonQuery();
         }
 
         internal static ulong GetRowVersion(this IDbCommand dbCmd, ModelDefinition modelDef, object id)