Merge branch 'master' into picky_nodes

funbringer · funbringer · commit 999c710a591b · 2016-06-23T15:53:15.000+03:00
diff --git a/README.md b/README.md
@@ -192,7 +192,7 @@ EXPLAIN SELECT * FROM items WHERE id = 1234;
    ->  Index Scan using items_34_pkey on items_34  (cost=0.28..8.29 rows=0 width=0)
          Index Cond: (id = 1234)
 ```
-Note that pg_pathman exludes parent table from the query plan. To access parent table use ONLY modifier:
+Note that pg_pathman excludes parent table from the query plan. To access parent table use ONLY modifier:
 ```
 EXPLAIN SELECT * FROM ONLY items;
                       QUERY PLAN                      
diff --git a/init.sql b/init.sql
@@ -252,7 +252,11 @@ CREATE OR REPLACE FUNCTION @extschema@.get_schema_qualified_name(
 RETURNS TEXT AS
 $$
 BEGIN
-	RETURN relnamespace::regnamespace || delimiter || quote_ident(relname || suffix) FROM pg_class WHERE oid = cls::oid;
+	RETURN (SELECT quote_ident(relnamespace::regnamespace::text) ||
+				   delimiter ||
+				   quote_ident(relname || suffix)
+			FROM pg_class
+			WHERE oid = cls::oid);
 END
 $$
 LANGUAGE plpgsql;
@@ -264,23 +268,23 @@ CREATE OR REPLACE FUNCTION @extschema@.validate_relations_equality(relation1 OID
 RETURNS BOOLEAN AS
 $$
 DECLARE
-    rec RECORD;
+	rec RECORD;
 BEGIN
-    FOR rec IN (
-        WITH
-            a1 AS (select * from pg_attribute where attrelid = relation1 and attnum > 0),
-            a2 AS (select * from pg_attribute where attrelid = relation2 and attnum > 0)
-        SELECT a1.attname name1, a2.attname name2, a1.atttypid type1, a2.atttypid type2
-        FROM a1
-        FULL JOIN a2 ON a1.attnum = a2.attnum
-    )
-    LOOP
-        IF rec.name1 IS NULL OR rec.name2 IS NULL OR rec.name1 != rec.name2 THEN
-            RETURN False;
-        END IF;
-    END LOOP;
-
-    RETURN True;
+	FOR rec IN (
+		WITH
+			a1 AS (select * from pg_attribute where attrelid = relation1 and attnum > 0),
+			a2 AS (select * from pg_attribute where attrelid = relation2 and attnum > 0)
+		SELECT a1.attname name1, a2.attname name2, a1.atttypid type1, a2.atttypid type2
+		FROM a1
+		FULL JOIN a2 ON a1.attnum = a2.attnum
+	)
+	LOOP
+		IF rec.name1 IS NULL OR rec.name2 IS NULL OR rec.name1 != rec.name2 THEN
+			RETURN False;
+		END IF;
+	END LOOP;
+
+	RETURN True;
 END
 $$
 LANGUAGE plpgsql;
diff --git a/range.sql b/range.sql
@@ -613,7 +613,7 @@ LANGUAGE plpgsql;
  * partition will be destroyed.
  *
  * Notes: dummy field is used to pass the element type to the function
- * (it is neccessary because of pseudo-types used in function)
+ * (it is necessary because of pseudo-types used in function)
  */
 CREATE OR REPLACE FUNCTION @extschema@.merge_range_partitions_internal(
 	p_parent_relid OID

Original file line number	Diff line number	Diff line change
`@@ -613,7 +613,7 @@ LANGUAGE plpgsql;`
`613`	`613`	`* partition will be destroyed.`
`614`	`614`	`*`
`615`	`615`	`* Notes: dummy field is used to pass the element type to the function`
`616`		`- * (it is neccessary because of pseudo-types used in function)`
	`616`	`+ * (it is necessary because of pseudo-types used in function)`
`617`	`617`	`*/`
`618`	`618`	`CREATE OR REPLACE FUNCTION @extschema@.merge_range_partitions_internal(`
`619`	`619`	`p_parent_relid OID`