Clark C. Evans avatar Clark C. Evans committed 6097c5b

Let's have only 3 non-acedemic departments, as they
are quite distracting from the general test set.

Comments (0)

Files changed (2)

test/output/pgsql.yaml

       headers:
       - [Content-Type, text/plain; charset=UTF-8]
       body: |2
-         | department                                         |
-        -+----------------------------------------------------+-
-         | code   | name                             | school |
-        -+--------+----------------------------------+--------+-
-         | acc    | Accounting                       | bus    |
-         | alumni | Alumni, Parents and Friends      |        |
-         | arthis | Art History                      | art    |
-         | artstd | Studio Art                       | art    |
-         | astro  | Astronomy                        | ns     |
-         | be     | Bioengineering                   | egn    |
-         | bursar | Bursar's Office                  |        |
-         | capmrk | Capital Markets                  | bus    |
-         | career | Career Development and Placement |        |
-         | chem   | Chemistry                        | ns     |
-         | comp   | Computer Science                 | egn    |
-         | corpfi | Corporate Finance                | bus    |
-         | edpol  | Educational Policy               | edu    |
-         | ee     | Electrical Engineering           | egn    |
-         | eng    | English                          | la     |
-         | finaid | Office of Financial Aid          |        |
-         | health | Student Health Services          |        |
-         | hist   | History                          | la     |
-         | imedia | Instructional Media & Technology |        |
-         | lang   | Foreign Languages                | la     |
-         | me     | Mechanical Engineering           | egn    |
-         | mth    | Mathematics                      | ns     |
-         | phys   | Physics                          | ns     |
-         | pia    | Piano                            | mus    |
-         | poli   | Political Science                | la     |
-         | psych  | Psychology                       | la     |
-         | str    | Strings                          | mus    |
-         | tched  | Teacher Education                | edu    |
-         | unisrv | University Facilities & Services |        |
-         | voc    | Vocals                           | mus    |
-         | win    | Wind                             | mus    |
-                                                      (31 rows)
+         | department                               |
+        -+------------------------------------------+-
+         | code   | name                   | school |
+        -+--------+------------------------+--------+-
+         | acc    | Accounting             | bus    |
+         | alumni | Alumni & Parents       |        |
+         | arthis | Art History            | art    |
+         | artstd | Studio Art             | art    |
+         | astro  | Astronomy              | ns     |
+         | be     | Bioengineering         | egn    |
+         | bursar | Bursar's Office        |        |
+         | capmrk | Capital Markets        | bus    |
+         | career | Career Development     |        |
+         | chem   | Chemistry              | ns     |
+         | comp   | Computer Science       | egn    |
+         | corpfi | Corporate Finance      | bus    |
+         | edpol  | Educational Policy     | edu    |
+         | ee     | Electrical Engineering | egn    |
+         | eng    | English                | la     |
+         | hist   | History                | la     |
+         | lang   | Foreign Languages      | la     |
+         | me     | Mechanical Engineering | egn    |
+         | mth    | Mathematics            | ns     |
+         | phys   | Physics                | ns     |
+         | pia    | Piano                  | mus    |
+         | poli   | Political Science      | la     |
+         | psych  | Psychology             | la     |
+         | str    | Strings                | mus    |
+         | tched  | Teacher Education      | edu    |
+         | voc    | Vocals                 | mus    |
+         | win    | Wind                   | mus    |
+                                            (27 rows)
 
          ----
          /department
       headers:
       - [Content-Type, text/plain; charset=UTF-8]
       body: |2
