Skip to content

Revert "SL-329 optimize db" #298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarijusDilys merged 1 commit into from
Oct 16, 2025
Merged

Revert "SL-329 optimize db" #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
215 changes: 0 additions & 215 deletions TASKS.md
View file
Open in desktop

This file was deleted.

23 changes: 4 additions & 19 deletions src/Install/Installer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,7 @@ private function installSaferPayOrderTable()
`refunded` tinyint(1) DEFAULT 0,
`canceled` tinyint(1) DEFAULT 0,
`authorized` tinyint(1) DEFAULT 0,
`pending` tinyint(1) DEFAULT 0,
INDEX `idx_token` (`token`),
INDEX `idx_status` (`captured`, `refunded`, `canceled`, `authorized`, `pending`)
`pending` tinyint(1) DEFAULT 0
) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'
);
}
Expand Down Expand Up @@ -256,13 +254,7 @@ private function installSaferPayAssertTable()
`card_number` VARCHAR(64) NOT NULL,
`dcc_value` INTEGER(32) DEFAULT NULL,
`dcc_currency_code` VARCHAR(64) DEFAULT NULL,
`authorized` tinyint(1) DEFAULT 0,
INDEX `idx_status` (`status`),
INDEX `idx_payment_id` (`payment_id`),
INDEX `idx_merchant_reference` (`merchant_reference`),
INDEX `idx_authorized` (`authorized`),
INDEX `idx_currency_code` (`currency_code`),
INDEX `idx_order_status` (`id_saferpay_order`, `status`)
`authorized` tinyint(1) DEFAULT 0
) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'
);
}
Expand All @@ -280,10 +272,7 @@ private function installSaferPayCardAlias()
`payment_method` VARCHAR(64) NOT NULL,
`valid_till` datetime NOT NULL,
`date_add` datetime NOT NULL,
`date_upd` datetime NOT NULL,
INDEX `idx_success` (`success`),
INDEX `idx_customer_success` (`id_customer`, `success`),
INDEX `idx_customer_valid_till` (`id_customer`, `valid_till`)
`date_upd` datetime NOT NULL
) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'
);
}
Expand Down Expand Up @@ -315,11 +304,7 @@ private function installOrderRefundTable()
`transaction_id` VARCHAR(64) NOT NULL,
`amount` INTEGER(20) NOT NULL,
`currency` VARCHAR(64) NOT NULL,
`status` VARCHAR(64) NOT NULL,
INDEX `idx_status` (`status`),
INDEX `idx_currency` (`currency`),
INDEX `idx_order_status` (`id_order`, `status`),
INDEX `idx_saferpay_order_status` (`id_saferpay_order`, `status`)
`status` VARCHAR(64) NOT NULL
) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci'
);
}
Expand Down
8 changes: 4 additions & 4 deletions src/Repository/SaferPayCardAliasRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function getSavedValidCardsByUserIdAndPaymentMethod($userId, $paymentMeth
$query = new DbQuery();
$query->select('`id_saferpay_card_alias`, `card_number`');
$query->from('saferpay_card_alias');
$query->where('id_customer = ' . (int) $userId);
$query->where('id_customer = "' . (int) $userId . '"');
$query->where('payment_method = "' . pSQL($paymentMethod) . '"');
$query->where('valid_till > "' . pSQL($currentDate) . '"');

Expand All @@ -49,7 +49,7 @@ public function getSavedCardAliasFromId($id)
$query = new DbQuery();
$query->select('`alias_id`');
$query->from('saferpay_card_alias');
$query->where('id_saferpay_card_alias = ' . (int) $id);
$query->where('id_saferpay_card_alias = "' . (int) $id . '"');

return Db::getInstance()->getValue($query);
}
Expand All @@ -59,7 +59,7 @@ public function getSavedCardIdByCustomerIdAndAliasId($customerId, $aliasId)
$query = new DbQuery();
$query->select('`id_saferpay_card_alias`');
$query->from('saferpay_card_alias');
$query->where('id_customer = ' . (int) $customerId);
$query->where('id_customer = "' . (int) $customerId . '"');
$query->where('alias_id = "' . pSQL($aliasId) . '"');

return Db::getInstance()->getValue($query);
Expand All @@ -70,7 +70,7 @@ public function getSavedCardsByCustomerId($customerId)
$query = new DbQuery();
$query->select('*');
$query->from('saferpay_card_alias');
$query->where('id_customer = ' . (int) $customerId);
$query->where('id_customer = "' . (int) $customerId . '"');

return Db::getInstance()->executeS($query);
}
Expand Down
11 changes: 5 additions & 6 deletions src/Repository/SaferPayOrderRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function getIdByOrderId($orderId)
$query = new DbQuery();
$query->select('`id_saferpay_order`');
$query->from('saferpay_order');
$query->where('id_order = ' . (int) $orderId);
$query->where('id_order = "' . (int) $orderId . '"');
$query->orderBy('`id_saferpay_order` DESC');

return Db::getInstance()->getValue($query);
Expand All @@ -60,7 +60,7 @@ public function getIdByCartId($cartId)
$query = new DbQuery();
$query->select('`id_saferpay_order`');
$query->from('saferpay_order');
$query->where('id_cart = ' . (int) $cartId);
$query->where('id_cart = "' . (int) $cartId . '"');
$query->orderBy('`id_saferpay_order` DESC');

return Db::getInstance()->getValue($query);
Expand All @@ -70,7 +70,7 @@ public function getAssertIdBySaferPayOrderId($saferPayOrderId)
$query = new DbQuery();
$query->select('`id_saferpay_assert`');
$query->from('saferpay_assert');
$query->where('id_saferPay_order = ' . (int) $saferPayOrderId);
$query->where('id_saferPay_order = "' . (int) $saferPayOrderId . '"');
$query->orderBy('id_saferpay_assert DESC');

return Db::getInstance()->getValue($query);
Expand All @@ -86,8 +86,7 @@ public function getOrderRefunds($saferPayOrderId)
$query = new DbQuery();
$query->select('*');
$query->from('saferpay_order_refund');
$query->where('id_saferPay_order = ' . (int) $saferPayOrderId);
$query->orderBy('id_saferpay_order_refund DESC');
$query->where('id_saferPay_order = "' . (int) $saferPayOrderId . '"');

return Db::getInstance()->executeS($query);
}
Expand All @@ -97,7 +96,7 @@ public function getPaymentBrandBySaferpayOrderId($saferpayOrderId)
$query = new DbQuery();
$query->select('`brand`');
$query->from('saferpay_assert');
$query->where('id_saferpay_order = ' . (int) $saferpayOrderId);
$query->where('id_saferpay_order = "' . (int) $saferpayOrderId . '"');

return Db::getInstance()->getValue($query);
}
Expand Down
Loading
Loading