Changeset 30ab9cc

Timestamp:

06/23/23 17:40:28 (17 months ago)

Author:

GitHub <noreply@…>

Branches:

main

Parents:

e4e8212 (diff), c049fd6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Ekaterina Sazdova <74919977+SazdovaEkaterina@…> (06/23/23 17:40:28)

git-committer:

GitHub <noreply@…> (06/23/23 17:40:28)

Message:

Merge pull request #12 from SazdovaEkaterina/use-project-schema

Specify project schema in the backend

Location:

Prototype Application/Paw5/src/main/java/finki/paw5/model

Files:

• entities/Admin.java (modified) (1 diff)
• entities/Adopter.java (modified) (1 diff)
• entities/Adoption.java (modified) (1 diff)
• entities/Category.java (modified) (1 diff)
• entities/Donor.java (modified) (1 diff)
• entities/Employee.java (modified) (1 diff)
• entities/Food.java (modified) (1 diff)
• entities/Organisation.java (modified) (1 diff)
• entities/PersonalProfile.java (modified) (1 diff)
• entities/Pet.java (modified) (1 diff)
• entities/Post.java (modified) (1 diff)
• entities/Shelter.java (modified) (1 diff)
• entities/Surendee.java (modified) (1 diff)
• entities/Therapy.java (modified) (1 diff)
• entities/User.java (modified) (1 diff)
• entities/VetClinic.java (modified) (1 diff)
• relations/DonorDonatesToOrganisation.java (modified) (1 diff)
• relations/PetBelongsToCategory.java (modified) (1 diff)
• relations/PetNeedsInterventionInVetClinic.java (modified) (1 diff)
• relations/PetNeedsTherapy.java (modified) (1 diff)
• relations/PetPreferablyEatsFood.java (modified) (1 diff)

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Admin.java

@@ -10 +10 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "admin_table")
+@Table(name = "admin_table", schema = "project")
 @PrimaryKeyJoinColumn(name = "id_user")
 public class Admin extends User {

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Adopter.java

@@ -13 +13 @@
 @Data
 @Entity
-@Table(name = "adopter")
+@Table(name = "adopter", schema = "project")
 @RequiredArgsConstructor
 @PrimaryKeyJoinColumn(name = "id_user")

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Adoption.java

@@ -10 +10 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "adoption")
+@Table(name = "adoption", schema = "project")
 public class Adoption {
 

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Category.java

@@ -10 +10 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "category")
+@Table(name = "category", schema = "project")
 public class Category {
 

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Donor.java

@@ -11 +11 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "donor")
+@Table(name = "donor", schema = "project")
 @PrimaryKeyJoinColumn(name = "id_user")
 public class Donor extends User {

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Employee.java

@@ -10 +10 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "employee")
+@Table(name = "employee", schema = "project")
 @PrimaryKeyJoinColumn(name = "id_user")
 public class Employee extends User {

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Food.java

@@ -11 +11 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "food")
+@Table(name = "food", schema = "project")
 public class Food {
 

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Organisation.java

@@ -10 +10 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "organisation")
+@Table(name = "organisation", schema = "project")
 public class Organisation {
 

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/PersonalProfile.java

@@ -9 +9 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "personal_profile")
+@Table(name = "personal_profile", schema = "project")
 public class PersonalProfile {
 

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Pet.java

@@ -14 +14 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "pet")
+@Table(name = "pet", schema = "project")
 public class Pet {
 

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Post.java

@@ -10 +10 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "post")
+@Table(name = "post", schema = "project")
 public class Post {
 

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Shelter.java

@@ -8 +8 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "shelter")
+@Table(name = "shelter", schema = "project")
 public class Shelter {
 

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Surendee.java

@@ -10 +10 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "surendee")
+@Table(name = "surendee", schema = "project")
 @PrimaryKeyJoinColumn(name = "id_user")
 public class Surendee extends User {

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/Therapy.java

@@ -12 +12 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "therapy")
+@Table(name = "therapy", schema = "project")
 public class Therapy {
 

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/User.java

@@ -11 +11 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "user_table")
+@Table(name = "user_table", schema = "project")
 @Inheritance(strategy = InheritanceType.JOINED)
 public class User {

Prototype Application/Paw5/src/main/java/finki/paw5/model/entities/VetClinic.java

@@ -10 +10 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "vet_clinic")
+@Table(name = "vet_clinic", schema = "project")
 public class VetClinic {
 

Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/DonorDonatesToOrganisation.java

@@ -8 +8 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "donor_donates_to_organisation")
+@Table(name = "donor_donates_to_organisation", schema = "project")
 @IdClass(DonorDonatesToOrganisationId.class)
 public class DonorDonatesToOrganisation {

Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetBelongsToCategory.java

@@ -8 +8 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "pet_belongs_to_category")
+@Table(name = "pet_belongs_to_category", schema = "project")
 @IdClass(PetBelongsToCategoryId.class)
 public class PetBelongsToCategory {

Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetNeedsInterventionInVetClinic.java

@@ -11 +11 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "pet_needs_intervention_in_vet_clinic")
+@Table(name = "pet_needs_intervention_in_vet_clinic", schema = "project")
 @IdClass(PetNeedsInterventionInVetClinicId.class)
 public class PetNeedsInterventionInVetClinic {

Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetNeedsTherapy.java

@@ -8 +8 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "pet_needs_therapy")
+@Table(name = "pet_needs_therapy", schema = "project")
 @IdClass(PetNeedsTherapyId.class)
 public class PetNeedsTherapy {

Prototype Application/Paw5/src/main/java/finki/paw5/model/relations/PetPreferablyEatsFood.java

@@ -8 +8 @@
 @Entity
 @RequiredArgsConstructor
-@Table(name = "pet_preferably_eats_food")
+@Table(name = "pet_preferably_eats_food", schema = "project")
 @IdClass(PetPreferablyEatsFoodId.class)
 public class PetPreferablyEatsFood {