Item12583: some clean-up

git-svn-id: http://svn.foswiki.org/trunk/SqlPlugin@17149 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Dec 11, 2013 · d1ca869 · d1ca869
1 parent e894ed0
commit d1ca869
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/data/System/SqlPlugin.txt b/data/System/SqlPlugin.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="reprev" date="1270549594" format="1.1" reprev="1.2" version="1.2"}%
+%META:TOPICINFO{author="ProjectContributor" comment="autosave" date="1356278780" format="1.1" version="4"}%
 ---+!! %TOPIC%
 
 %TOC%
@@ -121,15 +121,17 @@ The behavior when the database parameter is omitted is unchanged.
 -->
 
 |  Author(s): | Foswiki:MichaelDaum|
-|  Copyright: | &copy; 2009-2010 Michael Daum http://michaeldaumconsulting.com 2012 Kip Lubliner |
+|  Copyright: | &copy; 2009-2013 Michael Daum http://michaeldaumconsulting.com, 2012 Kip Lubliner |
 |  License: | [[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]] |
 |  Version: | %$VERSION% |
 |  Release: | %$RELEASE% |
 |  Change History: | <!-- versions below in reverse order -->&nbsp; |
-|  5 Aug 2012:  | (1.03) Fix Foswiki:Tasks/Item12029 - more robust 'database' param handling <br> Foswiki:Tasks/Item12030 - DB errors cause unintended SQL calls <br> Foswiki:Tasks/Item12018 - queries spread across multiple lines <br> Foswiki:Tasks/Item12033 - also log access from API and log access control failures (Foswiki:Main/KipLubliner) |
+|  5 Aug 2012:  | (1.03) Foswiki:Tasks/Item12029 - more robust 'database' param handling <br>\
+                         Foswiki:Tasks/Item12030 - DB errors cause unintended SQL calls <br>\
+                         Foswiki:Tasks/Item12018 - queries spread across multiple lines <br>\
+                         Foswiki:Tasks/Item12033 - also log access from API and log access control failures (Foswiki:Main/KipLubliner) |
 |  18 May 2012: | (1.02) Added bind parameters, access control, perl API.  (Foswiki:Main/KipLubliner) |
 |  14 Jun 2010: | removed hard-coded sort of column keys |
 |  Dependencies: | %$DEPENDENCIES% |
 |  Home page: | http://foswiki.org/Extensions/%TOPIC% |
 |  Support page: | http://foswiki.org/Support/%TOPIC% |
-
diff --git a/lib/Foswiki/Plugins/SqlPlugin.pm b/lib/Foswiki/Plugins/SqlPlugin.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 # 
-# Copyright (C) 2009-2010 Michael Daum http://michaeldaumconsulting.com
+# Copyright (C) 2009-2013 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -16,9 +16,10 @@
 package Foswiki::Plugins::SqlPlugin;
 
 use strict;
+use warnings;
 
-our $VERSION = '$Rev$';
-our $RELEASE = '1.03';
+our $VERSION = '1.04';
+our $RELEASE = '1.04';
 our $SHORTDESCRIPTION = 'SQL interface for Foswiki';
 our $NO_PREFS_IN_TOPIC = 1;
 our $doneInit;
@@ -54,19 +55,19 @@ sub finishPlugin {
 ##############################################################################
 sub handleSQL {
   init();
-  Foswiki::Plugins::SqlPlugin::Core::handleSQL(@_);
+  return Foswiki::Plugins::SqlPlugin::Core::handleSQL(@_);
 }
 
 ##############################################################################
 sub handleSQLFORMAT {
   init();
-  Foswiki::Plugins::SqlPlugin::Core::handleSQLFORMAT(@_);
+  return Foswiki::Plugins::SqlPlugin::Core::handleSQLFORMAT(@_);
 }
 
 ##############################################################################
 sub handleSQLINFO {
   init();
-  Foswiki::Plugins::SqlPlugin::Core::handleSQLINFO(@_);
+  return Foswiki::Plugins::SqlPlugin::Core::handleSQLINFO(@_);
 }
 
 =begin TML
@@ -84,7 +85,7 @@ Throws Error::Simple on errors.
 =cut
 sub execute {
   init();
-  Foswiki::Plugins::SqlPlugin::Core::handleExecute(@_);
+  return Foswiki::Plugins::SqlPlugin::Core::handleExecute(@_);
 }
 
 1;