From 7a382a6c33bb5e8edc2237e05ab271992690a1e1 Mon Sep 17 00:00:00 2001
From: Sylvain LE GAL <sylvain.legal@grap.coop>
Date: Tue, 18 Apr 2017 11:46:22 +0200
Subject: [PATCH] [FIX] various improvement. Courtesy @dreispt review

---
 sql_export/demo/sql_export.xml                |  2 +-
 sql_export/sql_export_view.xml                |  6 +++--
 sql_export/tests/test_sql_query.py            | 27 +++++--------------
 .../models/sql_request_mixin.py               | 11 +++++---
 .../security/ir_module_category.xml           |  2 +-
 5 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/sql_export/demo/sql_export.xml b/sql_export/demo/sql_export.xml
index 70499c9f860..4e168a50510 100644
--- a/sql_export/demo/sql_export.xml
+++ b/sql_export/demo/sql_export.xml
@@ -12,6 +12,6 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <field name="query">SELECT name, street FROM res_partner;</field>
     </record>
 
-    <function model="sql.export" name="button_clean_check_request" eval="([ref('sql_export.sql_export_partner')])"/>
+    <function model="sql.export" name="button_validate_sql_expression" eval="([ref('sql_export.sql_export_partner')])"/>
 
 </data></openerp>
diff --git a/sql_export/sql_export_view.xml b/sql_export/sql_export_view.xml
index d92ca85f719..05d7f1ae4c5 100644
--- a/sql_export/sql_export_view.xml
+++ b/sql_export/sql_export_view.xml
@@ -10,8 +10,8 @@
             <form string="SQL export">
                 <sheet>
                     <header>
-                        <button name="button_clean_check_request" type="object" states="draft"
-                                string="Clean and Check Request" class="oe_highlight"/>
+                        <button name="button_validate_sql_expression" type="object" states="draft"
+                                string="Validate SQL Expression" class="oe_highlight"/>
                         <button name="button_set_draft" type="object" states="sql_valid"
                                 string="Set to Draft" groups="sql_request_abstract.group_sql_request_manager"/>
                         <button name="export_sql_query" string="Execute Query" states="sql_valid" type="object" class="oe_highlight"
@@ -74,6 +74,7 @@
     <record id="sql_parameter_view_form" model="ir.ui.view">
         <field name="name">Sql_parameter_form_view</field>
         <field name="model">ir.model.fields</field>
+        <field name="priority">100</field>
         <field name="arch" type="xml">
             <form string="SQL export">
             </form>
@@ -83,6 +84,7 @@
     <record id="sql_parameter_view_tree" model="ir.ui.view">
         <field name="name">Sql_parameter_tree_view</field>
         <field name="model">ir.model.fields</field>
+        <field name="priority">100</field>
         <field name="arch" type="xml">
             <tree string="SQL Parameter">
                 <field name="name"/>
diff --git a/sql_export/tests/test_sql_query.py b/sql_export/tests/test_sql_query.py
index d1b0f711f34..3feccd80ccf 100644
--- a/sql_export/tests/test_sql_query.py
+++ b/sql_export/tests/test_sql_query.py
@@ -1,23 +1,8 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Author: Florian da Costa
-#    Copyright 2015 Akretion
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distnaributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# Copyright (C) 2015 Akretion (<http://www.akretion.com>)
+# @author: Florian da Costa
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
 import base64
 from openerp.tests.common import TransactionCase
 from openerp.exceptions import Warning as UserError
@@ -57,7 +42,7 @@ def test_prohibited_queries(self):
                 sql_export = self.sql_export_obj.create({
                     'name': 'test_prohibited',
                     'query': query})
-                sql_export.button_clean_check_request()
+                sql_export.button_validate_sql_expression()
 
     def test_authorized_queries(self):
         authorized_queries = [
@@ -68,7 +53,7 @@ def test_authorized_queries(self):
             sql_export = self.sql_export_obj.create({
                 'name': 'test_authorized',
                 'query': query})
-            sql_export.button_clean_check_request()
+            sql_export.button_validate_sql_expression()
             self.assertEqual(
                 sql_export.state, 'sql_valid',
                 "%s is a valid request" % (query))
diff --git a/sql_request_abstract/models/sql_request_mixin.py b/sql_request_abstract/models/sql_request_mixin.py
index bd6ad4085ed..d7df1f85cff 100644
--- a/sql_request_abstract/models/sql_request_mixin.py
+++ b/sql_request_abstract/models/sql_request_mixin.py
@@ -14,7 +14,7 @@
 from openerp.exceptions import Warning as UserError
 
 
-class SQLRequestMixin(models.Model):
+class SQLRequestMixin(models.AbstractModel):
     _name = 'sql.request.mixin'
 
     _clean_query_enabled = True
@@ -60,7 +60,7 @@ def _default_user_ids(self):
 
     query = fields.Text(
         string='Query', required=True, help="You can't use the following words"
-        ": DELETE, DROP, CREATE, INSERT, ALTER, TRUNCATE, EXECUTE, UPDATE")
+        ": DELETE, DROP, CREATE, INSERT, ALTER, TRUNCATE, EXECUTE, UPDATE.")
 
     state = fields.Selection(
         string='State', selection=STATE_SELECTION, default='draft',
@@ -82,7 +82,7 @@ def _default_user_ids(self):
 
     # Action Section
     @api.multi
-    def button_clean_check_request(self):
+    def button_validate_sql_expression(self):
         for item in self:
             if item._clean_query_enabled:
                 item._clean_query()
@@ -198,7 +198,10 @@ def _check_materialized_view_available(self):
         self.env.cr.execute("SHOW server_version;")
         res = self.env.cr.fetchone()[0].split('.')
         minor_version = float('.'.join(res[:2]))
-        return minor_version >= 9.3
+        if minor_version < 9.3:
+            raise UserError(_(
+                "Materialized View requires PostgreSQL 9.3 or greater but"
+                " PostgreSQL %s is currently installed.") % (minor_version))
 
     @api.multi
     def _clean_query(self):
diff --git a/sql_request_abstract/security/ir_module_category.xml b/sql_request_abstract/security/ir_module_category.xml
index 2c7663336e0..0928edeebf4 100644
--- a/sql_request_abstract/security/ir_module_category.xml
+++ b/sql_request_abstract/security/ir_module_category.xml
@@ -3,7 +3,7 @@
 <openerp><data>
 
     <record model="ir.module.category" id="category_sql_abstract">
-        <field name="name">Sql Request</field>
+        <field name="name">SQL Request</field>
     </record>
 
 </data></openerp>