-         | department                                                                                          |
-        -+-----------------------------------------------------------------------------------------------------+-
-         | school.code | school.name                      | code   | name                             | school |
-        -+-------------+----------------------------------+--------+----------------------------------+--------+-
-         | bus         | School of Business               | acc    | Accounting                       | bus    |
-         |             |                                  | alumni | Alumni, Parents and Friends      |        |
-         | art         | School of Art and Design         | arthis | Art History                      | art    |
-         | art         | School of Art and Design         | artstd | Studio Art                       | art    |
-         | ns          | School of Natural Sciences       | astro  | Astronomy                        | ns     |
-         | egn         | School of Engineering            | be     | Bioengineering                   | egn    |
-         |             |                                  | bursar | Bursar's Office                  |        |
-         | bus         | School of Business               | capmrk | Capital Markets                  | bus    |
-         |             |                                  | career | Career Development and Placement |        |
-         | ns          | School of Natural Sciences       | chem   | Chemistry                        | ns     |
-         | egn         | School of Engineering            | comp   | Computer Science                 | egn    |
-         | bus         | School of Business               | corpfi | Corporate Finance                | bus    |
-         | edu         | College of Education             | edpol  | Educational Policy               | edu    |
-         | egn         | School of Engineering            | ee     | Electrical Engineering           | egn    |
-         | la          | School of Arts, Letters, and the | eng    | English                          | la     |
-         :             : Humanities                       :        :                                  :        :
-         |             |                                  | finaid | Office of Financial Aid          |        |
-         |             |                                  | health | Student Health Services          |        |
-         | la          | School of Arts, Letters, and the | hist   | History                          | la     |
-         :             : Humanities                       :        :                                  :        :
-         |             |                                  | imedia | Instructional Media & Technology |        |
-         | la          | School of Arts, Letters, and the | lang   | Foreign Languages                | la     |
-         :             : Humanities                       :        :                                  :        :
-         | egn         | School of Engineering            | me     | Mechanical Engineering           | egn    |
-         | ns          | School of Natural Sciences       | mth    | Mathematics                      | ns     |
-         | ns          | School of Natural Sciences       | phys   | Physics                          | ns     |
-         | mus         | Musical School                   | pia    | Piano                            | mus    |
-         | la          | School of Arts, Letters, and the | poli   | Political Science                | la     |
-         :             : Humanities                       :        :                                  :        :
-         | la          | School of Arts, Letters, and the | psych  | Psychology                       | la     |
-         :             : Humanities                       :        :                                  :        :
-         | mus         | Musical School                   | str    | Strings                          | mus    |
-         | edu         | College of Education             | tched  | Teacher Education                | edu    |
-         |             |                                  | unisrv | University Facilities & Services |        |
-         | mus         | Musical School                   | voc    | Vocals                           | mus    |
-         | mus         | Musical School                   | win    | Wind                             | mus    |
-                                                                                                       (31 rows)
+         | department                                                                                |
+        -+-------------------------------------------------------------------------------------------+-
+         | school.code | school.name                      | code   | name                   | school |
+        -+-------------+----------------------------------+--------+------------------------+--------+-
+         | bus         | School of Business               | acc    | Accounting             | bus    |
+         |             |                                  | alumni | Alumni & Parents       |        |
+         | art         | School of Art and Design         | arthis | Art History            | art    |
+         | art         | School of Art and Design         | artstd | Studio Art             | art    |
+         | ns          | School of Natural Sciences       | astro  | Astronomy              | ns     |
+         | egn         | School of Engineering            | be     | Bioengineering         | egn    |
+         |             |                                  | bursar | Bursar's Office        |        |
+         | bus         | School of Business               | capmrk | Capital Markets        | bus    |
+         |             |                                  | career | Career Development     |        |
+         | ns          | School of Natural Sciences       | chem   | Chemistry              | ns     |
+         | egn         | School of Engineering            | comp   | Computer Science       | egn    |
+         | bus         | School of Business               | corpfi | Corporate Finance      | bus    |
+         | edu         | College of Education             | edpol  | Educational Policy     | edu    |
+         | egn         | School of Engineering            | ee     | Electrical Engineering | egn    |
+         | la          | School of Arts, Letters, and the | eng    | English                | la     |
+         :             : Humanities                       :        :                        :        :
+         | la          | School of Arts, Letters, and the | hist   | History                | la     |
+         :             : Humanities                       :        :                        :        :
+         | la          | School of Arts, Letters, and the | lang   | Foreign Languages      | la     |
+         :             : Humanities                       :        :                        :        :
+         | egn         | School of Engineering            | me     | Mechanical Engineering | egn    |
+         | ns          | School of Natural Sciences       | mth    | Mathematics            | ns     |
+         | ns          | School of Natural Sciences       | phys   | Physics                | ns     |
+         | mus         | Musical School                   | pia    | Piano                  | mus    |
+         | la          | School of Arts, Letters, and the | poli   | Political Science      | la     |
+         :             : Humanities                       :        :                        :        :
+         | la          | School of Arts, Letters, and the | psych  | Psychology             | la     |
+         :             : Humanities                       :        :                        :        :
+         | mus         | Musical School                   | str    | Strings                | mus    |
+         | edu         | College of Education             | tched  | Teacher Education      | edu    |
+         | mus         | Musical School                   | voc    | Vocals                 | mus    |
+         | mus         | Musical School                   | win    | Wind                   | mus    |
+                                                                                             (27 rows)
 
          ----
          /department{school.*,*}
         -+---------------------------------------------------+-
          | count(school) | count(department) | count(course) |
         -+---------------+-------------------+---------------+-
-         |             9 |                31 |           100 |
+         |             9 |                27 |           100 |
                                                        (1 row)
 
          ----
         -+------------------------------------------------------+-
          | count(department) | count(department?exists(course)) |
         -+-------------------+----------------------------------+-
-         |                31 |                               20 |
+         |                27 |                               20 |
                                                           (1 row)
 
          ----
          | edpol  |                        4 |
          | ee     |                        4 |
          | eng    |                        4 |
-         | finaid |                        0 |
-         | health |                        0 |
          | hist   |                        5 |
