Merge pull request #6028 from sikachu/master-fix_plpgsql

Create plpgsql language if not available

1 files changed, 29 insertions, 21 deletions

diff --git a/activerecord/test/schema/postgresql_specific_schema.rb b/activerecord/test/schema/postgresql_specific_schema.rb
index 84228cdd0a..e51db50ae3 100644
--- a/activerecord/test/schema/postgresql_specific_schema.rb
+++ b/activerecord/test/schema/postgresql_specific_schema.rb
@@ -127,28 +127,36 @@ _SQL
   );
 _SQL
 
-  execute <<_SQL
-  CREATE TABLE postgresql_partitioned_table_parent (
-    id SERIAL PRIMARY KEY,
-    number integer
-  );
-  CREATE TABLE postgresql_partitioned_table ( )
-    INHERITS (postgresql_partitioned_table_parent);
-
-  CREATE OR REPLACE FUNCTION partitioned_insert_trigger()
-  RETURNS TRIGGER AS $$
-  BEGIN
-    INSERT INTO postgresql_partitioned_table VALUES (NEW.*);
-    RETURN NULL;
-  END;
-  $$
-  LANGUAGE plpgsql;
-
-  CREATE TRIGGER insert_partitioning_trigger
-    BEFORE INSERT ON postgresql_partitioned_table_parent
-    FOR EACH ROW EXECUTE PROCEDURE partitioned_insert_trigger();
+begin
+    execute <<_SQL
+    CREATE TABLE postgresql_partitioned_table_parent (
+      id SERIAL PRIMARY KEY,
+      number integer
+    );
+    CREATE TABLE postgresql_partitioned_table ( )
+      INHERITS (postgresql_partitioned_table_parent);
+
+    CREATE OR REPLACE FUNCTION partitioned_insert_trigger()
+    RETURNS TRIGGER AS $$
+    BEGIN
+      INSERT INTO postgresql_partitioned_table VALUES (NEW.*);
+      RETURN NULL;
+    END;
+    $$
+    LANGUAGE plpgsql;
+
+    CREATE TRIGGER insert_partitioning_trigger
+      BEFORE INSERT ON postgresql_partitioned_table_parent
+      FOR EACH ROW EXECUTE PROCEDURE partitioned_insert_trigger();
 _SQL
-
+rescue ActiveRecord::StatementInvalid => e
+  if e.message =~ /language "plpgsql" does not exist/
+    execute "CREATE LANGUAGE 'plpgsql';"
+    retry
+  else
+    raise e
+  end
+end
 
   begin
     execute <<_SQL