Commits

Clark C. Evans  committed a94d5bc

course.number -> course.no
appointment.percent -> appointment.fraction
student.number -> student.id

  • Participants
  • Parent commits 8baf164

Comments (0)

Files changed (5)

File test/regress/input/library.yaml

            every(course?department='str'),
            count(course?department='str')}
   # Applied to all-TRUE, all-FALSE, mixed sets
-  - uri: /course{department,number,credits,credits>3}
+  - uri: /course{department,no,credits,credits>3}
                 ?department={'me','mth','phys'}
   - uri: /{exists(course{credits>3}?department='me'),
            every(course{credits>3}?department='me'),
     expect: 400
 
   # Min, Max
-  - uri: /course{number,credits}?department='be'
+  - uri: /course{no,credits}?department='be'
   - uri: /{min(course{credits}?department='be'),
            max(course{credits}?department='be')}
   # Applied to an empty set
   - uri: /school.department.sort(code+)
   - uri: /school.sort(code+).department.sort(code+)
   # Multiple arguments
-  - uri: /course.sort(credits-,number+)?department='stdart'
+  - uri: /course.sort(credits-,no+)?department='stdart'
 
   # Limiting
   - uri: /course.limit(9)
   # Combined with sort
   - uri: /course.sort(credits+).limit(9)
   - uri: /course.limit(9).sort(credits+)
-  - uri: /course.sort(credits-).limit(9).sort(number-)
+  - uri: /course.sort(credits-).limit(9).sort(no-)
 
   # Selecting
   - uri: /school{name}
 
   # Direction decorator
   - uri: /school{name+}
-  - uri: /course{credits-, number+, title}?department='stdart'
+  - uri: /course{credits-, no+, title}?department='stdart'
 

File test/regress/input/schema.yaml

   - uri: /(program?school='eng'&code='umech').program_requirement
 
   # Course -> Department (parental)
-  - uri: /(course?department='psych'&number=610).department
+  - uri: /(course?department='psych'&no=610).department
   # Course -> Class
-  - uri: /(course?department='psych'&number=610).class
+  - uri: /(course?department='psych'&no=610).class
   # Course -> Prerequisite
   # FIXME: broken! Cannot choose between on_course and of_course links;
   # need a mechanism to select a desired link among ambiguous links.
-  - uri: /(course?department='psych'&number=610).prerequisite
+  - uri: /(course?department='psych'&no=610).prerequisite
     expect: 400
   # Course -> Course Classification
-  - uri: /(course?department='psych'&number=610).course_classification
+  - uri: /(course?department='psych'&no=610).course_classification
 
   # Instructor -> Confidential (singular, optional)
   - uri: /(instructor?code='kcavallaro').confidential
   - uri: /(class?class_seq=10086).enrollment
 
   # Student -> School (singular, optional, via Program)
-  - uri: /(student?number=25371).school
+  - uri: /(student?id=25371).school
   # Student -> Program (singular, optional)
-  - uri: /(student?number=25371).program
+  - uri: /(student?id=25371).program
   # Student -> Enrollment
-  - uri: /(student?number=25371).enrollment
+  - uri: /(student?id=25371).enrollment
 
   # Enrollment -> Student (parental)
   - uri: /(enrollment?student=92039&class=10071).student

File test/regress/input/tutorial.yaml

   - uri: /school
   - uri: /program{school, code, title}
   - uri: /department{name-, school}
-  - uri: /course{department+, number, credits-, title}
-  - uri: /course{department+ :as 'Dept Code', number :as 'No.',
+  - uri: /course{department+, no, credits-, title}
+  - uri: /course{department+ :as 'Dept Code', no :as 'No.',
                  credits-, title}
   # Linking Data
   - uri: /program{school.name, title}
   - uri: /department?school='eng'
   - uri: /program?degree={'ba','bs'}
   - uri: /program?school='bus'&degree!='bs'
-  - uri: /course{department, number, title}
+  - uri: /course{department, no, title}
                 ?credits<3&department.school='ns'
   - uri: /(course?credits<3&department.school='ns')
-                {department, number, title}
+                {department, no, title}
   # Formatters
   - uri: /school/:json
   # Putting it All Together
-  - uri: /course{department{code, name},number,title+}
+  - uri: /course{department{code, name},no,title+}
                 ?department.school='bus'/:csv
 
 - title: Relating and Aggregating Data
   - uri: /max(course.credits)
   # Aggregate Expressions
   - uri: /school{name, count(program), count(department)}
-  - uri: /department{name, count(course?number>=400)}
+  - uri: /department{name, count(course?no>=400)}
   - uri: /school{name, avg(department.count(course))}
   - uri: /school{name, count(department?exists(course?credits>3))}
-  - uri: /department{name, avg((course?number>400).credits)}
+  - uri: /department{name, avg((course?no>400).credits)}
   - uri: /department{code, min(course.credits), max(course.credits),
                            avg(course.credits)}
   - uri: /department{name, avg(course.credits), count(course)}
   - uri: /course?title~'lab'
   - uri: /course?title!~'lab'
   - uri: /course?title!='Organic Chemistry Laboratory I'
-  - uri: /course{department,number,title}?number=101
+  - uri: /course{department,no,title}?no=101
   - uri: /course?department!={'arthis','stdart'}
   - uri: /course?credits>3
   - uri: /course?credits>=3
   - uri: /course?(department='arthis'|department='stdart')&credits>3
   - uri: /course?department='arthis'|department='stdart'&credits>3
   - uri: /course?description
-  - uri: /course{department, number, description}?!description
+  - uri: /course{department, no, description}?!description
 
 - title: Types and Functions
   tests: