Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

Change primary key generation from nextval to identity

givanzea5b7c89976f
diff --git a/install/sql/pgsql/schema/admin/admin_failed_login.sql b/install/sql/pgsql/schema/admin/admin_failed_login.sql
index 55fe9af..5f7ba25 100644
--- a/install/sql/pgsql/schema/admin/admin_failed_login.sql
+++ b/install/sql/pgsql/schema/admin/admin_failed_login.sql
@@ -5,5 +5,5 @@ CREATE TABLE "admin_failed_login" (
"count" int check ("count" > 0) NOT NULL DEFAULT 1,
"last_ip" varchar(16) NOT NULL DEFAULT '',
"updated_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("admin_id", "updated_at")
+ PRIMARY KEY("admin_id", "updated_at")
);
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/admin/role.sql b/install/sql/pgsql/schema/admin/role.sql
index 9339f01..6cb8075 100755
--- a/install/sql/pgsql/schema/admin/role.sql
+++ b/install/sql/pgsql/schema/admin/role.sql
@@ -1,13 +1,14 @@
DROP TABLE IF EXISTS role;
-DROP SEQUENCE IF EXISTS role_seq;
-CREATE SEQUENCE role_seq;
-SELECT setval('role_seq', 10, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS role_role_id_seq;
+-- CREATE SEQUENCE role_role_id_seq;
CREATE TABLE role (
- "role_id" int check ("role_id" > 0) NOT NULL DEFAULT NEXTVAL ('role_seq'),
+ "role_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"name" varchar(191) NOT NULL,
"display_name" varchar(191) NOT NULL,
- "permissions" text NOT NULL,
- PRIMARY KEY ("role_id")
+ "permissions" text NOT NULL
+ -- PRIMARY KEY("role_id")
);
+
+SELECT setval('role_role_id_seq', 11, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/attribute/attribute.sql b/install/sql/pgsql/schema/attribute/attribute.sql
index 1144f63..31d9d29 100755
--- a/install/sql/pgsql/schema/attribute/attribute.sql
+++ b/install/sql/pgsql/schema/attribute/attribute.sql
@@ -1,12 +1,13 @@
DROP TABLE IF EXISTS attribute;
-DROP SEQUENCE IF EXISTS attribute_seq;
-CREATE SEQUENCE attribute_seq;
-SELECT setval('attribute_seq', 12, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS attribute_attribute_id_seq;
+-- CREATE SEQUENCE attribute_attribute_id_seq;
CREATE TABLE "attribute" (
- "attribute_id" int check ("attribute_id" > 0) NOT NULL DEFAULT NEXTVAL ('attribute_seq'),
+ "attribute_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"attribute_group_id" int check ("attribute_group_id" > 0) NOT NULL DEFAULT 0,
- "sort_order" INT NOT NULL DEFAULT 0,
- PRIMARY KEY ("attribute_id")
+ "sort_order" INT NOT NULL DEFAULT 0
+ -- PRIMARY KEY("attribute_id")
);
+
+SELECT setval('attribute_attribute_id_seq', 12, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/attribute/attribute_content.sql b/install/sql/pgsql/schema/attribute/attribute_content.sql
index 3e3ff95..5686cde 100755
--- a/install/sql/pgsql/schema/attribute/attribute_content.sql
+++ b/install/sql/pgsql/schema/attribute/attribute_content.sql
@@ -4,5 +4,5 @@ CREATE TABLE "attribute_content" (
"attribute_id" INTEGER,
"language_id" INT NOT NULL,
"name" TEXT NOT NULL,
- PRIMARY KEY ("attribute_id","language_id")
+ PRIMARY KEY("attribute_id","language_id")
);
diff --git a/install/sql/pgsql/schema/attribute/attribute_group.sql b/install/sql/pgsql/schema/attribute/attribute_group.sql
index e253aef..f3ba403 100755
--- a/install/sql/pgsql/schema/attribute/attribute_group.sql
+++ b/install/sql/pgsql/schema/attribute/attribute_group.sql
@@ -1,11 +1,12 @@
DROP TABLE IF EXISTS attribute_group;
-DROP SEQUENCE IF EXISTS attribute_group_seq;
-CREATE SEQUENCE attribute_group_seq;
-SELECT setval('attribute_group_seq', 4, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS attribute_group_attribute_group_id_seq;
+-- CREATE SEQUENCE attribute_group_attribute_group_id_seq;
CREATE TABLE "attribute_group" (
- "attribute_group_id" int check ("attribute_group_id" > 0) NOT NULL DEFAULT NEXTVAL ('attribute_group_seq'),
- "sort_order" INT NOT NULL DEFAULT 0,
- PRIMARY KEY ("attribute_group_id")
+ "attribute_group_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
+ "sort_order" INT NOT NULL DEFAULT 0
+ -- PRIMARY KEY("attribute_group_id")
);
+
+SELECT setval('attribute_group_attribute_group_id_seq', 4, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/attribute/attribute_group_content.sql b/install/sql/pgsql/schema/attribute/attribute_group_content.sql
index 58315a8..cd26120 100755
--- a/install/sql/pgsql/schema/attribute/attribute_group_content.sql
+++ b/install/sql/pgsql/schema/attribute/attribute_group_content.sql
@@ -4,5 +4,5 @@ CREATE TABLE "attribute_group_content" (
"attribute_group_id" INT NOT NULL,
"language_id" INT NOT NULL,
"name" TEXT NOT NULL,
- PRIMARY KEY ("attribute_group_id","language_id")
+ PRIMARY KEY("attribute_group_id","language_id")
);
diff --git a/install/sql/pgsql/schema/cart/cart.sql b/install/sql/pgsql/schema/cart/cart.sql
index 57bfcf2..de248d0 100644
--- a/install/sql/pgsql/schema/cart/cart.sql
+++ b/install/sql/pgsql/schema/cart/cart.sql
@@ -1,15 +1,15 @@
DROP TABLE IF EXISTS "cart";
-DROP SEQUENCE IF EXISTS cart_seq;
-CREATE SEQUENCE cart_seq;
+-- DROP SEQUENCE IF EXISTS cart_seq;
+-- CREATE SEQUENCE cart_seq;
CREATE TABLE cart (
- "cart_id" int check ("cart_id" > 0) NOT NULL DEFAULT NEXTVAL ('cart_seq'),
+ "cart_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"user_id" int check ("user_id" >= -1) NOT NULL DEFAULT 0,
"session_id" varchar(32) NOT NULL DEFAULT '',
"data" text NOT NULL,
- "created_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("cart_id")
+ "created_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("cart_id")
);
CREATE INDEX "cart_user_id" ON cart ("user_id");
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/cart/coupon.sql b/install/sql/pgsql/schema/cart/coupon.sql
index c0f09a8..2066d36 100755
--- a/install/sql/pgsql/schema/cart/coupon.sql
+++ b/install/sql/pgsql/schema/cart/coupon.sql
@@ -1,12 +1,10 @@
DROP TABLE IF EXISTS coupon;
-DROP SEQUENCE IF EXISTS coupon_seq;
-CREATE SEQUENCE coupon_seq;
-SELECT setval('coupon_seq', 3, true); -- last inserted id by sample data
-
+-- DROP SEQUENCE IF EXISTS coupon_coupon_id_seq;
+-- CREATE SEQUENCE coupon_coupon_id_seq;
CREATE TABLE coupon (
- "coupon_id" int check ("coupon_id" > 0) NOT NULL DEFAULT NEXTVAL ('coupon_seq'),
+ "coupon_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"name" varchar(128) NOT NULL,
"code" varchar(20) NOT NULL,
"type" char(1) NOT NULL,
@@ -20,6 +18,8 @@ CREATE TABLE coupon (
"from_date" date NOT NULL DEFAULT '1000-01-01',
"to_date" date NOT NULL DEFAULT '1000-01-01',
"created_at" timestamp(0) NOT NULL DEFAULT now(),
- "updated_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("coupon_id")
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("coupon_id")
);
+
+SELECT setval('coupon_coupon_id_seq', 3, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/cart/coupon_log.sql b/install/sql/pgsql/schema/cart/coupon_log.sql
index 63a7dca..1a48041 100755
--- a/install/sql/pgsql/schema/cart/coupon_log.sql
+++ b/install/sql/pgsql/schema/cart/coupon_log.sql
@@ -1,15 +1,16 @@
DROP TABLE IF EXISTS coupon_log;
-DROP SEQUENCE IF EXISTS coupon_log_seq;
-CREATE SEQUENCE coupon_log_seq;
--- SELECT setval('coupon_log_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS coupon_log_coupon_log_id_seq;
+-- CREATE SEQUENCE coupon_log_coupon_log_id_seq;
CREATE TABLE coupon_log (
- "coupon_log_id" int check ("coupon_log_id" > 0) NOT NULL DEFAULT NEXTVAL ('coupon_log_seq'),
+ "coupon_log_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"coupon_id" int check ("coupon_id" > 0) NOT NULL,
"order_id" int check ("order_id" > 0) NOT NULL,
"user_id" int check ("user_id" > 0) NOT NULL,
"discount" decimal(15,4) NOT NULL,
- "created_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("coupon_log_id")
+ "created_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("coupon_log_id")
);
+
+-- SELECT setval('coupon_log_coupon_log_id_seq', 0, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/cart/coupon_product.sql b/install/sql/pgsql/schema/cart/coupon_product.sql
index 6de11c4..6327a0a 100755
--- a/install/sql/pgsql/schema/cart/coupon_product.sql
+++ b/install/sql/pgsql/schema/cart/coupon_product.sql
@@ -1,13 +1,14 @@
DROP TABLE IF EXISTS coupon_product;
-DROP SEQUENCE IF EXISTS coupon_product_seq;
-CREATE SEQUENCE coupon_product_seq;
--- SELECT setval('coupon_product_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS coupon_product_coupon_product_id_seq;
+-- CREATE SEQUENCE coupon_product_coupon_product_id_seq;
CREATE TABLE coupon_product (
- "coupon_product_id" int check ("coupon_product_id" > 0) NOT NULL DEFAULT NEXTVAL ('coupon_product_seq'),
+ "coupon_product_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"coupon_id" int check ("coupon_id" > 0) NOT NULL,
- "product_id" int check ("product_id" > 0) NOT NULL,
- PRIMARY KEY ("coupon_product_id")
+ "product_id" int check ("product_id" > 0) NOT NULL
+ -- PRIMARY KEY("coupon_product_id")
);
+
+-- SELECT setval('coupon_product_coupon_product_id_seq', 0, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/cart/coupon_taxonomy.sql b/install/sql/pgsql/schema/cart/coupon_taxonomy.sql
index fd4bad6..c36820f 100755
--- a/install/sql/pgsql/schema/cart/coupon_taxonomy.sql
+++ b/install/sql/pgsql/schema/cart/coupon_taxonomy.sql
@@ -3,5 +3,5 @@ DROP TABLE IF EXISTS coupon_taxonomy;
CREATE TABLE coupon_taxonomy (
"coupon_id" int check ("coupon_id" > 0) NOT NULL,
"taxonomy_item_id" int check ("taxonomy_item_id" > 0) NOT NULL,
- PRIMARY KEY ("coupon_id","taxonomy_item_id")
+ PRIMARY KEY("coupon_id","taxonomy_item_id")
);
diff --git a/install/sql/pgsql/schema/checkout/voucher.sql b/install/sql/pgsql/schema/checkout/voucher.sql
index a221969..12bea58 100755
--- a/install/sql/pgsql/schema/checkout/voucher.sql
+++ b/install/sql/pgsql/schema/checkout/voucher.sql
@@ -1,12 +1,10 @@
DROP TABLE IF EXISTS voucher;
-DROP SEQUENCE IF EXISTS voucher_seq;
-CREATE SEQUENCE voucher_seq;
-SELECT setval('voucher_seq', 1, true); -- last inserted id by sample data
-
+-- DROP SEQUENCE IF EXISTS voucher_voucher_id_seq;
+-- CREATE SEQUENCE voucher_voucher_id_seq;
CREATE TABLE voucher (
- "voucher_id" int check ("voucher_id" > 0) NOT NULL DEFAULT NEXTVAL ('voucher_seq'),
+ "voucher_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"order_id" int check ("order_id" > 0) NOT NULL,
"code" varchar(10) NOT NULL,
"from_name" varchar(64) NOT NULL,
@@ -16,6 +14,8 @@ CREATE TABLE voucher (
"message" text NOT NULL,
"credit" decimal(15,4) NOT NULL,
"status" smallint NOT NULL,
- "created_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("voucher_id")
+ "created_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("voucher_id")
);
+
+SELECT setval('voucher_voucher_id_seq', 1, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/checkout/voucher_log.sql b/install/sql/pgsql/schema/checkout/voucher_log.sql
index fa8a325..fbfc6d0 100755
--- a/install/sql/pgsql/schema/checkout/voucher_log.sql
+++ b/install/sql/pgsql/schema/checkout/voucher_log.sql
@@ -1,15 +1,16 @@
DROP TABLE IF EXISTS voucher_log;
-DROP SEQUENCE IF EXISTS voucher_log_seq;
-CREATE SEQUENCE voucher_log_seq;
--- SELECT setval('voucher_log_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS voucher_log_voucher_log_id_seq;
+-- CREATE SEQUENCE voucher_log_voucher_log_id_seq;
CREATE TABLE voucher_log (
- "voucher_log_id" int check ("voucher_log_id" > 0) NOT NULL DEFAULT NEXTVAL ('voucher_log_seq'),
+ "voucher_log_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"voucher_id" int check ("voucher_id" > 0) NOT NULL,
"order_id" int check ("order_id" > 0) NOT NULL,
"credit" decimal(15,4) NOT NULL,
- "created_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("voucher_log_id")
+ "created_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("voucher_log_id")
);
+
+-- SELECT setval('voucher_log_voucher_log_id_seq', 0, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/geoip/country.sql b/install/sql/pgsql/schema/geoip/country.sql
index 2d6c328..823348b 100755
--- a/install/sql/pgsql/schema/geoip/country.sql
+++ b/install/sql/pgsql/schema/geoip/country.sql
@@ -1,15 +1,16 @@
DROP TABLE IF EXISTS country;
-DROP SEQUENCE IF EXISTS country_seq;
-CREATE SEQUENCE country_seq;
-SELECT setval('country_seq', 257, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS country_country_id_seq;
+-- CREATE SEQUENCE country_country_id_seq;
CREATE TABLE country (
- "country_id" int check ("country_id" > 0) NOT NULL DEFAULT NEXTVAL ('country_seq'),
+ "country_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"name" varchar(128) NOT NULL,
"iso_code_2" varchar(2) NOT NULL,
"iso_code_3" varchar(3) NOT NULL,
- "status" smallint NOT NULL DEFAULT 1,
- PRIMARY KEY ("country_id")
+ "status" smallint NOT NULL DEFAULT 1
+ -- PRIMARY KEY("country_id")
);
+
+SELECT setval('country_country_id_seq', 257, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/geoip/region.sql b/install/sql/pgsql/schema/geoip/region.sql
index 0d8fcfc..76947b9 100755
--- a/install/sql/pgsql/schema/geoip/region.sql
+++ b/install/sql/pgsql/schema/geoip/region.sql
@@ -1,15 +1,15 @@
DROP TABLE IF EXISTS region;
-DROP SEQUENCE IF EXISTS region_seq;
-CREATE SEQUENCE region_seq;
-SELECT setval('region_seq', 4343, true); -- last inserted id by sample data
-
+-- DROP SEQUENCE IF EXISTS region_region_id_seq;
+-- CREATE SEQUENCE region_region_id_seq;
CREATE TABLE region (
- "region_id" int check ("region_id" > 0) NOT NULL DEFAULT NEXTVAL ('region_seq'),
+ "region_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"country_id" int check ("country_id" > 0) NOT NULL,
"name" varchar(128) NOT NULL,
"code" varchar(32) NOT NULL,
- "status" smallint NOT NULL DEFAULT 1,
- PRIMARY KEY ("region_id")
+ "status" smallint NOT NULL DEFAULT 1
+ -- PRIMARY KEY("region_id")
);
+
+SELECT setval('region_region_id_seq', 4343, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/geoip/region_group.sql b/install/sql/pgsql/schema/geoip/region_group.sql
index b15c561..f5a91d3 100755
--- a/install/sql/pgsql/schema/geoip/region_group.sql
+++ b/install/sql/pgsql/schema/geoip/region_group.sql
@@ -1,14 +1,15 @@
DROP TABLE IF EXISTS region_group;
-DROP SEQUENCE IF EXISTS region_group_seq;
-CREATE SEQUENCE region_group_seq;
-SELECT setval('region_group_seq', 2, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS region_group_region_group_id_seq;
+-- CREATE SEQUENCE region_group_region_group_id_seq;
CREATE TABLE region_group (
- "region_group_id" int check ("region_group_id" > 0) NOT NULL DEFAULT NEXTVAL ('region_group_seq'),
+ "region_group_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"name" varchar(32) NOT NULL,
"content" varchar(191) NOT NULL,
- "created_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("region_group_id")
+ "created_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("region_group_id")
);
+
+SELECT setval('region_group_region_group_id_seq', 2, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/geoip/region_to_region_group.sql b/install/sql/pgsql/schema/geoip/region_to_region_group.sql
index 0471a6d..2221b09 100755
--- a/install/sql/pgsql/schema/geoip/region_to_region_group.sql
+++ b/install/sql/pgsql/schema/geoip/region_to_region_group.sql
@@ -1,14 +1,15 @@
DROP TABLE IF EXISTS region_to_region_group;
-DROP SEQUENCE IF EXISTS region_to_region_group_seq;
-CREATE SEQUENCE region_to_region_group_seq;
-SELECT setval('region_to_region_group_seq', 108, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS region_to_region_group_region_to_region_group_id_seq;
+-- CREATE SEQUENCE region_to_region_group_region_to_region_group_id_seq;
CREATE TABLE region_to_region_group (
- "region_to_region_group_id" int check ("region_to_region_group_id" > 0) NOT NULL DEFAULT NEXTVAL ('region_to_region_group_seq'),
+ "region_to_region_group_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"country_id" int check ("country_id" > 0) NOT NULL,
"region_id" int check ("region_id" >= 0) NOT NULL DEFAULT 0,
"region_group_id" int check ("region_group_id" > 0) NOT NULL,
- "created_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("region_to_region_group_id")
+ "created_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("region_to_region_group_id")
);
+
+SELECT setval('region_to_region_group_region_to_region_group_id_seq', 108, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/localisation/currency.sql b/install/sql/pgsql/schema/localisation/currency.sql
index ab215c1..e821786 100755
--- a/install/sql/pgsql/schema/localisation/currency.sql
+++ b/install/sql/pgsql/schema/localisation/currency.sql
@@ -1,12 +1,11 @@
DROP TABLE IF EXISTS currency;
-DROP SEQUENCE IF EXISTS currency_seq;
-CREATE SEQUENCE currency_seq;
-SELECT setval('currency_seq', 8, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS currency_currency_id_seq;
+-- CREATE SEQUENCE currency_currency_id_seq;
CREATE TABLE currency (
- "currency_id" int check ("currency_id" > 0) NOT NULL DEFAULT NEXTVAL ('currency_seq'),
+ "currency_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"name" varchar(32) NOT NULL,
"code" varchar(3) NOT NULL,
"value" double precision NOT NULL,
@@ -14,6 +13,8 @@ CREATE TABLE currency (
"sign_end" varchar(12) NOT NULL,
"decimal_place" char(1) NOT NULL,
"status" smallint NOT NULL,
- "updated_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("currency_id")
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("currency_id")
);
+
+SELECT setval('currency_currency_id_seq', 8, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/media/media.sql b/install/sql/pgsql/schema/media/media.sql
old mode 100644
new mode 100755
index 818148e..f90d8bb
--- a/install/sql/pgsql/schema/media/media.sql
+++ b/install/sql/pgsql/schema/media/media.sql
@@ -1,16 +1,16 @@
DROP TABLE IF EXISTS media;
-DROP SEQUENCE IF EXISTS media_seq;
-CREATE SEQUENCE media_seq;
--- SELECT setval('media_seq', 14, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS media_media_id_seq;
+-- CREATE SEQUENCE media_media_id_seq;
+-- SELECT setval('media_media_id_seq', 14, true); -- last inserted id by sample data
CREATE TABLE media (
- "media_id" int check ("media_id" > 0) NOT NULL DEFAULT NEXTVAL ('media_seq'),
+ "media_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"file" varchar(191) NOT NULL,
"type" varchar(30) NOT NULL default 'image/png',
- "meta" TEXT,
- PRIMARY KEY ("media_id")
+ "meta" TEXT
+ -- PRIMARY KEY("media_id")
);
CREATE INDEX "file_media_id" ON media ("file", "media_id");
diff --git a/install/sql/pgsql/schema/media/media_content.sql b/install/sql/pgsql/schema/media/media_content.sql
old mode 100644
new mode 100755
index 75d33cc..50e905c
--- a/install/sql/pgsql/schema/media/media_content.sql
+++ b/install/sql/pgsql/schema/media/media_content.sql
@@ -8,7 +8,7 @@ CREATE TABLE media_content (
"caption" varchar(191) NOT NULL DEFAULT '',
"description" varchar(191) NOT NULL DEFAULT '',
-- "content" text DEFAULT NULL,
- PRIMARY KEY ("media_id","language_id")
+ PRIMARY KEY("media_id","language_id")
);
--CREATE INDEX "media_content_slug" ON media_content ("slug");
diff --git a/install/sql/pgsql/schema/menu/menu.sql b/install/sql/pgsql/schema/menu/menu.sql
index 2ce8572..4cf0d27 100755
--- a/install/sql/pgsql/schema/menu/menu.sql
+++ b/install/sql/pgsql/schema/menu/menu.sql
@@ -1,15 +1,15 @@
DROP TABLE IF EXISTS menu;
-DROP SEQUENCE IF EXISTS menu_seq;
-CREATE SEQUENCE menu_seq;
-SELECT setval('menu_seq', 5, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS menu_seq;
+-- CREATE SEQUENCE menu_seq;
CREATE TABLE menu (
- "menu_id" int check ("menu_id" > 0) NOT NULL DEFAULT NEXTVAL ('menu_seq'),
+ "menu_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"name" varchar(191) NOT NULL DEFAULT '',
- "slug" varchar(191) NOT NULL DEFAULT '',
- PRIMARY KEY ("menu_id")
+ "slug" varchar(191) NOT NULL DEFAULT ''
+ -- PRIMARY KEY("menu_id")
);
CREATE INDEX "menu_menu_id" ON menu ("menu_id");
+SELECT setval('menu_menu_id_seq', 5, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/menu/menu_item.sql b/install/sql/pgsql/schema/menu/menu_item.sql
index 23057e2..c4513cc 100755
--- a/install/sql/pgsql/schema/menu/menu_item.sql
+++ b/install/sql/pgsql/schema/menu/menu_item.sql
@@ -1,12 +1,11 @@
DROP TABLE IF EXISTS menu_item;
-DROP SEQUENCE IF EXISTS menu_item_seq;
-CREATE SEQUENCE menu_item_seq;
-SELECT setval('menu_item_seq', 68, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS menu_item_seq;
+-- CREATE SEQUENCE menu_item_seq;
CREATE TABLE menu_item (
- "menu_item_id" int check ("menu_item_id" > 0) NOT NULL DEFAULT NEXTVAL ('menu_item_seq'),
+ "menu_item_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"menu_id" int check ("menu_id" > 0) NOT NULL,
"type" varchar(191) NOT NULL DEFAULT 'link',
"url" varchar(191) NOT NULL DEFAULT '',
@@ -14,8 +13,9 @@ CREATE TABLE menu_item (
"item_id" int check ("item_id" > 0) DEFAULT NULL,
"options" varchar(191) NOT NULL DEFAULT '',
"sort_order" int NOT NULL DEFAULT 0,
- "status" smallint NOT NULL DEFAULT 0,
- PRIMARY KEY ("menu_item_id")
+ "status" smallint NOT NULL DEFAULT 0
+ -- PRIMARY KEY("menu_item_id")
);
CREATE INDEX "menu_item_parent_id" ON menu_item ("parent_id");
+SELECT setval('menu_item_menu_item_id_seq', 68, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/menu/menu_item_content.sql b/install/sql/pgsql/schema/menu/menu_item_content.sql
index c7dd5f0..d82abae 100755
--- a/install/sql/pgsql/schema/menu/menu_item_content.sql
+++ b/install/sql/pgsql/schema/menu/menu_item_content.sql
@@ -5,7 +5,7 @@ CREATE TABLE menu_item_content (
"name" varchar(191) NOT NULL DEFAULT '',
"slug" varchar(191) NOT NULL DEFAULT '',
"content" text NOT NULL,
- PRIMARY KEY ("menu_item_id","language_id")
+ PRIMARY KEY("menu_item_id","language_id")
);
CREATE INDEX "menu_item_content_name" ON menu_item_content ("name");
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/menu/menu_item_meta.sql b/install/sql/pgsql/schema/menu/menu_item_meta.sql
index e6e450d..1224221 100755
--- a/install/sql/pgsql/schema/menu/menu_item_meta.sql
+++ b/install/sql/pgsql/schema/menu/menu_item_meta.sql
@@ -1,17 +1,17 @@
DROP TABLE IF EXISTS menu_item_meta;
-DROP SEQUENCE IF EXISTS menu_item_meta_seq;
-CREATE SEQUENCE menu_item_meta_seq;
--- SELECT setval('menu_item_meta_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS menu_item_meta_menu_item_meta_id_seq;
+-- CREATE SEQUENCE menu_item_meta_menu_item_meta_id_seq;
CREATE TABLE menu_item_meta (
- "menu_item_id" int check ("menu_item_id" > 0) NOT NULL DEFAULT 0,
- "namespace" varchar(191) DEFAULT NULL,
- "key" varchar(191) DEFAULT NULL,
- "value" text DEFAULT NULL
--- PRIMARY KEY ("menu_item_meta_id")
+ "menu_item_id" int check ("menu_item_id" > 0) NOT NULL,
+ "namespace" varchar(191) NOT NULL DEFAULT '',
+ "key" varchar(191) NOT NULL,
+ "value" text DEFAULT NULL,
+ PRIMARY KEY ("menu_item_id", "namespace", "key")
);
-CREATE INDEX "menu_item_id" ON menu_item_meta ("menu_item_id", "namespace", "key");
+-- CREATE UNIQUE INDEX "menu_item_id" ON menu_item_meta ("menu_item_id", "namespace", "key");
-- CREATE INDEX "menu_item_meta_key" ON menu_item_meta ("key");
+-- SELECT setval('menu_item_meta_menu_item_meta_id_seq', 0, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/menu/menu_to_site.sql b/install/sql/pgsql/schema/menu/menu_to_site.sql
index 7debb27..6826f8b 100755
--- a/install/sql/pgsql/schema/menu/menu_to_site.sql
+++ b/install/sql/pgsql/schema/menu/menu_to_site.sql
@@ -1,6 +1,7 @@
DROP TABLE IF EXISTS menu_to_site;
+
CREATE TABLE menu_to_site (
"menu_id" int check ("menu_id" > 0) NOT NULL,
"site_id" smallint NOT NULL,
- PRIMARY KEY ("menu_id","site_id")
+ PRIMARY KEY("menu_id","site_id")
);
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/menu/menu_type_content.sql b/install/sql/pgsql/schema/menu/menu_type_content.sql
index 0626bac..4a8f103 100755
--- a/install/sql/pgsql/schema/menu/menu_type_content.sql
+++ b/install/sql/pgsql/schema/menu/menu_type_content.sql
@@ -5,7 +5,7 @@ CREATE TABLE menu_type_content (
"name" varchar(191) NOT NULL,
"slug" varchar(191) NOT NULL DEFAULT '',
"content" text NOT NULL,
- PRIMARY KEY ("menu_type_id","language_id")
+ PRIMARY KEY("menu_type_id","language_id")
);
CREATE INDEX "menu_type_content_name" ON menu_type_content ("name");
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/menu/post_to_menu.sql b/install/sql/pgsql/schema/menu/post_to_menu.sql
index 5c6e704..19b0e18 100755
--- a/install/sql/pgsql/schema/menu/post_to_menu.sql
+++ b/install/sql/pgsql/schema/menu/post_to_menu.sql
@@ -3,7 +3,7 @@ DROP TABLE IF EXISTS post_to_menu;
CREATE TABLE post_to_menu (
"post_id" int check ("post_id" > 0) NOT NULL,
"menu_id" int check ("menu_id" > 0) NOT NULL,
- PRIMARY KEY ("post_id","menu_id")
+ PRIMARY KEY("post_id","menu_id")
);
CREATE INDEX "menu_id" ON post_to_menu ("menu_id");
diff --git a/install/sql/pgsql/schema/option/option.sql b/install/sql/pgsql/schema/option/option.sql
index 430da59..583f442 100755
--- a/install/sql/pgsql/schema/option/option.sql
+++ b/install/sql/pgsql/schema/option/option.sql
@@ -1,12 +1,13 @@
DROP TABLE IF EXISTS option;
-DROP SEQUENCE IF EXISTS option_seq;
-CREATE SEQUENCE option_seq;
-SELECT setval('option_seq', 14, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS option_option_id_seq;
+-- CREATE SEQUENCE option_option_id_seq;
CREATE TABLE "option" (
- "option_id" int check ("option_id" > 0) NOT NULL DEFAULT NEXTVAL ('option_seq'),
+ "option_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"type" TEXT NOT NULL,
- "sort_order" INT NOT NULL DEFAULT 0,
- PRIMARY KEY ("option_id", "type")
+ "sort_order" INT NOT NULL DEFAULT 0
+ -- PRIMARY KEY("option_id", "type")
);
+
+SELECT setval('option_option_id_seq', 14, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/option/option_content.sql b/install/sql/pgsql/schema/option/option_content.sql
index 2d7c5f4..584c864 100755
--- a/install/sql/pgsql/schema/option/option_content.sql
+++ b/install/sql/pgsql/schema/option/option_content.sql
@@ -4,5 +4,5 @@ CREATE TABLE "option_content" (
"option_id" INT NOT NULL,
"language_id" INT NOT NULL,
"name" TEXT NOT NULL,
- PRIMARY KEY ("option_id","language_id")
+ PRIMARY KEY("option_id","language_id")
);
diff --git a/install/sql/pgsql/schema/option/option_value.sql b/install/sql/pgsql/schema/option/option_value.sql
index c5297f1..b737234 100755
--- a/install/sql/pgsql/schema/option/option_value.sql
+++ b/install/sql/pgsql/schema/option/option_value.sql
@@ -1,13 +1,15 @@
DROP TABLE IF EXISTS option_value;
-DROP SEQUENCE IF EXISTS option_value_seq;
-CREATE SEQUENCE option_value_seq;
-SELECT setval('option_value_seq', 18, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS option_value_option_value_id_seq;
+-- CREATE SEQUENCE option_value_option_value_id_seq;
+
CREATE TABLE "option_value" (
- "option_value_id" int check ("option_value_id" > 0) NOT NULL DEFAULT NEXTVAL ('option_value_seq'),
+ "option_value_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"option_id" INT NOT NULL,
"image" TEXT NOT NULL,
- "sort_order" INT NOT NULL DEFAULT 0,
- PRIMARY KEY ("option_value_id")
+ "sort_order" INT NOT NULL DEFAULT 0
+ -- PRIMARY KEY("option_value_id")
);
+
+SELECT setval('option_value_option_value_id_seq', 18, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/option/option_value_content.sql b/install/sql/pgsql/schema/option/option_value_content.sql
index dd963f8..8f7cb38 100755
--- a/install/sql/pgsql/schema/option/option_value_content.sql
+++ b/install/sql/pgsql/schema/option/option_value_content.sql
@@ -5,5 +5,5 @@ CREATE TABLE "option_value_content" (
"language_id" INT NOT NULL,
"option_id" INT NOT NULL,
"name" TEXT NOT NULL,
- PRIMARY KEY ("option_value_id","language_id")
+ PRIMARY KEY("option_value_id","language_id")
);
diff --git a/install/sql/pgsql/schema/option/product_option.sql b/install/sql/pgsql/schema/option/product_option.sql
index 1230f8f..5dbfff6 100755
--- a/install/sql/pgsql/schema/option/product_option.sql
+++ b/install/sql/pgsql/schema/option/product_option.sql
@@ -1,15 +1,16 @@
DROP TABLE IF EXISTS product_option;
-DROP SEQUENCE IF EXISTS product_option_seq;
-CREATE SEQUENCE product_option_seq;
-SELECT setval('product_option_seq', 3, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS product_option_product_option_id_seq;
+-- CREATE SEQUENCE product_option_product_option_id_seq;
CREATE TABLE product_option (
- "product_option_id" int check ("product_option_id" > 0) NOT NULL DEFAULT NEXTVAL ('product_option_seq'),
+ "product_option_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"product_id" int check ("product_id" > 0) NOT NULL,
"option_id" int check ("option_id" > 0) NOT NULL,
"value" text NOT NULL,
- "required" smallint NOT NULL DEFAULT 0,
- PRIMARY KEY ("product_option_id")
+ "required" smallint NOT NULL DEFAULT 0
+ -- PRIMARY KEY("product_option_id")
);
+
+SELECT setval('product_option_product_option_id_seq', 3, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/option/product_option_value.sql b/install/sql/pgsql/schema/option/product_option_value.sql
index 99d7282..49a30e3 100755
--- a/install/sql/pgsql/schema/option/product_option_value.sql
+++ b/install/sql/pgsql/schema/option/product_option_value.sql
@@ -1,12 +1,11 @@
DROP TABLE IF EXISTS product_option_value;
-DROP SEQUENCE IF EXISTS product_option_value_seq;
-CREATE SEQUENCE product_option_value_seq;
-SELECT setval('product_option_value_seq', 9, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS product_option_value_product_option_value_id_seq;
+-- CREATE SEQUENCE product_option_value_product_option_value_id_seq;
CREATE TABLE product_option_value (
- "product_option_value_id" int check ("product_option_value_id" > 0) NOT NULL DEFAULT NEXTVAL ('product_option_value_seq'),
+ "product_option_value_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"product_option_id" int check ("product_option_id" > 0) NOT NULL,
"product_id" int check ("product_id" > 0) NOT NULL,
"option_id" int check ("option_id" > 0) NOT NULL,
@@ -18,6 +17,8 @@ CREATE TABLE product_option_value (
"points_operator" varchar(1) NOT NULL DEFAULT '+',
"points" int NOT NULL DEFAULT 0,
"weight_operator" varchar(1) NOT NULL DEFAULT '+',
- "weight" decimal(15,8) NOT NULL DEFAULT 0,
- PRIMARY KEY ("product_option_value_id")
+ "weight" decimal(15,8) NOT NULL DEFAULT 0
+ -- PRIMARY KEY("product_option_value_id")
);
+
+SELECT setval('product_option_value_product_option_value_id_seq', 9, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/order/order.sql b/install/sql/pgsql/schema/order/order.sql
index eff2134..7e3db79 100755
--- a/install/sql/pgsql/schema/order/order.sql
+++ b/install/sql/pgsql/schema/order/order.sql
@@ -1,8 +1,7 @@
DROP TABLE IF EXISTS "order";
-DROP SEQUENCE IF EXISTS order_seq;
-CREATE SEQUENCE order_seq;
--- SELECT setval('order_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS order_order_id_seq;
+-- CREATE SEQUENCE order_order_id_seq;
-- CREATE TYPE shipping_status AS ENUM
-- ('not_fulfilled', 'partially_fulfilled', 'fulfilled', 'partially_shipped', 'shipped', 'partially_returned', 'returned', 'canceled', 'requires_action');
@@ -12,7 +11,7 @@ CREATE SEQUENCE order_seq;
CREATE TABLE "order" (
- "order_id" int check ("order_id" > 0) NOT NULL DEFAULT NEXTVAL ('order_seq'),
+ "order_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"invoice_no" varchar(64) NOT NULL DEFAULT '0',
"customer_order_id" varchar(64) NOT NULL DEFAULT '0',
"invoice_prefix" varchar(26) NOT NULL DEFAULT 'I-',
@@ -66,9 +65,11 @@ CREATE TABLE "order" (
"forwarded_for_ip" varchar(40) NOT NULL DEFAULT '',
"user_agent" varchar(191) NOT NULL DEFAULT '',
"created_at" timestamp(0) NOT NULL DEFAULT now(),
- "updated_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("order_id")
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("order_id")
);
CREATE INDEX "order_order_status_id" ON "order" ("site_id","order_status_id","created_at");
CREATE INDEX "order_customer_order_id" ON "order" ("customer_order_id","order_status_id","created_at");
+
+-- SELECT setval('order_order_id_seq', 0, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/order/order_log.sql b/install/sql/pgsql/schema/order/order_log.sql
index 385916f..d42a85e 100755
--- a/install/sql/pgsql/schema/order/order_log.sql
+++ b/install/sql/pgsql/schema/order/order_log.sql
@@ -1,17 +1,18 @@
DROP TABLE IF EXISTS order_log;
-DROP SEQUENCE IF EXISTS order_log_seq;
-CREATE SEQUENCE order_log_seq;
--- SELECT setval('order_log_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS order_log_order_log_id_seq;
+-- CREATE SEQUENCE order_log_order_log_id_seq;
CREATE TABLE order_log (
- "order_log_id" int check ("order_log_id" > 0) NOT NULL DEFAULT NEXTVAL ('order_log_seq'),
+ "order_log_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"order_id" int check ("order_id" > 0) NOT NULL,
"order_status_id" int check ("order_status_id" > 0) NOT NULL,
"notify" smallint NOT NULL DEFAULT 0,
"public" smallint NOT NULL DEFAULT 0,
"note" text NOT NULL,
- "created_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("order_log_id")
+ "created_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("order_log_id")
);
+
+-- SELECT setval('order_log_order_log_id_seq', 0, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/order/order_meta.sql b/install/sql/pgsql/schema/order/order_meta.sql
index 14b6b77..9c95d8c 100755
--- a/install/sql/pgsql/schema/order/order_meta.sql
+++ b/install/sql/pgsql/schema/order/order_meta.sql
@@ -1,17 +1,14 @@
DROP TABLE IF EXISTS order_meta;
-DROP SEQUENCE IF EXISTS order_meta_seq;
-CREATE SEQUENCE order_meta_seq;
--- SELECT setval('order_meta_seq', 0, true); -- last inserted id by sample data
-
+-- DROP SEQUENCE IF EXISTS order_meta_order_meta_id_seq;
+-- CREATE SEQUENCE order_meta_order_meta_id_seq;
CREATE TABLE order_meta (
- "meta_id" int check ("meta_id" > 0) NOT NULL DEFAULT NEXTVAL ('order_meta_seq'),
- "order_id" int check ("order_id" > 0) NOT NULL DEFAULT 0,
- "key" varchar(191) DEFAULT NULL,
- "value" text DEFAULT NULL,
- PRIMARY KEY ("meta_id")
+ "order_id" int check ("order_id" > 0) NOT NULL,
+ "namespace" varchar(32) NOT NULL DEFAULT '',
+ "key" varchar(191) NOT NULL,
+ "value" text DEFAULT NULL
);
-CREATE INDEX "order_meta_order_id" ON order_meta ("order_id");
-CREATE INDEX "order_meta_key" ON order_meta ("key");
+CREATE UNIQUE INDEX "order_meta_order_id" ON order_meta ("order_id","namespace","key");
+-- SELECT setval('order_meta_order_meta_id_seq', 0, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/order/order_product.sql b/install/sql/pgsql/schema/order/order_product.sql
index 788887f..8f2d4cb 100755
--- a/install/sql/pgsql/schema/order/order_product.sql
+++ b/install/sql/pgsql/schema/order/order_product.sql
@@ -1,12 +1,11 @@
DROP TABLE IF EXISTS order_product;
-DROP SEQUENCE IF EXISTS order_product_seq;
-CREATE SEQUENCE order_product_seq;
--- SELECT setval('order_product_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS order_product_order_product_id_seq;
+-- CREATE SEQUENCE order_product_order_product_id_seq;
CREATE TABLE order_product (
- "order_product_id" int check ("order_product_id" > 0) NOT NULL DEFAULT NEXTVAL ('order_product_seq'),
+ "order_product_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"order_id" int check ("order_id" > 0) NOT NULL,
"product_id" int check ("product_id" > 0) NOT NULL,
"name" varchar(191) NOT NULL,
@@ -15,8 +14,9 @@ CREATE TABLE order_product (
"price" decimal(15,4) NOT NULL DEFAULT 0.0000,
"total" decimal(15,4) NOT NULL DEFAULT 0.0000,
"tax" decimal(15,4) NOT NULL DEFAULT 0.0000,
- "points" int NOT NULL DEFAULT 0,
- PRIMARY KEY ("order_product_id")
+ "points" int NOT NULL DEFAULT 0
+ -- PRIMARY KEY("order_product_id")
);
CREATE INDEX "order_product_order_id" ON order_product ("order_id");
+-- SELECT setval('order_product_order_product_id_seq', 0, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/order/order_product_option.sql b/install/sql/pgsql/schema/order/order_product_option.sql
index 30ed0a0..ed101e8 100755
--- a/install/sql/pgsql/schema/order/order_product_option.sql
+++ b/install/sql/pgsql/schema/order/order_product_option.sql
@@ -1,12 +1,11 @@
DROP TABLE IF EXISTS order_product_option;
-DROP SEQUENCE IF EXISTS order_product_option_seq;
-CREATE SEQUENCE order_product_option_seq;
--- SELECT setval('order_product_option_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS order_product_option_order_product_option_id_seq;
+-- CREATE SEQUENCE order_product_option_order_product_option_id_seq;
CREATE TABLE order_product_option (
- "order_product_option_id" int check ("order_product_option_id" > 0) NOT NULL DEFAULT NEXTVAL ('order_product_option_seq'),
+ "order_product_option_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"order_id" int check ("order_id" > 0) NOT NULL,
"order_product_id" int check ("order_product_id" > 0) NOT NULL,
"product_option_id" int check ("product_option_id" > 0) NOT NULL,
@@ -14,6 +13,8 @@ CREATE TABLE order_product_option (
"option" varchar(191) NOT NULL,
"name" varchar(191) NOT NULL,
"price" decimal(15,4) NOT NULL DEFAULT 0.0000,
- "type" varchar(32) NOT NULL DEFAULT '',
- PRIMARY KEY ("order_product_option_id")
+ "type" varchar(32) NOT NULL DEFAULT ''
+ -- PRIMARY KEY("order_product_option_id")
);
+
+-- SELECT setval('order_product_option_order_product_option_id_seq', 0, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/order/order_shipment.sql b/install/sql/pgsql/schema/order/order_shipment.sql
index 6f66f2a..fd4dd41 100755
--- a/install/sql/pgsql/schema/order/order_shipment.sql
+++ b/install/sql/pgsql/schema/order/order_shipment.sql
@@ -1,15 +1,16 @@
DROP TABLE IF EXISTS order_shipment;
-DROP SEQUENCE IF EXISTS order_shipment_seq;
-CREATE SEQUENCE order_shipment_seq;
--- SELECT setval('order_shipment_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS order_shipment_order_shipment_id_seq;
+-- CREATE SEQUENCE order_shipment_order_shipment_id_seq;
CREATE TABLE order_shipment (
- "order_shipment_id" int check ("order_shipment_id" > 0) NOT NULL DEFAULT NEXTVAL ('order_shipment_seq'),
+ "order_shipment_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"order_id" int check ("order_id" > 0) NOT NULL,
"shipping_method" varchar(191) NOT NULL,
"tracking_number" varchar(191) NOT NULL,
- "created_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("order_shipment_id")
+ "created_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("order_shipment_id")
);
+
+-- SELECT setval('order_shipment_order_shipment_id_seq', 0, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/order/order_status.sql b/install/sql/pgsql/schema/order/order_status.sql
index 70a828b..2b5266c 100755
--- a/install/sql/pgsql/schema/order/order_status.sql
+++ b/install/sql/pgsql/schema/order/order_status.sql
@@ -1,13 +1,14 @@
DROP TABLE IF EXISTS order_status;
-DROP SEQUENCE IF EXISTS order_status_seq;
-CREATE SEQUENCE order_status_seq;
-SELECT setval('order_status_seq', 20, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS order_status_order_status_id_seq;
+-- CREATE SEQUENCE order_status_order_status_id_seq;
CREATE TABLE order_status (
- "order_status_id" int check ("order_status_id" > 0) NOT NULL DEFAULT NEXTVAL ('order_status_seq'),
+ "order_status_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"language_id" int check ("language_id" > 0) NOT NULL,
- "name" varchar(32) NOT NULL,
- PRIMARY KEY ("order_status_id","language_id")
+ "name" varchar(32) NOT NULL
+ -- PRIMARY KEY("order_status_id","language_id")
);
+
+SELECT setval('order_status_order_status_id_seq', 20, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/order/order_total.sql b/install/sql/pgsql/schema/order/order_total.sql
index cef6d07..0b220fc 100755
--- a/install/sql/pgsql/schema/order/order_total.sql
+++ b/install/sql/pgsql/schema/order/order_total.sql
@@ -1,18 +1,18 @@
DROP TABLE IF EXISTS order_total;
-DROP SEQUENCE IF EXISTS order_total_seq;
-CREATE SEQUENCE order_total_seq;
--- SELECT setval('order_total_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS order_total_order_total_id_seq;
+-- CREATE SEQUENCE order_total_order_total_id_seq;
CREATE TABLE order_total (
- "order_total_id" int NOT NULL DEFAULT NEXTVAL ('order_total_seq'),
+ "order_total_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY,
"order_id" int check ("order_id" > 0) NOT NULL,
"key" varchar(32) NOT NULL DEFAULT '',
"title" varchar(191) NOT NULL,
"value" decimal(15,4) NOT NULL DEFAULT 0.0000,
- "sort_order" int NOT NULL DEFAULT 0,
- PRIMARY KEY ("order_total_id")
+ "sort_order" int NOT NULL DEFAULT 0
+ -- PRIMARY KEY("order_total_id")
);
CREATE INDEX "order_id" ON order_total ("order_id");
+-- SELECT setval('order_total_order_total_id_seq', 0, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/order/order_voucher.sql b/install/sql/pgsql/schema/order/order_voucher.sql
index c7e7377..9b3237f 100755
--- a/install/sql/pgsql/schema/order/order_voucher.sql
+++ b/install/sql/pgsql/schema/order/order_voucher.sql
@@ -1,12 +1,11 @@
DROP TABLE IF EXISTS order_voucher;
-DROP SEQUENCE IF EXISTS order_voucher_seq;
-CREATE SEQUENCE order_voucher_seq;
--- SELECT setval('order_voucher_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS order_voucher_order_voucher_id_seq;
+-- CREATE SEQUENCE order_voucher_order_voucher_id_seq;
CREATE TABLE order_voucher (
- "order_voucher_id" int check ("order_voucher_id" > 0) NOT NULL DEFAULT NEXTVAL ('order_voucher_seq'),
+ "order_voucher_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"order_id" int check ("order_id" > 0) NOT NULL,
"voucher_id" int check ("voucher_id" > 0) NOT NULL,
"content" varchar(191) NOT NULL,
@@ -16,6 +15,8 @@ CREATE TABLE order_voucher (
"to_name" varchar(64) NOT NULL,
"to_email" varchar(96) NOT NULL,
"message" text NOT NULL,
- "amount" decimal(15,4) NOT NULL,
- PRIMARY KEY ("order_voucher_id")
+ "amount" decimal(15,4) NOT NULL
+ -- PRIMARY KEY("order_voucher_id")
);
+
+-- SELECT setval('order_voucher_order_voucher_id_seq', 0, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/order/payment_status.sql b/install/sql/pgsql/schema/order/payment_status.sql
old mode 100644
new mode 100755
index 379590a..15082d6
--- a/install/sql/pgsql/schema/order/payment_status.sql
+++ b/install/sql/pgsql/schema/order/payment_status.sql
@@ -1,13 +1,14 @@
DROP TABLE IF EXISTS payment_status;
-DROP SEQUENCE IF EXISTS payment_status_seq;
-CREATE SEQUENCE payment_status_seq;
-SELECT setval('payment_status_seq', 20, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS payment_status_payment_status_id_seq;
+-- CREATE SEQUENCE payment_status_payment_status_id_seq;
CREATE TABLE payment_status (
- "payment_status_id" int check ("payment_status_id" > 0) NOT NULL DEFAULT NEXTVAL ('payment_status_seq'),
+ "payment_status_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"language_id" int check ("language_id" > 0) NOT NULL,
- "name" varchar(32) NOT NULL,
- PRIMARY KEY ("payment_status_id","language_id")
+ "name" varchar(32) NOT NULL
+ -- PRIMARY KEY("payment_status_id","language_id")
);
+
+SELECT setval('payment_status_payment_status_id_seq', 20, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/order/return.sql b/install/sql/pgsql/schema/order/return.sql
index 50bb1c3..1d5e4ef 100755
--- a/install/sql/pgsql/schema/order/return.sql
+++ b/install/sql/pgsql/schema/order/return.sql
@@ -1,12 +1,11 @@
DROP TABLE IF EXISTS return;
-DROP SEQUENCE IF EXISTS return_seq;
-CREATE SEQUENCE return_seq;
--- SELECT setval('return_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS return_return_id_seq;
+-- CREATE SEQUENCE return_return_id_seq;
CREATE TABLE return (
- "return_id" int check ("return_id" > 0) NOT NULL DEFAULT NEXTVAL ('return_seq'),
+ "return_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"order_id" int check ("order_id" > 0) NOT NULL,
"customer_order_id" varchar(64) NOT NULL DEFAULT 0,
"user_id" int check ("user_id" > 0) NOT NULL,
@@ -24,6 +23,8 @@ CREATE TABLE return (
"note" text NOT NULL,
"date_ordered" date NOT NULL,
"created_at" timestamp(0) NOT NULL DEFAULT now(),
- "updated_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("return_id")
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("return_id")
);
+
+-- SELECT setval('return_return_id_seq', 0, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/order/return_log.sql b/install/sql/pgsql/schema/order/return_log.sql
index 880e708..3ad04bd 100755
--- a/install/sql/pgsql/schema/order/return_log.sql
+++ b/install/sql/pgsql/schema/order/return_log.sql
@@ -1,16 +1,17 @@
DROP TABLE IF EXISTS return_log;
-DROP SEQUENCE IF EXISTS return_log_seq;
-CREATE SEQUENCE return_log_seq;
--- SELECT setval('return_log_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS return_log_return_log_id_seq;
+-- CREATE SEQUENCE return_log_return_log_id_seq;
CREATE TABLE return_log (
- "return_log_id" int check ("return_log_id" > 0) NOT NULL DEFAULT NEXTVAL ('return_log_seq'),
+ "return_log_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"return_id" int check ("return_id" > 0) NOT NULL,
"return_status_id" int check ("return_status_id" > 0) NOT NULL,
"notify" smallint NOT NULL,
"note" text NOT NULL,
- "created_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("return_log_id")
+ "created_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("return_log_id")
);
+
+-- SELECT setval('return_log_return_log_id_seq', 0, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/order/return_reason.sql b/install/sql/pgsql/schema/order/return_reason.sql
index 37a2546..9cbf04b 100755
--- a/install/sql/pgsql/schema/order/return_reason.sql
+++ b/install/sql/pgsql/schema/order/return_reason.sql
@@ -1,13 +1,14 @@
DROP TABLE IF EXISTS return_reason;
-DROP SEQUENCE IF EXISTS return_reason_seq;
-CREATE SEQUENCE return_reason_seq;
-SELECT setval('return_reason_seq', 11, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS return_reason_return_reason_id_seq;
+-- CREATE SEQUENCE return_reason_return_reason_id_seq;
CREATE TABLE return_reason (
- "return_reason_id" int check ("return_reason_id" > 0) NOT NULL DEFAULT NEXTVAL ('return_reason_seq'),
+ "return_reason_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"language_id" int check ("language_id" > 0) NOT NULL DEFAULT 0,
- "name" varchar(128) NOT NULL,
- PRIMARY KEY ("return_reason_id","language_id")
+ "name" varchar(128) NOT NULL
+ -- PRIMARY KEY("return_reason_id","language_id")
);
+
+SELECT setval('return_reason_return_reason_id_seq', 11, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/order/return_resolution.sql b/install/sql/pgsql/schema/order/return_resolution.sql
index 5539dd4..8e870a0 100755
--- a/install/sql/pgsql/schema/order/return_resolution.sql
+++ b/install/sql/pgsql/schema/order/return_resolution.sql
@@ -1,12 +1,14 @@
DROP TABLE IF EXISTS return_resolution;
-DROP SEQUENCE IF EXISTS return_resolution_seq;
-CREATE SEQUENCE return_resolution_seq;
-SELECT setval('return_resolution_seq', 4, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS return_resolution_return_resolution_id_seq;
+-- CREATE SEQUENCE return_resolution_return_resolution_id_seq;
+
CREATE TABLE return_resolution (
- "return_resolution_id" int check ("return_resolution_id" > 0) NOT NULL DEFAULT NEXTVAL ('return_resolution_seq'),
+ "return_resolution_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"language_id" int check ("language_id" > 0) NOT NULL DEFAULT 0,
- "name" varchar(64) NOT NULL,
- PRIMARY KEY ("return_resolution_id","language_id")
+ "name" varchar(64) NOT NULL
+ -- PRIMARY KEY("return_resolution_id","language_id")
);
+
+SELECT setval('return_resolution_return_resolution_id_seq', 4, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/order/return_status.sql b/install/sql/pgsql/schema/order/return_status.sql
index 0b29a8f..256da28 100755
--- a/install/sql/pgsql/schema/order/return_status.sql
+++ b/install/sql/pgsql/schema/order/return_status.sql
@@ -1,13 +1,14 @@
DROP TABLE IF EXISTS return_status;
-DROP SEQUENCE IF EXISTS return_status_seq;
-CREATE SEQUENCE return_status_seq;
-SELECT setval('return_status_seq', 5, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS return_status_return_status_id_seq;
+-- CREATE SEQUENCE return_status_return_status_id_seq;
CREATE TABLE return_status (
- "return_status_id" int check ("return_status_id" > 0) NOT NULL DEFAULT NEXTVAL ('return_status_seq'),
+ "return_status_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"language_id" int check ("language_id" > 0) NOT NULL DEFAULT 0,
- "name" varchar(32) NOT NULL,
- PRIMARY KEY ("return_status_id","language_id")
+ "name" varchar(32) NOT NULL
+ -- PRIMARY KEY("return_status_id","language_id")
);
+
+SELECT setval('return_status_return_status_id_seq', 5, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/order/shipping_status.sql b/install/sql/pgsql/schema/order/shipping_status.sql
old mode 100644
new mode 100755
index 54161da..aff807e
--- a/install/sql/pgsql/schema/order/shipping_status.sql
+++ b/install/sql/pgsql/schema/order/shipping_status.sql
@@ -1,13 +1,14 @@
DROP TABLE IF EXISTS shipping_status;
-DROP SEQUENCE IF EXISTS shipping_status_seq;
-CREATE SEQUENCE shipping_status_seq;
-SELECT setval('shipping_status_seq', 20, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS shipping_status_shipping_status_id_seq;
+-- CREATE SEQUENCE shipping_status_shipping_status_id_seq;
CREATE TABLE shipping_status (
- "shipping_status_id" int check ("shipping_status_id" > 0) NOT NULL DEFAULT NEXTVAL ('shipping_status_seq'),
+ "shipping_status_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"language_id" int check ("language_id" > 0) NOT NULL,
- "name" varchar(32) NOT NULL,
- PRIMARY KEY ("shipping_status_id","language_id")
+ "name" varchar(32) NOT NULL
+ -- PRIMARY KEY("shipping_status_id","language_id")
);
+
+SELECT setval('shipping_status_shipping_status_id_seq', 20, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/message.sql b/install/sql/pgsql/schema/plugin/message.sql
similarity index 58%
rename from install/sql/pgsql/schema/message.sql
rename to install/sql/pgsql/schema/plugin/message.sql
index 853329e..a5d13f2 100755
--- a/install/sql/pgsql/schema/message.sql
+++ b/install/sql/pgsql/schema/plugin/message.sql
@@ -1,22 +1,22 @@
DROP TABLE IF EXISTS message;
-DROP SEQUENCE IF EXISTS message_seq;
-CREATE SEQUENCE message_seq;
--- SELECT setval('message_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS message_seq;
+-- CREATE SEQUENCE message_seq;
-- CREATE TABLE IF NOT EXISTS message (
CREATE TABLE message (
- "message_id" int check ("message_id" > 0) NOT NULL DEFAULT NEXTVAL ('message_seq'),
+ "message_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"type" varchar(20) NOT NULL DEFAULT 'message',
"data" text DEFAULT NULL,
"meta" text DEFAULT NULL,
"status" smallint NOT NULL DEFAULT 0, -- unread = 0, read = 1
"created_at" timestamp(0) NOT NULL DEFAULT now(),
- "updated_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("message_id")
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("message_id")
);
DROP INDEX IF EXISTS "message_type_status_date";
CREATE INDEX "message_type_status_date" ON message ("type","created_at","message_id");
+-- SELECT setval('message_message_id_seq', 0, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/plugin/newsletter_list.sql b/install/sql/pgsql/schema/plugin/newsletter_list.sql
new file mode 100644
index 0000000..7e4bfe1
--- /dev/null
+++ b/install/sql/pgsql/schema/plugin/newsletter_list.sql
@@ -0,0 +1,11 @@
+-- DROP TABLE IF EXISTS "newsletter_list";
+
+CREATE TABLE IF NOT EXISTS newsletter_list (
+ "newsletter_list_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
+ "name" varchar(254) NOT NULL,
+ "data" text NOT NULL DEFAULT '',
+ "status"tinyint(6) NOT NULL DEFAULT '0',
+ "created_at" timestamp(0) NOT NULL DEFAULT now(),
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
+);
+
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/plugin/newsletter_mail.sql b/install/sql/pgsql/schema/plugin/newsletter_mail.sql
new file mode 100644
index 0000000..72c5236
--- /dev/null
+++ b/install/sql/pgsql/schema/plugin/newsletter_mail.sql
@@ -0,0 +1,14 @@
+-- DROP TABLE IF EXISTS "newsletter_mail";
+
+CREATE TABLE IF NOT EXISTS "newsletter_mail" (
+ "newsletter_list_id" INT UNSIGNED,
+ "email" varchar(254) NOT NULL,
+ "first_name" varchar(254) NOT NULL DEFAULT '',
+ "last_name" varchar(254) NOT NULL DEFAULT '',
+ "data" text NOT NULL DEFAULT '',
+ "status" tinyint(6) NOT NULL DEFAULT '0', -- inactive = 0, active = 1, unsubsubscribed = 2
+ "created_at" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ "updated_at" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX "newsletter_mail_email_newsletter_list_id" ON post ("email","newsletter_list_id");
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/plugin/newsletter_post.sql b/install/sql/pgsql/schema/plugin/newsletter_post.sql
new file mode 100644
index 0000000..69529f4
--- /dev/null
+++ b/install/sql/pgsql/schema/plugin/newsletter_post.sql
@@ -0,0 +1,14 @@
+-- DROP TABLE IF EXISTS "newsletter_post";
+
+CREATE TABLE IF NOT EXISTS "newsletter_post" (
+ "newsletter_post_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
+ "name" varchar(191) NOT NULL,
+ "content" longtext NOT NULL,
+ "status" tinyint(6) NOT NULL DEFAULT 1, -- archived = 0, active = 1
+ "sent" INT(6) NOT NULL DEFAULT 0,
+ "open" INT(6) NOT NULL DEFAULT 0,
+ "click" INT(6) NOT NULL DEFAULT 0,
+ "created_at" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ "updated_at" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
diff --git a/install/sql/pgsql/schema/post/comment.sql b/install/sql/pgsql/schema/post/comment.sql
index e0473d5..122b248 100755
--- a/install/sql/pgsql/schema/post/comment.sql
+++ b/install/sql/pgsql/schema/post/comment.sql
@@ -1,14 +1,13 @@
DROP TABLE IF EXISTS comment;
-DROP SEQUENCE IF EXISTS comment_seq;
-CREATE SEQUENCE comment_seq;
-SELECT setval('comment_seq', 4, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS comment_comment_id_seq;
+-- CREATE SEQUENCE comment_comment_id_seq;
CREATE TABLE comment (
- "comment_id" int check ("comment_id" > 0) NOT NULL DEFAULT NEXTVAL ('comment_seq'),
+ "comment_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"post_id" int check ("post_id" > 0) NOT NULL DEFAULT 0,
- "user_id" int check ("user_id" > 0) NOT NULL DEFAULT 0,
+ "user_id" int check ("user_id" >= 0) NOT NULL DEFAULT 0,
"author" varchar(100) NOT NULL,
"email" varchar(100) NOT NULL DEFAULT '',
"url" varchar(200) NOT NULL DEFAULT '',
@@ -19,10 +18,12 @@ CREATE TABLE comment (
"type" varchar(20) NOT NULL DEFAULT '',
"parent_id" int check ("parent_id" >= 0) NOT NULL DEFAULT 0,
"created_at" timestamp(0) NOT NULL DEFAULT now(),
- "updated_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("comment_id")
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("comment_id")
);
CREATE INDEX "post_id" ON comment ("post_id","status");
CREATE INDEX "comment_parent" ON comment ("parent_id");
CREATE INDEX "comment_email" ON comment ("email");
+
+SELECT setval('comment_comment_id_seq', 4, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/post/post.sql b/install/sql/pgsql/schema/post/post.sql
index 42b691f..4909273 100755
--- a/install/sql/pgsql/schema/post/post.sql
+++ b/install/sql/pgsql/schema/post/post.sql
@@ -1,12 +1,11 @@
DROP TABLE IF EXISTS post;
-DROP SEQUENCE IF EXISTS post_seq;
-CREATE SEQUENCE post_seq;
--- SELECT setval('post_seq', 15, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS post_post_id_seq;
+-- CREATE SEQUENCE post_post_id_seq;
CREATE TABLE post (
- "post_id" int check ("post_id" > 0) NOT NULL DEFAULT NEXTVAL ('post_seq'),
+ "post_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"admin_id" int check ("admin_id" > 0) NOT NULL,
"status" varchar(20) NOT NULL DEFAULT 'publish',
"image" varchar(191) NOT NULL DEFAULT '',
@@ -19,11 +18,13 @@ CREATE TABLE post (
"comment_count" int NOT NULL DEFAULT 0,
"views" int NOT NULL DEFAULT 0,
"created_at" timestamp(0) NOT NULL DEFAULT now(),
- "updated_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("post_id")
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("post_id")
);
CREATE INDEX "post_type_status_date" ON post ("type","status","sort_order","created_at","post_id");
CREATE INDEX "post_parent" ON post ("parent");
CREATE INDEX "post_author" ON post ("admin_id");
CREATE INDEX "post_updated_at" ON post ("updated_at");
+
+-- SELECT setval('post_post_id_seq', 15, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/post/post_content_meta.sql b/install/sql/pgsql/schema/post/post_content_meta.sql
index f0cf2c8..ffcc6f5 100755
--- a/install/sql/pgsql/schema/post/post_content_meta.sql
+++ b/install/sql/pgsql/schema/post/post_content_meta.sql
@@ -1,5 +1,9 @@
DROP TABLE IF EXISTS post_content_meta;
+-- DROP SEQUENCE IF EXISTS post_content_meta_post_content_meta_id_seq;
+-- CREATE SEQUENCE post_content_meta_post_content_meta_id_seq;
+-- SELECT setval('post_content_meta_post_content_meta_id_seq', 0, true); -- last inserted id by sample data
+
CREATE TABLE post_content_meta (
"post_id" int check ("post_id" > 0) NOT NULL,
"language_id" int check ("language_id" > 0) NOT NULL,
@@ -8,3 +12,5 @@ CREATE TABLE post_content_meta (
"value" text DEFAULT NULL,
PRIMARY KEY ("post_id","language_id","namespace","key")
);
+
+-- CREATE UNIQUE INDEX "post_content_meta_post_id" ON post_content_meta ("post_id","language_id","namespace","key");
diff --git a/install/sql/pgsql/schema/post/post_content_revision.sql b/install/sql/pgsql/schema/post/post_content_revision.sql
index 7126290..b4c9596 100755
--- a/install/sql/pgsql/schema/post/post_content_revision.sql
+++ b/install/sql/pgsql/schema/post/post_content_revision.sql
@@ -3,13 +3,13 @@
CREATE TABLE IF NOT EXISTS post_content_revision (
--- "post_content_revision" int check ("post_content_revision" > 0) NOT NULL DEFAULT NEXTVAL ('post_content_revision_seq'),
+-- "post_content_revision" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"post_id" int check ("post_id" > 0) NOT NULL,
"language_id" int check ("language_id" > 0) NOT NULL,
"content" text DEFAULT NULL,
"admin_id" int check ("admin_id" > 0) NOT NULL,
"created_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("post_id","language_id","created_at")
+ PRIMARY KEY("post_id","language_id","created_at")
);
diff --git a/install/sql/pgsql/schema/post/post_meta.sql b/install/sql/pgsql/schema/post/post_meta.sql
index 40c84ef..bbaf41d 100755
--- a/install/sql/pgsql/schema/post/post_meta.sql
+++ b/install/sql/pgsql/schema/post/post_meta.sql
@@ -1,9 +1,15 @@
DROP TABLE IF EXISTS post_meta;
+-- DROP SEQUENCE IF EXISTS post_meta_post_meta_id_seq;
+-- CREATE SEQUENCE post_meta_post_meta_id_seq;
+
CREATE TABLE post_meta (
- "post_id" smallint check ("post_id" > 0) NOT NULL DEFAULT 0,
- "namespace" varchar(128) NOT NULL,
- "key" varchar(128) NOT NULL,
- "value" text NOT NULL,
+ "post_id" int check ("post_id" > 0) NOT NULL,
+ "namespace" varchar(32) NOT NULL DEFAULT '',
+ "key" varchar(191) NOT NULL,
+ "value" text DEFAULT NULL,
PRIMARY KEY ("post_id","namespace","key")
);
+
+-- CREATE UNIQUE INDEX "post_meta_post_id" ON post_meta ("post_id","namespace","key");
+-- SELECT setval('post_meta_post_meta_id_seq', 0, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/post/post_to_site.sql b/install/sql/pgsql/schema/post/post_to_site.sql
index 4418800..eef4c65 100755
--- a/install/sql/pgsql/schema/post/post_to_site.sql
+++ b/install/sql/pgsql/schema/post/post_to_site.sql
@@ -3,5 +3,5 @@ DROP TABLE IF EXISTS post_to_site;
CREATE TABLE post_to_site (
"post_id" int check ("post_id" > 0) NOT NULL,
"site_id" smallint NOT NULL DEFAULT 0,
- PRIMARY KEY ("post_id","site_id")
+ PRIMARY KEY("post_id","site_id")
);
diff --git a/install/sql/pgsql/schema/post_category/post_to_taxonomy_item.sql b/install/sql/pgsql/schema/post_category/post_to_taxonomy_item.sql
old mode 100644
new mode 100755
index 92108e6..2241c2d
--- a/install/sql/pgsql/schema/post_category/post_to_taxonomy_item.sql
+++ b/install/sql/pgsql/schema/post_category/post_to_taxonomy_item.sql
@@ -2,7 +2,7 @@ DROP TABLE IF EXISTS post_to_taxonomy_item;
CREATE TABLE post_to_taxonomy_item (
"post_id" int check ("post_id" > 0) NOT NULL,
"taxonomy_item_id" int check ("taxonomy_item_id" > 0) NOT NULL,
- PRIMARY KEY ("post_id","taxonomy_item_id")
+ PRIMARY KEY("post_id","taxonomy_item_id")
);
CREATE INDEX "post_to_taxonomy_item_taxonomy_item_id" ON post_to_taxonomy_item ("taxonomy_item_id");
diff --git a/install/sql/pgsql/schema/post_category/taxonomy.sql b/install/sql/pgsql/schema/post_category/taxonomy.sql
index 45a5afb..59ee288 100755
--- a/install/sql/pgsql/schema/post_category/taxonomy.sql
+++ b/install/sql/pgsql/schema/post_category/taxonomy.sql
@@ -1,17 +1,17 @@
DROP TABLE IF EXISTS taxonomy;
-DROP SEQUENCE IF EXISTS taxonomy_seq;
-CREATE SEQUENCE taxonomy_seq;
-SELECT setval('taxonomy_seq', 5, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS taxonomy_taxonomy_id_seq;
+-- CREATE SEQUENCE taxonomy_taxonomy_id_seq;
CREATE TABLE taxonomy (
- "taxonomy_id" int check ("taxonomy_id" > 0) NOT NULL DEFAULT NEXTVAL ('taxonomy_seq'),
+ "taxonomy_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"name" varchar(191) NOT NULL DEFAULT '',
"post_type" varchar(191) NOT NULL DEFAULT '',
"type" varchar(50) NOT NULL DEFAULT 'categories',
- "site_id" smallint NOT NULL DEFAULT 0,
- PRIMARY KEY ("taxonomy_id")
+ "site_id" smallint NOT NULL DEFAULT 0
+ -- PRIMARY KEY("taxonomy_id")
);
CREATE INDEX "taxonomy_id" ON taxonomy ("taxonomy_id");
+SELECT setval('taxonomy_taxonomy_id_seq', 5, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/post_category/taxonomy_content.sql b/install/sql/pgsql/schema/post_category/taxonomy_content.sql
index 0343115..6270093 100755
--- a/install/sql/pgsql/schema/post_category/taxonomy_content.sql
+++ b/install/sql/pgsql/schema/post_category/taxonomy_content.sql
@@ -5,7 +5,7 @@ CREATE TABLE taxonomy_content (
"name" varchar(191) NOT NULL,
"slug" varchar(191) NOT NULL DEFAULT '',
"content" text NOT NULL,
- PRIMARY KEY ("taxonomy_id","language_id")
+ PRIMARY KEY("taxonomy_id","language_id")
);
CREATE INDEX "taxonomy_content_name" ON taxonomy_content ("name");
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/post_category/taxonomy_item.sql b/install/sql/pgsql/schema/post_category/taxonomy_item.sql
index 62bf72f..d0aab32 100755
--- a/install/sql/pgsql/schema/post_category/taxonomy_item.sql
+++ b/install/sql/pgsql/schema/post_category/taxonomy_item.sql
@@ -1,20 +1,20 @@
DROP TABLE IF EXISTS taxonomy_item;
-DROP SEQUENCE IF EXISTS taxonomy_item_seq;
-CREATE SEQUENCE taxonomy_item_seq;
-SELECT setval('taxonomy_item_seq', 87, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS taxonomy_item_taxonomy_item_id_seq;
+-- CREATE SEQUENCE taxonomy_item_taxonomy_item_id_seq;
CREATE TABLE taxonomy_item (
- "taxonomy_item_id" int check ("taxonomy_item_id" > 0) NOT NULL DEFAULT NEXTVAL ('taxonomy_item_seq'),
+ "taxonomy_item_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"taxonomy_id" int check ("taxonomy_id" > 0) NOT NULL,
"image" varchar(191) NOT NULL DEFAULT '',
"template" varchar(191) NOT NULL DEFAULT '',
"parent_id" int check ("parent_id" >= 0) NOT NULL DEFAULT 0,
"item_id" int check ("item_id" > 0) DEFAULT NULL,
"sort_order" int NOT NULL DEFAULT 0,
- "status" smallint NOT NULL DEFAULT 0,
- PRIMARY KEY ("taxonomy_item_id")
+ "status" smallint NOT NULL DEFAULT 0
+ -- PRIMARY KEY("taxonomy_item_id")
);
CREATE INDEX "taxonomy_item_parent_id" ON taxonomy_item ("parent_id");
+SELECT setval('taxonomy_item_taxonomy_item_id_seq', 87, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/post_category/taxonomy_item_content.sql b/install/sql/pgsql/schema/post_category/taxonomy_item_content.sql
index da2c1c6..fc0ff38 100755
--- a/install/sql/pgsql/schema/post_category/taxonomy_item_content.sql
+++ b/install/sql/pgsql/schema/post_category/taxonomy_item_content.sql
@@ -8,7 +8,7 @@ CREATE TABLE taxonomy_item_content (
"meta_title" varchar(191) NOT NULL DEFAULT '',
"meta_description" varchar(191) NOT NULL DEFAULT '',
"meta_keywords" varchar(191) NOT NULL DEFAULT '',
- PRIMARY KEY ("taxonomy_item_id","language_id")
+ PRIMARY KEY("taxonomy_item_id","language_id")
);
CREATE INDEX "taxonomy_item_content_name" ON taxonomy_item_content ("name");
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/post_category/taxonomy_item_meta.sql b/install/sql/pgsql/schema/post_category/taxonomy_item_meta.sql
index 6624f09..a07ac63 100755
--- a/install/sql/pgsql/schema/post_category/taxonomy_item_meta.sql
+++ b/install/sql/pgsql/schema/post_category/taxonomy_item_meta.sql
@@ -1,16 +1,15 @@
DROP TABLE IF EXISTS taxonomy_item_meta;
-DROP SEQUENCE IF EXISTS taxonomy_item_meta_seq;
-CREATE SEQUENCE taxonomy_item_meta_seq;
--- SELECT setval('taxonomy_item_meta_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS taxonomy_item_meta_seq;
+-- CREATE SEQUENCE taxonomy_item_meta_seq;
+-- SELECT setval('taxonomy_item_meta_taxonomy_item_meta_id_seq', 0, true); -- last inserted id by sample data
CREATE TABLE taxonomy_item_meta (
- "meta_id" int check ("meta_id" > 0) NOT NULL DEFAULT NEXTVAL ('taxonomy_item_meta_seq'),
- "taxonomy_item_id" int check ("taxonomy_item_id" > 0) NOT NULL DEFAULT 0,
- "key" varchar(191) DEFAULT NULL,
+ "taxonomy_item_id" int check ("taxonomy_item_id" > 0) NOT NULL,
+ "namespace" varchar(32) NOT NULL DEFAULT '',
+ "key" varchar(191) NOT NULL,
"value" text DEFAULT NULL,
- PRIMARY KEY ("meta_id")
+ PRIMARY KEY("taxonomy_item_id","namespace","key")
);
-CREATE INDEX "taxonomy_item_meta_taxonomy_item_id" ON taxonomy_item_meta ("taxonomy_item_id");
-CREATE INDEX "taxonomy_item_meta_key" ON taxonomy_item_meta ("key");
+-- CREATE UNIQUE INDEX "taxonomy_item_meta_taxonomy_item_id" ON taxonomy_item_meta ("taxonomy_item_id","namespace","key");
diff --git a/install/sql/pgsql/schema/post_category/taxonomy_to_site.sql b/install/sql/pgsql/schema/post_category/taxonomy_to_site.sql
index 2e72da8..0447a17 100755
--- a/install/sql/pgsql/schema/post_category/taxonomy_to_site.sql
+++ b/install/sql/pgsql/schema/post_category/taxonomy_to_site.sql
@@ -2,5 +2,5 @@ DROP TABLE IF EXISTS taxonomy_to_site;
CREATE TABLE taxonomy_to_site (
"taxonomy_item_id" int check ("taxonomy_item_id" > 0) NOT NULL,
"site_id" smallint NOT NULL,
- PRIMARY KEY ("taxonomy_item_id","site_id")
+ PRIMARY KEY("taxonomy_item_id","site_id")
);
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/product/length_type.sql b/install/sql/pgsql/schema/product/length_type.sql
index d379112..d847b61 100755
--- a/install/sql/pgsql/schema/product/length_type.sql
+++ b/install/sql/pgsql/schema/product/length_type.sql
@@ -1,12 +1,12 @@
DROP TABLE IF EXISTS length_type;
-DROP SEQUENCE IF EXISTS length_type_seq;
-CREATE SEQUENCE length_type_seq;
-SELECT setval('length_type_seq', 4, true); -- last inserted id by sample data
-
+-- DROP SEQUENCE IF EXISTS length_type_seq;
+-- CREATE SEQUENCE length_type_seq;
CREATE TABLE length_type (
- "length_type_id" int check ("length_type_id" > 0) NOT NULL DEFAULT NEXTVAL ('length_type_seq'),
- "value" decimal(15,8) NOT NULL,
- PRIMARY KEY ("length_type_id")
+ "length_type_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
+ "value" decimal(15,8) NOT NULL
+ -- PRIMARY KEY("length_type_id")
);
+
+SELECT setval('length_type_length_type_id_seq', 4, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/product/length_type_content.sql b/install/sql/pgsql/schema/product/length_type_content.sql
index 9e7668f..06c677d 100755
--- a/install/sql/pgsql/schema/product/length_type_content.sql
+++ b/install/sql/pgsql/schema/product/length_type_content.sql
@@ -3,6 +3,6 @@ CREATE TABLE length_type_content (
"length_type_id" int check ("length_type_id" > 0) NOT NULL,
"language_id" int check ("language_id" > 0) NOT NULL,
"name" varchar(32) NOT NULL,
- "unit" varchar(4) NOT NULL,
- PRIMARY KEY ("length_type_id","language_id")
+ "unit" varchar(4) NOT NULL
+ -- PRIMARY KEY("length_type_id","language_id")
);
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/product/manufacturer.sql b/install/sql/pgsql/schema/product/manufacturer.sql
index 0387a65..fb4f7f3 100755
--- a/install/sql/pgsql/schema/product/manufacturer.sql
+++ b/install/sql/pgsql/schema/product/manufacturer.sql
@@ -1,14 +1,15 @@
DROP TABLE IF EXISTS manufacturer;
-DROP SEQUENCE IF EXISTS manufacturer_seq;
-CREATE SEQUENCE manufacturer_seq;
-SELECT setval('manufacturer_seq', 6, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS manufacturer_seq;
+-- CREATE SEQUENCE manufacturer_seq;
CREATE TABLE manufacturer (
- "manufacturer_id" int check ("manufacturer_id" > 0) NOT NULL DEFAULT NEXTVAL ('manufacturer_seq'),
+ "manufacturer_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"name" varchar(191) NOT NULL DEFAULT '',
"slug" varchar(191) NOT NULL DEFAULT '',
"image" varchar(191) NOT NULL,
- "sort_order" int NOT NULL DEFAULT 0,
- PRIMARY KEY ("manufacturer_id")
+ "sort_order" int NOT NULL DEFAULT 0
+ -- PRIMARY KEY("manufacturer_id")
);
+
+SELECT setval('manufacturer_manufacturer_id_seq', 6, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/product/manufacturer_to_site.sql b/install/sql/pgsql/schema/product/manufacturer_to_site.sql
index 2fe43e6..2cf376f 100755
--- a/install/sql/pgsql/schema/product/manufacturer_to_site.sql
+++ b/install/sql/pgsql/schema/product/manufacturer_to_site.sql
@@ -3,5 +3,5 @@ DROP TABLE IF EXISTS manufacturer_to_site;
CREATE TABLE manufacturer_to_site (
"manufacturer_id" int check ("manufacturer_id" > 0) NOT NULL,
"site_id" smallint NOT NULL,
- PRIMARY KEY ("manufacturer_id","site_id")
+ PRIMARY KEY("manufacturer_id","site_id")
);
diff --git a/install/sql/pgsql/schema/product/product.sql b/install/sql/pgsql/schema/product/product.sql
old mode 100755
new mode 100644
index b3b19dd..e942cbd
--- a/install/sql/pgsql/schema/product/product.sql
+++ b/install/sql/pgsql/schema/product/product.sql
@@ -1,13 +1,12 @@
DROP TABLE IF EXISTS product;
-DROP SEQUENCE IF EXISTS product_seq;
-CREATE SEQUENCE product_seq;
--- SELECT setval('product_seq', 19, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS product_product_id_seq;
+-- CREATE SEQUENCE product_product_id_seq;
CREATE TABLE product (
- "product_id" int check ("product_id" > 0) NOT NULL DEFAULT NEXTVAL ('product_seq'),
- "admin_id" int check ("admin_id" >= 0) NOT NULL DEFAULT 0,
+ "product_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
+ "admin_id" int check ("admin_id" >= 0) NOT NULL,
"model" varchar(64) NOT NULL DEFAULT '',
"sku" varchar(64) NOT NULL DEFAULT '',
"upc" varchar(12) NOT NULL DEFAULT '',
@@ -47,10 +46,10 @@ CREATE TABLE product (
"status" smallint NOT NULL DEFAULT 0,
"sort_order" int check ("sort_order" >= 0) NOT NULL DEFAULT 0,
"created_at" timestamp(0) NOT NULL DEFAULT now(),
- "updated_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("product_id")
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("product_id")
);
CREATE INDEX "product_type_status_date" ON product ("type","status","created_at","product_id");
+-- SELECT setval('product_product_id_seq', 19, true); -- last inserted id by sample data
--- SELECT setval('my_table_seq', (SELECT max(id) FROM my_table));
diff --git a/install/sql/pgsql/schema/product/product_attribute.sql b/install/sql/pgsql/schema/product/product_attribute.sql
index 8d44a88..fa248ed 100755
--- a/install/sql/pgsql/schema/product/product_attribute.sql
+++ b/install/sql/pgsql/schema/product/product_attribute.sql
@@ -4,5 +4,5 @@ CREATE TABLE product_attribute (
"attribute_id" int check ("attribute_id" > 0) NOT NULL,
"language_id" int check ("language_id" > 0) NOT NULL,
"value" text NOT NULL,
- PRIMARY KEY ("product_id","attribute_id","language_id")
-);
\ No newline at end of file
+ PRIMARY KEY("product_id","attribute_id","language_id")
+);
diff --git a/install/sql/pgsql/schema/product/product_content_meta.sql b/install/sql/pgsql/schema/product/product_content_meta.sql
old mode 100644
new mode 100755
index 8c3fed2..2f1eb45
--- a/install/sql/pgsql/schema/product/product_content_meta.sql
+++ b/install/sql/pgsql/schema/product/product_content_meta.sql
@@ -1,5 +1,8 @@
DROP TABLE IF EXISTS product_content_meta;
+-- DROP SEQUENCE IF EXISTS product_content_meta_product_content_meta_id_seq;
+-- CREATE SEQUENCE product_content_meta_product_content_meta_id_seq;
+
CREATE TABLE product_content_meta (
"product_id" int check ("product_id" > 0) NOT NULL,
"language_id" int check ("language_id" > 0) NOT NULL,
@@ -8,3 +11,6 @@ CREATE TABLE product_content_meta (
"value" text DEFAULT NULL,
PRIMARY KEY("product_id","language_id","namespace","key")
);
+
+-- CREATE UNIQUE INDEX "product_content_meta_product_id" ON product_content_meta ("product_id","language_id","namespace","key");
+-- SELECT setval('product_content_meta_product_content_meta_id_seq', 0, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/product/product_content_revision.sql b/install/sql/pgsql/schema/product/product_content_revision.sql
index 013387d..6b214ef 100755
--- a/install/sql/pgsql/schema/product/product_content_revision.sql
+++ b/install/sql/pgsql/schema/product/product_content_revision.sql
@@ -5,13 +5,13 @@ DROP TABLE IF EXISTS product_content_revision;
-- CREATE TABLE IF NOT EXISTS product_content_revision (
CREATE TABLE product_content_revision (
--- "product_content_revision" int check ("product_content_revision" > 0) NOT NULL DEFAULT NEXTVAL ('product_content_revision_seq'),
+-- "product_content_revision" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"product_id" int check ("product_id" > 0) NOT NULL,
"language_id" int check ("language_id" > 0) NOT NULL,
"content" text DEFAULT NULL,
"admin_id" int check ("admin_id" > 0) NOT NULL,
"created_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("product_id","language_id","created_at")
+ PRIMARY KEY("product_id","language_id","created_at")
);
diff --git a/install/sql/pgsql/schema/product/product_discount.sql b/install/sql/pgsql/schema/product/product_discount.sql
index aa1be82..e5689c4 100755
--- a/install/sql/pgsql/schema/product/product_discount.sql
+++ b/install/sql/pgsql/schema/product/product_discount.sql
@@ -1,20 +1,19 @@
DROP TABLE IF EXISTS product_discount;
-DROP SEQUENCE IF EXISTS product_discount_seq;
-CREATE SEQUENCE product_discount_seq;
-SELECT setval('product_discount_seq', 19, true); -- last inserted id by sample data
-
+-- DROP SEQUENCE IF EXISTS product_discount_product_discount_id_seq;
+-- CREATE SEQUENCE product_discount_product_discount_id_seq;
CREATE TABLE product_discount (
- "product_discount_id" int check ("product_discount_id" > 0) NOT NULL DEFAULT NEXTVAL ('product_discount_seq'),
+ "product_discount_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"product_id" int check ("product_id" > 0) NOT NULL,
"user_group_id" int check ("user_group_id" > 0) NOT NULL,
"quantity" int NOT NULL DEFAULT 0,
"priority" int NOT NULL DEFAULT 1,
"price" decimal(15,4) NOT NULL DEFAULT 0.0000,
"from_date" date NOT NULL DEFAULT '1000-01-01',
- "to_date" date NOT NULL DEFAULT '1000-01-01',
- PRIMARY KEY ("product_discount_id")
+ "to_date" date NOT NULL DEFAULT '1000-01-01'
+-- PRIMARY KEY("product_discount_id")
);
-CREATE INDEX "product_discount_product_id" ON product_discount ("product_id");
+-- CREATE INDEX "product_discount_product_id" ON product_discount ("product_id");
+SELECT setval('product_discount_product_discount_id_seq', 19, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/product/product_image.sql b/install/sql/pgsql/schema/product/product_image.sql
index b263738..dcdd65e 100755
--- a/install/sql/pgsql/schema/product/product_image.sql
+++ b/install/sql/pgsql/schema/product/product_image.sql
@@ -1,16 +1,16 @@
DROP TABLE IF EXISTS product_image;
-DROP SEQUENCE IF EXISTS product_image_seq;
-CREATE SEQUENCE product_image_seq;
-SELECT setval('product_image_seq', 53, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS product_image_product_image_id_seq;
+-- CREATE SEQUENCE product_image_product_image_id_seq;
CREATE TABLE product_image (
- "product_image_id" int check ("product_image_id" > 0) NOT NULL DEFAULT NEXTVAL ('product_image_seq'),
+ "product_image_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"product_id" int check ("product_id" > 0) NOT NULL,
"image" varchar(191) NOT NULL,
- "sort_order" int NOT NULL DEFAULT 0,
- PRIMARY KEY ("product_image_id")
+ "sort_order" int NOT NULL DEFAULT 0
+ -- PRIMARY KEY("product_image_id")
);
-CREATE INDEX "product_image_product_id" ON product_image ("product_id");
+CREATE INDEX "product_image_product_id" ON product_image ("product_id", "product_image_id", "sort_order");
+SELECT setval('product_image_product_image_id_seq', 53, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/product/product_meta.sql b/install/sql/pgsql/schema/product/product_meta.sql
old mode 100644
new mode 100755
index 3e9ebeb..739771a
--- a/install/sql/pgsql/schema/product/product_meta.sql
+++ b/install/sql/pgsql/schema/product/product_meta.sql
@@ -1,9 +1,14 @@
DROP TABLE IF EXISTS product_meta;
+-- DROP SEQUENCE IF EXISTS product_meta_product_meta_id_seq;
+-- CREATE SEQUENCE product_meta_product_meta_id_seq;
+
CREATE TABLE product_meta (
- "product_id" smallint check ("product_id" > 0) NOT NULL DEFAULT 0,
- "namespace" varchar(128) NOT NULL,
- "key" varchar(128) NOT NULL,
- "value" text NOT NULL,
- PRIMARY KEY ("product_id","namespace","key")
+ "product_id" int check ("product_id" > 0) NOT NULL,
+ "namespace" varchar(32) NOT NULL DEFAULT '',
+ "key" varchar(191) NOT NULL,
+ "value" text DEFAULT NULL
);
+
+CREATE UNIQUE INDEX "product_meta_product_id" ON product_meta ("product_id","namespace","key");
+-- SELECT setval('product_meta_product_meta_id_seq', 0, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/product/product_points.sql b/install/sql/pgsql/schema/product/product_points.sql
index 1da5114..46a564f 100755
--- a/install/sql/pgsql/schema/product/product_points.sql
+++ b/install/sql/pgsql/schema/product/product_points.sql
@@ -1,14 +1,15 @@
DROP TABLE IF EXISTS product_points;
-DROP SEQUENCE IF EXISTS product_points_seq;
-CREATE SEQUENCE product_points_seq;
-SELECT setval('product_points_seq', 11, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS product_points_product_points_id_seq;
+-- CREATE SEQUENCE product_points_product_points_id_seq;
CREATE TABLE product_points (
- "product_points_id" int check ("product_points_id" > 0) NOT NULL DEFAULT NEXTVAL ('product_points_seq'),
+ "product_points_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"product_id" int check ("product_id" > 0) NOT NULL DEFAULT 0,
"user_group_id" int check ("user_group_id" > 0) NOT NULL DEFAULT 0,
- "points" int NOT NULL DEFAULT 0,
- PRIMARY KEY ("product_points_id")
+ "points" int NOT NULL DEFAULT 0
+ -- PRIMARY KEY("product_points_id")
);
+
+SELECT setval('product_points_product_points_id_seq', 11, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/product/product_promotion.sql b/install/sql/pgsql/schema/product/product_promotion.sql
index d36ea75..c4d4701 100755
--- a/install/sql/pgsql/schema/product/product_promotion.sql
+++ b/install/sql/pgsql/schema/product/product_promotion.sql
@@ -1,19 +1,19 @@
DROP TABLE IF EXISTS product_promotion;
-DROP SEQUENCE IF EXISTS product_promotion_seq;
-CREATE SEQUENCE product_promotion_seq;
-SELECT setval('product_promotion_seq', 1, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS product_promotion_product_promotion_id_seq;
+-- CREATE SEQUENCE product_promotion_product_promotion_id_seq;
CREATE TABLE product_promotion (
- "product_promotion_id" int check ("product_promotion_id" > 0) NOT NULL DEFAULT NEXTVAL ('product_promotion_seq'),
+ "product_promotion_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"product_id" int check ("product_id" > 0) NOT NULL,
"user_group_id" int check ("user_group_id" > 0) NOT NULL,
"priority" int NOT NULL DEFAULT 1,
"price" decimal(15,4) NOT NULL DEFAULT 0.0000,
"from_date" date NOT NULL DEFAULT '1000-01-01',
- "to_date" date NOT NULL DEFAULT '1000-01-01',
- PRIMARY KEY ("product_promotion_id")
+ "to_date" date NOT NULL DEFAULT '1000-01-01'
+ -- PRIMARY KEY("product_promotion_id")
);
CREATE INDEX "product_promotion_product_id" ON product_promotion ("product_id");
+SELECT setval('product_promotion_product_promotion_id_seq', 1, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/product/product_question.sql b/install/sql/pgsql/schema/product/product_question.sql
index e617855..4290901 100755
--- a/install/sql/pgsql/schema/product/product_question.sql
+++ b/install/sql/pgsql/schema/product/product_question.sql
@@ -1,21 +1,21 @@
DROP TABLE IF EXISTS product_question;
-DROP SEQUENCE IF EXISTS product_question_seq;
-CREATE SEQUENCE product_question_seq;
-SELECT setval('product_question_seq', 5, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS product_question_product_question_id_seq;
+-- CREATE SEQUENCE product_question_product_question_id_seq;
CREATE TABLE product_question (
- "product_question_id" int check ("product_question_id" > 0) NOT NULL DEFAULT NEXTVAL ('product_question_seq'),
+ "product_question_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"product_id" int check ("product_id" > 0) NOT NULL,
- "user_id" int check ("user_id" > 0) NOT NULL,
+ "user_id" int check ("user_id" >= 0) NOT NULL DEFAULT 0,
"author" varchar(64) NOT NULL,
"content" text NOT NULL,
"status" smallint NOT NULL DEFAULT 0,
"parent_id" int check ("parent_id" >= 0) NOT NULL DEFAULT 0,
"created_at" timestamp(0) NOT NULL DEFAULT now(),
- "updated_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("product_question_id")
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("product_question_id")
);
CREATE INDEX "product_question_product_id" ON product_question ("product_id");
+SELECT setval('product_question_product_question_id_seq', 5, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/product/product_related.sql b/install/sql/pgsql/schema/product/product_related.sql
index ea6f702..c2ff5fd 100755
--- a/install/sql/pgsql/schema/product/product_related.sql
+++ b/install/sql/pgsql/schema/product/product_related.sql
@@ -2,5 +2,5 @@ DROP TABLE IF EXISTS product_related;
CREATE TABLE product_related (
"product_id" int check ("product_id" > 0) NOT NULL,
"product_related_id" int check ("product_related_id" > 0) NOT NULL,
- PRIMARY KEY ("product_id","product_related_id")
+ PRIMARY KEY("product_id","product_related_id")
);
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/product/product_review.sql b/install/sql/pgsql/schema/product/product_review.sql
index af932a8..8b4df76 100755
--- a/install/sql/pgsql/schema/product/product_review.sql
+++ b/install/sql/pgsql/schema/product/product_review.sql
@@ -1,22 +1,22 @@
DROP TABLE IF EXISTS product_review;
-DROP SEQUENCE IF EXISTS product_review_seq;
-CREATE SEQUENCE product_review_seq;
-SELECT setval('product_review_seq', 5, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS product_review_product_review_id_seq;
+-- CREATE SEQUENCE product_review_product_review_id_seq;
CREATE TABLE product_review (
- "product_review_id" int check ("product_review_id" > 0) NOT NULL DEFAULT NEXTVAL ('product_review_seq'),
+ "product_review_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"product_id" int check ("product_id" > 0) NOT NULL,
- "user_id" int check ("user_id" > 0) NOT NULL,
+ "user_id" int check ("user_id" >= 0) NOT NULL DEFAULT 0,
"author" varchar(64) NOT NULL,
"content" text NOT NULL,
"rating" smallint check ("rating" > 0) NOT NULL,
"status" smallint NOT NULL DEFAULT 0,
"parent_id" int check ("parent_id" >= 0) NOT NULL DEFAULT 0,
"created_at" timestamp(0) NOT NULL DEFAULT now(),
- "updated_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("product_review_id")
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("product_review_id")
);
CREATE INDEX "product_review_product_id" ON product_review ("product_id", "user_id", "status");
+SELECT setval('product_review_product_review_id_seq', 5, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/product/product_review_media.sql b/install/sql/pgsql/schema/product/product_review_media.sql
old mode 100644
new mode 100755
index aaca8eb..15154eb
--- a/install/sql/pgsql/schema/product/product_review_media.sql
+++ b/install/sql/pgsql/schema/product/product_review_media.sql
@@ -1,19 +1,19 @@
DROP TABLE IF EXISTS product_review_media;
-DROP SEQUENCE IF EXISTS product_review_media_seq;
-CREATE SEQUENCE product_review_media_seq;
--- SELECT setval('product_review_media_seq', 14, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS product_review_media_product_review_media_id_seq;
+-- CREATE SEQUENCE product_review_media_product_review_media_id_seq;
CREATE TABLE product_review_media (
- "product_review_media_id" int check ("product_review_media_id" > 0) NOT NULL DEFAULT NEXTVAL ('product_review_media_seq'),
+ "product_review_media_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"product_review_id" int check ("product_id" > 0) NOT NULL,
"product_id" int check ("product_id" > 0) NOT NULL,
"user_id" int check ("user_id" > 0) NOT NULL,
"image" varchar(191) NOT NULL,
- "sort_order" int NOT NULL DEFAULT 0,
- PRIMARY KEY ("product_review_media_id")
+ "sort_order" int NOT NULL DEFAULT 0
+ -- PRIMARY KEY("product_review_media_id")
);
CREATE INDEX "product_review_media_product_id" ON product_review_media ("product_id", "user_id");
CREATE INDEX "product_review_media_product_review_id" ON product_review_media ("product_review_id");
+SELECT setval('product_review_media_product_review_media_id_seq', 14, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/product/product_to_digital_asset.sql b/install/sql/pgsql/schema/product/product_to_digital_asset.sql
index 734ddd9..833a292 100755
--- a/install/sql/pgsql/schema/product/product_to_digital_asset.sql
+++ b/install/sql/pgsql/schema/product/product_to_digital_asset.sql
@@ -3,5 +3,5 @@ DROP TABLE IF EXISTS product_to_digital_asset;
CREATE TABLE product_to_digital_asset (
"product_id" int check ("product_id" > 0) NOT NULL,
"digital_asset_id" int check ("digital_asset_id" > 0) NOT NULL,
- PRIMARY KEY ("product_id","digital_asset_id")
+ PRIMARY KEY("product_id","digital_asset_id")
);
diff --git a/install/sql/pgsql/schema/product/product_to_site.sql b/install/sql/pgsql/schema/product/product_to_site.sql
index 378b0ff..4439113 100755
--- a/install/sql/pgsql/schema/product/product_to_site.sql
+++ b/install/sql/pgsql/schema/product/product_to_site.sql
@@ -3,5 +3,5 @@ DROP TABLE IF EXISTS product_to_site;
CREATE TABLE product_to_site (
"product_id" int check ("product_id" > 0) NOT NULL,
"site_id" smallint NOT NULL DEFAULT 0,
- PRIMARY KEY ("product_id","site_id")
+ PRIMARY KEY("product_id","site_id")
);
diff --git a/install/sql/pgsql/schema/product/product_to_taxonomy_item.sql b/install/sql/pgsql/schema/product/product_to_taxonomy_item.sql
index 763857d..8d6ab1a 100755
--- a/install/sql/pgsql/schema/product/product_to_taxonomy_item.sql
+++ b/install/sql/pgsql/schema/product/product_to_taxonomy_item.sql
@@ -1,9 +1,9 @@
DROP TABLE IF EXISTS product_to_taxonomy_item;
CREATE TABLE product_to_taxonomy_item (
-"product_id" INT NOT NULL,
-"taxonomy_item_id" INT NOT NULL,
-PRIMARY KEY ("product_id","taxonomy_item_id")
+ "product_id" INT NOT NULL,
+ "taxonomy_item_id" INT NOT NULL,
+ PRIMARY KEY ("product_id","taxonomy_item_id")
);
CREATE INDEX "product_to_taxonomy_item_taxonomy_item_id" ON "product_to_taxonomy_item" ("taxonomy_item_id");
diff --git a/install/sql/pgsql/schema/product/product_variant.sql b/install/sql/pgsql/schema/product/product_variant.sql
old mode 100755
new mode 100644
index 90c5460..f09fc41
--- a/install/sql/pgsql/schema/product/product_variant.sql
+++ b/install/sql/pgsql/schema/product/product_variant.sql
@@ -1,10 +1,10 @@
DROP TABLE IF EXISTS product_variant;
-DROP SEQUENCE IF EXISTS product_variant_seq;
-CREATE SEQUENCE product_variant_seq;
+-- DROP SEQUENCE IF EXISTS product_variant_seq;
+-- CREATE SEQUENCE product_variant_seq;
CREATE TABLE product_variant (
- "product_variant_id" int check ("product_variant_id" > 0) NOT NULL DEFAULT NEXTVAL ('product_variant_seq'),
+ "product_variant_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"product_id" int check ("product_id" > 0) NOT NULL,
"options" varchar(191) NOT NULL DEFAULT '',
"image" varchar(191) NOT NULL DEFAULT '',
@@ -13,8 +13,8 @@ CREATE TABLE product_variant (
"stock_quantity" int NOT NULL DEFAULT 0,
"weight" decimal(15,8) NOT NULL DEFAULT '0.00000000',
"sku" varchar(64) NOT NULL DEFAULT '',
- "barcode" varchar(64) NOT NULL DEFAULT '',
- PRIMARY KEY ("product_variant_id")
+ "barcode" varchar(64) NOT NULL DEFAULT ''
+ -- PRIMARY KEY("product_variant_id")
);
CREATE INDEX "product_variant_product_id_product_option" ON "product_variant" ("product_id","product_variant_id", "options");
diff --git a/install/sql/pgsql/schema/product/stock_status.sql b/install/sql/pgsql/schema/product/stock_status.sql
index dfff644..3d3b723 100755
--- a/install/sql/pgsql/schema/product/stock_status.sql
+++ b/install/sql/pgsql/schema/product/stock_status.sql
@@ -1,13 +1,14 @@
DROP TABLE IF EXISTS stock_status;
-DROP SEQUENCE IF EXISTS stock_status_seq;
-CREATE SEQUENCE stock_status_seq;
-SELECT setval('stock_status_seq', 7, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS stock_status_stock_status_id_seq;
+-- CREATE SEQUENCE stock_status_stock_status_id_seq;
CREATE TABLE stock_status (
- "stock_status_id" int check ("stock_status_id" > 0) NOT NULL DEFAULT NEXTVAL ('stock_status_seq'),
+ "stock_status_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"language_id" int check ("language_id" > 0) NOT NULL,
- "name" varchar(32) NOT NULL,
- PRIMARY KEY ("stock_status_id","language_id")
+ "name" varchar(32) NOT NULL
+ -- PRIMARY KEY("stock_status_id","language_id")
);
+
+SELECT setval('stock_status_stock_status_id_seq', 7, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/product/vendor.sql b/install/sql/pgsql/schema/product/vendor.sql
index e4ba9f6..2e5d395 100755
--- a/install/sql/pgsql/schema/product/vendor.sql
+++ b/install/sql/pgsql/schema/product/vendor.sql
@@ -1,16 +1,17 @@
DROP TABLE IF EXISTS vendor;
-DROP SEQUENCE IF EXISTS vendor_seq;
-CREATE SEQUENCE vendor_seq;
-SELECT setval('vendor_seq', 6, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS vendor_vendor_id_seq;
+-- CREATE SEQUENCE vendor_vendor_id_seq;
CREATE TABLE vendor (
- "vendor_id" int check ("vendor_id" > 0) NOT NULL DEFAULT NEXTVAL ('vendor_seq'),
+ "vendor_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"admin_id" int check ("admin_id" >= 0) NOT NULL DEFAULT 0,
"name" varchar(191) NOT NULL DEFAULT '',
"slug" varchar(191) NOT NULL DEFAULT '',
"image" varchar(191) NOT NULL,
- "sort_order" int NOT NULL DEFAULT 0,
- PRIMARY KEY ("vendor_id")
+ "sort_order" int NOT NULL DEFAULT 0
+ -- PRIMARY KEY("vendor_id")
);
+
+SELECT setval('vendor_vendor_id_seq', 6, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/product/vendor_to_site.sql b/install/sql/pgsql/schema/product/vendor_to_site.sql
index f4b604e..24f2a62 100755
--- a/install/sql/pgsql/schema/product/vendor_to_site.sql
+++ b/install/sql/pgsql/schema/product/vendor_to_site.sql
@@ -3,5 +3,5 @@ DROP TABLE IF EXISTS vendor_to_site;
CREATE TABLE vendor_to_site (
"vendor_id" int check ("vendor_id" > 0) NOT NULL,
"site_id" smallint NOT NULL,
- PRIMARY KEY ("vendor_id","site_id")
+ PRIMARY KEY("vendor_id","site_id")
);
diff --git a/install/sql/pgsql/schema/product/weight_type.sql b/install/sql/pgsql/schema/product/weight_type.sql
index a41d5c7..8a39853 100755
--- a/install/sql/pgsql/schema/product/weight_type.sql
+++ b/install/sql/pgsql/schema/product/weight_type.sql
@@ -1,11 +1,13 @@
DROP TABLE IF EXISTS weight_type;
-DROP SEQUENCE IF EXISTS weight_type_seq;
-CREATE SEQUENCE weight_type_seq;
-SELECT setval('weight_type_seq', 5, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS weight_type_weight_type_id_seq;
+-- CREATE SEQUENCE weight_type_weight_type_id_seq;
+
CREATE TABLE weight_type (
- "weight_type_id" int check ("weight_type_id" > 0) NOT NULL DEFAULT NEXTVAL ('weight_type_seq'),
- "value" decimal(15,8) NOT NULL DEFAULT 0.00000000,
- PRIMARY KEY ("weight_type_id")
+ "weight_type_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
+ "value" decimal(15,8) NOT NULL DEFAULT 0.00000000
+ -- PRIMARY KEY("weight_type_id")
);
+
+SELECT setval('weight_type_weight_type_id_seq', 5, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/product/weight_type_content.sql b/install/sql/pgsql/schema/product/weight_type_content.sql
index b206ee2..dd0de3d 100755
--- a/install/sql/pgsql/schema/product/weight_type_content.sql
+++ b/install/sql/pgsql/schema/product/weight_type_content.sql
@@ -5,5 +5,5 @@ CREATE TABLE weight_type_content (
"language_id" int check ("language_id" > 0) NOT NULL,
"name" varchar(32) NOT NULL,
"unit" varchar(4) NOT NULL,
- PRIMARY KEY ("weight_type_id","language_id")
+ PRIMARY KEY("weight_type_id","language_id")
);
diff --git a/install/sql/pgsql/schema/site/setting.sql b/install/sql/pgsql/schema/site/setting.sql
index 54a3401..4f8f7a3 100755
--- a/install/sql/pgsql/schema/site/setting.sql
+++ b/install/sql/pgsql/schema/site/setting.sql
@@ -5,5 +5,5 @@ CREATE TABLE setting (
"namespace" varchar(128) NOT NULL,
"key" varchar(128) NOT NULL,
"value" text NOT NULL,
- PRIMARY KEY ("site_id","namespace","key")
+ PRIMARY KEY("site_id","namespace","key")
);
diff --git a/install/sql/pgsql/schema/site/setting_content.sql b/install/sql/pgsql/schema/site/setting_content.sql
index ef034ba..ecb51aa 100755
--- a/install/sql/pgsql/schema/site/setting_content.sql
+++ b/install/sql/pgsql/schema/site/setting_content.sql
@@ -6,5 +6,5 @@ CREATE TABLE setting_content (
"namespace" varchar(128) NOT NULL,
"key" varchar(128) NOT NULL,
"value" text NOT NULL,
- PRIMARY KEY ("site_id","language_id","namespace","key")
+ PRIMARY KEY("site_id","language_id","namespace","key")
);
diff --git a/install/sql/pgsql/schema/site/site.sql b/install/sql/pgsql/schema/site/site.sql
index adbe29d..8056f71 100755
--- a/install/sql/pgsql/schema/site/site.sql
+++ b/install/sql/pgsql/schema/site/site.sql
@@ -1,16 +1,17 @@
DROP TABLE IF EXISTS site;
-DROP SEQUENCE IF EXISTS site_seq;
-CREATE SEQUENCE site_seq;
-SELECT setval('site_seq', 1, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS site_site_id_seq;
+-- CREATE SEQUENCE site_site_id_seq;
CREATE TABLE site (
- "site_id" smallint NOT NULL DEFAULT NEXTVAL ('site_seq'),
+ "site_id" smallint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY,
"key" varchar(191) NOT NULL,
"name" varchar(191) NOT NULL,
"host" varchar(191) NOT NULL,
"theme" varchar(191) NOT NULL,
"template" varchar(191) NOT NULL DEFAULT '',
- "settings" text DEFAULT NULL,
- PRIMARY KEY ("site_id")
+ "settings" text DEFAULT NULL
+ -- PRIMARY KEY("site_id")
);
+
+SELECT setval('site_site_id_seq', 1, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/subscription/order_subscription.sql b/install/sql/pgsql/schema/subscription/order_subscription.sql
old mode 100644
new mode 100755
index 25b8723..4c27768
--- a/install/sql/pgsql/schema/subscription/order_subscription.sql
+++ b/install/sql/pgsql/schema/subscription/order_subscription.sql
@@ -1,11 +1,10 @@
DROP TABLE IF EXISTS order_subscription;
-DROP SEQUENCE IF EXISTS order_subscription_seq;
-CREATE SEQUENCE order_subscription_seq;
--- SELECT setval('order_subscription_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS order_subscription_order_subscription_id_seq;
+-- CREATE SEQUENCE order_subscription_order_subscription_id_seq;
CREATE TABLE "order_subscription" (
- "order_subscription_id" int check ("order_subscription_id" > 0) NOT NULL DEFAULT NEXTVAL ('order_subscription_seq'),
+ "order_subscription_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"order_product_id" INT NOT NULL,
"order_id" INT NOT NULL,
"product_id" INT NOT NULL,
@@ -21,9 +20,10 @@ CREATE TABLE "order_subscription" (
"tax" decimal(15,4) NOT NULL,
"period" TEXT CHECK( period IN ('day','week','month','year') ) NOT NULL DEFAULT 'month',
"cycle" smallint NOT NULL,
- "length" smallint NOT NULL,
-PRIMARY KEY ("order_subscription_id")
+ "length" smallint NOT NULL
+ -- PRIMARY KEY ("order_subscription_id")
-- KEY "order_id" ("order_id")
);
-- CREATE INDEX "order_subscription_order_id" ON "order_subscription" ("order_id");
+-- SELECT setval('order_subscription_order_subscription_id_seq', 0, true); -- last inserted id by sample data
diff --git a/install/sql/pgsql/schema/subscription/product_subscription.sql b/install/sql/pgsql/schema/subscription/product_subscription.sql
index 231f10d..5a44b08 100755
--- a/install/sql/pgsql/schema/subscription/product_subscription.sql
+++ b/install/sql/pgsql/schema/subscription/product_subscription.sql
@@ -4,7 +4,9 @@ CREATE TABLE product_subscription (
"product_id" int check ("product_id" > 0) NOT NULL,
"subscription_plan_id" int check ("subscription_plan_id" > 0) NOT NULL,
"user_group_id" int check ("user_group_id" > 0) NOT NULL,
+ "type" char(1) NOT NULL DEFAULT '', -- empty = original price, p = percentage discount, f = fixed discount, n = flat price
+ "discount" decimal(15,4) NOT NULL DEFAULT 0,
"price" decimal(15,4) NOT NULL DEFAULT 0.0000,
"trial_price" decimal(15,4) NOT NULL DEFAULT 0.0000,
- PRIMARY KEY ("product_id","subscription_plan_id","user_group_id")
+ PRIMARY KEY("product_id","subscription_plan_id","user_group_id")
);
diff --git a/install/sql/pgsql/schema/subscription/subscription_log.sql b/install/sql/pgsql/schema/subscription/subscription_log.sql
old mode 100644
new mode 100755
index 1d63831..2a47bd3
--- a/install/sql/pgsql/schema/subscription/subscription_log.sql
+++ b/install/sql/pgsql/schema/subscription/subscription_log.sql
@@ -1,15 +1,16 @@
DROP TABLE IF EXISTS subscription_log;
-DROP SEQUENCE IF EXISTS subscription_log_seq;
-CREATE SEQUENCE subscription_log_seq;
--- SELECT setval('subscription_log_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS subscription_log_subscription_log_id_seq;
+-- CREATE SEQUENCE subscription_log_subscription_log_id_seq;
CREATE TABLE "subscription_log" (
- "subscription_log_id" int check ("subscription_log_id" > 0) NOT NULL DEFAULT NEXTVAL ('subscription_log_seq'),
+ "subscription_log_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"subscription_id" INT NOT NULL,
"subscription_status_id" INT NOT NULL,
"notify" smallint NOT NULL DEFAULT 0,
"note" text NOT NULL,
- "created_at" timestamp(0) NOT NULL DEFAULT now(),
-PRIMARY KEY ("subscription_log_id")
+ "created_at" timestamp(0) NOT NULL DEFAULT now()
+-- PRIMARY KEY ("subscription_log_id")
);
+
+-- SELECT setval('subscription_log_subscription_log_id_seq', 0, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/subscription/subscription_plan.sql b/install/sql/pgsql/schema/subscription/subscription_plan.sql
old mode 100644
new mode 100755
index 46c0db5..30e88e9
--- a/install/sql/pgsql/schema/subscription/subscription_plan.sql
+++ b/install/sql/pgsql/schema/subscription/subscription_plan.sql
@@ -1,12 +1,11 @@
DROP TABLE IF EXISTS subscription_plan;
-DROP SEQUENCE IF EXISTS subscription_plan_seq;
-CREATE SEQUENCE subscription_plan_seq;
-SELECT setval('subscription_plan_seq', 5, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS subscription_plan_subscription_plan_id_seq;
+-- CREATE SEQUENCE subscription_plan_subscription_plan_id_seq;
CREATE TABLE "subscription_plan" (
- "subscription_plan_id" int check ("subscription_plan_id" > 0) NOT NULL DEFAULT NEXTVAL ('subscription_plan_seq'),
+ "subscription_plan_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"period" TEXT CHECK( period IN ('day','week','month','year') ) NOT NULL DEFAULT 'month',
"length" INT NOT NULL,
"cycle" INT NOT NULL,
@@ -15,6 +14,8 @@ CREATE TABLE "subscription_plan" (
"trial_cycle" INT NOT NULL,
"trial_status" smallint NOT NULL,
"status" smallint NOT NULL DEFAULT 0,
- "sort_order" INT NOT NULL DEFAULT 0,
-PRIMARY KEY ("subscription_plan_id")
+ "sort_order" INT NOT NULL DEFAULT 0
+-- PRIMARY KEY ("subscription_plan_id")
);
+
+SELECT setval('subscription_plan_subscription_plan_id_seq', 5, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/subscription/subscription_plan_content.sql b/install/sql/pgsql/schema/subscription/subscription_plan_content.sql
index 7df3e52..8ddf841 100644
--- a/install/sql/pgsql/schema/subscription/subscription_plan_content.sql
+++ b/install/sql/pgsql/schema/subscription/subscription_plan_content.sql
@@ -3,6 +3,7 @@ DROP TABLE IF EXISTS "subscription_plan_content";
CREATE TABLE "subscription_plan_content" (
"subscription_plan_id" INT NOT NULL,
"language_id" INT NOT NULL,
- "name" TEXT NOT NULL,
- PRIMARY KEY ("subscription_plan_id","language_id")
+ "name" varchar(191) NOT NULL DEFAULT '',
+ "content" text DEFAULT NULL,
+ PRIMARY KEY("subscription_plan_id","language_id")
);
diff --git a/install/sql/pgsql/schema/subscription/subscription_status.sql b/install/sql/pgsql/schema/subscription/subscription_status.sql
index 0684fe2..946eb90 100755
--- a/install/sql/pgsql/schema/subscription/subscription_status.sql
+++ b/install/sql/pgsql/schema/subscription/subscription_status.sql
@@ -1,13 +1,14 @@
DROP TABLE IF EXISTS subscription_status;
-DROP SEQUENCE IF EXISTS subscription_status_seq;
-CREATE SEQUENCE subscription_status_seq;
-SELECT setval('subscription_status_seq', 6, true); -- last inserted id by sample data
+DROP SEQUENCE IF EXISTS subscription_status_subscription_status_id_seq;
+CREATE SEQUENCE subscription_status_subscription_status_id_seq;
CREATE TABLE subscription_status (
- "subscription_status_id" int check ("subscription_status_id" > 0) NOT NULL DEFAULT NEXTVAL ('subscription_status_seq'),
+ "subscription_status_id" int check ("subscription_status_id" > 0) NOT NULL, -- SERIAL PRIMARY KEY
"language_id" int check ("language_id" > 0) NOT NULL,
"name" varchar(32) NOT NULL,
- PRIMARY KEY ("subscription_status_id","language_id")
+ PRIMARY KEY("subscription_status_id","language_id")
);
+
+SELECT setval('subscription_status_subscription_status_id_seq', 6, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/tax/tax_rate.sql b/install/sql/pgsql/schema/tax/tax_rate.sql
index 0071565..ab0833f 100755
--- a/install/sql/pgsql/schema/tax/tax_rate.sql
+++ b/install/sql/pgsql/schema/tax/tax_rate.sql
@@ -1,17 +1,19 @@
DROP TABLE IF EXISTS tax_rate;
-DROP SEQUENCE IF EXISTS tax_rate_seq;
-CREATE SEQUENCE tax_rate_seq;
-SELECT setval('tax_rate_seq', 3, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS tax_rate_tax_rate_id_seq;
+-- CREATE SEQUENCE tax_rate_tax_rate_id_seq;
+
CREATE TABLE tax_rate (
- "tax_rate_id" int check ("tax_rate_id" > 0) NOT NULL DEFAULT NEXTVAL ('tax_rate_seq'),
+ "tax_rate_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"region_group_id" int check ("region_group_id" > 0) NOT NULL DEFAULT 0,
"name" varchar(32) NOT NULL,
"rate" decimal(15,4) NOT NULL DEFAULT 0.0000,
"type" char(1) NOT NULL,
"created_at" timestamp(0) NOT NULL DEFAULT now(),
- "updated_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("tax_rate_id")
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("tax_rate_id")
);
+
+SELECT setval('tax_rate_tax_rate_id_seq', 3, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/tax/tax_rate_to_user_group.sql b/install/sql/pgsql/schema/tax/tax_rate_to_user_group.sql
index 87bb3f0..4ff552c 100755
--- a/install/sql/pgsql/schema/tax/tax_rate_to_user_group.sql
+++ b/install/sql/pgsql/schema/tax/tax_rate_to_user_group.sql
@@ -3,5 +3,5 @@ DROP TABLE IF EXISTS tax_rate_to_user_group;
CREATE TABLE tax_rate_to_user_group (
"tax_rate_id" int check ("tax_rate_id" > 0) NOT NULL,
"user_group_id" int check ("user_group_id" > 0) NOT NULL,
- PRIMARY KEY ("tax_rate_id","user_group_id")
+ PRIMARY KEY("tax_rate_id","user_group_id")
);
diff --git a/install/sql/pgsql/schema/tax/tax_rule.sql b/install/sql/pgsql/schema/tax/tax_rule.sql
index eef9db0..cf14a8e 100755
--- a/install/sql/pgsql/schema/tax/tax_rule.sql
+++ b/install/sql/pgsql/schema/tax/tax_rule.sql
@@ -1,14 +1,16 @@
DROP TABLE IF EXISTS tax_rule;
-DROP SEQUENCE IF EXISTS tax_rule_seq;
-CREATE SEQUENCE tax_rule_seq;
-SELECT setval('tax_rule_seq', 2, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS tax_rule_tax_rule_id_seq;
+-- CREATE SEQUENCE tax_rule_tax_rule_id_seq;
+
CREATE TABLE tax_rule (
- "tax_rule_id" int check ("tax_rule_id" > 0) NOT NULL DEFAULT NEXTVAL ('tax_rule_seq'),
+ "tax_rule_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"tax_type_id" int check ("tax_type_id" > 0) NOT NULL,
"tax_rate_id" int check ("tax_rate_id" > 0) NOT NULL,
"based" varchar(10) NOT NULL,
- "priority" int NOT NULL DEFAULT 1,
- PRIMARY KEY ("tax_rule_id")
+ "priority" int NOT NULL DEFAULT 1
+ -- PRIMARY KEY("tax_rule_id")
);
+
+SELECT setval('tax_rule_tax_rule_id_seq', 2, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/tax/tax_type.sql b/install/sql/pgsql/schema/tax/tax_type.sql
index a067269..f4da9b6 100755
--- a/install/sql/pgsql/schema/tax/tax_type.sql
+++ b/install/sql/pgsql/schema/tax/tax_type.sql
@@ -1,15 +1,17 @@
DROP TABLE IF EXISTS tax_type;
-DROP SEQUENCE IF EXISTS tax_type_seq;
-CREATE SEQUENCE tax_type_seq;
-SELECT setval('tax_type_seq', 3, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS tax_type_tax_type_id_seq;
+-- CREATE SEQUENCE tax_type_tax_type_id_seq;
+
CREATE TABLE tax_type (
- "tax_type_id" int check ("tax_type_id" > 0) NOT NULL DEFAULT NEXTVAL ('tax_type_seq'),
+ "tax_type_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"name" varchar(32) NOT NULL,
"content" varchar(191) NOT NULL,
"created_at" timestamp(0) NOT NULL DEFAULT now(),
- "updated_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("tax_type_id")
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("tax_type_id")
);
+
+SELECT setval('tax_type_tax_type_id_seq', 3, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/user/digital_asset.sql b/install/sql/pgsql/schema/user/digital_asset.sql
index 7de4dd5..54e9e47 100755
--- a/install/sql/pgsql/schema/user/digital_asset.sql
+++ b/install/sql/pgsql/schema/user/digital_asset.sql
@@ -1,14 +1,16 @@
DROP TABLE IF EXISTS digital_asset;
-DROP SEQUENCE IF EXISTS digital_asset_seq;
-CREATE SEQUENCE digital_asset_seq;
-SELECT setval('digital_asset_seq', 1, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS digital_asset_digital_asset_id_seq;
+-- CREATE SEQUENCE digital_asset_digital_asset_id_seq;
CREATE TABLE digital_asset (
- "digital_asset_id" int check ("digital_asset_id" > 0) NOT NULL DEFAULT NEXTVAL ('digital_asset_seq'),
+ "digital_asset_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"file" varchar(160) NOT NULL,
"public" varchar(128) NOT NULL,
- "created_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("digital_asset_id")
+ "created_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("digital_asset_id")
);
+
+
+SELECT setval('digital_asset_digital_asset_id_seq', 1, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/user/digital_asset_content.sql b/install/sql/pgsql/schema/user/digital_asset_content.sql
index 908df3c..8124324 100755
--- a/install/sql/pgsql/schema/user/digital_asset_content.sql
+++ b/install/sql/pgsql/schema/user/digital_asset_content.sql
@@ -4,5 +4,5 @@ CREATE TABLE digital_asset_content (
"digital_asset_id" int check ("digital_asset_id" > 0) NOT NULL,
"language_id" int check ("language_id" > 0) NOT NULL,
"name" varchar(64) NOT NULL,
- PRIMARY KEY ("digital_asset_id","language_id")
+ PRIMARY KEY("digital_asset_id","language_id")
);
diff --git a/install/sql/pgsql/schema/user/digital_asset_log.sql b/install/sql/pgsql/schema/user/digital_asset_log.sql
index 5e6f5cf..7635179 100755
--- a/install/sql/pgsql/schema/user/digital_asset_log.sql
+++ b/install/sql/pgsql/schema/user/digital_asset_log.sql
@@ -1,19 +1,20 @@
DROP TABLE IF EXISTS digital_asset_log;
-DROP SEQUENCE IF EXISTS digital_asset_log_seq;
-CREATE SEQUENCE digital_asset_log_seq;
--- SELECT setval('digital_asset_log_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS digital_asset_log_digital_asset_log_id_seq;
+-- CREATE SEQUENCE digital_asset_log_digital_asset_log_id_seq;
+
CREATE TABLE digital_asset_log (
- "digital_asset_log_id" int check ("digital_asset_log_id" > 0) NOT NULL DEFAULT NEXTVAL ('digital_asset_log_seq'),
+ "digital_asset_log_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"digital_asset_id" int check ("digital_asset_id" > 0) NOT NULL,
"user_id" int check ("user_id" > 0) NOT NULL,
"site_id" smallint NOT NULL,
"ip" varchar(40) NOT NULL,
"country" varchar(2),
- "created_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("digital_asset_log_id")
+ "created_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("digital_asset_log_id")
);
CREATE INDEX "digital_asset_log_user_id" ON digital_asset_log ("user_id");
CREATE INDEX "digital_asset_log_digital_asset_id" ON digital_asset_log ("digital_asset_id");
+-- SELECT setval('digital_asset_log_digital_asset_log_id_seq', 0, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/user/user.sql b/install/sql/pgsql/schema/user/user.sql
index ba14760..10972b6 100755
--- a/install/sql/pgsql/schema/user/user.sql
+++ b/install/sql/pgsql/schema/user/user.sql
@@ -1,12 +1,11 @@
DROP TABLE IF EXISTS "user";
-DROP SEQUENCE IF EXISTS "user_seq";
-CREATE SEQUENCE "user_seq";
-SELECT setval('"user_seq"', 1, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS "user_user_id_seq";
+-- CREATE SEQUENCE "user_user_id_seq";
CREATE TABLE "user" (
- "user_id" int check ("user_id" > 0) NOT NULL DEFAULT NEXTVAL ('user_seq'),
+ "user_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"user_group_id" int check ("user_group_id" > 0) NOT NULL DEFAULT 1,
"site_id" int check ("site_id" > 0) NOT NULL DEFAULT 1,
"username" varchar(60) NOT NULL DEFAULT '',
@@ -24,11 +23,13 @@ CREATE TABLE "user" (
"token" varchar(32) NOT NULL DEFAULT '',
"secret" varchar(32) NOT NULL DEFAULT '',
"subscribe" smallint check ("status" >= 0) NOT NULL DEFAULT '0',
+ "last_ip" varchar(40) NOT NULL DEFAULT '',
"created_at" timestamp(0) NOT NULL DEFAULT now(),
- "updated_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("user_id")
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("user_id")
);
CREATE INDEX "user_username" ON "user" ("username");
CREATE INDEX "user_email" ON "user" ("email");
CREATE INDEX "user_created_at" ON "user" ("created_at");
+SELECT setval('"user_user_id_seq"', 1, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/user/user_address.sql b/install/sql/pgsql/schema/user/user_address.sql
index 436fcdc..9d6f29f 100755
--- a/install/sql/pgsql/schema/user/user_address.sql
+++ b/install/sql/pgsql/schema/user/user_address.sql
@@ -1,11 +1,10 @@
DROP TABLE IF EXISTS user_address;
-DROP SEQUENCE IF EXISTS user_address_seq;
-CREATE SEQUENCE user_address_seq;
--- SELECT setval('user_address_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS user_address_user_address_id_seq;
+-- CREATE SEQUENCE user_address_user_address_id_seq;
CREATE TABLE user_address (
- "user_address_id" int check ("user_address_id" > 0) NOT NULL DEFAULT NEXTVAL ('user_address_seq'),
+ "user_address_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"user_id" int check ("user_id" > 0) NOT NULL,
"first_name" varchar(32) NOT NULL,
"last_name" varchar(32) NOT NULL,
@@ -17,8 +16,9 @@ CREATE TABLE user_address (
"country_id" int check ("country_id" > 0) NOT NULL DEFAULT 0,
"region_id" int check ("region_id" > 0) NOT NULL DEFAULT 0,
"default_address" smallint check ("default_address" > 0) NOT NULL DEFAULT 0,
- "fields" text NOT NULL,
- PRIMARY KEY ("user_address_id")
+ "fields" text NOT NULL
+ -- PRIMARY KEY("user_address_id")
);
CREATE INDEX "user_address_user_id" ON user_address ("user_id");
+-- SELECT setval('user_address_user_address_id_seq', 0, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/user/user_failed_login.sql b/install/sql/pgsql/schema/user/user_failed_login.sql
index 11274f6..21a66ed 100644
--- a/install/sql/pgsql/schema/user/user_failed_login.sql
+++ b/install/sql/pgsql/schema/user/user_failed_login.sql
@@ -5,5 +5,5 @@ CREATE TABLE "user_failed_login" (
"count" int check ("count" > 0) NOT NULL DEFAULT 1,
"last_ip" varchar(16) NOT NULL DEFAULT '',
"updated_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("user_id", "updated_at")
+ PRIMARY KEY("user_id", "updated_at")
);
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/user/user_group.sql b/install/sql/pgsql/schema/user/user_group.sql
index 7e0895a..4c340d5 100755
--- a/install/sql/pgsql/schema/user/user_group.sql
+++ b/install/sql/pgsql/schema/user/user_group.sql
@@ -1,13 +1,14 @@
DROP TABLE IF EXISTS user_group;
-DROP SEQUENCE IF EXISTS user_group_seq;
-CREATE SEQUENCE user_group_seq;
-SELECT setval('user_group_seq', 1, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS user_group_user_group_id_seq;
+-- CREATE SEQUENCE user_group_user_group_id_seq;
CREATE TABLE user_group (
- "user_group_id" int check ("user_group_id" > 0) NOT NULL DEFAULT NEXTVAL ('user_group_seq'),
+ "user_group_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"status" int NOT NULL,
- "sort_order" int NOT NULL DEFAULT 0,
- PRIMARY KEY ("user_group_id")
+ "sort_order" int NOT NULL DEFAULT 0
+ -- PRIMARY KEY("user_group_id")
);
+
+SELECT setval('user_group_user_group_id_seq', 1, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/user/user_group_content.sql b/install/sql/pgsql/schema/user/user_group_content.sql
index 0a389d6..33564c4 100755
--- a/install/sql/pgsql/schema/user/user_group_content.sql
+++ b/install/sql/pgsql/schema/user/user_group_content.sql
@@ -5,5 +5,5 @@ CREATE TABLE user_group_content (
"language_id" int check ("language_id" > 0) NOT NULL,
"name" varchar(32) NOT NULL,
"content" text NOT NULL,
- PRIMARY KEY ("user_group_id","language_id")
+ PRIMARY KEY("user_group_id","language_id")
);
diff --git a/install/sql/pgsql/schema/user/user_points.sql b/install/sql/pgsql/schema/user/user_points.sql
index 75ea1c4..b015b04 100755
--- a/install/sql/pgsql/schema/user/user_points.sql
+++ b/install/sql/pgsql/schema/user/user_points.sql
@@ -1,16 +1,18 @@
DROP TABLE IF EXISTS user_points;
-DROP SEQUENCE IF EXISTS user_points_seq;
-CREATE SEQUENCE user_points_seq;
--- SELECT setval('user_points_seq', 0, true); -- last inserted id by sample data
+-- DROP SEQUENCE IF EXISTS user_points_user_points_id_seq;
+-- CREATE SEQUENCE user_points_user_points_id_seq;
CREATE TABLE user_points (
- "user_points_id" int check ("user_points_id" > 0) NOT NULL DEFAULT NEXTVAL ('user_points_seq'),
+ "user_points_id" int PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, -- SERIAL PRIMARY KEY
"user_id" int check ("user_id" > 0) NOT NULL DEFAULT 0,
"order_id" int check ("order_id" > 0) NOT NULL DEFAULT 0,
"content" text NOT NULL,
"points" int NOT NULL DEFAULT 0,
- "created_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("user_points_id")
+ "created_at" timestamp(0) NOT NULL DEFAULT now()
+ -- PRIMARY KEY("user_points_id")
);
+
+
+-- SELECT setval('user_points_user_points_id_seq', 0, true); -- last inserted id by sample data
\ No newline at end of file
diff --git a/install/sql/pgsql/schema/user/user_wishlist.sql b/install/sql/pgsql/schema/user/user_wishlist.sql
index 9134d36..cd77dce 100755
--- a/install/sql/pgsql/schema/user/user_wishlist.sql
+++ b/install/sql/pgsql/schema/user/user_wishlist.sql
@@ -4,5 +4,5 @@ CREATE TABLE user_wishlist (
"user_id" int check ("user_id" > 0) NOT NULL,
"product_id" int check ("product_id" > 0) NOT NULL,
"created_at" timestamp(0) NOT NULL DEFAULT now(),
- PRIMARY KEY ("user_id","product_id")
+ PRIMARY KEY("user_id","product_id")
);