From 3661080b0895bd6346bd90024a887671bdfa49e0 Mon Sep 17 00:00:00 2001 From: givanz Date: Mon, 13 Jan 2025 02:23:30 +0200 Subject: [PATCH] Changed product model getContent method table alias to product --- app/sql/mysqli/product.sql | 2 +- app/sql/pgsql/product.sql | 10 +++++----- app/sql/sqlite/product.sql | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/sql/mysqli/product.sql b/app/sql/mysqli/product.sql index cfa07a85..c1601965 100755 --- a/app/sql/mysqli/product.sql +++ b/app/sql/mysqli/product.sql @@ -8,7 +8,7 @@ CREATE PROCEDURE getContent( IN product_id INT, IN status INT, - IN slug CHAR, + IN slug CHAR, OUT fetch_all, ) BEGIN diff --git a/app/sql/pgsql/product.sql b/app/sql/pgsql/product.sql index d88a7b9e..c1601965 100755 --- a/app/sql/pgsql/product.sql +++ b/app/sql/pgsql/product.sql @@ -8,12 +8,12 @@ CREATE PROCEDURE getContent( IN product_id INT, IN status INT, - IN slug CHAR, + IN slug CHAR, OUT fetch_all, ) BEGIN - SELECT _.product_id,_.slug,_.name,_.meta_keywords,_.meta_description,_.language_id,product.template,language.code,language.code as array_key + SELECT product.*, _.product_id,_.slug,_.name,_.meta_keywords,_.meta_description,_.language_id,product.template,language.code,language.code as array_key FROM product_content AS _ LEFT JOIN language ON (language.language_id = _.language_id) LEFT JOIN product ON (product.product_id = _.product_id) @@ -29,8 +29,8 @@ AND _.product_id = (SELECT product_id FROM product_content WHERE slug = :slug LIMIT 1) END @IF - @IF isset(:product_id) - THEN - AND _.product_id = :product_id + @IF isset(:product_id) && :product_id > 0 + THEN + AND _.product_id = :product_id END @IF END diff --git a/app/sql/sqlite/product.sql b/app/sql/sqlite/product.sql index 9f95687b..e539ed5f 100755 --- a/app/sql/sqlite/product.sql +++ b/app/sql/sqlite/product.sql @@ -8,20 +8,20 @@ CREATE PROCEDURE getContent( IN product_id INT, IN status INT, - IN slug CHAR, + IN slug CHAR, OUT fetch_all, ) BEGIN - SELECT _.product_id,_.slug,_.name,_.meta_keywords,_.meta_description,_.language_id,product.template,language.code,language.code as array_key + SELECT product.*, _.product_id,_.slug,_.name,_.meta_keywords,_.meta_description,_.language_id,product.template,language.code,language.code as array_key FROM product_content AS _ LEFT JOIN language ON (language.language_id = _.language_id) LEFT JOIN product ON (product.product_id = _.product_id) WHERE 1 = 1 - @IF isset(:status) + @IF isset(:status) THEN - AND product.status = :status + AND product.status = :status END @IF @IF isset(:slug) && !(isset(:product_id) && :product_id)