Skip to content

armgit / Vvveb

Public Imported from GitHub
0

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

Pgsql fixes https://github.com/givanz/Vvveb/issues/425 https://github.com/givanz/Vvveb/issues/427

givanz3586df5cc0d4
diff --git a/admin/sql/pgsql/cart.sql b/admin/sql/pgsql/cart.sql
index c92c7b0..5ee927d 100644
--- a/admin/sql/pgsql/cart.sql
+++ b/admin/sql/pgsql/cart.sql
@@ -125,8 +125,7 @@
VALUES ( :cart )
- ON DUPLICATE KEY
- UPDATE data = values(data), user_id = values(user_id);
+ ON CONFLICT ("cart_id", "user_id") DO UPDATE SET "data" = :cart.data;
END
diff --git a/admin/sql/pgsql/category.sql b/admin/sql/pgsql/category.sql
index 90a8481..8a5fed8 100644
--- a/admin/sql/pgsql/category.sql
+++ b/admin/sql/pgsql/category.sql
@@ -335,7 +335,16 @@
@IF isset(:type)
THEN
- INNER JOIN taxonomy t ON (_.taxonomy_id = t.taxonomy_id AND t.type = :type)
+ INNER JOIN taxonomy t ON (
+ _.taxonomy_id = t.taxonomy_id AND t.type = :type
+
+ @IF isset(:post_type)
+ THEN
+
+ AND t.post_type = :post_type
+
+ END @IF
+ )
END @IF
WHERE
@@ -348,13 +357,6 @@
END @IF
- @IF isset(:post_type)
- THEN
-
- AND _.post_type = :post_type
-
- END @IF
-
@IF isset(:post_id)
THEN
,pt.post_id as checked
diff --git a/admin/sql/pgsql/media_content.sql b/admin/sql/pgsql/media_content.sql
old mode 100644
new mode 100755
index e9288f4..ac7a781
--- a/admin/sql/pgsql/media_content.sql
+++ b/admin/sql/pgsql/media_content.sql
@@ -153,7 +153,7 @@
( @KEYS(:each), media_id)
VALUES ( :each, :media_id)
- ON DUPLICATE KEY UPDATE @LIST(:each);
+ ON CONFLICT ("media_id", "language_id") DO UPDATE SET @LIST(:each);
-- allow only table fields and set defaults for missing values
@FILTER(:media, media)
diff --git a/admin/sql/pgsql/menu_item.sql b/admin/sql/pgsql/menu_item.sql
index c4238b4..04b613b 100644
--- a/admin/sql/pgsql/menu_item.sql
+++ b/admin/sql/pgsql/menu_item.sql
@@ -155,7 +155,7 @@
( @KEYS(:each), menu_item_id)
VALUES ( :each, :menu_item_id)
- ON DUPLICATE KEY UPDATE @LIST(:each);
+ ON CONFLICT ("menu_item_id", "language_id") DO UPDATE SET "content" = :each.content;
-- allow only table fields and set defaults for missing values
@FILTER(:menu_item, menu_item)
diff --git a/admin/sql/pgsql/option.sql b/admin/sql/pgsql/option.sql
old mode 100644
new mode 100755
index 3628517..498d272
--- a/admin/sql/pgsql/option.sql
+++ b/admin/sql/pgsql/option.sql
@@ -17,7 +17,9 @@
ON option_content.option_id = "option".option_id AND option_content.language_id = :language_id
WHERE 1 = 1
-
+
+ ORDER BY option.option_id DESC
+
-- limit
@IF isset(:limit)
THEN
@@ -53,6 +55,7 @@
PROCEDURE add(
IN option ARRAY,
+ IN language_id INT,
OUT fetch_one,
OUT insert_id
)
@@ -118,7 +121,11 @@
OUT affected_rows,
)
BEGIN
- -- option
+ -- option value
+ DELETE FROM option_value_content WHERE option_value_id IN (:option_value_id);
+ DELETE FROM option_value WHERE option_value_id IN (:option_id);
+
+ -- option
DELETE FROM option_content WHERE option_id IN (:option_id);
- DELETE FROM "option" WHERE option_id IN (:option_id);
+ DELETE FROM `option` WHERE option_id IN (:option_id);
END
diff --git a/admin/sql/pgsql/product_image.sql b/admin/sql/pgsql/product_image.sql
index 48748fc..9fd903c 100644
--- a/admin/sql/pgsql/product_image.sql
+++ b/admin/sql/pgsql/product_image.sql
@@ -69,8 +69,7 @@
VALUES (:product_id, :namespace, :key, :value )
- ON DUPLICATE KEY
- UPDATE value = values(value);
+ ON CONFLICT ("product_image_id", "language_id") DO UPDATE SET @LIST(:each);
END
@@ -85,7 +84,7 @@
UPDATE product_image
- SET @LIST(:product_image)
+ SET @LIST(:product_image)
WHERE product_image_id = :product_image_id
diff --git a/admin/sql/pgsql/product_meta.sql b/admin/sql/pgsql/product_meta.sql
old mode 100644
new mode 100755
index 60f5105..7bf6d73
--- a/admin/sql/pgsql/product_meta.sql
+++ b/admin/sql/pgsql/product_meta.sql
@@ -43,8 +43,7 @@
VALUES (:product_id, :namespace, :key, :value )
- ON DUPLICATE KEY
- UPDATE value = values(value);
+ ON CONFLICT ("product_id", "language_id", "namespace", "key") DO UPDATE SET "value" = :value;
END
diff --git a/install/sql/pgsql/schema/plugin/newsletter_list.sql b/install/sql/pgsql/schema/plugin/newsletter_list.sql
index 482532e..42fb4af 100644
--- a/install/sql/pgsql/schema/plugin/newsletter_list.sql
+++ b/install/sql/pgsql/schema/plugin/newsletter_list.sql
@@ -4,7 +4,7 @@ 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,
- "status"tinyint(6) NOT NULL DEFAULT '0',
+ "status" smallint NOT NULL DEFAULT '0',
"created_at" timestamp(0) NOT NULL DEFAULT now(),
"updated_at" timestamp(0) NOT NULL DEFAULT now()
);
diff --git a/install/sql/pgsql/schema/plugin/newsletter_mail.sql b/install/sql/pgsql/schema/plugin/newsletter_mail.sql
index a927424..84960b8 100644
--- a/install/sql/pgsql/schema/plugin/newsletter_mail.sql
+++ b/install/sql/pgsql/schema/plugin/newsletter_mail.sql
@@ -1,14 +1,14 @@
-- DROP TABLE IF EXISTS "newsletter_mail";
CREATE TABLE IF NOT EXISTS "newsletter_mail" (
- "newsletter_list_id" INT UNSIGNED,
+ "newsletter_list_id" INT,
"email" varchar(254) NOT NULL,
"first_name" varchar(254) NOT NULL DEFAULT '',
"last_name" varchar(254) NOT NULL DEFAULT '',
"data" text NOT NULL,
- "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
+ "status" smallint NOT NULL DEFAULT '0', -- inactive = 0, active = 1, unsubsubscribed = 2
+ "created_at" timestamp(0) NOT NULL DEFAULT now(),
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
);
-CREATE INDEX "newsletter_mail_email_newsletter_list_id" ON post ("email","newsletter_list_id");
\ No newline at end of file
+CREATE INDEX "newsletter_mail_email_newsletter_list_id" ON newsletter_mail ("email","newsletter_list_id");
diff --git a/install/sql/pgsql/schema/plugin/newsletter_post.sql b/install/sql/pgsql/schema/plugin/newsletter_post.sql
index 69529f4..d38afe8 100644
--- a/install/sql/pgsql/schema/plugin/newsletter_post.sql
+++ b/install/sql/pgsql/schema/plugin/newsletter_post.sql
@@ -3,12 +3,12 @@
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
+ "content" text NOT NULL,
+ "status" smallint NOT NULL DEFAULT 1, -- archived = 0, active = 1
+ "sent" INT NOT NULL DEFAULT 0,
+ "open" INT NOT NULL DEFAULT 0,
+ "click" INT NOT NULL DEFAULT 0,
+ "created_at" timestamp(0) NOT NULL DEFAULT now(),
+ "updated_at" timestamp(0) NOT NULL DEFAULT now()
);
diff --git a/install/sql/pgsql/schema/site/site.sql b/install/sql/pgsql/schema/site/site.sql
old mode 100755
new mode 100644
index 8056f71..90d831a
--- a/install/sql/pgsql/schema/site/site.sql
+++ b/install/sql/pgsql/schema/site/site.sql
@@ -5,13 +5,9 @@ DROP TABLE IF EXISTS site;
CREATE TABLE site (
"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")
);
-SELECT setval('site_site_id_seq', 1, true); -- last inserted id by sample data
\ No newline at end of file
+SELECT setval('site_site_id_seq', 1, true); -- last inserted id by sample data
diff --git a/install/sql/sqlite/schema/site/site.sql b/install/sql/sqlite/schema/site/site.sql
old mode 100755
new mode 100644
index 8de7863..0543294
--- a/install/sql/sqlite/schema/site/site.sql
+++ b/install/sql/sqlite/schema/site/site.sql
@@ -2,11 +2,7 @@ DROP TABLE IF EXISTS `site`;
CREATE TABLE `site` (
`site_id` INTEGER PRIMARY KEY AUTOINCREMENT,
-`key` TEXT NOT NULL,
`name` TEXT NOT NULL,
-`host` TEXT NOT NULL,
-`theme` TEXT NOT NULL,
-`template` TEXT NOT NULL DEFAULT '',
`settings` TEXT NOT NULL DEFAULT ''
-- PRIMARY KEY (`site_id`)
);