Database improvements (#32)

* Limit copy-paste in DatabaseCommand.php
* read spName only if present
* remove not used indexes
* optimize left outer joins
* don't double queries w/o days
* addDaysRange
* make methods in DatabaseCommand not static
* Use SimpleSAML\Database
* indent
* update config-template
* mark deprecated options
* Fixes
* Updated template configuration
* Fixes after rebase

Author: melanger

CHANGELOG.md

@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 #### Changed
 - Remove unnecessary is_null()
+- Use SimpleSAML\Database
 
 #### Fixed
 - Log info message about successful authentication only after successful authentication to SP
@@ -12,6 +13,9 @@ All notable changes to this project will be documented in this file.
     - describe setup for modes PROXY/SP/IDP
     - change array notation from `array()` to `[]`
 - Read spName from $request only if present
+- Remove unused indexes
+- Optimize left outer join
+- Don't double queries w/o days
 
 ## [v3.1.0]
 #### Added

config-templates/module_statisticsproxy.php

@@ -38,29 +38,32 @@
     'spName' => '',
 
     /*
-     * Fill the serverName
-     */
-    'serverName' => 'localhost',
-
-    /*
-     * If you want to use the default port, please comment option 'port'
-     */
-    'port' => 3306,
-
-    /*
-     * Fill the user name
-     */
-    'userName' => 'stats',
-
-    /*
-     * Fill the password
-     */
-    'password' => 'stats',
-
-    /*
-     * Fill the database name
-     */
-    'databaseName' => 'STATS',
+     * Fill config for SimpleSAML\Database.
+     * If not set, the global config is used.
+     * @see SimpleSAML\Database
+     */
+    'store' => [
+        'database.dsn' => 'mysql:host=localhost;port=3306;dbname=STATS;charset=utf8',
+        'database.username' => 'stats',
+        'database.password' => 'stats',
+
+        /**
+         * Configuration for SSL
+         * If you want to use SSL you must filled this value and uncomment block of code
+         */
+        /*
+        'database.driver_options' => [
+            // Path for the ssl key file
+            PDO::MYSQL_ATTR_SSL_KEY => '',
+            // Path for the ssl cert file
+            PDO::MYSQL_ATTR_SSL_CERT => '',
+            // Path for the ssl ca file
+            PDO::MYSQL_ATTR_SSL_CA => '',
+            // Path for the ssl ca dir
+            PDO::MYSQL_ATTR_SSL_CAPATH => '',
+        ],
+        */
+    ],
 
     /*
      * Fill the table name for statistics
@@ -76,38 +79,4 @@
      * Fill the table name for serviceProviders
      */
     'serviceProvidersMapTableName' => 'serviceProvidersMap',
-
-    /*
-     * Fill true, if you want to use encryption, false if not.
-     */
-    'encryption' => true / false,
-
-    /*
-     * The path name to the certificate authority file.
-     *
-     * If you use encryption, you must fill this option.
-     */
-    'ssl_ca' => '/example/ca.pem',
-
-    /*
-     * The path name to the certificate file.
-     *
-     * If you use encryption, you must fill this option.
-     */
-    'ssl_cert_path' => '/example/cert.pem',
-
-    /*
-     * The path name to the key file.
-     *
-     * If you use encryption, you must fill this option.
-     */
-    'ssl_key_path' => '/example/key.pem',
-
-    /*
-     * The pathname to a directory that contains trusted SSL CA certificates in PEM format.
-     *
-     * If you use encryption, you must fill this option.
-     */
-    'ssl_ca_path' => '/etc/ssl',
-
 ];

config-templates/tables.sql

@@ -8,9 +8,6 @@ CREATE TABLE statistics (
     count INT,
     INDEX (sourceIdp),
     INDEX (service),
-    INDEX (year),
-    INDEX (year,month),
-    INDEX (year,month,day),
     PRIMARY KEY (year, month, day, sourceIdp, service)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;