Some fixes to make tests pass

Author: roji

tests/CommandTests.cs

@@ -132,7 +132,8 @@ public void NoNameParameterAdd()
         [Test]
         public void FunctionCallFromSelect()
         {
-            ExecuteNonQuery(@"CREATE OR REPLACE FUNCTION funcB() returns setof data as 'select * from data;' language 'sql';");
+            ExecuteNonQuery(@"DROP FUNCTION IF EXISTS funcB()");
+            ExecuteNonQuery(@"CREATE FUNCTION funcB() returns setof data as 'select * from data;' language 'sql';");
             var command = new NpgsqlCommand("select * from funcB()", Conn);
             var reader = command.ExecuteReader();
             Assert.IsNotNull(reader);
@@ -369,7 +370,8 @@ public void FunctionCallWithParametersPrepareReturnSingleValueNpgsqlDbType2_Supp
         [Test]
         public void FunctionCallReturnResultSet()
         {
-            ExecuteNonQuery(@"CREATE OR REPLACE FUNCTION funcB() returns setof data as 'select * from data;' language 'sql';");
+            ExecuteNonQuery(@"DROP FUNCTION IF EXISTS funcB()");
+            ExecuteNonQuery(@"CREATE FUNCTION funcB() returns setof data as 'select * from data;' language 'sql';");
             var command = new NpgsqlCommand("funcB()", Conn);
             command.CommandType = CommandType.StoredProcedure;
             var dr = command.ExecuteReader();

tests/DataReaderTests.cs

@@ -625,7 +625,8 @@ public void SingleRowCommandBehaviorSupportFunctioncall()
         {
             ExecuteNonQuery(@"INSERT INTO data (field_text) VALUES ('X')");
             ExecuteNonQuery(@"INSERT INTO data (field_text) VALUES ('Y')");
-            ExecuteNonQuery(@"CREATE OR REPLACE FUNCTION funcB() returns setof data as '
+            ExecuteNonQuery(@"DROP FUNCTION IF EXISTS funcB()");
+            ExecuteNonQuery(@"CREATE FUNCTION funcB() returns setof data as '
                               select * from data;
                               ' language 'sql';");
             var command = new NpgsqlCommand("funcb", Conn);
@@ -647,7 +648,8 @@ public void SingleRowCommandBehaviorSupportFunctioncallPrepare()
             // Problem is that prepare plan must already have the limit 1 single row support.
             ExecuteNonQuery(@"INSERT INTO data (field_text) VALUES ('X')");
             ExecuteNonQuery(@"INSERT INTO data (field_text) VALUES ('Y')");
-            ExecuteNonQuery(@"CREATE OR REPLACE FUNCTION funcB() returns setof data as '
+            ExecuteNonQuery(@"DROP FUNCTION IF EXISTS funcB()");
+            ExecuteNonQuery(@"CREATE FUNCTION funcB() returns setof data as '
                               select * from data;
                               ' language 'sql';");
 
@@ -891,7 +893,8 @@ public void SchemaOnlyCommandBehaviorSupport()
         [Test]
         public void SchemaOnlyCommandBehaviorSupportFunctioncall()
         {
-            ExecuteNonQuery(@"CREATE OR REPLACE FUNCTION funcB() returns setof data as '
+            ExecuteNonQuery(@"DROP FUNCTION IF EXISTS funcB()");
+            ExecuteNonQuery(@"CREATE FUNCTION funcB() returns setof data as '
                               select * from data;
                               ' language 'sql';");
             var command = new NpgsqlCommand("funcb", Conn);

tests/FunctionTests.cs

@@ -19,15 +19,15 @@ public FunctionTests(string backendVersion) : base(backendVersion) {}
         [Test]
         public void FunctionInOutParameters()
         {
-            ExecuteNonQuery(@"CREATE OR REPLACE FUNCTION ""SomeFunction""(OUT param1 int, INOUT param2 int) RETURNS record AS 
+            ExecuteNonQuery(@"CREATE FUNCTION func(OUT param1 int, INOUT param2 int) RETURNS record AS 
                               '
                               BEGIN
                                       param1 = 1;
                                       param2 = param2 + 1; 
                               END;
                               ' LANGUAGE 'plpgsql';");
 
-            var cmd = new NpgsqlCommand(@"""SomeFunction""", Conn);
+            var cmd = new NpgsqlCommand(@"func", Conn);
             cmd.CommandType = CommandType.StoredProcedure;
 
             cmd.Parameters.Add(new NpgsqlParameter("param1", DbType.Int32) {
@@ -51,7 +51,7 @@ public void FunctionInOutParameters()
         public void DeriveParametersVarious()
         {
             // This function returns record because of the two Out (InOut & Out) parameters
-            ExecuteNonQuery(@"CREATE OR REPLACE FUNCTION ""func""(IN param1 INT, OUT param2 text, INOUT param3 INT) RETURNS record AS 
+            ExecuteNonQuery(@"CREATE FUNCTION func(IN param1 INT, OUT param2 text, INOUT param3 INT) RETURNS record AS 
                               '
                               BEGIN
                                       param2 = ''sometext'';
@@ -78,7 +78,7 @@ public void DeriveParametersVarious()
         public void DeriveParametersInOnly()
         {
             // This function returns record because of the two Out (InOut & Out) parameters
-            ExecuteNonQuery(@"CREATE OR REPLACE FUNCTION ""func""(IN param1 INT, IN param2 INT) RETURNS int AS 
+            ExecuteNonQuery(@"CREATE FUNCTION func (IN param1 INT, IN param2 INT) RETURNS int AS 
                               '
                               BEGIN
                                 RETURN param1 + param2;
@@ -100,7 +100,7 @@ public void DeriveParametersInOnly()
         public void DeriveParametersNoParams()
         {
             // This function returns record because of the two Out (InOut & Out) parameters
-            ExecuteNonQuery(@"CREATE OR REPLACE FUNCTION ""func""() RETURNS int AS 
+            ExecuteNonQuery(@"CREATE FUNCTION func() RETURNS int AS 
                               '
                               BEGIN
                                 RETURN 4;
@@ -122,9 +122,9 @@ public void Setup()
 
             // Drop all functions in the public schema
             const string query =
-               @"SELECT proname, oidvectortypes(proargtypes)
-                 FROM pg_proc INNER JOIN pg_namespace ns ON pg_proc.pronamespace = ns.oid
-                 WHERE ns.nspname = 'public'";
+                @"SELECT proname, oidvectortypes(proargtypes)
+                  FROM pg_proc INNER JOIN pg_namespace ns ON pg_proc.pronamespace = ns.oid
+                  WHERE ns.nspname = 'public' AND proname='func'";
 
             var funcs = new Dictionary<string, string>();
             using (var cmd = new NpgsqlCommand(query, Conn))