-         | imedia |                        0 |
          | lang   |                        3 |
          | me     |                        3 |
          | mth    |                        0 |
          | psych  |                        3 |
          | str    |                        0 |
          | tched  |                        4 |
-         | unisrv |                        0 |
          | voc    |                        0 |
          | win    |                        0 |
-                                     (31 rows)
+                                     (27 rows)
 
          ----
          /department{code,count(course{credits=3})}
       headers:
       - [Content-Type, text/plain; charset=UTF-8]
       body: |2
-         | (department?every(course.credits=5))               |
-        -+----------------------------------------------------+-
-         | code   | name                             | school |
-        -+--------+----------------------------------+--------+-
-         | alumni | Alumni, Parents and Friends      |        |
-         | bursar | Bursar's Office                  |        |
-         | career | Career Development and Placement |        |
-         | finaid | Office of Financial Aid          |        |
-         | health | Student Health Services          |        |
-         | imedia | Instructional Media & Technology |        |
-         | mth    | Mathematics                      | ns     |
-         | pia    | Piano                            | mus    |
-         | str    | Strings                          | mus    |
-         | unisrv | University Facilities & Services |        |
-         | voc    | Vocals                           | mus    |
-         | win    | Wind                             | mus    |
-                                                      (12 rows)
+         | (department?every(course.credits=5)) |
+        -+--------------------------------------+-
+         | code   | name               | school |
+        -+--------+--------------------+--------+-
+         | alumni | Alumni & Parents   |        |
+         | bursar | Bursar's Office    |        |
+         | career | Career Development |        |
+         | mth    | Mathematics        | ns     |
+         | pia    | Piano              | mus    |
+         | str    | Strings            | mus    |
+         | voc    | Vocals             | mus    |
+         | win    | Wind               | mus    |
+                                         (8 rows)
 
          ----
          /department?every(course.credits=5)
          | edpol  |                   3 |                   3 |
          | ee     |                   3 |                   4 |
          | eng    |                   2 |                   3 |
-         | finaid |                     |                     |
-         | health |                     |                     |
          | hist   |                   3 |                   3 |
-         | imedia |                     |                     |
          | lang   |                   2 |                   4 |
          | me     |                   3 |                   4 |
          | mth    |                   5 |                   5 |
          | psych  |                   3 |                   4 |
          | str    |                     |                     |
          | tched  |                   3 |                   4 |
-         | unisrv |                     |                     |
          | voc    |                     |                     |
          | win    |                     |                     |
-                                                      (31 rows)
+                                                      (27 rows)
 
          ----
          /department{code,min(course.credits),max(course.credits)}
          | edpol  |  3.0000000000000000 |                        3.0000000000000000 |
          | ee     |  3.2000000000000000 |                        3.2000000000000000 |
          | eng    |  2.6666666666666667 |                        2.6666666666666667 |
-         | finaid |                     |                                           |
-         | health |                     |                                           |
          | hist   |  3.0000000000000000 |                        3.0000000000000000 |
-         | imedia |                     |                                           |
          | lang   |  3.0000000000000000 |                        3.0000000000000000 |
          | me     |  3.4000000000000000 |                        3.4000000000000000 |
          | mth    |  5.0000000000000000 |                        5.0000000000000000 |
          | psych  |  3.4000000000000000 |                        3.4000000000000000 |
          | str    |                     |                                           |
          | tched  |  3.2000000000000000 |                        3.2000000000000000 |
-         | unisrv |                     |                                           |
          | voc    |                     |                                           |
          | win    |                     |                                           |
-                                                                            (31 rows)
+                                                                            (27 rows)
 
          ----
          /department{code,avg(course.credits),sum(course.credits)/count(course.credits)}

test/sql/regress-pgsql.sql

 single-column primary key ``code`` and a unique ``name``.  In this
 schema, we associate departments with exactly one school, although the
 ``code`` for the department must be unique across schools.  Non-acedemic
-departments are modeled with a ``NULL`` value for their ``school``.
+departments are modeled with a ``NULL`` for their ``school``.
 
 Two second-tier tables, ``course`` and ``program`` have compound primary
 keys, consisting of a parent table and a second column.  For ``course``
 ('win', 'Wind', 'mus'),
 ('str', 'Strings', 'mus'),
 -- Non-Academic Departments
-('alumni','Alumni, Parents and Friends',NULL),
+('alumni','Alumni & Parents',NULL),
 ('bursar','Bursar''s Office',NULL),
-('career','Career Development and Placement',NULL),
-('health','Student Health Services',NULL),
-('finaid','Office of Financial Aid',NULL),
-('imedia','Instructional Media & Technology',NULL),
-('unisrv','University Facilities & Services',NULL)
+('career','Career Development',NULL)
 ;
 
 INSERT INTO ad.program (school, code, title, degree) VALUES
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.