added services and repositories interfaces

brcm/.idea/dataSources/e1da602a-1461-4afe-ad38-9747a7f59eaa/storage_v2/_src_/database/brcm.ukQuAA/schema/public.abK9xQ.meta

@@ -0,0 +1,2 @@
+#n:public
+!<md> [783, 0, null, null, -2147483648, -2147483648]

brcm/.idea/jpa-buddy.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="JpaBuddyIdeaProjectConfig">
+    <option name="defaultUnitInitialized" value="true" />
     <option name="renamerInitialized" value="true" />
-    <option name="reverseEngineeringLastDbConnectionId" value="f021bbf7-0a0d-4a70-aada-f67ae5ccf5ea" />
+    <option name="reverseEngineeringLastDbConnectionId" value="e1da602a-1461-4afe-ad38-9747a7f59eaa" />
     <option name="reLastEntityCreationPackage" value="core/src/main/java/entities" />
   </component>
 </project>

brcm/core/pom.xml

@@ -79,5 +79,15 @@
         </plugin>
       </plugins>
     </pluginManagement>
+      <plugins>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <configuration>
+                  <source>8</source>
+                  <target>8</target>
+              </configuration>
+          </plugin>
+      </plugins>
   </build>
 </project>

brcm/core/src/main/java/dtos/AppointmentDto.java

