Skip to content

armgit / Vvveb

Public Imported from GitHub
0

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

Fixed search order by score

givanz45dfefee51e3
diff --git a/admin/sql/mysqli/post.sql b/admin/sql/mysqli/post.sql
index ae7d9a5..86e7bef 100644
--- a/admin/sql/mysqli/post.sql
+++ b/admin/sql/mysqli/post.sql
@@ -6,6 +6,7 @@
IN start INT, -- start offset
IN limit INT, -- number of posts
IN search CHAR, -- filter posts by search string
+ IN search_boolean INT, -- use boolean search
IN like CHAR, -- filter posts by search string using LIKE for partial search, slower
IN username CHAR, -- filter by author username
IN status CHAR, -- filter by author username
@@ -240,11 +241,16 @@
END @IF
-- ORDER BY parameters can't be binded, because they are added to the query directly they must be properly sanitized by only allowing a predefined set of values
- @IF isset(:order_by)
+ @IF isset(:search)
THEN
- ORDER BY post.$order_by $direction
+ ORDER BY score DESC
@ELSE
- ORDER BY post.post_id DESC
+ @IF isset(:order_by)
+ THEN
+ ORDER BY post.$order_by $direction
+ @ELSE
+ ORDER BY post.post_id DESC
+ END @IF
END @IF
-- limit
@@ -268,6 +274,7 @@
CREATE PROCEDURE get(
IN post_id INT,
+ IN site_id INT,
IN slug CHAR,
IN language_id INT,
IN comment_count INT,
@@ -313,27 +320,32 @@
)
LEFT JOIN admin ad ON (_.admin_id = ad.admin_id)
+
+ @IF isset(:site_id)
+ THEN
+ LEFT JOIN post_to_site ps ON (ps.post_id = _.post_id AND ps.site_id = :site_id)
+ END @IF
WHERE 1 = 1
- @IF isset(:slug) && !(isset(:post_id) && :post_id)
- THEN
+ @IF isset(:slug) && !(isset(:post_id) && :post_id)
+ THEN
AND pd.slug = :slug
END @IF
- @IF isset(:post_id) && :post_id > 0
- THEN
- AND _.post_id = :post_id
+ @IF isset(:post_id) && :post_id > 0
+ THEN
+ AND _.post_id = :post_id
END @IF
- @IF isset(:admin_id)
- THEN
- AND _.admin_id = :admin_id
+ @IF isset(:admin_id)
+ THEN
+ AND _.admin_id = :admin_id
END @IF
- @IF isset(:type)
- THEN
- AND _.type = :type
+ @IF isset(:type)
+ THEN
+ AND _.type = :type
END @IF
LIMIT 1;
diff --git a/admin/sql/mysqli/product.sql b/admin/sql/mysqli/product.sql
index d9eb0f0..6174218 100755
--- a/admin/sql/mysqli/product.sql
+++ b/admin/sql/mysqli/product.sql
@@ -8,6 +8,7 @@
IN type CHAR,
IN language_id INT,
IN promotion INT, -- include promotional price
+ IN user_group_id INT, -- user_group_id for group promotional price
IN variant INT, -- include variants
IN variant_price INT, -- include variants min max prices
IN points INT, -- include points
@@ -1177,11 +1178,16 @@
-- ORDER BY parameters can't be binded, because they are added to the query directly they must be properly sanitized by only allowing a predefined set of values
- @IF isset(:order_by)
+ @IF isset(:search)
THEN
- ORDER BY product.$order_by $direction
+ ORDER BY score DESC
@ELSE
- ORDER BY product.product_id DESC
+ @IF isset(:order_by)
+ THEN
+ ORDER BY product.$order_by $direction
+ @ELSE
+ ORDER BY product.product_id DESC
+ END @IF
END @IF
diff --git a/admin/sql/pgsql/post.sql b/admin/sql/pgsql/post.sql
index f40a31f..c1f346b 100644
--- a/admin/sql/pgsql/post.sql
+++ b/admin/sql/pgsql/post.sql
@@ -194,6 +194,7 @@
CREATE PROCEDURE get(
IN post_id INT,
+ IN site_id INT,
IN slug CHAR,
IN language_id INT,
IN comment_count INT,
@@ -239,27 +240,32 @@
)
LEFT JOIN admin ad ON (_.admin_id = ad.admin_id)
+
+ @IF isset(:site_id)
+ THEN
+ LEFT JOIN post_to_site ps ON (ps.post_id = _.post_id AND ps.site_id = :site_id)
+ END @IF
WHERE 1 = 1
- @IF isset(:slug) && !(isset(:post_id) && :post_id)
- THEN
- AND pd.slug = :slug
+ @IF isset(:slug) && !(isset(:post_id) && :post_id)
+ THEN
+ AND pd.slug = :slug
END @IF
- @IF isset(:post_id) && :post_id > 0
- THEN
- AND _.post_id = :post_id
+ @IF isset(:post_id) && :post_id > 0
+ THEN
+ AND _.post_id = :post_id
END @IF
- @IF isset(:admin_id)
- THEN
- AND _.admin_id = :admin_id
+ @IF isset(:admin_id)
+ THEN
+ AND _.admin_id = :admin_id
END @IF
- @IF isset(:type)
- THEN
- AND _.type = :type
+ @IF isset(:type)
+ THEN
+ AND _.type = :type
END @IF
LIMIT 1;
diff --git a/admin/sql/pgsql/product.sql b/admin/sql/pgsql/product.sql
index 513ab0a..c3bc982 100755
--- a/admin/sql/pgsql/product.sql
+++ b/admin/sql/pgsql/product.sql
@@ -8,6 +8,7 @@
IN type CHAR,
IN language_id INT,
IN promotion INT, -- include promotional price
+ IN user_group_id INT, -- user_group_id for group promotional price
IN variant INT, -- include variants
IN variant_price INT, -- include variants min max prices
IN points INT, -- include points
diff --git a/admin/sql/sqlite/post.sql b/admin/sql/sqlite/post.sql
index c15107d..1fbd59a 100644
--- a/admin/sql/sqlite/post.sql
+++ b/admin/sql/sqlite/post.sql
@@ -189,6 +189,7 @@
CREATE PROCEDURE get(
IN post_id INT,
+ IN site_id INT,
IN slug CHAR,
IN language_id INT,
IN comment_count INT,
@@ -234,27 +235,32 @@
)
LEFT JOIN admin ad ON (_.admin_id = ad.admin_id)
+
+ @IF isset(:site_id)
+ THEN
+ LEFT JOIN post_to_site ps ON (ps.post_id = _.post_id AND ps.site_id = :site_id)
+ END @IF
WHERE 1 = 1
- @IF isset(:slug) && !(isset(:post_id) && :post_id)
- THEN
- AND pd.slug = :slug
+ @IF isset(:slug) && !(isset(:post_id) && :post_id)
+ THEN
+ AND pd.slug = :slug
END @IF
- @IF isset(:post_id) && :post_id > 0
- THEN
- AND _.post_id = :post_id
+ @IF isset(:post_id) && :post_id > 0
+ THEN
+ AND _.post_id = :post_id
END @IF
- @IF isset(:admin_id)
- THEN
- AND _.admin_id = :admin_id
+ @IF isset(:admin_id)
+ THEN
+ AND _.admin_id = :admin_id
END @IF
- @IF isset(:type)
- THEN
- AND _.type = :type
+ @IF isset(:type)
+ THEN
+ AND _.type = :type
END @IF
LIMIT 1;
diff --git a/admin/sql/sqlite/product.sql b/admin/sql/sqlite/product.sql
index 65470d8..f73a98d 100755
--- a/admin/sql/sqlite/product.sql
+++ b/admin/sql/sqlite/product.sql
@@ -8,6 +8,7 @@
IN type CHAR,
IN language_id INT,
IN promotion INT, -- include promotional price
+ IN user_group_id INT, -- user_group_id for group promotional price
IN variant INT, -- include variants
IN variant_price INT, -- include variants min max prices
IN points INT, -- include points