diff --git a/doc/src/sgml/advanced.sgml b/doc/src/sgml/advanced.sgml index 55ab445b045..9ec389dda1b 100644 --- a/doc/src/sgml/advanced.sgml +++ b/doc/src/sgml/advanced.sgml @@ -586,20 +586,20 @@ SELECT sum(salary) OVER w, avg(salary) OVER w CREATE TABLE capitals ( name text, population real, - altitude int, -- (in ft) + elevation int, -- (in ft) state char(2) ); CREATE TABLE non_capitals ( name text, population real, - altitude int -- (in ft) + elevation int -- (in ft) ); CREATE VIEW cities AS - SELECT name, population, altitude FROM capitals + SELECT name, population, elevation FROM capitals UNION - SELECT name, population, altitude FROM non_capitals; + SELECT name, population, elevation FROM non_capitals; This works OK as far as querying goes, but it gets ugly when you @@ -613,7 +613,7 @@ CREATE VIEW cities AS CREATE TABLE cities ( name text, population real, - altitude int -- (in ft) + elevation int -- (in ft) ); CREATE TABLE capitals ( @@ -625,7 +625,7 @@ CREATE TABLE capitals ( In this case, a row of capitals inherits all columns (name, - population, and altitude) from its + population, and elevation) from its parent, cities. The type of the column name is text, a native PostgreSQL @@ -637,23 +637,23 @@ CREATE TABLE capitals ( For example, the following query finds the names of all cities, - including state capitals, that are located at an altitude + including state capitals, that are located at an elevation over 500 feet: -SELECT name, altitude +SELECT name, elevation FROM cities - WHERE altitude > 500; + WHERE elevation > 500; which returns: - name | altitude ------------+---------- - Las Vegas | 2174 - Mariposa | 1953 - Madison | 845 + name | elevation +-----------+----------- + Las Vegas | 2174 + Mariposa | 1953 + Madison | 845 (3 rows) @@ -661,19 +661,19 @@ SELECT name, altitude On the other hand, the following query finds all the cities that are not state capitals and - are situated at an altitude over 500 feet: + are situated at an elevation over 500 feet: -SELECT name, altitude +SELECT name, elevation FROM ONLY cities - WHERE altitude > 500; + WHERE elevation > 500; - name | altitude ------------+---------- - Las Vegas | 2174 - Mariposa | 1953 + name | elevation +-----------+----------- + Las Vegas | 2174 + Mariposa | 1953 (2 rows) diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml index b278144c128..40fe41463b0 100644 --- a/doc/src/sgml/ddl.sgml +++ b/doc/src/sgml/ddl.sgml @@ -2521,7 +2521,7 @@ REVOKE CREATE ON SCHEMA public FROM PUBLIC; CREATE TABLE cities ( name text, population float, - altitude int -- in feet + elevation int -- in feet ); CREATE TABLE capitals ( @@ -2541,40 +2541,40 @@ CREATE TABLE capitals ( rows of a table or all rows of a table plus all of its descendant tables. The latter behavior is the default. For example, the following query finds the names of all cities, - including state capitals, that are located at an altitude over + including state capitals, that are located at an elevation over 500 feet: -SELECT name, altitude +SELECT name, elevation FROM cities - WHERE altitude > 500; + WHERE elevation > 500; Given the sample data from the PostgreSQL tutorial (see ), this returns: - name | altitude ------------+---------- - Las Vegas | 2174 - Mariposa | 1953 - Madison | 845 + name | elevation +-----------+----------- + Las Vegas | 2174 + Mariposa | 1953 + Madison | 845 On the other hand, the following query finds all the cities that - are not state capitals and are situated at an altitude over 500 feet: + are not state capitals and are situated at an elevation over 500 feet: -SELECT name, altitude +SELECT name, elevation FROM ONLY cities - WHERE altitude > 500; + WHERE elevation > 500; - name | altitude ------------+---------- - Las Vegas | 2174 - Mariposa | 1953 + name | elevation +-----------+----------- + Las Vegas | 2174 + Mariposa | 1953 @@ -2593,9 +2593,9 @@ SELECT name, altitude to explicitly specify that descendant tables are included: -SELECT name, altitude +SELECT name, elevation FROM cities* - WHERE altitude > 500; + WHERE elevation > 500; Writing * is not necessary, since this behavior is @@ -2612,19 +2612,19 @@ SELECT name, altitude originating table: -SELECT c.tableoid, c.name, c.altitude +SELECT c.tableoid, c.name, c.elevation FROM cities c -WHERE c.altitude > 500; +WHERE c.elevation > 500; which returns: - tableoid | name | altitude -----------+-----------+---------- - 139793 | Las Vegas | 2174 - 139793 | Mariposa | 1953 - 139798 | Madison | 845 + tableoid | name | elevation +----------+-----------+----------- + 139793 | Las Vegas | 2174 + 139793 | Mariposa | 1953 + 139798 | Madison | 845 (If you try to reproduce this example, you will probably get @@ -2632,19 +2632,19 @@ WHERE c.altitude > 500; pg_class you can see the actual table names: -SELECT p.relname, c.name, c.altitude +SELECT p.relname, c.name, c.elevation FROM cities c, pg_class p -WHERE c.altitude > 500 AND c.tableoid = p.oid; +WHERE c.elevation > 500 AND c.tableoid = p.oid; which returns: - relname | name | altitude -----------+-----------+---------- - cities | Las Vegas | 2174 - cities | Mariposa | 1953 - capitals | Madison | 845 + relname | name | elevation +----------+-----------+----------- + cities | Las Vegas | 2174 + cities | Mariposa | 1953 + capitals | Madison | 845 @@ -2653,9 +2653,9 @@ WHERE c.altitude > 500 AND c.tableoid = p.oid; pseudo-type, which will print the table OID symbolically: -SELECT c.tableoid::regclass, c.name, c.altitude +SELECT c.tableoid::regclass, c.name, c.elevation FROM cities c -WHERE c.altitude > 500; +WHERE c.elevation > 500; @@ -2665,7 +2665,7 @@ WHERE c.altitude > 500; other tables in the inheritance hierarchy. In our example, the following INSERT statement will fail: -INSERT INTO cities (name, population, altitude, state) +INSERT INTO cities (name, population, elevation, state) VALUES ('Albany', NULL, NULL, 'NY'); We might hope that the data would somehow be routed to the