diff --git a/Chinook_Rev1.sql b/Chinook_Rev1.sql index 7a34be0..4dcd71d 100644 --- a/Chinook_Rev1.sql +++ b/Chinook_Rev1.sql @@ -27,6 +27,42 @@ CREATE TABLE `GooglePay` CONSTRAINT `PK_GooglePay` PRIMARY KEY (`PayId`) ); +<<<<<<< HEAD +======= +CREATE TABLE `Invoice` +( + `InvoiceId` INT NOT NULL, + `CustomerId` INT NOT NULL, + `InvoiceDate` DATETIME NOT NULL, + `BillingAddress` NVARCHAR(70), + `BillingCity` NVARCHAR(40), + `BillingState` NVARCHAR(40), + `BillingCountry` NVARCHAR(40), + `BillingPostalCode` NVARCHAR(10), + `Total` NUMERIC(10,2) NOT NULL, + `PayId` INT, + CONSTRAINT `PK_Invoice` PRIMARY KEY (`InvoiceId`) +); + +CREATE TABLE `InvoiceLine` +( + `InvoiceLineId` INT NOT NULL, + `InvoiceId` INT NOT NULL, + `TrackId` INT NOT NULL, + `UnitPrice` NUMERIC(10,2) NOT NULL, + `Quantity` INT NOT NULL, + `PayID` INT NOT NULL, + CONSTRAINT `PK_InvoiceLine` PRIMARY KEY (`InvoiceLineId`) +); + +CREATE TABLE `MediaType` +( + `MediaTypeId` INT NOT NULL, + `Name` NVARCHAR(120), + CONSTRAINT `PK_MediaType` PRIMARY KEY (`MediaTypeId`) +); + +>>>>>>> origin/master CREATE TABLE `MyPlaylist` ( `PlaylistId` INT NOT NULL,