@@ -12,13 +12,15 @@ public class AppointmentDto implements Serializable {
     private final Instant endtime;
     private final Integer activityid;
     private final Integer customerid;
+    private final String status;
 
-    public AppointmentDto(Integer id, Instant starttime, Instant endtime, Integer activityid, Integer customerid) {
+    public AppointmentDto(Integer id, Instant starttime, Instant endtime, Integer activityid, Integer customerid, String status) {
         this.id = id;
         this.starttime = starttime;
         this.endtime = endtime;
         this.activityid = activityid;
         this.customerid = customerid;
+        this.status = status;
     }
 
     public Integer getId() {
@@ -40,4 +42,6 @@ public class AppointmentDto implements Serializable {
     public Integer getCustomerid() {
         return customerid;
     }
+
+    public String getStatus() { return status; }
 }

brcm/core/src/main/java/dtos/LineitemDto.java

@@ -1,7 +1,5 @@
 package dtos;
 
-import entities.Lineitem;
-
 import java.io.Serializable;
 
 /**

brcm/core/src/main/java/dtos/OrderDto.java

@@ -1,10 +1,10 @@
 package dtos;
 
-import entities.Order;
-
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * A DTO for the {@link Order} entity
@@ -16,14 +16,30 @@ public class OrderDto implements Serializable {
     private final Double discountapplied;
     private final String totalprice;
 
+    private final List<LineitemDto> lineitems;
+
     public OrderDto(Integer id, LocalDate date, LocalTime time, Double discountapplied, String totalprice) {
         this.id = id;
         this.date = date;
         this.time = time;
         this.discountapplied = discountapplied;
         this.totalprice = totalprice;
+        this.lineitems = new ArrayList<LineitemDto>();
+    }
+    public void addLineItem(LineitemDto lineitem){
+        this.lineitems.add(lineitem);
+    }
+    public void deleteLineItem(int id){
+        LineitemDto objToRemove = null;
+        for (LineitemDto lineitem : this.lineitems) {
+            if (lineitem.getId() == id) {
+                objToRemove = lineitem;
+            }
+        }
+        if(objToRemove != null){
+            this.lineitems.remove(objToRemove);
+        }
     }
-
     public Integer getId() {
         return id;
     }

brcm/core/src/main/java/dtos/ProfessorDto.java

@@ -1,19 +1,19 @@
 package dtos;
 
-import entities.Professor;
-
 import java.io.Serializable;
+import java.time.LocalDate;
 
 /**
  * A DTO for the {@link Professor} entity
  */
-public class ProfessorDto implements Serializable {
+public class ProfessorDto extends CustomerDto implements Serializable {
     private final Integer id;
     private final String department;
     private final String office;
     private final String research;
 
-    public ProfessorDto(Integer id, String department, String office, String research) {
+    public ProfessorDto(Integer id, String department, String office, String research, String firstname, String lastname, LocalDate dateofbirth, String phone) {
+        super(id, firstname, lastname, dateofbirth, phone);
         this.id = id;
         this.department = department;
         this.office = office;

brcm/core/src/main/java/dtos/StudentDto.java

@@ -1,21 +1,20 @@
 package dtos;
 
-import entities.Student;
-
 import java.io.Serializable;
 import java.time.LocalDate;
 
 /**
  * A DTO for the {@link Student} entity
  */
-public class StudentDto implements Serializable {
+public class StudentDto extends CustomerDto implements Serializable {
     private final Integer id;
     private final LocalDate enterdate;
     private final String major;
     private final String minor;
     private final LocalDate graddate;
 
-    public StudentDto(Integer id, LocalDate enterdate, String major, String minor, LocalDate graddate) {
+    public StudentDto(Integer id, LocalDate enterdate, String major, String minor, LocalDate graddate, String firstname, String lastname, LocalDate dateofbirth, String phone) {
+        super(id, firstname, lastname, dateofbirth, phone);
         this.id = id;
         this.enterdate = enterdate;
         this.major = major;

brcm/core/src/main/java/entities/Address.java

@@ -10,22 +10,22 @@ public class Address {
     private Integer id;
 
     @Lob
-    @Column(name = "street", nullable = false)
+    @Column(name = "street")
     private String street;
 
     @Lob
-    @Column(name = "number", nullable = false)
+    @Column(name = "number")
     private String number;
 
-    @Column(name = "zipcode", nullable = false)
+    @Column(name = "zipcode")
     private Integer zipcode;
 
     @Lob
-    @Column(name = "city", nullable = false)
+    @Column(name = "city")
     private String city;
 
     @Lob
-    @Column(name = "state", nullable = false)
+    @Column(name = "state")
     private String state;
 
     public Integer getId() {

brcm/core/src/main/java/entities/Appointment.java

@@ -1,9 +1,6 @@
 package entities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.time.Instant;
 
 @Entity
@@ -25,6 +22,10 @@ public class Appointment {
     @Column(name = "customerid", nullable = false)
     private Integer customerid;
 
+    @Lob
+    @Column(name = "status")
+    private String status;
+
     public Integer getId() {
         return id;
     }
@@ -65,4 +66,12 @@ public class Appointment {
         this.customerid = customerid;
     }
 
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
 }

brcm/core/src/main/java/entities/Customer.java

@@ -15,14 +15,14 @@ public class Customer {
     private String firstname;
 
     @Lob
-    @Column(name = "lastname", nullable = false)
+    @Column(name = "lastname")
     private String lastname;
 
-    @Column(name = "dateofbirth", nullable = false)
+    @Column(name = "dateofbirth")
     private LocalDate dateofbirth;
 
     @Lob
-    @Column(name = "phone", nullable = false)
+    @Column(name = "phone")
     private String phone;
 
     @ManyToOne(fetch = FetchType.LAZY, optional = false)

brcm/core/src/main/java/entities/Discountscheme.java

@@ -10,20 +10,20 @@ public class Discountscheme {
     @Column(name = "id", nullable = false)
     private Integer id;
 
-    @Column(name = "pricediscount", nullable = false)
+    @Column(name = "pricediscount")
     private Double pricediscount;
 
-    @Column(name = "percentdiscount", nullable = false)
+    @Column(name = "percentdiscount")
     private Double percentdiscount;
 
     @Lob
-    @Column(name = "customertype", nullable = false)
+    @Column(name = "customertype")
     private String customertype;
 
-    @Column(name = "startdate", nullable = false)
+    @Column(name = "startdate")
     private LocalDate startdate;
 
-    @Column(name = "enddate", nullable = false)
+    @Column(name = "enddate")
     private LocalDate enddate;
 
     public Integer getId() {

brcm/core/src/main/java/entities/Professor.java

@@ -12,7 +12,7 @@ public class Professor {
     @MapsId
     @OneToOne(fetch = FetchType.LAZY, optional = false)
     @JoinColumn(name = "id", nullable = false)
-    private Customer customers;
+    private Customer customer;
 
     @Lob
     @Column(name = "department", nullable = false)
@@ -34,12 +34,12 @@ public class Professor {
         this.id = id;
     }
 
-    public Customer getCustomers() {
-        return customers;
+    public Customer getCustomer() {
+        return customer;
     }
 
-    public void setCustomers(Customer customers) {
-        this.customers = customers;
+    public void setCustomer(Customer customer) {
+        this.customer = customer;
     }
 
     public String getDepartment() {

brcm/core/src/main/java/entities/Student.java

@@ -13,7 +13,7 @@ public class Student {
     @MapsId
     @OneToOne(fetch = FetchType.LAZY, optional = false)
     @JoinColumn(name = "id", nullable = false)
-    private Customer customers;
+    private Customer customer;
 
     @Column(name = "enterdate", nullable = false)
     private LocalDate enterdate;
@@ -37,12 +37,12 @@ public class Student {
         this.id = id;
     }
 
-    public Customer getCustomers() {
-        return customers;
+    public Customer getCustomer() {
+        return customer;
     }
 
-    public void setCustomers(Customer customers) {
-        this.customers = customers;
+    public void setCustomer(Customer customer) {
+        this.customer = customer;
     }
 
     public LocalDate getEnterdate() {

brcm/core/src/main/java/impl/CustomerManagementServiceImpl.java

@@ -0,0 +1,70 @@
+package impl;
+
+import dtos.ProfessorDto;
+import dtos.StudentDto;
+import repositories.ProfessorRepository;
+import repositories.StudentRepository;
+import services.CustomerManagementService;
+
+import java.util.List;
+
+public class CustomerManagementServiceImpl implements CustomerManagementService {
+
+    private final ProfessorRepository professorRepository;
+    private final StudentRepository studentRepository;
+
+    public CustomerManagementServiceImpl(StudentRepository studentRepository, ProfessorRepository professorRepository){
+        this.studentRepository = studentRepository;
+        this.professorRepository = professorRepository;
+    }
+
+    @Override
+    public void saveStudent(StudentDto student) {
+
+    }
+
+    @Override
+    public void saveProfessor(ProfessorDto professor) {
+
+    }
+
+    @Override
+    public StudentDto getStudentByBroncoId(int id) {
+        return null;
+    }
+
+    @Override
+    public ProfessorDto getProfessorByBroncoId(int id) {
+        return null;
+    }
+
+    @Override
+    public void updateStudent(StudentDto student) {
+
+    }
+
+    @Override
+    public void updateProfessor(ProfessorDto professor) {
+
+    }
+
+    @Override
+    public void deleteStudentByBroncoId(int id) {
+
+    }
+
+    @Override
+    public void deleteProfessorByBroncoId(int id) {
+
+    }
+
+    @Override
+    public List<StudentDto> listStudentsbyMajor(String major) {
+        return null;
+    }
+
+    @Override
+    public List<ProfessorDto> listProfessorsbyDept(String dept) {
+        return null;
+    }
+}

brcm/core/src/main/java/repositories/ActivityRepository.java

@@ -0,0 +1,12 @@
+package repositories;
+
+import entities.Activity;
+
+import java.util.List;
+
+public interface ActivityRepository {
+    Activity saveActivity(Activity activity);
+    List<Activity> getAllActivities();
+    void updateActivity(Activity activity);
+    void deleteActivity(int id);
+}

brcm/core/src/main/java/repositories/AppointmentRepository.java

@@ -0,0 +1,13 @@
+package repositories;
+
+import entities.Appointment;
+
+import java.time.LocalDate;
+import java.util.List;
+
+public interface AppointmentRepository {
+    Appointment saveAppointment(Appointment appointment);
+    void updateAppointment(Appointment appointment);
+    void updateAppointmentStatus(int id, String status);
+    List<Appointment> getAllAppointmentsBetweenDates(LocalDate startDate, LocalDate endDate);
+}

brcm/core/src/main/java/repositories/DiscountSchemeRepository.java

@@ -0,0 +1,12 @@
+package repositories;
+
+import entities.Discountscheme;
+
+import java.util.List;
+
+public interface DiscountSchemeRepository {
+    Discountscheme AddDiscount(Discountscheme discountscheme);
+    void DeleteDiscount(int id);
+    List<Discountscheme> getAllDiscounts();
+    void UpdateDiscount(Discountscheme discountscheme);
+}

brcm/core/src/main/java/repositories/LineItemRepository.java

@@ -0,0 +1,12 @@
+package repositories;
+
+import entities.Lineitem;
+
+import java.util.List;
+
+public interface LineItemRepository {
+    void saveLineItem(Lineitem lineitem);
+    void deleteLineItem(int id);
+    void updateLineItem(Lineitem lineitem);
+    List<Lineitem> getLineItemsForOrderId(int id);
+}

brcm/core/src/main/java/repositories/OrderRepository.java

@@ -0,0 +1,12 @@
+package repositories;
+
+import entities.Order;
+
+import java.util.Date;
+import java.util.List;
+
+public interface OrderRepository {
+    void saveOrder(Order order);
+    void updateOrder(Order order);
+    List<Order> getOrdersBetweenDates(Date start, Date end);
+}

brcm/core/src/main/java/repositories/PriceHistoryRepository.java

@@ -0,0 +1,9 @@
+package repositories;
+
+import entities.Historicalprice;
+
+import java.util.List;
+
+public interface PriceHistoryRepository {
+    List<Historicalprice> getPriceHistoryForActivity(int activityId);
+}

brcm/core/src/main/java/repositories/ProfessorRepository.java

@@ -0,0 +1,11 @@
+package repositories;
+
+import entities.Professor;
+import java.util.List;
+public interface ProfessorRepository {
+    Professor saveProfessor(Professor Professor);
+    void deleteProfessor(int id);
+    void updateProfessor(int id);
+    void getProfessorById(int id);
+    List<Professor> getProfessorsByDept(String dept);
+}

brcm/core/src/main/java/repositories/StudentRepository.java

@@ -0,0 +1,12 @@
+package repositories;
+
+import entities.Student;
+import java.util.List;
+
+public interface StudentRepository {
+    Student saveStudent(Student student);
+    void deleteStudent(int id);
+    void updateStudent(int id);
+    void getStudentById(int id);
+    List<Student> getStudentsByMajor(String major);
+}

brcm/core/src/main/java/services/ActivityRegistrationService.java

@@ -0,0 +1,4 @@
+package services;
+
+public interface ActivityRegistrationService {
+}

brcm/core/src/main/java/services/CustomerManagementService.java

@@ -0,0 +1,18 @@
+package services;
+
+import dtos.ProfessorDto;
+import dtos.StudentDto;
+import java.util.List;
+
+public interface CustomerManagementService {
+    void saveStudent(StudentDto student);
+    void saveProfessor(ProfessorDto professor);
+    StudentDto getStudentByBroncoId(int id);
+    ProfessorDto getProfessorByBroncoId(int id);
+    void updateStudent(StudentDto student);
+    void updateProfessor(ProfessorDto professor);
+    void deleteStudentByBroncoId(int id);
+    void deleteProfessorByBroncoId(int id);
+    List<StudentDto> listStudentsbyMajor(String major);
+    List<ProfessorDto> listProfessorsbyDept(String dept);
+}

brcm/core/src/main/java/services/DiscountManagementService.java

@@ -0,0 +1,4 @@
+package services;
+
+public interface DiscountManagementService {
+}

brcm/core/src/main/java/services/PriceHistoryService.java

@@ -0,0 +1,4 @@
+package services;
+
+public interface PriceHistoryService {
+}

brcm/core/src/main/java/services/RevenueReportService.java

@@ -0,0 +1,4 @@
+package services;
+
+public interface RevenueReportService {
+}

brcm/core/src/main/java/services/VisitRegistrationService.java

@@ -0,0 +1,4 @@
+package services;
+
+public interface VisitRegistrationService {
+}

docs/brcm_sql.architect

@@ -4,7 +4,7 @@
  <print-settings numCopies="1" zoom="1.0" pageNumbersPrinted="true" orientation="1" paperWidth="612.0" paperHeight="792.0" leftBorder="50.0" rightBorder="50.0" topBorder="50.0" bottomBorder="50.0" />
  <project-data-sources>
   <data-source id="DS0">
-   <property key="Logical" value="(Target Database)" />
+   <property key="Logical" value="localmac" />
    <property key="Connection Type" value="PostgreSQL" />
    <property key="JDBC URL" value="jdbc:postgresql://localhost:5432/brcm" />
    <property key="UID" value="sivacharan" />
@@ -15,7 +15,7 @@
    <property key="ca.sqlpower.architect.etl.kettle.repos.login" value="" />
    <property key="ca.sqlpower.architect.etl.kettle.repos.password" value="" />
   </data-source>
-  <data-source id="DS2">
+  <data-source id="DS0">
    <property key="Connection Type" value="PostgreSQL" />
    <property key="Logical" value="localmac" />
    <property key="JDBC URL" value="jdbc:postgresql://localhost:5432/brcm" />
@@ -29,7 +29,7 @@
   </data-source>
  </project-data-sources>
  <source-databases>
-  <database id="DB0" populated="true" UUID="89121a35-6f21-473a-b6cd-92cb8d5111d7" dbcs-ref="DS2" name="localmac" physicalName="localmac" >
+  <database id="DB0" populated="true" UUID="89121a35-6f21-473a-b6cd-92cb8d5111d7" dbcs-ref="DS0" name="localmac" physicalName="localmac" >
    <catalog id="CAT1" populated="true" UUID="a6db5ca8-b658-452f-9b3f-25b0bc155a9f" name="brcm" nativeTerm="database" physicalName="brcm" >
     <schema id="SCH2" populated="true" UUID="d702d3b3-bbe1-46c6-87bb-245638a3016f" name="" nativeTerm="schema" physicalName="" >
      <table id="TAB3" populated="false" UUID="d9b80105-68af-4eb4-a095-3b2487131dad" name="sql_features" objectType="TABLE" physicalName="sql_features" >
@@ -515,6 +515,76 @@
        </index>
       </folder>
      </table>
+     <table id="TAB141" populated="false" UUID="97ce0b19-dfbc-49b9-9b60-b4a303df3440" name="activities" objectType="TABLE" physicalName="activities" >
+      <remarks></remarks>
+      <folder id="FOLTAB1411" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX142" populated="true" UUID="230d17fa-5877-4215-b123-99c42cda1f3b" clustered="false" name="activities_pk" physicalName="activities_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB143" populated="false" UUID="7a50d5fe-b673-495b-a343-504e94ae1eff" name="addresses" objectType="TABLE" physicalName="addresses" >
+      <remarks></remarks>
+      <folder id="FOLTAB1431" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX144" populated="true" UUID="c9275bf6-2620-4bd8-ba8a-63daff4b1171" clustered="false" name="addresses_pk" physicalName="addresses_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB145" populated="false" UUID="47f0f420-4690-4c1a-a444-b72847162d2b" name="appointments" objectType="TABLE" physicalName="appointments" >
+      <remarks></remarks>
+      <folder id="FOLTAB1451" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX146" populated="true" UUID="5b85b91b-8055-48cd-a3bb-597746389d76" clustered="false" name="appointments_pk" physicalName="appointments_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB147" populated="false" UUID="92ed7d1b-09c0-4bf7-a688-5536aa1806cd" name="customers" objectType="TABLE" physicalName="customers" >
+      <remarks></remarks>
+      <folder id="FOLTAB1471" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX148" populated="true" UUID="6887604f-e5ac-43df-8bbd-a5d42b8c25d4" clustered="false" name="customers_pk" physicalName="customers_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB149" populated="false" UUID="d8949172-3702-449e-9bd2-35dbcb450c2d" name="discountscheme" objectType="TABLE" physicalName="discountscheme" >
+      <remarks></remarks>
+      <folder id="FOLTAB1491" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX150" populated="true" UUID="924e9b57-290e-4650-93a1-7787105b371c" clustered="false" name="discountscheme_pk" physicalName="discountscheme_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB151" populated="false" UUID="1dc54577-ebbd-4913-8b4b-1b90c78452b2" name="historicalprice" objectType="TABLE" physicalName="historicalprice" >
+      <remarks></remarks>
+      <folder id="FOLTAB1511" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX152" populated="true" UUID="232ff30d-d3cf-4c37-b8ce-4771c8c62029" clustered="false" name="historicalprice_pk" physicalName="historicalprice_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB153" populated="false" UUID="86f1d95b-c97b-4a39-84ec-2b29224a3013" name="lineitems" objectType="TABLE" physicalName="lineitems" >
+      <remarks></remarks>
+      <folder id="FOLTAB1531" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX154" populated="true" UUID="9d3a3109-7249-441a-8d71-880dd781653c" clustered="false" name="lineitems_pk" physicalName="lineitems_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB155" populated="false" UUID="2d2c9da8-30dc-4873-8fce-7d36b7d561dc" name="orders" objectType="TABLE" physicalName="orders" >
+      <remarks></remarks>
+      <folder id="FOLTAB1551" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX156" populated="true" UUID="917264cb-c405-4121-8f8e-bd6530b03df5" clustered="false" name="orders_pk" physicalName="orders_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB157" populated="false" UUID="9926dff9-bee1-42b2-a713-ed403e009e2c" name="professors" objectType="TABLE" physicalName="professors" >
+      <remarks></remarks>
+      <folder id="FOLTAB1571" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX158" populated="true" UUID="6bf6f35a-f94a-4009-8326-d0ed13af488a" clustered="false" name="professors_pk" physicalName="professors_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB159" populated="false" UUID="3ad0aefa-9aa9-4e7a-951e-cff71af2613a" name="students" objectType="TABLE" physicalName="students" >
+      <remarks></remarks>
+      <folder id="FOLTAB1591" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX160" populated="true" UUID="1c62fdfb-e23e-4967-b5d0-47e8e49f2061" clustered="false" name="students_pk" physicalName="students_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
     </schema>
    </catalog>
    <relationships>
@@ -522,352 +592,355 @@
   </database>
  </source-databases>
  <target-database id="ppdb" dbcs-ref="DS0">
-  <table id="TAB142" populated="true" UUID="bd3a39fd-1f1c-4c87-924b-3992b6caa66a" name="Professors" objectType="TABLE" physicalName="Professors" >
+  <table id="TAB162" populated="true" UUID="bd3a39fd-1f1c-4c87-924b-3992b6caa66a" name="Professors" objectType="TABLE" physicalName="Professors" >
    <remarks></remarks>
-   <folder id="FOLTAB1421" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL143" populated="true" UUID="9a4a7c2a-2b4a-4bfc-8772-148cb5c9f92c" autoIncrement="false" autoIncrementSequenceName="Customers_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB1621" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL163" populated="true" UUID="9a4a7c2a-2b4a-4bfc-8772-148cb5c9f92c" autoIncrement="false" autoIncrementSequenceName="Customers_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL144" populated="true" UUID="e6a0d8d3-4361-4435-a04d-08e05b563752" autoIncrement="false" autoIncrementSequenceName="Professors_Department_seq" defaultValue="" name="Department" nullable="0" physicalName="Department" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL164" populated="true" UUID="e6a0d8d3-4361-4435-a04d-08e05b563752" autoIncrement="false" autoIncrementSequenceName="Professors_Department_seq" defaultValue="" name="Department" nullable="0" physicalName="Department" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL145" populated="true" UUID="2044196b-e103-4952-b83c-5d6f7b06d3fa" autoIncrement="false" autoIncrementSequenceName="Professors_Office_seq" defaultValue="" name="Office" nullable="0" physicalName="Office" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL165" populated="true" UUID="2044196b-e103-4952-b83c-5d6f7b06d3fa" autoIncrement="false" autoIncrementSequenceName="Professors_Office_seq" defaultValue="" name="Office" nullable="0" physicalName="Office" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL146" populated="true" UUID="b5475c16-1cbc-42b1-89a0-e1687ebee6b2" autoIncrement="false" autoIncrementSequenceName="Professors_Research_seq" defaultValue="" name="Research" nullable="0" physicalName="Research" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL166" populated="true" UUID="b5475c16-1cbc-42b1-89a0-e1687ebee6b2" autoIncrement="false" autoIncrementSequenceName="Professors_Research_seq" defaultValue="" name="Research" nullable="0" physicalName="Research" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1423" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB1623" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1422" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB1622" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1424" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX147" populated="true" UUID="39e28f6f-7ee9-4a47-88bd-8465280d6cec" clustered="false" name="Professors_PK" physicalName="professors_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC148" populated="true" UUID="5943cd18-92e2-4205-a873-55a243736a7f" ascendingOrDescending="UNSPECIFIED" column-ref="COL143" name="id" physicalName="id" />
+    <folder id="FOLTAB1624" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX167" populated="true" UUID="39e28f6f-7ee9-4a47-88bd-8465280d6cec" clustered="false" name="Professors_PK" physicalName="professors_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC168" populated="true" UUID="5943cd18-92e2-4205-a873-55a243736a7f" ascendingOrDescending="UNSPECIFIED" column-ref="COL163" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB149" populated="true" UUID="3051964d-5fff-4451-9c8a-dd3e3099f34e" name="Students" objectType="TABLE" physicalName="Students" >
+  <table id="TAB169" populated="true" UUID="3051964d-5fff-4451-9c8a-dd3e3099f34e" name="Students" objectType="TABLE" physicalName="Students" >
    <remarks></remarks>
-   <folder id="FOLTAB1491" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL150" populated="true" UUID="73835850-1bdf-4ea3-a550-51e3b8c68031" autoIncrement="false" autoIncrementSequenceName="Customers_id_seq_1" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB1691" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL170" populated="true" UUID="73835850-1bdf-4ea3-a550-51e3b8c68031" autoIncrement="false" autoIncrementSequenceName="Customers_id_seq_1" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL151" populated="true" UUID="08866859-ce25-4c4c-b97a-50f5cabf5a88" autoIncrement="false" autoIncrementSequenceName="Students_EnterDate_seq" defaultValue="" name="EnterDate" nullable="0" physicalName="EnterDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
+    <column id="COL171" populated="true" UUID="08866859-ce25-4c4c-b97a-50f5cabf5a88" autoIncrement="false" autoIncrementSequenceName="Students_EnterDate_seq" defaultValue="" name="EnterDate" nullable="0" physicalName="EnterDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
      <remarks></remarks>
     </column>
-    <column id="COL152" populated="true" UUID="78fe5e60-d0aa-476e-b70c-73907d13eeef" autoIncrement="false" autoIncrementSequenceName="Students_Major_seq" defaultValue="" name="Major" nullable="0" physicalName="Major" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL172" populated="true" UUID="78fe5e60-d0aa-476e-b70c-73907d13eeef" autoIncrement="false" autoIncrementSequenceName="Students_Major_seq" defaultValue="" name="Major" nullable="0" physicalName="Major" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL153" populated="true" UUID="2b13f6d1-33a0-4146-8805-2c3750e5f4c0" autoIncrement="false" autoIncrementSequenceName="Students_Minor_seq" defaultValue="" name="Minor" nullable="0" physicalName="Minor" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL173" populated="true" UUID="2b13f6d1-33a0-4146-8805-2c3750e5f4c0" autoIncrement="false" autoIncrementSequenceName="Students_Minor_seq" defaultValue="" name="Minor" nullable="0" physicalName="Minor" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL154" populated="true" UUID="c14ef43a-e8cc-4bd8-b0bd-3365155f79a1" autoIncrement="false" autoIncrementSequenceName="Students_GradDate_seq" defaultValue="" name="GradDate" nullable="0" physicalName="GradDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
+    <column id="COL174" populated="true" UUID="c14ef43a-e8cc-4bd8-b0bd-3365155f79a1" autoIncrement="false" autoIncrementSequenceName="Students_GradDate_seq" defaultValue="" name="GradDate" nullable="0" physicalName="GradDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1493" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB1693" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1492" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB1692" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1494" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX155" populated="true" UUID="648eff76-08a2-4edc-b833-888e6847dccd" clustered="false" name="Students_pk" physicalName="students_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC156" populated="true" UUID="310d1814-1665-4624-bc7e-6d15c245b100" ascendingOrDescending="UNSPECIFIED" column-ref="COL150" name="id" physicalName="id" />
+    <folder id="FOLTAB1694" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX175" populated="true" UUID="648eff76-08a2-4edc-b833-888e6847dccd" clustered="false" name="Students_pk" physicalName="students_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC176" populated="true" UUID="310d1814-1665-4624-bc7e-6d15c245b100" ascendingOrDescending="UNSPECIFIED" column-ref="COL170" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB157" populated="true" UUID="4e3cef0b-4f43-4e75-951f-b0a5a6c626dd" name="Customers" objectType="TABLE" physicalName="Customers" >
+  <table id="TAB177" populated="true" UUID="4e3cef0b-4f43-4e75-951f-b0a5a6c626dd" name="Customers" objectType="TABLE" physicalName="Customers" >
    <remarks></remarks>
-   <folder id="FOLTAB1571" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL158" populated="true" UUID="7853c610-7670-4d64-97a1-63e17464e02f" autoIncrement="false" autoIncrementSequenceName="Customers_id_seq_2" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="2" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB1771" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL178" populated="true" UUID="7853c610-7670-4d64-97a1-63e17464e02f" autoIncrement="false" autoIncrementSequenceName="Customers_id_seq_2" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="2" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL159" populated="true" UUID="39796ef1-1d31-4e12-9ad1-2ec02f507c69" autoIncrement="false" autoIncrementSequenceName="Customers_FirstName_seq" defaultValue="" name="FirstName" nullable="0" physicalName="FirstName" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL179" populated="true" UUID="39796ef1-1d31-4e12-9ad1-2ec02f507c69" autoIncrement="false" autoIncrementSequenceName="Customers_FirstName_seq" defaultValue="" name="FirstName" nullable="0" physicalName="FirstName" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL160" populated="true" UUID="c61876e0-d894-4def-a3e7-8c09d5983968" autoIncrement="false" autoIncrementSequenceName="Customers_LastName_seq" defaultValue="" name="LastName" nullable="0" physicalName="LastName" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL180" populated="true" UUID="c61876e0-d894-4def-a3e7-8c09d5983968" autoIncrement="false" autoIncrementSequenceName="Customers_LastName_seq" defaultValue="" name="LastName" nullable="1" physicalName="LastName" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL161" populated="true" UUID="eb4fd724-580f-44a7-94d2-94d9e3d36790" autoIncrement="false" autoIncrementSequenceName="Customers_DateOfBirth_seq" defaultValue="" name="DateOfBirth" nullable="0" physicalName="DateOfBirth" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
+    <column id="COL181" populated="true" UUID="eb4fd724-580f-44a7-94d2-94d9e3d36790" autoIncrement="false" autoIncrementSequenceName="Customers_DateOfBirth_seq" defaultValue="" name="DateOfBirth" nullable="1" physicalName="DateOfBirth" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
      <remarks></remarks>
     </column>
-    <column id="COL162" populated="true" UUID="b3546e61-f2f2-410f-8b9f-31caf975ef5e" autoIncrement="false" autoIncrementSequenceName="Customers_Phone_seq" defaultValue="" name="Phone" nullable="0" physicalName="Phone" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL182" populated="true" UUID="b3546e61-f2f2-410f-8b9f-31caf975ef5e" autoIncrement="false" autoIncrementSequenceName="Customers_Phone_seq" defaultValue="" name="Phone" nullable="1" physicalName="Phone" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL163" populated="true" UUID="ce412cb1-7ac0-4a7f-8b42-ffb5f9f86e02" autoIncrement="false" autoIncrementSequenceName="Customers_AddressId_seq" defaultValue="" name="AddressId" nullable="0" physicalName="AddressId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL183" populated="true" UUID="ce412cb1-7ac0-4a7f-8b42-ffb5f9f86e02" autoIncrement="false" autoIncrementSequenceName="Customers_AddressId_seq" defaultValue="" name="AddressId" nullable="0" physicalName="AddressId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1573" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB1773" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1572" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB1772" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1574" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX164" populated="true" UUID="e8d34772-abb4-42d2-a97f-bae5c5e8db3a" clustered="false" name="customers_pk" physicalName="customers_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC165" populated="true" UUID="79596297-25c1-4a83-a3cb-223fafe8f052" ascendingOrDescending="UNSPECIFIED" column-ref="COL158" name="id" physicalName="id" />
+    <folder id="FOLTAB1774" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX184" populated="true" UUID="e8d34772-abb4-42d2-a97f-bae5c5e8db3a" clustered="false" name="customers_pk" physicalName="customers_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC185" populated="true" UUID="79596297-25c1-4a83-a3cb-223fafe8f052" ascendingOrDescending="UNSPECIFIED" column-ref="COL178" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB166" populated="true" UUID="4637740b-9d99-48ba-a192-063042c83d08" name="Addresses" objectType="TABLE" physicalName="Addresses" >
+  <table id="TAB186" populated="true" UUID="4637740b-9d99-48ba-a192-063042c83d08" name="Addresses" objectType="TABLE" physicalName="Addresses" >
    <remarks></remarks>
-   <folder id="FOLTAB1661" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL167" populated="true" UUID="05b89b39-ed70-423b-9edc-133235871374" autoIncrement="true" autoIncrementSequenceName="Addresses_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB1861" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL187" populated="true" UUID="05b89b39-ed70-423b-9edc-133235871374" autoIncrement="true" autoIncrementSequenceName="Addresses_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL168" populated="true" UUID="f8d3d791-9214-4f24-b5a0-c7aee3a5d58d" autoIncrement="false" autoIncrementSequenceName="Addresses_Street_seq" defaultValue="" name="Street" nullable="0" physicalName="Street" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL188" populated="true" UUID="f8d3d791-9214-4f24-b5a0-c7aee3a5d58d" autoIncrement="false" autoIncrementSequenceName="Addresses_Street_seq" defaultValue="" name="Street" nullable="1" physicalName="Street" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL169" populated="true" UUID="1788f00e-7a1f-47c9-9110-16328b2ea19f" autoIncrement="false" autoIncrementSequenceName="Addresses_Number_seq" defaultValue="" name="Number" nullable="0" physicalName="Number" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL189" populated="true" UUID="1788f00e-7a1f-47c9-9110-16328b2ea19f" autoIncrement="false" autoIncrementSequenceName="Addresses_Number_seq" defaultValue="" name="Number" nullable="1" physicalName="Number" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL170" populated="true" UUID="6745afa3-2d0a-4877-aef3-2f349dfe53f3" autoIncrement="false" autoIncrementSequenceName="Addresses_ZipCode_seq" defaultValue="" name="ZipCode" nullable="0" physicalName="ZipCode" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL190" populated="true" UUID="6745afa3-2d0a-4877-aef3-2f349dfe53f3" autoIncrement="false" autoIncrementSequenceName="Addresses_ZipCode_seq" defaultValue="" name="ZipCode" nullable="1" physicalName="ZipCode" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL171" populated="true" UUID="557a7bb7-0b2b-42c8-969f-0700d95fb10b" autoIncrement="false" autoIncrementSequenceName="Addresses_City_seq" defaultValue="" name="City" nullable="0" physicalName="City" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL191" populated="true" UUID="557a7bb7-0b2b-42c8-969f-0700d95fb10b" autoIncrement="false" autoIncrementSequenceName="Addresses_City_seq" defaultValue="" name="City" nullable="1" physicalName="City" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL172" populated="true" UUID="7ba7d006-5673-4fe4-8556-354c7ed25fd2" autoIncrement="false" autoIncrementSequenceName="Addresses_State_seq" defaultValue="" name="State" nullable="0" physicalName="State" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL192" populated="true" UUID="7ba7d006-5673-4fe4-8556-354c7ed25fd2" autoIncrement="false" autoIncrementSequenceName="Addresses_State_seq" defaultValue="" name="State" nullable="1" physicalName="State" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1663" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB1863" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1662" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB1862" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1664" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX173" populated="true" UUID="1e5e50dc-e40a-4460-9c3a-0445e86e7d05" clustered="false" name="Addresses_pk" physicalName="addresses_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC174" populated="true" UUID="ea325e95-08fc-4c6f-9aff-8e9b333ef0a8" ascendingOrDescending="UNSPECIFIED" column-ref="COL167" name="id" physicalName="id" />
+    <folder id="FOLTAB1864" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX193" populated="true" UUID="1e5e50dc-e40a-4460-9c3a-0445e86e7d05" clustered="false" name="Addresses_pk" physicalName="addresses_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC194" populated="true" UUID="ea325e95-08fc-4c6f-9aff-8e9b333ef0a8" ascendingOrDescending="UNSPECIFIED" column-ref="COL187" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB175" populated="true" UUID="c3c99a87-2895-4ced-aff0-d686d6f71bd0" name="DiscountScheme" objectType="TABLE" physicalName="DiscountScheme" >
+  <table id="TAB195" populated="true" UUID="c3c99a87-2895-4ced-aff0-d686d6f71bd0" name="DiscountScheme" objectType="TABLE" physicalName="DiscountScheme" >
    <remarks></remarks>
-   <folder id="FOLTAB1751" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL176" populated="true" UUID="74b0a396-83a1-4384-b7dc-46c03e642c8d" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB1951" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL196" populated="true" UUID="74b0a396-83a1-4384-b7dc-46c03e642c8d" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL177" populated="true" UUID="575fbdec-ae1c-47d0-ac7b-9f531c015dc7" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_PriceDiscount_seq" defaultValue="" name="PriceDiscount" nullable="0" physicalName="PriceDiscount" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
+    <column id="COL197" populated="true" UUID="575fbdec-ae1c-47d0-ac7b-9f531c015dc7" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_PriceDiscount_seq" defaultValue="" name="PriceDiscount" nullable="1" physicalName="PriceDiscount" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
      <remarks></remarks>
     </column>
-    <column id="COL178" populated="true" UUID="98b357c1-3b31-4012-ab21-0e3b84bc60d6" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_PercentDiscount_seq" defaultValue="" name="PercentDiscount" nullable="0" physicalName="PercentDiscount" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
+    <column id="COL198" populated="true" UUID="98b357c1-3b31-4012-ab21-0e3b84bc60d6" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_PercentDiscount_seq" defaultValue="" name="PercentDiscount" nullable="1" physicalName="PercentDiscount" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
      <remarks></remarks>
     </column>
-    <column id="COL179" populated="true" UUID="3dd11d4d-1566-473f-9167-58c3867596de" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_CustomerType_seq" defaultValue="" name="CustomerType" nullable="0" physicalName="CustomerType" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL199" populated="true" UUID="3dd11d4d-1566-473f-9167-58c3867596de" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_CustomerType_seq" defaultValue="" name="CustomerType" nullable="1" physicalName="CustomerType" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL180" populated="true" UUID="b00f2df5-d179-4c55-b01f-1696bb702d9e" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_StartDate_seq" defaultValue="" name="StartDate" nullable="0" physicalName="StartDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
+    <column id="COL200" populated="true" UUID="b00f2df5-d179-4c55-b01f-1696bb702d9e" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_StartDate_seq" defaultValue="" name="StartDate" nullable="1" physicalName="StartDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
      <remarks></remarks>
     </column>
-    <column id="COL181" populated="true" UUID="b0e703c3-f78c-456b-9324-d12624dda949" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_EndDate_seq" defaultValue="" name="EndDate" nullable="0" physicalName="EndDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
+    <column id="COL201" populated="true" UUID="b0e703c3-f78c-456b-9324-d12624dda949" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_EndDate_seq" defaultValue="" name="EndDate" nullable="1" physicalName="EndDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1753" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB1953" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1752" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB1952" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1754" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX182" populated="true" UUID="88a754db-c74e-4327-ad56-83f6964dbfb9" clustered="false" name="DiscountScheme_pk" physicalName="discountscheme_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC183" populated="true" UUID="f1e2d56e-379c-4da9-befc-3ed3d2ab1f43" ascendingOrDescending="UNSPECIFIED" column-ref="COL176" name="id" physicalName="id" />
+    <folder id="FOLTAB1954" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX202" populated="true" UUID="88a754db-c74e-4327-ad56-83f6964dbfb9" clustered="false" name="DiscountScheme_pk" physicalName="discountscheme_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC203" populated="true" UUID="f1e2d56e-379c-4da9-befc-3ed3d2ab1f43" ascendingOrDescending="UNSPECIFIED" column-ref="COL196" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB184" populated="true" UUID="8ecf7314-e3ff-4f11-b1f8-93d9cc2f5347" name="Activities" objectType="TABLE" physicalName="Activities" >
+  <table id="TAB204" populated="true" UUID="8ecf7314-e3ff-4f11-b1f8-93d9cc2f5347" name="Activities" objectType="TABLE" physicalName="Activities" >
    <remarks></remarks>
-   <folder id="FOLTAB1841" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL185" populated="true" UUID="c106541f-6509-4adf-85de-ac001aee57aa" autoIncrement="false" autoIncrementSequenceName="Activities_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB2041" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL205" populated="true" UUID="c106541f-6509-4adf-85de-ac001aee57aa" autoIncrement="false" autoIncrementSequenceName="Activities_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL186" populated="true" UUID="346078bc-2785-424f-ab90-7d70480b1013" autoIncrement="false" autoIncrementSequenceName="Activities_Name_seq" defaultValue="" name="Name" nullable="0" physicalName="Name" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL206" populated="true" UUID="346078bc-2785-424f-ab90-7d70480b1013" autoIncrement="false" autoIncrementSequenceName="Activities_Name_seq" defaultValue="" name="Name" nullable="0" physicalName="Name" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL187" populated="true" UUID="896ffe7d-8c7f-4ad8-86fd-2b0be06eb37c" autoIncrement="false" autoIncrementSequenceName="Activities_Price_seq" defaultValue="" name="Price" nullable="0" physicalName="Price" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
+    <column id="COL207" populated="true" UUID="896ffe7d-8c7f-4ad8-86fd-2b0be06eb37c" autoIncrement="false" autoIncrementSequenceName="Activities_Price_seq" defaultValue="" name="Price" nullable="0" physicalName="Price" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1843" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB2043" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1842" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB2042" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1844" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX188" populated="true" UUID="49906211-e1f8-40a5-927b-d035eb04bbab" clustered="false" name="Activities_pk" physicalName="activities_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC189" populated="true" UUID="2196ec49-17d7-410d-9e0c-d35896e7c687" ascendingOrDescending="UNSPECIFIED" column-ref="COL185" name="id" physicalName="id" />
+    <folder id="FOLTAB2044" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX208" populated="true" UUID="49906211-e1f8-40a5-927b-d035eb04bbab" clustered="false" name="Activities_pk" physicalName="activities_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC209" populated="true" UUID="2196ec49-17d7-410d-9e0c-d35896e7c687" ascendingOrDescending="UNSPECIFIED" column-ref="COL205" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB190" populated="true" UUID="1aa5f8cb-66ed-4983-8d57-c8144f0849b9" name="HistoricalPrice" objectType="TABLE" physicalName="HistoricalPrice" >
+  <table id="TAB210" populated="true" UUID="1aa5f8cb-66ed-4983-8d57-c8144f0849b9" name="HistoricalPrice" objectType="TABLE" physicalName="HistoricalPrice" >
    <remarks></remarks>
-   <folder id="FOLTAB1901" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL191" populated="true" UUID="24c3b9b7-773c-4b5a-a95e-6ac50ffd4075" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="2" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB2101" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL211" populated="true" UUID="24c3b9b7-773c-4b5a-a95e-6ac50ffd4075" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="2" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL192" populated="true" UUID="d0c2c6bb-da97-456f-a0af-3e4eac36e909" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_Date_seq" defaultValue="" name="Date" nullable="0" physicalName="Date" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
+    <column id="COL212" populated="true" UUID="d0c2c6bb-da97-456f-a0af-3e4eac36e909" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_Date_seq" defaultValue="" name="Date" nullable="0" physicalName="Date" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
      <remarks></remarks>
     </column>
-    <column id="COL193" populated="true" UUID="e45f9200-f32b-46b5-af28-0ba4ca69d896" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_Price_seq" defaultValue="" name="Price" nullable="0" physicalName="Price" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
+    <column id="COL213" populated="true" UUID="e45f9200-f32b-46b5-af28-0ba4ca69d896" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_Price_seq" defaultValue="" name="Price" nullable="0" physicalName="Price" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
      <remarks></remarks>
     </column>
-    <column id="COL194" populated="true" UUID="eaf82148-d140-4075-a11b-9337fb5c6ddb" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_ActivityId_seq" defaultValue="" name="ActivityId" nullable="0" physicalName="ActivityId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL214" populated="true" UUID="eaf82148-d140-4075-a11b-9337fb5c6ddb" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_ActivityId_seq" defaultValue="" name="ActivityId" nullable="0" physicalName="ActivityId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1903" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB2103" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1902" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB2102" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1904" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX195" populated="true" UUID="a83cd8e9-6494-4ed0-890a-54bb51656dc5" clustered="false" name="HistoricalPrice_pk" physicalName="historicalprice_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC196" populated="true" UUID="663c9b1d-f520-4da4-aa0c-461aa9e2a19a" ascendingOrDescending="UNSPECIFIED" column-ref="COL191" name="id" physicalName="id" />
+    <folder id="FOLTAB2104" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX215" populated="true" UUID="a83cd8e9-6494-4ed0-890a-54bb51656dc5" clustered="false" name="HistoricalPrice_pk" physicalName="historicalprice_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC216" populated="true" UUID="663c9b1d-f520-4da4-aa0c-461aa9e2a19a" ascendingOrDescending="UNSPECIFIED" column-ref="COL211" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB197" populated="true" UUID="5f5b6700-fadc-42f1-827c-5170773c5216" name="Orders" objectType="TABLE" physicalName="Orders" >
+  <table id="TAB217" populated="true" UUID="5f5b6700-fadc-42f1-827c-5170773c5216" name="Orders" objectType="TABLE" physicalName="Orders" >
    <remarks></remarks>
-   <folder id="FOLTAB1971" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL198" populated="true" UUID="aa44fcc0-f86a-4fce-a315-4b92149aad33" autoIncrement="false" autoIncrementSequenceName="Orders_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="3" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB2171" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL218" populated="true" UUID="aa44fcc0-f86a-4fce-a315-4b92149aad33" autoIncrement="false" autoIncrementSequenceName="Orders_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="3" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL199" populated="true" UUID="edb35bc3-c1a0-47cd-b804-b46abdb9cc66" autoIncrement="false" autoIncrementSequenceName="Orders_Date_seq" defaultValue="" name="Date" nullable="0" physicalName="Date" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
+    <column id="COL219" populated="true" UUID="edb35bc3-c1a0-47cd-b804-b46abdb9cc66" autoIncrement="false" autoIncrementSequenceName="Orders_Date_seq" defaultValue="" name="Date" nullable="0" physicalName="Date" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
      <remarks></remarks>
     </column>
-    <column id="COL200" populated="true" UUID="b682e1f1-d187-49ea-a9a8-41d3b19294c8" autoIncrement="false" autoIncrementSequenceName="Orders_Time_seq" defaultValue="" name="Time" nullable="0" physicalName="Time" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="92" userDefinedTypeUUID="10d6960f-169d-47c2-860a-37341342b1d5" >
+    <column id="COL220" populated="true" UUID="b682e1f1-d187-49ea-a9a8-41d3b19294c8" autoIncrement="false" autoIncrementSequenceName="Orders_Time_seq" defaultValue="" name="Time" nullable="0" physicalName="Time" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="92" userDefinedTypeUUID="10d6960f-169d-47c2-860a-37341342b1d5" >
      <remarks></remarks>
     </column>
-    <column id="COL201" populated="true" UUID="5acb0c86-1c70-45d6-aaf4-6237a0f3e860" autoIncrement="false" autoIncrementSequenceName="Orders_CustomerId_seq" defaultValue="" name="CustomerId" nullable="0" physicalName="CustomerId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL221" populated="true" UUID="5acb0c86-1c70-45d6-aaf4-6237a0f3e860" autoIncrement="false" autoIncrementSequenceName="Orders_CustomerId_seq" defaultValue="" name="CustomerId" nullable="0" physicalName="CustomerId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL202" populated="true" UUID="e3c60560-348c-4b3a-8855-907a2deb6ff9" autoIncrement="false" autoIncrementSequenceName="Orders_DiscountApplied_seq" defaultValue="" name="DiscountApplied" nullable="0" physicalName="DiscountApplied" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
+    <column id="COL222" populated="true" UUID="e3c60560-348c-4b3a-8855-907a2deb6ff9" autoIncrement="false" autoIncrementSequenceName="Orders_DiscountApplied_seq" defaultValue="" name="DiscountApplied" nullable="0" physicalName="DiscountApplied" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
      <remarks></remarks>
     </column>
-    <column id="COL203" populated="true" UUID="6be12563-39f8-4f3d-8849-8162a9054681" autoIncrement="false" autoIncrementSequenceName="Orders_TotalPrice_seq" defaultValue="" name="TotalPrice" nullable="0" physicalName="TotalPrice" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL223" populated="true" UUID="6be12563-39f8-4f3d-8849-8162a9054681" autoIncrement="false" autoIncrementSequenceName="Orders_TotalPrice_seq" defaultValue="" name="TotalPrice" nullable="0" physicalName="TotalPrice" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL204" populated="true" UUID="0715fc3d-6c9d-46ca-85e1-3fffb2da9b39" autoIncrement="false" autoIncrementSequenceName="Orders_DiscountSchemeId_seq" defaultValue="" name="DiscountSchemeId" nullable="0" physicalName="DiscountSchemeId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL224" populated="true" UUID="0715fc3d-6c9d-46ca-85e1-3fffb2da9b39" autoIncrement="false" autoIncrementSequenceName="Orders_DiscountSchemeId_seq" defaultValue="" name="DiscountSchemeId" nullable="0" physicalName="DiscountSchemeId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1973" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB2173" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1972" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB2172" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1974" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX205" populated="true" UUID="cea841bb-d8d4-4218-be7c-954e427b2dd8" clustered="false" name="Orders_pk" physicalName="orders_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC206" populated="true" UUID="320662ea-226c-4339-a8a5-33e5bf7dcc37" ascendingOrDescending="UNSPECIFIED" column-ref="COL198" name="id" physicalName="id" />
+    <folder id="FOLTAB2174" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX225" populated="true" UUID="cea841bb-d8d4-4218-be7c-954e427b2dd8" clustered="false" name="Orders_pk" physicalName="orders_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC226" populated="true" UUID="320662ea-226c-4339-a8a5-33e5bf7dcc37" ascendingOrDescending="UNSPECIFIED" column-ref="COL218" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB207" populated="true" UUID="2a3020bc-f2a3-49c5-9a31-b6d9d81a58e5" name="LineItems" objectType="TABLE" physicalName="LineItems" >
+  <table id="TAB227" populated="true" UUID="2a3020bc-f2a3-49c5-9a31-b6d9d81a58e5" name="LineItems" objectType="TABLE" physicalName="LineItems" >
    <remarks></remarks>
-   <folder id="FOLTAB2071" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL208" populated="true" UUID="378cc769-1ea8-413c-8897-d5f731b03390" autoIncrement="false" autoIncrementSequenceName="LineItems_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="4" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB2271" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL228" populated="true" UUID="378cc769-1ea8-413c-8897-d5f731b03390" autoIncrement="false" autoIncrementSequenceName="LineItems_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="4" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL209" populated="true" UUID="befb5b28-b210-4277-a23b-064c2aac46f3" autoIncrement="false" autoIncrementSequenceName="LineItems_ActivityId_seq" defaultValue="" name="ActivityId" nullable="0" physicalName="ActivityId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL229" populated="true" UUID="befb5b28-b210-4277-a23b-064c2aac46f3" autoIncrement="false" autoIncrementSequenceName="LineItems_ActivityId_seq" defaultValue="" name="ActivityId" nullable="0" physicalName="ActivityId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL210" populated="true" UUID="8acac5ca-2c2e-45f0-9ecc-dc97302f89b6" autoIncrement="false" autoIncrementSequenceName="LineItems_Quantity_seq" defaultValue="" name="Quantity" nullable="0" physicalName="Quantity" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL230" populated="true" UUID="8acac5ca-2c2e-45f0-9ecc-dc97302f89b6" autoIncrement="false" autoIncrementSequenceName="LineItems_Quantity_seq" defaultValue="" name="Quantity" nullable="0" physicalName="Quantity" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL211" populated="true" UUID="2341023a-2574-4b33-bbe4-3d9df57e92c5" autoIncrement="false" autoIncrementSequenceName="LineItems_AppointmentId_seq" defaultValue="" name="AppointmentId" nullable="0" physicalName="AppointmentId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL231" populated="true" UUID="2341023a-2574-4b33-bbe4-3d9df57e92c5" autoIncrement="false" autoIncrementSequenceName="LineItems_AppointmentId_seq" defaultValue="" name="AppointmentId" nullable="0" physicalName="AppointmentId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL212" populated="true" UUID="d9e6100c-0c22-4718-bf4f-dafca331ed7d" autoIncrement="false" autoIncrementSequenceName="LineItems_OrderId_seq" defaultValue="" name="OrderId" nullable="0" physicalName="OrderId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL232" populated="true" UUID="d9e6100c-0c22-4718-bf4f-dafca331ed7d" autoIncrement="false" autoIncrementSequenceName="LineItems_OrderId_seq" defaultValue="" name="OrderId" nullable="0" physicalName="OrderId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB2073" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB2273" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB2072" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB2272" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB2074" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX213" populated="true" UUID="505b84db-4d61-426e-a99c-9ed0962c068c" clustered="false" name="LineItems_pk" physicalName="lineitems_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC214" populated="true" UUID="b119ef19-afe0-4246-a3e3-23e29860549e" ascendingOrDescending="UNSPECIFIED" column-ref="COL208" name="id" physicalName="id" />
+    <folder id="FOLTAB2274" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX233" populated="true" UUID="505b84db-4d61-426e-a99c-9ed0962c068c" clustered="false" name="LineItems_pk" physicalName="lineitems_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC234" populated="true" UUID="b119ef19-afe0-4246-a3e3-23e29860549e" ascendingOrDescending="UNSPECIFIED" column-ref="COL228" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB215" populated="true" UUID="249e0595-ee6a-4eeb-9f1c-311175da953b" name="Appointments" objectType="TABLE" physicalName="Appointments" >
+  <table id="TAB235" populated="true" UUID="249e0595-ee6a-4eeb-9f1c-311175da953b" name="Appointments" objectType="TABLE" physicalName="Appointments" >
    <remarks></remarks>
-   <folder id="FOLTAB2151" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL216" populated="true" UUID="cf467287-d353-4783-a565-744273862c00" autoIncrement="true" autoIncrementSequenceName="Appointments_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB2351" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL236" populated="true" UUID="cf467287-d353-4783-a565-744273862c00" autoIncrement="true" autoIncrementSequenceName="Appointments_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL217" populated="true" UUID="c61430aa-41cb-44aa-b7b6-852db8430433" autoIncrement="false" autoIncrementSequenceName="Appointments_StartTime_seq" defaultValue="" name="StartTime" nullable="0" physicalName="StartTime" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="93" userDefinedTypeUUID="6497d8de-0e00-40d6-a42e-e2adca83be64" >
+    <column id="COL237" populated="true" UUID="c61430aa-41cb-44aa-b7b6-852db8430433" autoIncrement="false" autoIncrementSequenceName="Appointments_StartTime_seq" defaultValue="" name="StartTime" nullable="0" physicalName="StartTime" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="93" userDefinedTypeUUID="6497d8de-0e00-40d6-a42e-e2adca83be64" >
      <remarks></remarks>
     </column>
-    <column id="COL218" populated="true" UUID="15520c61-465b-4b61-8e3c-f1133a26cd5d" autoIncrement="false" autoIncrementSequenceName="Appointments_EndTime_seq" defaultValue="" name="EndTime" nullable="0" physicalName="EndTime" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="93" userDefinedTypeUUID="6497d8de-0e00-40d6-a42e-e2adca83be64" >
+    <column id="COL238" populated="true" UUID="15520c61-465b-4b61-8e3c-f1133a26cd5d" autoIncrement="false" autoIncrementSequenceName="Appointments_EndTime_seq" defaultValue="" name="EndTime" nullable="0" physicalName="EndTime" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="93" userDefinedTypeUUID="6497d8de-0e00-40d6-a42e-e2adca83be64" >
      <remarks></remarks>
     </column>
-    <column id="COL219" populated="true" UUID="ea9d1b8a-bfb0-4581-9646-3d45f3254b5d" autoIncrement="false" autoIncrementSequenceName="Appointments_ActivityId_seq" defaultValue="" name="ActivityId" nullable="0" physicalName="ActivityId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL239" populated="true" UUID="ea9d1b8a-bfb0-4581-9646-3d45f3254b5d" autoIncrement="false" autoIncrementSequenceName="Appointments_ActivityId_seq" defaultValue="" name="ActivityId" nullable="0" physicalName="ActivityId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL220" populated="true" UUID="bcc446d6-af14-40f6-9de1-c8a97b0b0080" autoIncrement="false" autoIncrementSequenceName="Appointments_CustomerId_seq" defaultValue="" name="CustomerId" nullable="0" physicalName="CustomerId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL240" populated="true" UUID="bcc446d6-af14-40f6-9de1-c8a97b0b0080" autoIncrement="false" autoIncrementSequenceName="Appointments_CustomerId_seq" defaultValue="" name="CustomerId" nullable="0" physicalName="CustomerId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+     <remarks></remarks>
+    </column>
+    <column id="COL241" populated="true" UUID="28ba76d6-0915-4e2f-8b82-b9611d486faa" autoIncrement="false" autoIncrementSequenceName="Appointments_status_seq" defaultValue="" name="status" nullable="1" physicalName="status" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB2153" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB2353" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB2152" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB2352" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB2154" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX221" populated="true" UUID="b4516abd-c745-4d78-8ec7-51742ae30c52" clustered="false" name="Appointments_pk" physicalName="appointments_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC222" populated="true" UUID="cab84aea-ad1b-43ae-add3-0b7ff4ac6d64" ascendingOrDescending="UNSPECIFIED" column-ref="COL216" name="id" physicalName="id" />
+    <folder id="FOLTAB2354" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX242" populated="true" UUID="b4516abd-c745-4d78-8ec7-51742ae30c52" clustered="false" name="Appointments_pk" physicalName="appointments_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC243" populated="true" UUID="cab84aea-ad1b-43ae-add3-0b7ff4ac6d64" ascendingOrDescending="UNSPECIFIED" column-ref="COL236" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
   <relationships>
-   <relationship id="REL223" populated="true" UUID="27275a2e-9a0f-499a-8b64-e49fd4206377" deferrability="7" deleteRule="3" fk-table-ref="TAB197" fkCardinality="7" identifying="true" name="Customers_Orders_fk" physicalName="customers_orders_fk" pk-table-ref="TAB157" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP224" populated="true" UUID="37b0ec4a-22da-44db-ac68-5903697bf438" fk-column-ref="COL201" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL158" />
+   <relationship id="REL244" populated="true" UUID="27275a2e-9a0f-499a-8b64-e49fd4206377" deferrability="7" deleteRule="3" fk-table-ref="TAB217" fkCardinality="7" identifying="true" name="Customers_Orders_fk" physicalName="customers_orders_fk" pk-table-ref="TAB177" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP245" populated="true" UUID="37b0ec4a-22da-44db-ac68-5903697bf438" fk-column-ref="COL221" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL178" />
    </relationship>
-   <relationship id="REL225" populated="true" UUID="8b06a95b-ca37-4901-a817-c08b299ebecc" deferrability="7" deleteRule="3" fk-table-ref="TAB149" fkCardinality="7" identifying="true" name="Customers_Students_fk" physicalName="customers_students_fk" pk-table-ref="TAB157" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP226" populated="true" UUID="bc869b75-4d71-41fd-92f5-80a37de9598f" fk-column-ref="COL150" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL158" />
+   <relationship id="REL246" populated="true" UUID="8b06a95b-ca37-4901-a817-c08b299ebecc" deferrability="7" deleteRule="3" fk-table-ref="TAB169" fkCardinality="7" identifying="true" name="Customers_Students_fk" physicalName="customers_students_fk" pk-table-ref="TAB177" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP247" populated="true" UUID="bc869b75-4d71-41fd-92f5-80a37de9598f" fk-column-ref="COL170" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL178" />
    </relationship>
-   <relationship id="REL227" populated="true" UUID="b173357c-d281-4ff2-aef6-60251c637bab" deferrability="7" deleteRule="3" fk-table-ref="TAB142" fkCardinality="7" identifying="true" name="Customers_Professors_fk" physicalName="customers_professors_fk" pk-table-ref="TAB157" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP228" populated="true" UUID="33eb0a74-dab7-4409-8dab-30e492b5148d" fk-column-ref="COL143" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL158" />
+   <relationship id="REL248" populated="true" UUID="b173357c-d281-4ff2-aef6-60251c637bab" deferrability="7" deleteRule="3" fk-table-ref="TAB162" fkCardinality="7" identifying="true" name="Customers_Professors_fk" physicalName="customers_professors_fk" pk-table-ref="TAB177" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP249" populated="true" UUID="33eb0a74-dab7-4409-8dab-30e492b5148d" fk-column-ref="COL163" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL178" />
    </relationship>
-   <relationship id="REL229" populated="true" UUID="3a0ec06e-2a73-4e83-9754-0cf2f7558f63" deferrability="7" deleteRule="3" fk-table-ref="TAB157" fkCardinality="7" identifying="true" name="Addresses_Customers_fk" physicalName="addresses_customers_fk" pk-table-ref="TAB166" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP230" populated="true" UUID="f1a63702-6a38-4bdf-b4ed-33df637115d1" fk-column-ref="COL163" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL167" />
+   <relationship id="REL250" populated="true" UUID="3a0ec06e-2a73-4e83-9754-0cf2f7558f63" deferrability="7" deleteRule="3" fk-table-ref="TAB177" fkCardinality="7" identifying="true" name="Addresses_Customers_fk" physicalName="addresses_customers_fk" pk-table-ref="TAB186" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP251" populated="true" UUID="f1a63702-6a38-4bdf-b4ed-33df637115d1" fk-column-ref="COL183" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL187" />
    </relationship>
-   <relationship id="REL231" populated="true" UUID="5e5ca12b-6c03-4be4-b1c9-c4fc7d8826cf" deferrability="7" deleteRule="3" fk-table-ref="TAB197" fkCardinality="7" identifying="true" name="DiscountScheme_Orders_fk" physicalName="discountscheme_orders_fk" pk-table-ref="TAB175" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP232" populated="true" UUID="3ff2d20f-9253-46f0-8363-80c16fe779c9" fk-column-ref="COL204" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL176" />
+   <relationship id="REL252" populated="true" UUID="5e5ca12b-6c03-4be4-b1c9-c4fc7d8826cf" deferrability="7" deleteRule="3" fk-table-ref="TAB217" fkCardinality="7" identifying="true" name="DiscountScheme_Orders_fk" physicalName="discountscheme_orders_fk" pk-table-ref="TAB195" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP253" populated="true" UUID="3ff2d20f-9253-46f0-8363-80c16fe779c9" fk-column-ref="COL224" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL196" />
    </relationship>
-   <relationship id="REL233" populated="true" UUID="6b56258e-8f4f-4ffe-b8ad-21b2a5f3bd61" deferrability="7" deleteRule="3" fk-table-ref="TAB190" fkCardinality="7" identifying="true" name="Activities_HistoricalPrice_fk" physicalName="activities_historicalprice_fk" pk-table-ref="TAB184" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP234" populated="true" UUID="aea03873-1f2a-47f3-a335-7bb356da17a3" fk-column-ref="COL194" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL185" />
+   <relationship id="REL254" populated="true" UUID="6b56258e-8f4f-4ffe-b8ad-21b2a5f3bd61" deferrability="7" deleteRule="3" fk-table-ref="TAB210" fkCardinality="7" identifying="true" name="Activities_HistoricalPrice_fk" physicalName="activities_historicalprice_fk" pk-table-ref="TAB204" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP255" populated="true" UUID="aea03873-1f2a-47f3-a335-7bb356da17a3" fk-column-ref="COL214" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL205" />
    </relationship>
-   <relationship id="REL235" populated="true" UUID="7b406951-2b45-4a42-a83e-a9405dc90989" deferrability="7" deleteRule="3" fk-table-ref="TAB207" fkCardinality="7" identifying="true" name="Activities_LineItems_fk" physicalName="activities_lineitems_fk" pk-table-ref="TAB184" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP236" populated="true" UUID="29b5df45-8f46-4bf5-8c9a-8bb2ec76d96c" fk-column-ref="COL209" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL185" />
+   <relationship id="REL256" populated="true" UUID="7b406951-2b45-4a42-a83e-a9405dc90989" deferrability="7" deleteRule="3" fk-table-ref="TAB227" fkCardinality="7" identifying="true" name="Activities_LineItems_fk" physicalName="activities_lineitems_fk" pk-table-ref="TAB204" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP257" populated="true" UUID="29b5df45-8f46-4bf5-8c9a-8bb2ec76d96c" fk-column-ref="COL229" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL205" />
    </relationship>
-   <relationship id="REL237" populated="true" UUID="3fb93eec-d832-4734-be5b-2f74deaa821b" deferrability="7" deleteRule="3" fk-table-ref="TAB207" fkCardinality="7" identifying="true" name="Orders_LineItems_fk" physicalName="orders_lineitems_fk" pk-table-ref="TAB197" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP238" populated="true" UUID="b93ba463-fe7d-44b4-b5e7-3a81074dcdda" fk-column-ref="COL212" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL198" />
+   <relationship id="REL258" populated="true" UUID="3fb93eec-d832-4734-be5b-2f74deaa821b" deferrability="7" deleteRule="3" fk-table-ref="TAB227" fkCardinality="7" identifying="true" name="Orders_LineItems_fk" physicalName="orders_lineitems_fk" pk-table-ref="TAB217" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP259" populated="true" UUID="b93ba463-fe7d-44b4-b5e7-3a81074dcdda" fk-column-ref="COL232" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL218" />
    </relationship>
-   <relationship id="REL239" populated="true" UUID="acd37020-7d63-4d41-a0a6-0d978c211685" deferrability="7" deleteRule="3" fk-table-ref="TAB207" fkCardinality="7" identifying="true" name="Appointments_LineItems_fk" physicalName="appointments_lineitems_fk" pk-table-ref="TAB215" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP240" populated="true" UUID="bddfc5e2-e17e-405a-94ce-d71d09141cf2" fk-column-ref="COL211" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL216" />
+   <relationship id="REL260" populated="true" UUID="acd37020-7d63-4d41-a0a6-0d978c211685" deferrability="7" deleteRule="3" fk-table-ref="TAB227" fkCardinality="7" identifying="true" name="Appointments_LineItems_fk" physicalName="appointments_lineitems_fk" pk-table-ref="TAB235" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP261" populated="true" UUID="bddfc5e2-e17e-405a-94ce-d71d09141cf2" fk-column-ref="COL231" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL236" />
    </relationship>
   </relationships>
  </target-database>
- <ddl-generator type="ca.sqlpower.architect.ddl.PostgresDDLGenerator" allow-connection="false" target-schema="brcm"> </ddl-generator>
+ <ddl-generator type="ca.sqlpower.architect.ddl.PostgresDDLGenerator" allow-connection="false" target-schema="public"> </ddl-generator>
  <liquibase-settings useSeparateChangeSets="false" generateId="false" idStart="1"/>
  <create-kettle-job-settings filePath="" jobName="" schemaName="" kettleJoinType="0" savingToFile="true" />
  <play-pen zoom="1.0" viewportX="0" viewportY="0" relationship-style="rectilinear" names-displayLogicalNames="true" showPrimaryTag="true" showForeignTag="true" showAlternateTag="true" columnVisibility="ALL" relationshipLabelVisibility="true">
-  <table-pane table-ref="TAB142" x="24" y="24" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB149" x="27" y="132" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB157" x="310" y="45" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB166" x="652" y="47" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB175" x="606" y="456" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB184" x="33" y="273" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB190" x="20" y="457" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB197" x="601" y="239" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB207" x="290" y="454" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB215" x="312" y="260" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-link relationship-ref="REL237" pkConnection="0.03355704697986577" fkConnection="0.9127272727272727" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
-  <table-link relationship-ref="REL231" pkConnection="0.9214876033057852" fkConnection="0.7651006711409396" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="72"/>
-  <table-link relationship-ref="REL223" pkConnection="0.8317757009345794" fkConnection="0.15100671140939598" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
-  <table-link relationship-ref="REL233" pkConnection="0.17098445595854922" fkConnection="0.1908713692946058" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
-  <table-link relationship-ref="REL235" pkConnection="0.533678756476684" fkConnection="0.08727272727272728" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
-  <table-link relationship-ref="REL239" pkConnection="0.19457013574660634" fkConnection="0.23636363636363636" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
-  <table-link relationship-ref="REL225" pkConnection="0.8740157480314961" fkConnection="0.21621621621621623" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="18"/>
-  <table-link relationship-ref="REL227" pkConnection="0.2440944881889764" fkConnection="0.5473684210526316" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="18"/>
-  <table-link relationship-ref="REL229" pkConnection="0.4881889763779528" fkConnection="0.5039370078740157" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="18"/>
+  <table-pane table-ref="TAB162" x="24" y="24" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB169" x="27" y="132" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB177" x="310" y="45" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB186" x="652" y="47" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB195" x="606" y="456" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB204" x="33" y="273" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB210" x="20" y="457" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB217" x="601" y="239" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB227" x="290" y="454" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB235" x="312" y="260" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-link relationship-ref="REL258" pkConnection="0.03355704697986577" fkConnection="0.9127272727272727" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
+  <table-link relationship-ref="REL252" pkConnection="0.9214876033057852" fkConnection="0.7651006711409396" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="72"/>
+  <table-link relationship-ref="REL244" pkConnection="0.8317757009345794" fkConnection="0.15100671140939598" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
+  <table-link relationship-ref="REL254" pkConnection="0.17098445595854922" fkConnection="0.1908713692946058" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
+  <table-link relationship-ref="REL256" pkConnection="0.533678756476684" fkConnection="0.08727272727272728" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
+  <table-link relationship-ref="REL260" pkConnection="0.19457013574660634" fkConnection="0.23636363636363636" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
+  <table-link relationship-ref="REL246" pkConnection="0.8740157480314961" fkConnection="0.21621621621621623" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="18"/>
+  <table-link relationship-ref="REL248" pkConnection="0.2440944881889764" fkConnection="0.5473684210526316" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="18"/>
+  <table-link relationship-ref="REL250" pkConnection="0.4881889763779528" fkConnection="0.5039370078740157" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="18"/>
  </play-pen>
  <critic-manager>
   <critic-grouping platformType="Generic" enabled="true">
@@ -916,7 +989,7 @@
  <profiles topNCount="10">
   </profiles>
   <olap>
-   <olap-session id="0" db-ref="">
+   <olap-session id="0">
     <Schema id="1" name="BRCM_DB"/>
    </olap-session>
   </olap>

docs/brcm_sql.architect~

@@ -506,6 +506,76 @@
        </index>
       </folder>
      </table>
+     <table id="TAB141" populated="false" UUID="97ce0b19-dfbc-49b9-9b60-b4a303df3440" name="activities" objectType="TABLE" physicalName="activities" >
+      <remarks></remarks>
+      <folder id="FOLTAB1411" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX142" populated="true" UUID="230d17fa-5877-4215-b123-99c42cda1f3b" clustered="false" name="activities_pk" physicalName="activities_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB143" populated="false" UUID="7a50d5fe-b673-495b-a343-504e94ae1eff" name="addresses" objectType="TABLE" physicalName="addresses" >
+      <remarks></remarks>
+      <folder id="FOLTAB1431" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX144" populated="true" UUID="c9275bf6-2620-4bd8-ba8a-63daff4b1171" clustered="false" name="addresses_pk" physicalName="addresses_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB145" populated="false" UUID="47f0f420-4690-4c1a-a444-b72847162d2b" name="appointments" objectType="TABLE" physicalName="appointments" >
+      <remarks></remarks>
+      <folder id="FOLTAB1451" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX146" populated="true" UUID="5b85b91b-8055-48cd-a3bb-597746389d76" clustered="false" name="appointments_pk" physicalName="appointments_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB147" populated="false" UUID="92ed7d1b-09c0-4bf7-a688-5536aa1806cd" name="customers" objectType="TABLE" physicalName="customers" >
+      <remarks></remarks>
+      <folder id="FOLTAB1471" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX148" populated="true" UUID="6887604f-e5ac-43df-8bbd-a5d42b8c25d4" clustered="false" name="customers_pk" physicalName="customers_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB149" populated="false" UUID="d8949172-3702-449e-9bd2-35dbcb450c2d" name="discountscheme" objectType="TABLE" physicalName="discountscheme" >
+      <remarks></remarks>
+      <folder id="FOLTAB1491" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX150" populated="true" UUID="924e9b57-290e-4650-93a1-7787105b371c" clustered="false" name="discountscheme_pk" physicalName="discountscheme_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB151" populated="false" UUID="1dc54577-ebbd-4913-8b4b-1b90c78452b2" name="historicalprice" objectType="TABLE" physicalName="historicalprice" >
+      <remarks></remarks>
+      <folder id="FOLTAB1511" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX152" populated="true" UUID="232ff30d-d3cf-4c37-b8ce-4771c8c62029" clustered="false" name="historicalprice_pk" physicalName="historicalprice_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB153" populated="false" UUID="86f1d95b-c97b-4a39-84ec-2b29224a3013" name="lineitems" objectType="TABLE" physicalName="lineitems" >
+      <remarks></remarks>
+      <folder id="FOLTAB1531" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX154" populated="true" UUID="9d3a3109-7249-441a-8d71-880dd781653c" clustered="false" name="lineitems_pk" physicalName="lineitems_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB155" populated="false" UUID="2d2c9da8-30dc-4873-8fce-7d36b7d561dc" name="orders" objectType="TABLE" physicalName="orders" >
+      <remarks></remarks>
+      <folder id="FOLTAB1551" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX156" populated="true" UUID="917264cb-c405-4121-8f8e-bd6530b03df5" clustered="false" name="orders_pk" physicalName="orders_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB157" populated="false" UUID="9926dff9-bee1-42b2-a713-ed403e009e2c" name="professors" objectType="TABLE" physicalName="professors" >
+      <remarks></remarks>
+      <folder id="FOLTAB1571" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX158" populated="true" UUID="6bf6f35a-f94a-4009-8326-d0ed13af488a" clustered="false" name="professors_pk" physicalName="professors_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
+     <table id="TAB159" populated="false" UUID="3ad0aefa-9aa9-4e7a-951e-cff71af2613a" name="students" objectType="TABLE" physicalName="students" >
+      <remarks></remarks>
+      <folder id="FOLTAB1591" populated="false" name="Columns" physicalName="Columns" type="1">
+       <index id="IDX160" populated="true" UUID="1c62fdfb-e23e-4967-b5d0-47e8e49f2061" clustered="false" name="students_pk" physicalName="students_pk" primaryKeyIndex="true" unique="false" >
+       </index>
+      </folder>
+     </table>
     </schema>
    </catalog>
    <relationships>
@@ -513,352 +583,355 @@
   </database>
  </source-databases>
  <target-database id="ppdb" dbcs-ref="DS0">
-  <table id="TAB142" populated="true" UUID="bd3a39fd-1f1c-4c87-924b-3992b6caa66a" name="Professors" objectType="TABLE" physicalName="Professors" >
+  <table id="TAB162" populated="true" UUID="bd3a39fd-1f1c-4c87-924b-3992b6caa66a" name="Professors" objectType="TABLE" physicalName="Professors" >
    <remarks></remarks>
-   <folder id="FOLTAB1421" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL143" populated="true" UUID="9a4a7c2a-2b4a-4bfc-8772-148cb5c9f92c" autoIncrement="false" autoIncrementSequenceName="Customers_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB1621" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL163" populated="true" UUID="9a4a7c2a-2b4a-4bfc-8772-148cb5c9f92c" autoIncrement="false" autoIncrementSequenceName="Customers_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL144" populated="true" UUID="e6a0d8d3-4361-4435-a04d-08e05b563752" autoIncrement="false" autoIncrementSequenceName="Professors_Department_seq" defaultValue="" name="Department" nullable="0" physicalName="Department" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL164" populated="true" UUID="e6a0d8d3-4361-4435-a04d-08e05b563752" autoIncrement="false" autoIncrementSequenceName="Professors_Department_seq" defaultValue="" name="Department" nullable="0" physicalName="Department" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL145" populated="true" UUID="2044196b-e103-4952-b83c-5d6f7b06d3fa" autoIncrement="false" autoIncrementSequenceName="Professors_Office_seq" defaultValue="" name="Office" nullable="0" physicalName="Office" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL165" populated="true" UUID="2044196b-e103-4952-b83c-5d6f7b06d3fa" autoIncrement="false" autoIncrementSequenceName="Professors_Office_seq" defaultValue="" name="Office" nullable="0" physicalName="Office" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL146" populated="true" UUID="b5475c16-1cbc-42b1-89a0-e1687ebee6b2" autoIncrement="false" autoIncrementSequenceName="Professors_Research_seq" defaultValue="" name="Research" nullable="0" physicalName="Research" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL166" populated="true" UUID="b5475c16-1cbc-42b1-89a0-e1687ebee6b2" autoIncrement="false" autoIncrementSequenceName="Professors_Research_seq" defaultValue="" name="Research" nullable="0" physicalName="Research" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1423" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB1623" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1422" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB1622" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1424" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX147" populated="true" UUID="39e28f6f-7ee9-4a47-88bd-8465280d6cec" clustered="false" name="Professors_PK" physicalName="Professors_PK" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC148" populated="true" UUID="5943cd18-92e2-4205-a873-55a243736a7f" ascendingOrDescending="UNSPECIFIED" column-ref="COL143" name="id" physicalName="id" />
+    <folder id="FOLTAB1624" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX167" populated="true" UUID="39e28f6f-7ee9-4a47-88bd-8465280d6cec" clustered="false" name="Professors_PK" physicalName="professors_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC168" populated="true" UUID="5943cd18-92e2-4205-a873-55a243736a7f" ascendingOrDescending="UNSPECIFIED" column-ref="COL163" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB149" populated="true" UUID="3051964d-5fff-4451-9c8a-dd3e3099f34e" name="Students" objectType="TABLE" physicalName="Students" >
+  <table id="TAB169" populated="true" UUID="3051964d-5fff-4451-9c8a-dd3e3099f34e" name="Students" objectType="TABLE" physicalName="Students" >
    <remarks></remarks>
-   <folder id="FOLTAB1491" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL150" populated="true" UUID="73835850-1bdf-4ea3-a550-51e3b8c68031" autoIncrement="false" autoIncrementSequenceName="Customers_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB1691" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL170" populated="true" UUID="73835850-1bdf-4ea3-a550-51e3b8c68031" autoIncrement="false" autoIncrementSequenceName="Customers_id_seq_1" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL151" populated="true" UUID="08866859-ce25-4c4c-b97a-50f5cabf5a88" autoIncrement="false" autoIncrementSequenceName="Students_EnterDate_seq" defaultValue="" name="EnterDate" nullable="0" physicalName="EnterDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
+    <column id="COL171" populated="true" UUID="08866859-ce25-4c4c-b97a-50f5cabf5a88" autoIncrement="false" autoIncrementSequenceName="Students_EnterDate_seq" defaultValue="" name="EnterDate" nullable="0" physicalName="EnterDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
      <remarks></remarks>
     </column>
-    <column id="COL152" populated="true" UUID="78fe5e60-d0aa-476e-b70c-73907d13eeef" autoIncrement="false" autoIncrementSequenceName="Students_Major_seq" defaultValue="" name="Major" nullable="0" physicalName="Major" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL172" populated="true" UUID="78fe5e60-d0aa-476e-b70c-73907d13eeef" autoIncrement="false" autoIncrementSequenceName="Students_Major_seq" defaultValue="" name="Major" nullable="0" physicalName="Major" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL153" populated="true" UUID="2b13f6d1-33a0-4146-8805-2c3750e5f4c0" autoIncrement="false" autoIncrementSequenceName="Students_Minor_seq" defaultValue="" name="Minor" nullable="0" physicalName="Minor" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL173" populated="true" UUID="2b13f6d1-33a0-4146-8805-2c3750e5f4c0" autoIncrement="false" autoIncrementSequenceName="Students_Minor_seq" defaultValue="" name="Minor" nullable="0" physicalName="Minor" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL154" populated="true" UUID="c14ef43a-e8cc-4bd8-b0bd-3365155f79a1" autoIncrement="false" autoIncrementSequenceName="Students_GradDate_seq" defaultValue="" name="GradDate" nullable="0" physicalName="GradDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
+    <column id="COL174" populated="true" UUID="c14ef43a-e8cc-4bd8-b0bd-3365155f79a1" autoIncrement="false" autoIncrementSequenceName="Students_GradDate_seq" defaultValue="" name="GradDate" nullable="0" physicalName="GradDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1493" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB1693" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1492" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB1692" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1494" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX155" populated="true" UUID="648eff76-08a2-4edc-b833-888e6847dccd" clustered="false" name="Students_pk" physicalName="Students_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC156" populated="true" UUID="310d1814-1665-4624-bc7e-6d15c245b100" ascendingOrDescending="UNSPECIFIED" column-ref="COL150" name="id" physicalName="id" />
+    <folder id="FOLTAB1694" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX175" populated="true" UUID="648eff76-08a2-4edc-b833-888e6847dccd" clustered="false" name="Students_pk" physicalName="students_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC176" populated="true" UUID="310d1814-1665-4624-bc7e-6d15c245b100" ascendingOrDescending="UNSPECIFIED" column-ref="COL170" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB157" populated="true" UUID="4e3cef0b-4f43-4e75-951f-b0a5a6c626dd" name="Customers" objectType="TABLE" physicalName="Customers" >
+  <table id="TAB177" populated="true" UUID="4e3cef0b-4f43-4e75-951f-b0a5a6c626dd" name="Customers" objectType="TABLE" physicalName="Customers" >
    <remarks></remarks>
-   <folder id="FOLTAB1571" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL158" populated="true" UUID="7853c610-7670-4d64-97a1-63e17464e02f" autoIncrement="false" autoIncrementSequenceName="Customers_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="2" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB1771" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL178" populated="true" UUID="7853c610-7670-4d64-97a1-63e17464e02f" autoIncrement="false" autoIncrementSequenceName="Customers_id_seq_2" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="2" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL159" populated="true" UUID="39796ef1-1d31-4e12-9ad1-2ec02f507c69" autoIncrement="false" autoIncrementSequenceName="Customers_FirstName_seq" defaultValue="" name="FirstName" nullable="0" physicalName="FirstName" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL179" populated="true" UUID="39796ef1-1d31-4e12-9ad1-2ec02f507c69" autoIncrement="false" autoIncrementSequenceName="Customers_FirstName_seq" defaultValue="" name="FirstName" nullable="0" physicalName="FirstName" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL160" populated="true" UUID="c61876e0-d894-4def-a3e7-8c09d5983968" autoIncrement="false" autoIncrementSequenceName="Customers_LastName_seq" defaultValue="" name="LastName" nullable="0" physicalName="LastName" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL180" populated="true" UUID="c61876e0-d894-4def-a3e7-8c09d5983968" autoIncrement="false" autoIncrementSequenceName="Customers_LastName_seq" defaultValue="" name="LastName" nullable="1" physicalName="LastName" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL161" populated="true" UUID="eb4fd724-580f-44a7-94d2-94d9e3d36790" autoIncrement="false" autoIncrementSequenceName="Customers_DateOfBirth_seq" defaultValue="" name="DateOfBirth" nullable="0" physicalName="DateOfBirth" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
+    <column id="COL181" populated="true" UUID="eb4fd724-580f-44a7-94d2-94d9e3d36790" autoIncrement="false" autoIncrementSequenceName="Customers_DateOfBirth_seq" defaultValue="" name="DateOfBirth" nullable="1" physicalName="DateOfBirth" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
      <remarks></remarks>
     </column>
-    <column id="COL162" populated="true" UUID="b3546e61-f2f2-410f-8b9f-31caf975ef5e" autoIncrement="false" autoIncrementSequenceName="Customers_Phone_seq" defaultValue="" name="Phone" nullable="0" physicalName="Phone" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL182" populated="true" UUID="b3546e61-f2f2-410f-8b9f-31caf975ef5e" autoIncrement="false" autoIncrementSequenceName="Customers_Phone_seq" defaultValue="" name="Phone" nullable="1" physicalName="Phone" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL163" populated="true" UUID="ce412cb1-7ac0-4a7f-8b42-ffb5f9f86e02" autoIncrement="false" autoIncrementSequenceName="Customers_AddressId_seq" defaultValue="" name="AddressId" nullable="0" physicalName="AddressId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL183" populated="true" UUID="ce412cb1-7ac0-4a7f-8b42-ffb5f9f86e02" autoIncrement="false" autoIncrementSequenceName="Customers_AddressId_seq" defaultValue="" name="AddressId" nullable="1" physicalName="AddressId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1573" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB1773" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1572" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB1772" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1574" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX164" populated="true" UUID="e8d34772-abb4-42d2-a97f-bae5c5e8db3a" clustered="false" name="customers_pk" physicalName="customers_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC165" populated="true" UUID="79596297-25c1-4a83-a3cb-223fafe8f052" ascendingOrDescending="UNSPECIFIED" column-ref="COL158" name="id" physicalName="id" />
+    <folder id="FOLTAB1774" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX184" populated="true" UUID="e8d34772-abb4-42d2-a97f-bae5c5e8db3a" clustered="false" name="customers_pk" physicalName="customers_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC185" populated="true" UUID="79596297-25c1-4a83-a3cb-223fafe8f052" ascendingOrDescending="UNSPECIFIED" column-ref="COL178" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB166" populated="true" UUID="4637740b-9d99-48ba-a192-063042c83d08" name="Addresses" objectType="TABLE" physicalName="Addresses" >
+  <table id="TAB186" populated="true" UUID="4637740b-9d99-48ba-a192-063042c83d08" name="Addresses" objectType="TABLE" physicalName="Addresses" >
    <remarks></remarks>
-   <folder id="FOLTAB1661" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL167" populated="true" UUID="05b89b39-ed70-423b-9edc-133235871374" autoIncrement="true" autoIncrementSequenceName="Addresses_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB1861" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL187" populated="true" UUID="05b89b39-ed70-423b-9edc-133235871374" autoIncrement="true" autoIncrementSequenceName="Addresses_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL168" populated="true" UUID="f8d3d791-9214-4f24-b5a0-c7aee3a5d58d" autoIncrement="false" autoIncrementSequenceName="Addresses_Street_seq" defaultValue="" name="Street" nullable="0" physicalName="Street" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL188" populated="true" UUID="f8d3d791-9214-4f24-b5a0-c7aee3a5d58d" autoIncrement="false" autoIncrementSequenceName="Addresses_Street_seq" defaultValue="" name="Street" nullable="1" physicalName="Street" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL169" populated="true" UUID="1788f00e-7a1f-47c9-9110-16328b2ea19f" autoIncrement="false" autoIncrementSequenceName="Addresses_Number_seq" defaultValue="" name="Number" nullable="0" physicalName="Number" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL189" populated="true" UUID="1788f00e-7a1f-47c9-9110-16328b2ea19f" autoIncrement="false" autoIncrementSequenceName="Addresses_Number_seq" defaultValue="" name="Number" nullable="1" physicalName="Number" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL170" populated="true" UUID="6745afa3-2d0a-4877-aef3-2f349dfe53f3" autoIncrement="false" autoIncrementSequenceName="Addresses_ZipCode_seq" defaultValue="" name="ZipCode" nullable="0" physicalName="ZipCode" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL190" populated="true" UUID="6745afa3-2d0a-4877-aef3-2f349dfe53f3" autoIncrement="false" autoIncrementSequenceName="Addresses_ZipCode_seq" defaultValue="" name="ZipCode" nullable="1" physicalName="ZipCode" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL171" populated="true" UUID="557a7bb7-0b2b-42c8-969f-0700d95fb10b" autoIncrement="false" autoIncrementSequenceName="Addresses_City_seq" defaultValue="" name="City" nullable="0" physicalName="City" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL191" populated="true" UUID="557a7bb7-0b2b-42c8-969f-0700d95fb10b" autoIncrement="false" autoIncrementSequenceName="Addresses_City_seq" defaultValue="" name="City" nullable="1" physicalName="City" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL172" populated="true" UUID="7ba7d006-5673-4fe4-8556-354c7ed25fd2" autoIncrement="false" autoIncrementSequenceName="Addresses_State_seq" defaultValue="" name="State" nullable="0" physicalName="State" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL192" populated="true" UUID="7ba7d006-5673-4fe4-8556-354c7ed25fd2" autoIncrement="false" autoIncrementSequenceName="Addresses_State_seq" defaultValue="" name="State" nullable="1" physicalName="State" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1663" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB1863" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1662" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB1862" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1664" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX173" populated="true" UUID="1e5e50dc-e40a-4460-9c3a-0445e86e7d05" clustered="false" name="Addresses_pk" physicalName="Addresses_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC174" populated="true" UUID="ea325e95-08fc-4c6f-9aff-8e9b333ef0a8" ascendingOrDescending="UNSPECIFIED" column-ref="COL167" name="id" physicalName="id" />
+    <folder id="FOLTAB1864" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX193" populated="true" UUID="1e5e50dc-e40a-4460-9c3a-0445e86e7d05" clustered="false" name="Addresses_pk" physicalName="addresses_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC194" populated="true" UUID="ea325e95-08fc-4c6f-9aff-8e9b333ef0a8" ascendingOrDescending="UNSPECIFIED" column-ref="COL187" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB175" populated="true" UUID="c3c99a87-2895-4ced-aff0-d686d6f71bd0" name="DiscountScheme" objectType="TABLE" physicalName="DiscountScheme" >
+  <table id="TAB195" populated="true" UUID="c3c99a87-2895-4ced-aff0-d686d6f71bd0" name="DiscountScheme" objectType="TABLE" physicalName="DiscountScheme" >
    <remarks></remarks>
-   <folder id="FOLTAB1751" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL176" populated="true" UUID="74b0a396-83a1-4384-b7dc-46c03e642c8d" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB1951" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL196" populated="true" UUID="74b0a396-83a1-4384-b7dc-46c03e642c8d" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL177" populated="true" UUID="575fbdec-ae1c-47d0-ac7b-9f531c015dc7" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_PriceDiscount_seq" defaultValue="" name="PriceDiscount" nullable="0" physicalName="PriceDiscount" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
+    <column id="COL197" populated="true" UUID="575fbdec-ae1c-47d0-ac7b-9f531c015dc7" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_PriceDiscount_seq" defaultValue="" name="PriceDiscount" nullable="1" physicalName="PriceDiscount" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
      <remarks></remarks>
     </column>
-    <column id="COL178" populated="true" UUID="98b357c1-3b31-4012-ab21-0e3b84bc60d6" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_PercentDiscount_seq" defaultValue="" name="PercentDiscount" nullable="0" physicalName="PercentDiscount" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
+    <column id="COL198" populated="true" UUID="98b357c1-3b31-4012-ab21-0e3b84bc60d6" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_PercentDiscount_seq" defaultValue="" name="PercentDiscount" nullable="1" physicalName="PercentDiscount" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
      <remarks></remarks>
     </column>
-    <column id="COL179" populated="true" UUID="3dd11d4d-1566-473f-9167-58c3867596de" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_CustomerType_seq" defaultValue="" name="CustomerType" nullable="0" physicalName="CustomerType" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL199" populated="true" UUID="3dd11d4d-1566-473f-9167-58c3867596de" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_CustomerType_seq" defaultValue="" name="CustomerType" nullable="1" physicalName="CustomerType" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL180" populated="true" UUID="b00f2df5-d179-4c55-b01f-1696bb702d9e" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_StartDate_seq" defaultValue="" name="StartDate" nullable="0" physicalName="StartDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
+    <column id="COL200" populated="true" UUID="b00f2df5-d179-4c55-b01f-1696bb702d9e" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_StartDate_seq" defaultValue="" name="StartDate" nullable="1" physicalName="StartDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
      <remarks></remarks>
     </column>
-    <column id="COL181" populated="true" UUID="b0e703c3-f78c-456b-9324-d12624dda949" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_EndDate_seq" defaultValue="" name="EndDate" nullable="0" physicalName="EndDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
+    <column id="COL201" populated="true" UUID="b0e703c3-f78c-456b-9324-d12624dda949" autoIncrement="false" autoIncrementSequenceName="DiscountScheme_EndDate_seq" defaultValue="" name="EndDate" nullable="1" physicalName="EndDate" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1753" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB1953" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1752" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB1952" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1754" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX182" populated="true" UUID="88a754db-c74e-4327-ad56-83f6964dbfb9" clustered="false" name="DiscountScheme_pk" physicalName="DiscountScheme_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC183" populated="true" UUID="f1e2d56e-379c-4da9-befc-3ed3d2ab1f43" ascendingOrDescending="UNSPECIFIED" column-ref="COL176" name="id" physicalName="id" />
+    <folder id="FOLTAB1954" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX202" populated="true" UUID="88a754db-c74e-4327-ad56-83f6964dbfb9" clustered="false" name="DiscountScheme_pk" physicalName="discountscheme_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC203" populated="true" UUID="f1e2d56e-379c-4da9-befc-3ed3d2ab1f43" ascendingOrDescending="UNSPECIFIED" column-ref="COL196" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB184" populated="true" UUID="8ecf7314-e3ff-4f11-b1f8-93d9cc2f5347" name="Activities" objectType="TABLE" physicalName="Activities" >
+  <table id="TAB204" populated="true" UUID="8ecf7314-e3ff-4f11-b1f8-93d9cc2f5347" name="Activities" objectType="TABLE" physicalName="Activities" >
    <remarks></remarks>
-   <folder id="FOLTAB1841" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL185" populated="true" UUID="c106541f-6509-4adf-85de-ac001aee57aa" autoIncrement="false" autoIncrementSequenceName="Activities_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB2041" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL205" populated="true" UUID="c106541f-6509-4adf-85de-ac001aee57aa" autoIncrement="false" autoIncrementSequenceName="Activities_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL186" populated="true" UUID="346078bc-2785-424f-ab90-7d70480b1013" autoIncrement="false" autoIncrementSequenceName="Activities_Name_seq" defaultValue="" name="Name" nullable="0" physicalName="Name" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL206" populated="true" UUID="346078bc-2785-424f-ab90-7d70480b1013" autoIncrement="false" autoIncrementSequenceName="Activities_Name_seq" defaultValue="" name="Name" nullable="0" physicalName="Name" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL187" populated="true" UUID="896ffe7d-8c7f-4ad8-86fd-2b0be06eb37c" autoIncrement="false" autoIncrementSequenceName="Activities_Price_seq" defaultValue="" name="Price" nullable="0" physicalName="Price" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
+    <column id="COL207" populated="true" UUID="896ffe7d-8c7f-4ad8-86fd-2b0be06eb37c" autoIncrement="false" autoIncrementSequenceName="Activities_Price_seq" defaultValue="" name="Price" nullable="0" physicalName="Price" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1843" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB2043" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1842" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB2042" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1844" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX188" populated="true" UUID="49906211-e1f8-40a5-927b-d035eb04bbab" clustered="false" name="Activities_pk" physicalName="Activities_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC189" populated="true" UUID="2196ec49-17d7-410d-9e0c-d35896e7c687" ascendingOrDescending="UNSPECIFIED" column-ref="COL185" name="id" physicalName="id" />
+    <folder id="FOLTAB2044" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX208" populated="true" UUID="49906211-e1f8-40a5-927b-d035eb04bbab" clustered="false" name="Activities_pk" physicalName="activities_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC209" populated="true" UUID="2196ec49-17d7-410d-9e0c-d35896e7c687" ascendingOrDescending="UNSPECIFIED" column-ref="COL205" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB190" populated="true" UUID="1aa5f8cb-66ed-4983-8d57-c8144f0849b9" name="HistoricalPrice" objectType="TABLE" physicalName="HistoricalPrice" >
+  <table id="TAB210" populated="true" UUID="1aa5f8cb-66ed-4983-8d57-c8144f0849b9" name="HistoricalPrice" objectType="TABLE" physicalName="HistoricalPrice" >
    <remarks></remarks>
-   <folder id="FOLTAB1901" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL191" populated="true" UUID="24c3b9b7-773c-4b5a-a95e-6ac50ffd4075" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="2" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB2101" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL211" populated="true" UUID="24c3b9b7-773c-4b5a-a95e-6ac50ffd4075" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="2" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL192" populated="true" UUID="d0c2c6bb-da97-456f-a0af-3e4eac36e909" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_Date_seq" defaultValue="" name="Date" nullable="0" physicalName="Date" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
+    <column id="COL212" populated="true" UUID="d0c2c6bb-da97-456f-a0af-3e4eac36e909" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_Date_seq" defaultValue="" name="Date" nullable="0" physicalName="Date" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
      <remarks></remarks>
     </column>
-    <column id="COL193" populated="true" UUID="e45f9200-f32b-46b5-af28-0ba4ca69d896" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_Price_seq" defaultValue="" name="Price" nullable="0" physicalName="Price" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
+    <column id="COL213" populated="true" UUID="e45f9200-f32b-46b5-af28-0ba4ca69d896" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_Price_seq" defaultValue="" name="Price" nullable="0" physicalName="Price" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
      <remarks></remarks>
     </column>
-    <column id="COL194" populated="true" UUID="eaf82148-d140-4075-a11b-9337fb5c6ddb" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_ActivityId_seq" defaultValue="" name="ActivityId" nullable="0" physicalName="ActivityId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL214" populated="true" UUID="eaf82148-d140-4075-a11b-9337fb5c6ddb" autoIncrement="false" autoIncrementSequenceName="HistoricalPrice_ActivityId_seq" defaultValue="" name="ActivityId" nullable="0" physicalName="ActivityId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1903" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB2103" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1902" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB2102" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1904" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX195" populated="true" UUID="a83cd8e9-6494-4ed0-890a-54bb51656dc5" clustered="false" name="HistoricalPrice_pk" physicalName="HistoricalPrice_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC196" populated="true" UUID="663c9b1d-f520-4da4-aa0c-461aa9e2a19a" ascendingOrDescending="UNSPECIFIED" column-ref="COL191" name="id" physicalName="id" />
+    <folder id="FOLTAB2104" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX215" populated="true" UUID="a83cd8e9-6494-4ed0-890a-54bb51656dc5" clustered="false" name="HistoricalPrice_pk" physicalName="historicalprice_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC216" populated="true" UUID="663c9b1d-f520-4da4-aa0c-461aa9e2a19a" ascendingOrDescending="UNSPECIFIED" column-ref="COL211" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB197" populated="true" UUID="5f5b6700-fadc-42f1-827c-5170773c5216" name="Orders" objectType="TABLE" physicalName="Orders" >
+  <table id="TAB217" populated="true" UUID="5f5b6700-fadc-42f1-827c-5170773c5216" name="Orders" objectType="TABLE" physicalName="Orders" >
    <remarks></remarks>
-   <folder id="FOLTAB1971" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL198" populated="true" UUID="aa44fcc0-f86a-4fce-a315-4b92149aad33" autoIncrement="false" autoIncrementSequenceName="Orders_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="3" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB2171" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL218" populated="true" UUID="aa44fcc0-f86a-4fce-a315-4b92149aad33" autoIncrement="false" autoIncrementSequenceName="Orders_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="3" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL199" populated="true" UUID="edb35bc3-c1a0-47cd-b804-b46abdb9cc66" autoIncrement="false" autoIncrementSequenceName="Orders_Date_seq" defaultValue="" name="Date" nullable="0" physicalName="Date" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
+    <column id="COL219" populated="true" UUID="edb35bc3-c1a0-47cd-b804-b46abdb9cc66" autoIncrement="false" autoIncrementSequenceName="Orders_Date_seq" defaultValue="" name="Date" nullable="0" physicalName="Date" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="91" userDefinedTypeUUID="ee349be3-6af2-46e1-b305-975f5354b009" >
      <remarks></remarks>
     </column>
-    <column id="COL200" populated="true" UUID="b682e1f1-d187-49ea-a9a8-41d3b19294c8" autoIncrement="false" autoIncrementSequenceName="Orders_Time_seq" defaultValue="" name="Time" nullable="0" physicalName="Time" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="92" userDefinedTypeUUID="10d6960f-169d-47c2-860a-37341342b1d5" >
+    <column id="COL220" populated="true" UUID="b682e1f1-d187-49ea-a9a8-41d3b19294c8" autoIncrement="false" autoIncrementSequenceName="Orders_Time_seq" defaultValue="" name="Time" nullable="0" physicalName="Time" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="92" userDefinedTypeUUID="10d6960f-169d-47c2-860a-37341342b1d5" >
      <remarks></remarks>
     </column>
-    <column id="COL201" populated="true" UUID="5acb0c86-1c70-45d6-aaf4-6237a0f3e860" autoIncrement="false" autoIncrementSequenceName="Orders_CustomerId_seq" defaultValue="" name="CustomerId" nullable="0" physicalName="CustomerId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL221" populated="true" UUID="5acb0c86-1c70-45d6-aaf4-6237a0f3e860" autoIncrement="false" autoIncrementSequenceName="Orders_CustomerId_seq" defaultValue="" name="CustomerId" nullable="0" physicalName="CustomerId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL202" populated="true" UUID="e3c60560-348c-4b3a-8855-907a2deb6ff9" autoIncrement="false" autoIncrementSequenceName="Orders_DiscountApplied_seq" defaultValue="" name="DiscountApplied" nullable="0" physicalName="DiscountApplied" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
+    <column id="COL222" populated="true" UUID="e3c60560-348c-4b3a-8855-907a2deb6ff9" autoIncrement="false" autoIncrementSequenceName="Orders_DiscountApplied_seq" defaultValue="" name="DiscountApplied" nullable="0" physicalName="DiscountApplied" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="8" userDefinedTypeUUID="4fc90970-b2e5-41dd-911c-cc605d87e7a8" >
      <remarks></remarks>
     </column>
-    <column id="COL203" populated="true" UUID="6be12563-39f8-4f3d-8849-8162a9054681" autoIncrement="false" autoIncrementSequenceName="Orders_TotalPrice_seq" defaultValue="" name="TotalPrice" nullable="0" physicalName="TotalPrice" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
+    <column id="COL223" populated="true" UUID="6be12563-39f8-4f3d-8849-8162a9054681" autoIncrement="false" autoIncrementSequenceName="Orders_TotalPrice_seq" defaultValue="" name="TotalPrice" nullable="0" physicalName="TotalPrice" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
-    <column id="COL204" populated="true" UUID="0715fc3d-6c9d-46ca-85e1-3fffb2da9b39" autoIncrement="false" autoIncrementSequenceName="Orders_DiscountSchemeId_seq" defaultValue="" name="DiscountSchemeId" nullable="0" physicalName="DiscountSchemeId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL224" populated="true" UUID="0715fc3d-6c9d-46ca-85e1-3fffb2da9b39" autoIncrement="false" autoIncrementSequenceName="Orders_DiscountSchemeId_seq" defaultValue="" name="DiscountSchemeId" nullable="0" physicalName="DiscountSchemeId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB1973" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB2173" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB1972" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB2172" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB1974" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX205" populated="true" UUID="cea841bb-d8d4-4218-be7c-954e427b2dd8" clustered="false" name="Orders_pk" physicalName="Orders_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC206" populated="true" UUID="320662ea-226c-4339-a8a5-33e5bf7dcc37" ascendingOrDescending="UNSPECIFIED" column-ref="COL198" name="id" physicalName="id" />
+    <folder id="FOLTAB2174" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX225" populated="true" UUID="cea841bb-d8d4-4218-be7c-954e427b2dd8" clustered="false" name="Orders_pk" physicalName="orders_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC226" populated="true" UUID="320662ea-226c-4339-a8a5-33e5bf7dcc37" ascendingOrDescending="UNSPECIFIED" column-ref="COL218" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB207" populated="true" UUID="2a3020bc-f2a3-49c5-9a31-b6d9d81a58e5" name="LineItems" objectType="TABLE" physicalName="LineItems" >
+  <table id="TAB227" populated="true" UUID="2a3020bc-f2a3-49c5-9a31-b6d9d81a58e5" name="LineItems" objectType="TABLE" physicalName="LineItems" >
    <remarks></remarks>
-   <folder id="FOLTAB2071" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL208" populated="true" UUID="378cc769-1ea8-413c-8897-d5f731b03390" autoIncrement="false" autoIncrementSequenceName="LineItems_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="4" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB2271" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL228" populated="true" UUID="378cc769-1ea8-413c-8897-d5f731b03390" autoIncrement="false" autoIncrementSequenceName="LineItems_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="4" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL209" populated="true" UUID="befb5b28-b210-4277-a23b-064c2aac46f3" autoIncrement="false" autoIncrementSequenceName="LineItems_ActivityId_seq" defaultValue="" name="ActivityId" nullable="0" physicalName="ActivityId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL229" populated="true" UUID="befb5b28-b210-4277-a23b-064c2aac46f3" autoIncrement="false" autoIncrementSequenceName="LineItems_ActivityId_seq" defaultValue="" name="ActivityId" nullable="0" physicalName="ActivityId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL210" populated="true" UUID="8acac5ca-2c2e-45f0-9ecc-dc97302f89b6" autoIncrement="false" autoIncrementSequenceName="LineItems_Quantity_seq" defaultValue="" name="Quantity" nullable="0" physicalName="Quantity" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL230" populated="true" UUID="8acac5ca-2c2e-45f0-9ecc-dc97302f89b6" autoIncrement="false" autoIncrementSequenceName="LineItems_Quantity_seq" defaultValue="" name="Quantity" nullable="0" physicalName="Quantity" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL211" populated="true" UUID="2341023a-2574-4b33-bbe4-3d9df57e92c5" autoIncrement="false" autoIncrementSequenceName="LineItems_AppointmentId_seq" defaultValue="" name="AppointmentId" nullable="0" physicalName="AppointmentId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL231" populated="true" UUID="2341023a-2574-4b33-bbe4-3d9df57e92c5" autoIncrement="false" autoIncrementSequenceName="LineItems_AppointmentId_seq" defaultValue="" name="AppointmentId" nullable="0" physicalName="AppointmentId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL212" populated="true" UUID="d9e6100c-0c22-4718-bf4f-dafca331ed7d" autoIncrement="false" autoIncrementSequenceName="LineItems_OrderId_seq" defaultValue="" name="OrderId" nullable="0" physicalName="OrderId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL232" populated="true" UUID="d9e6100c-0c22-4718-bf4f-dafca331ed7d" autoIncrement="false" autoIncrementSequenceName="LineItems_OrderId_seq" defaultValue="" name="OrderId" nullable="0" physicalName="OrderId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB2073" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB2273" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB2072" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB2272" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB2074" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX213" populated="true" UUID="505b84db-4d61-426e-a99c-9ed0962c068c" clustered="false" name="LineItems_pk" physicalName="LineItems_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC214" populated="true" UUID="b119ef19-afe0-4246-a3e3-23e29860549e" ascendingOrDescending="UNSPECIFIED" column-ref="COL208" name="id" physicalName="id" />
+    <folder id="FOLTAB2274" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX233" populated="true" UUID="505b84db-4d61-426e-a99c-9ed0962c068c" clustered="false" name="LineItems_pk" physicalName="lineitems_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC234" populated="true" UUID="b119ef19-afe0-4246-a3e3-23e29860549e" ascendingOrDescending="UNSPECIFIED" column-ref="COL228" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
-  <table id="TAB215" populated="true" UUID="249e0595-ee6a-4eeb-9f1c-311175da953b" name="Appointments" objectType="TABLE" physicalName="Appointments" >
+  <table id="TAB235" populated="true" UUID="249e0595-ee6a-4eeb-9f1c-311175da953b" name="Appointments" objectType="TABLE" physicalName="Appointments" >
    <remarks></remarks>
-   <folder id="FOLTAB2151" populated="true" name="Columns" physicalName="Columns" type="1">
-    <column id="COL216" populated="true" UUID="cf467287-d353-4783-a565-744273862c00" autoIncrement="true" autoIncrementSequenceName="Appointments_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+   <folder id="FOLTAB2351" populated="true" name="Columns" physicalName="Columns" type="1">
+    <column id="COL236" populated="true" UUID="cf467287-d353-4783-a565-744273862c00" autoIncrement="true" autoIncrementSequenceName="Appointments_id_seq" defaultValue="" name="id" nullable="0" physicalName="id" precision="0" primaryKeySeq="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL217" populated="true" UUID="c61430aa-41cb-44aa-b7b6-852db8430433" autoIncrement="false" autoIncrementSequenceName="Appointments_StartTime_seq" defaultValue="" name="StartTime" nullable="0" physicalName="StartTime" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="93" userDefinedTypeUUID="6497d8de-0e00-40d6-a42e-e2adca83be64" >
+    <column id="COL237" populated="true" UUID="c61430aa-41cb-44aa-b7b6-852db8430433" autoIncrement="false" autoIncrementSequenceName="Appointments_StartTime_seq" defaultValue="" name="StartTime" nullable="0" physicalName="StartTime" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="93" userDefinedTypeUUID="6497d8de-0e00-40d6-a42e-e2adca83be64" >
      <remarks></remarks>
     </column>
-    <column id="COL218" populated="true" UUID="15520c61-465b-4b61-8e3c-f1133a26cd5d" autoIncrement="false" autoIncrementSequenceName="Appointments_EndTime_seq" defaultValue="" name="EndTime" nullable="0" physicalName="EndTime" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="93" userDefinedTypeUUID="6497d8de-0e00-40d6-a42e-e2adca83be64" >
+    <column id="COL238" populated="true" UUID="15520c61-465b-4b61-8e3c-f1133a26cd5d" autoIncrement="false" autoIncrementSequenceName="Appointments_EndTime_seq" defaultValue="" name="EndTime" nullable="0" physicalName="EndTime" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="93" userDefinedTypeUUID="6497d8de-0e00-40d6-a42e-e2adca83be64" >
      <remarks></remarks>
     </column>
-    <column id="COL219" populated="true" UUID="ea9d1b8a-bfb0-4581-9646-3d45f3254b5d" autoIncrement="false" autoIncrementSequenceName="Appointments_ActivityId_seq" defaultValue="" name="ActivityId" nullable="0" physicalName="ActivityId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL239" populated="true" UUID="ea9d1b8a-bfb0-4581-9646-3d45f3254b5d" autoIncrement="false" autoIncrementSequenceName="Appointments_ActivityId_seq" defaultValue="" name="ActivityId" nullable="0" physicalName="ActivityId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
      <remarks></remarks>
     </column>
-    <column id="COL220" populated="true" UUID="bcc446d6-af14-40f6-9de1-c8a97b0b0080" autoIncrement="false" autoIncrementSequenceName="Appointments_CustomerId_seq" defaultValue="" name="CustomerId" nullable="0" physicalName="CustomerId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+    <column id="COL240" populated="true" UUID="bcc446d6-af14-40f6-9de1-c8a97b0b0080" autoIncrement="false" autoIncrementSequenceName="Appointments_CustomerId_seq" defaultValue="" name="CustomerId" nullable="0" physicalName="CustomerId" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="4" userDefinedTypeUUID="63b011c7-c81f-4c75-8271-632b3c87f727" >
+     <remarks></remarks>
+    </column>
+    <column id="COL241" populated="true" UUID="28ba76d6-0915-4e2f-8b82-b9611d486faa" autoIncrement="false" autoIncrementSequenceName="Appointments_status_seq" defaultValue="" name="status" nullable="1" physicalName="status" precision="0" referenceCount="1" scale="0" sourceDataTypeName="UserDefinedSQLType" type="12" userDefinedTypeUUID="831ac2d4-0e65-47ec-a0b7-62b7f6b8760a" >
      <remarks></remarks>
     </column>
     </folder>
-    <folder id="FOLTAB2153" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
+    <folder id="FOLTAB2353" populated="true" name="Exported Keys" physicalName="Exported Keys" type="3">
     </folder>
-    <folder id="FOLTAB2152" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
+    <folder id="FOLTAB2352" populated="true" name="Imported Keys" physicalName="Imported Keys" type="2">
     </folder>
-    <folder id="FOLTAB2154" populated="true" name="Indices" physicalName="Indices" type="4">
-    <index id="IDX221" populated="true" UUID="b4516abd-c745-4d78-8ec7-51742ae30c52" clustered="false" name="Appointments_pk" physicalName="Appointments_pk" primaryKeyIndex="true" unique="false" >
-     <index-column id="IDC222" populated="true" UUID="cab84aea-ad1b-43ae-add3-0b7ff4ac6d64" ascendingOrDescending="UNSPECIFIED" column-ref="COL216" name="id" physicalName="id" />
+    <folder id="FOLTAB2354" populated="true" name="Indices" physicalName="Indices" type="4">
+    <index id="IDX242" populated="true" UUID="b4516abd-c745-4d78-8ec7-51742ae30c52" clustered="false" name="Appointments_pk" physicalName="appointments_pk" primaryKeyIndex="true" unique="false" >
+     <index-column id="IDC243" populated="true" UUID="cab84aea-ad1b-43ae-add3-0b7ff4ac6d64" ascendingOrDescending="UNSPECIFIED" column-ref="COL236" name="id" physicalName="id" />
     </index>
    </folder>
   </table>
   <relationships>
-   <relationship id="REL223" populated="true" UUID="27275a2e-9a0f-499a-8b64-e49fd4206377" deferrability="7" deleteRule="3" fk-table-ref="TAB197" fkCardinality="7" identifying="true" name="Customers_Orders_fk" physicalName="Customers_Orders_fk" pk-table-ref="TAB157" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP224" populated="true" UUID="37b0ec4a-22da-44db-ac68-5903697bf438" fk-column-ref="COL201" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL158" />
+   <relationship id="REL244" populated="true" UUID="27275a2e-9a0f-499a-8b64-e49fd4206377" deferrability="7" deleteRule="3" fk-table-ref="TAB217" fkCardinality="7" identifying="true" name="Customers_Orders_fk" physicalName="Customers_Orders_fk" pk-table-ref="TAB177" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP245" populated="true" UUID="37b0ec4a-22da-44db-ac68-5903697bf438" fk-column-ref="COL221" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL178" />
    </relationship>
-   <relationship id="REL225" populated="true" UUID="8b06a95b-ca37-4901-a817-c08b299ebecc" deferrability="7" deleteRule="3" fk-table-ref="TAB149" fkCardinality="7" identifying="true" name="Customers_Students_fk" physicalName="Customers_Students_fk" pk-table-ref="TAB157" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP226" populated="true" UUID="bc869b75-4d71-41fd-92f5-80a37de9598f" fk-column-ref="COL150" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL158" />
+   <relationship id="REL246" populated="true" UUID="8b06a95b-ca37-4901-a817-c08b299ebecc" deferrability="7" deleteRule="3" fk-table-ref="TAB169" fkCardinality="7" identifying="true" name="Customers_Students_fk" physicalName="Customers_Students_fk" pk-table-ref="TAB177" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP247" populated="true" UUID="bc869b75-4d71-41fd-92f5-80a37de9598f" fk-column-ref="COL170" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL178" />
    </relationship>
-   <relationship id="REL227" populated="true" UUID="b173357c-d281-4ff2-aef6-60251c637bab" deferrability="7" deleteRule="3" fk-table-ref="TAB142" fkCardinality="7" identifying="true" name="Customers_Professors_fk" physicalName="Customers_Professors_fk" pk-table-ref="TAB157" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP228" populated="true" UUID="33eb0a74-dab7-4409-8dab-30e492b5148d" fk-column-ref="COL143" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL158" />
+   <relationship id="REL248" populated="true" UUID="b173357c-d281-4ff2-aef6-60251c637bab" deferrability="7" deleteRule="3" fk-table-ref="TAB162" fkCardinality="7" identifying="true" name="Customers_Professors_fk" physicalName="Customers_Professors_fk" pk-table-ref="TAB177" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP249" populated="true" UUID="33eb0a74-dab7-4409-8dab-30e492b5148d" fk-column-ref="COL163" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL178" />
    </relationship>
-   <relationship id="REL229" populated="true" UUID="3a0ec06e-2a73-4e83-9754-0cf2f7558f63" deferrability="7" deleteRule="3" fk-table-ref="TAB157" fkCardinality="7" identifying="true" name="Addresses_Customers_fk" physicalName="Addresses_Customers_fk" pk-table-ref="TAB166" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP230" populated="true" UUID="f1a63702-6a38-4bdf-b4ed-33df637115d1" fk-column-ref="COL163" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL167" />
+   <relationship id="REL250" populated="true" UUID="3a0ec06e-2a73-4e83-9754-0cf2f7558f63" deferrability="7" deleteRule="3" fk-table-ref="TAB177" fkCardinality="7" identifying="true" name="Addresses_Customers_fk" physicalName="Addresses_Customers_fk" pk-table-ref="TAB186" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP251" populated="true" UUID="f1a63702-6a38-4bdf-b4ed-33df637115d1" fk-column-ref="COL183" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL187" />
    </relationship>
-   <relationship id="REL231" populated="true" UUID="5e5ca12b-6c03-4be4-b1c9-c4fc7d8826cf" deferrability="7" deleteRule="3" fk-table-ref="TAB197" fkCardinality="7" identifying="true" name="DiscountScheme_Orders_fk" physicalName="DiscountScheme_Orders_fk" pk-table-ref="TAB175" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP232" populated="true" UUID="3ff2d20f-9253-46f0-8363-80c16fe779c9" fk-column-ref="COL204" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL176" />
+   <relationship id="REL252" populated="true" UUID="5e5ca12b-6c03-4be4-b1c9-c4fc7d8826cf" deferrability="7" deleteRule="3" fk-table-ref="TAB217" fkCardinality="7" identifying="true" name="DiscountScheme_Orders_fk" physicalName="DiscountScheme_Orders_fk" pk-table-ref="TAB195" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP253" populated="true" UUID="3ff2d20f-9253-46f0-8363-80c16fe779c9" fk-column-ref="COL224" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL196" />
    </relationship>
-   <relationship id="REL233" populated="true" UUID="6b56258e-8f4f-4ffe-b8ad-21b2a5f3bd61" deferrability="7" deleteRule="3" fk-table-ref="TAB190" fkCardinality="7" identifying="true" name="Activities_HistoricalPrice_fk" physicalName="Activities_HistoricalPrice_fk" pk-table-ref="TAB184" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP234" populated="true" UUID="aea03873-1f2a-47f3-a335-7bb356da17a3" fk-column-ref="COL194" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL185" />
+   <relationship id="REL254" populated="true" UUID="6b56258e-8f4f-4ffe-b8ad-21b2a5f3bd61" deferrability="7" deleteRule="3" fk-table-ref="TAB210" fkCardinality="7" identifying="true" name="Activities_HistoricalPrice_fk" physicalName="Activities_HistoricalPrice_fk" pk-table-ref="TAB204" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP255" populated="true" UUID="aea03873-1f2a-47f3-a335-7bb356da17a3" fk-column-ref="COL214" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL205" />
    </relationship>
-   <relationship id="REL235" populated="true" UUID="7b406951-2b45-4a42-a83e-a9405dc90989" deferrability="7" deleteRule="3" fk-table-ref="TAB207" fkCardinality="7" identifying="true" name="Activities_LineItems_fk" physicalName="Activities_LineItems_fk" pk-table-ref="TAB184" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP236" populated="true" UUID="29b5df45-8f46-4bf5-8c9a-8bb2ec76d96c" fk-column-ref="COL209" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL185" />
+   <relationship id="REL256" populated="true" UUID="7b406951-2b45-4a42-a83e-a9405dc90989" deferrability="7" deleteRule="3" fk-table-ref="TAB227" fkCardinality="7" identifying="true" name="Activities_LineItems_fk" physicalName="Activities_LineItems_fk" pk-table-ref="TAB204" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP257" populated="true" UUID="29b5df45-8f46-4bf5-8c9a-8bb2ec76d96c" fk-column-ref="COL229" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL205" />
    </relationship>
-   <relationship id="REL237" populated="true" UUID="3fb93eec-d832-4734-be5b-2f74deaa821b" deferrability="7" deleteRule="3" fk-table-ref="TAB207" fkCardinality="7" identifying="true" name="Orders_LineItems_fk" physicalName="Orders_LineItems_fk" pk-table-ref="TAB197" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP238" populated="true" UUID="b93ba463-fe7d-44b4-b5e7-3a81074dcdda" fk-column-ref="COL212" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL198" />
+   <relationship id="REL258" populated="true" UUID="3fb93eec-d832-4734-be5b-2f74deaa821b" deferrability="7" deleteRule="3" fk-table-ref="TAB227" fkCardinality="7" identifying="true" name="Orders_LineItems_fk" physicalName="Orders_LineItems_fk" pk-table-ref="TAB217" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP259" populated="true" UUID="b93ba463-fe7d-44b4-b5e7-3a81074dcdda" fk-column-ref="COL232" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL218" />
    </relationship>
-   <relationship id="REL239" populated="true" UUID="acd37020-7d63-4d41-a0a6-0d978c211685" deferrability="7" deleteRule="3" fk-table-ref="TAB207" fkCardinality="7" identifying="true" name="Appointments_LineItems_fk" physicalName="Appointments_LineItems_fk" pk-table-ref="TAB215" pkCardinality="2" updateRule="3" >
-    <column-mapping id="CMP240" populated="true" UUID="bddfc5e2-e17e-405a-94ce-d71d09141cf2" fk-column-ref="COL211" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL216" />
+   <relationship id="REL260" populated="true" UUID="acd37020-7d63-4d41-a0a6-0d978c211685" deferrability="7" deleteRule="3" fk-table-ref="TAB227" fkCardinality="7" identifying="true" name="Appointments_LineItems_fk" physicalName="Appointments_LineItems_fk" pk-table-ref="TAB235" pkCardinality="2" updateRule="3" >
+    <column-mapping id="CMP261" populated="true" UUID="bddfc5e2-e17e-405a-94ce-d71d09141cf2" fk-column-ref="COL231" name="Column Mapping" physicalName="Column Mapping" pk-column-ref="COL236" />
    </relationship>
   </relationships>
  </target-database>
- <ddl-generator type="ca.sqlpower.architect.ddl.GenericDDLGenerator" allow-connection="true"> </ddl-generator>
+ <ddl-generator type="ca.sqlpower.architect.ddl.PostgresDDLGenerator" allow-connection="true" target-schema="brcm"> </ddl-generator>
  <liquibase-settings useSeparateChangeSets="false" generateId="false" idStart="1"/>
  <create-kettle-job-settings filePath="" jobName="" schemaName="" kettleJoinType="0" savingToFile="true" />
  <play-pen zoom="1.0" viewportX="0" viewportY="0" relationship-style="rectilinear" names-displayLogicalNames="true" showPrimaryTag="true" showForeignTag="true" showAlternateTag="true" columnVisibility="ALL" relationshipLabelVisibility="true">
-  <table-pane table-ref="TAB142" x="24" y="24" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB149" x="27" y="132" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB157" x="310" y="45" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB166" x="652" y="47" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB175" x="606" y="456" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB184" x="33" y="273" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB190" x="20" y="457" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB197" x="601" y="239" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB207" x="290" y="454" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-pane table-ref="TAB215" x="312" y="260" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
-  <table-link relationship-ref="REL237" pkConnection="0.03355704697986577" fkConnection="0.9127272727272727" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
-  <table-link relationship-ref="REL231" pkConnection="0.9214876033057852" fkConnection="0.7651006711409396" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="72"/>
-  <table-link relationship-ref="REL223" pkConnection="0.8317757009345794" fkConnection="0.15100671140939598" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
-  <table-link relationship-ref="REL233" pkConnection="0.17098445595854922" fkConnection="0.1908713692946058" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
-  <table-link relationship-ref="REL235" pkConnection="0.533678756476684" fkConnection="0.08727272727272728" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
-  <table-link relationship-ref="REL239" pkConnection="0.19457013574660634" fkConnection="0.23636363636363636" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
-  <table-link relationship-ref="REL225" pkConnection="0.8740157480314961" fkConnection="0.21621621621621623" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="18"/>
-  <table-link relationship-ref="REL227" pkConnection="0.2440944881889764" fkConnection="0.5473684210526316" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="18"/>
-  <table-link relationship-ref="REL229" pkConnection="0.4881889763779528" fkConnection="0.5039370078740157" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="18"/>
+  <table-pane table-ref="TAB162" x="24" y="24" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB169" x="27" y="132" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB177" x="310" y="45" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB186" x="652" y="47" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB195" x="606" y="456" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB204" x="33" y="273" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB210" x="20" y="457" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB217" x="601" y="239" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB227" x="290" y="454" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-pane table-ref="TAB235" x="312" y="260" bgColor="0xeeeeee" fgColor="0x000000" rounded="false" dashed="false"/>
+  <table-link relationship-ref="REL258" pkConnection="0.03355704697986577" fkConnection="0.9127272727272727" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
+  <table-link relationship-ref="REL252" pkConnection="0.9214876033057852" fkConnection="0.7651006711409396" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="72"/>
+  <table-link relationship-ref="REL244" pkConnection="0.8317757009345794" fkConnection="0.15100671140939598" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
+  <table-link relationship-ref="REL254" pkConnection="0.17098445595854922" fkConnection="0.1908713692946058" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
+  <table-link relationship-ref="REL256" pkConnection="0.533678756476684" fkConnection="0.08727272727272728" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
+  <table-link relationship-ref="REL260" pkConnection="0.19457013574660634" fkConnection="0.23636363636363636" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="132"/>
+  <table-link relationship-ref="REL246" pkConnection="0.8740157480314961" fkConnection="0.21621621621621623" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="18"/>
+  <table-link relationship-ref="REL248" pkConnection="0.2440944881889764" fkConnection="0.5473684210526316" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="18"/>
+  <table-link relationship-ref="REL250" pkConnection="0.4881889763779528" fkConnection="0.5039370078740157" rLineColor="0x000000" pkLabelText="" fkLabelText="" orientation="18"/>
  </play-pen>
  <critic-manager>
   <critic-grouping platformType="Generic" enabled="true">
@@ -907,7 +980,7 @@
  <profiles topNCount="10">
   </profiles>
   <olap>
-   <olap-session id="0" db-ref="">
+   <olap-session id="0">
     <Schema id="1" name="BRCM_DB"/>
    </olap-session>
   </olap>

src/brcm/.idea/workspace.xml

@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="7b66479e-8aa2-446e-bcf3-9c392677b26f" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/../../docs/Problem(UoD).pdf" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../docs/Project.pdf" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../docs/Project_Requirements_Details.pdf" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../../docs/Project_Sample.pdf" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../readme.md" beforeDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../.." />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectId" id="2GqQUyhpdS4PGlzVQwaTrp0c5NJ" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true"
-  }
-}]]></component>
-  <component name="RunManager" selected="Application.App">
-    <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="org.cpp.App" />
-      <module name="brcm" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="org.cpp.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration name="brcm [compile]" type="MavenRunConfiguration" factoryName="Maven" nameIsGenerated="true">
-      <MavenSettings>
-        <option name="myGeneralSettings" />
-        <option name="myRunnerSettings" />
-        <option name="myRunnerParameters">
-          <MavenRunnerParameters>
-            <option name="profiles">
-              <set />
-            </option>
-            <option name="goals">
-              <list>
-                <option value="compile" />
-              </list>
-            </option>
-            <option name="pomFileName" />
-            <option name="profilesMap">
-              <map />
-            </option>
-            <option name="resolveToWorkspace" value="false" />
-            <option name="workingDirPath" value="$PROJECT_DIR$" />
-          </MavenRunnerParameters>
-        </option>
-      </MavenSettings>
-      <method v="2" />
-    </configuration>
-    <list>
-      <item itemvalue="Application.App" />
-      <item itemvalue="Maven.brcm [compile]" />
-    </list>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Application.App" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="7b66479e-8aa2-446e-bcf3-9c392677b26f" name="Changes" comment="" />
-      <created>1667113660957</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1667113660957</updated>
-    </task>
-    <servers />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>