MDL-18420 reserved words - adding 2 new PG reserved words. Merged from 19_STABLE

diff --git a/lib/ddl/postgres_sql_generator.php b/lib/ddl/postgres_sql_generator.php
index 39f6666a46de70a2d66bf7a48d815d1475e5e599..c1c0e9ad1de061a6d7e484b938b60417f62c3b6b 100644 (file)
--- a/lib/ddl/postgres_sql_generator.php
+++ b/lib/ddl/postgres_sql_generator.php
@@ -573,10 +573,10 @@ function getSequenceFromDB($xmldb_table) {
             'intersect', 'into', 'is', 'isnull', 'join', 'leading', 'left', 'like',
             'limit', 'localtime', 'localtimestamp', 'natural', 'new', 'not',
             'notnull', 'null', 'off', 'offset', 'old', 'on', 'only', 'or', 'order',
-            'outer', 'overlaps', 'placing', 'primary', 'references', 'right', 'select',
+            'outer', 'overlaps', 'placing', 'primary', 'references', 'returning', 'right', 'select',
             'session_user', 'similar', 'some', 'symmetric', 'table', 'then', 'to',
             'trailing', 'true', 'union', 'unique', 'user', 'using', 'verbose',
-            'when', 'where'
+            'when', 'where', 'with'
         );
         return $reserved_words;
     }