some cleanup
This commit is contained in:
parent
7ae9cca86f
commit
4b1c775b10
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
@ -8,7 +8,7 @@
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_22" default="true" project-jdk-name="22 (WSL) (2)" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_22" default="true" project-jdk-name="22 (WSL) (3)" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
BIN
diagram.png
Normal file
BIN
diagram.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 351 KiB |
@ -5,7 +5,7 @@ USE nplo_db;
|
||||
-- Create Member table
|
||||
CREATE TABLE Member
|
||||
(
|
||||
MemberID INT PRIMARY KEY AUTO_INCREMENT,
|
||||
MemberID INT PRIMARY KEY AUTO_INCREMENT UNIQUE,
|
||||
FirstName VARCHAR(50) NOT NULL,
|
||||
LastName VARCHAR(50) NOT NULL,
|
||||
MiddleInitial CHAR(1),
|
||||
@ -22,7 +22,7 @@ CREATE TABLE Member
|
||||
-- Create Donations table
|
||||
CREATE TABLE Donations
|
||||
(
|
||||
DonationID INT PRIMARY KEY AUTO_INCREMENT,
|
||||
DonationID INT PRIMARY KEY AUTO_INCREMENT UNIQUE,
|
||||
DonorID INT,
|
||||
DonationDate DATE NOT NULL,
|
||||
DonationType ENUM ('Money', 'Products') NOT NULL,
|
||||
@ -33,7 +33,7 @@ CREATE TABLE Donations
|
||||
-- Create Products table
|
||||
CREATE TABLE Products
|
||||
(
|
||||
ProductID INT PRIMARY KEY AUTO_INCREMENT,
|
||||
ProductID INT PRIMARY KEY AUTO_INCREMENT UNIQUE,
|
||||
Description TEXT,
|
||||
DonationDate DATE,
|
||||
SellingPrice DECIMAL(10, 2),
|
||||
@ -48,7 +48,7 @@ CREATE TABLE Products
|
||||
-- If DeliverToCity is NOT NULL, then this sale needs to be delivered
|
||||
CREATE TABLE Sales
|
||||
(
|
||||
SaleID INT PRIMARY KEY AUTO_INCREMENT,
|
||||
SaleID INT PRIMARY KEY AUTO_INCREMENT UNIQUE,
|
||||
SaleDate DATE NOT NULL,
|
||||
TotalAmount DECIMAL(10, 2) DEFAULT 0,
|
||||
ClientID INT,
|
||||
@ -71,7 +71,7 @@ CREATE TABLE SalesItems
|
||||
-- Create Employees table
|
||||
CREATE TABLE Employees
|
||||
(
|
||||
EmployeeID INT PRIMARY KEY,
|
||||
EmployeeID INT PRIMARY KEY UNIQUE,
|
||||
JobTitle ENUM ('President', 'Vice-President', 'Cashier', 'Other') NOT NULL,
|
||||
Salary DECIMAL(10, 2),
|
||||
FOREIGN KEY (EmployeeID) REFERENCES Member (MemberID)
|
||||
@ -80,7 +80,7 @@ CREATE TABLE Employees
|
||||
-- Create Expenses table
|
||||
CREATE TABLE Expenses
|
||||
(
|
||||
ExpenseID INT PRIMARY KEY AUTO_INCREMENT,
|
||||
ExpenseID INT PRIMARY KEY AUTO_INCREMENT UNIQUE,
|
||||
ApprovedByID INT,
|
||||
PaymentDate DATE NOT NULL,
|
||||
Amount DECIMAL(10, 2) NOT NULL,
|
||||
@ -387,6 +387,5 @@ WHERE m.MemberType = 'Client'
|
||||
FROM Sales
|
||||
WHERE SaleDate >= '2024-01-01')
|
||||
GROUP BY m.MemberID
|
||||
HAVING
|
||||
COUNT(s.SaleID) > 0
|
||||
HAVING COUNT(s.SaleID) > 0
|
||||
ORDER BY TotalSalesAmount DESC;
|
Loading…
x
Reference in New Issue
Block a user