diff --git a/lib/OpenLayers.js b/lib/OpenLayers.js index b22dd27daa..dfd10848dc 100644 --- a/lib/OpenLayers.js +++ b/lib/OpenLayers.js @@ -239,7 +239,6 @@ "OpenLayers/Filter/Function.js", "OpenLayers/Protocol.js", "OpenLayers/Protocol/HTTP.js", - "OpenLayers/Protocol/SQL.js", "OpenLayers/Protocol/WFS.js", "OpenLayers/Protocol/WFS/v1.js", "OpenLayers/Protocol/WFS/v1_0_0.js", diff --git a/lib/OpenLayers/Protocol/SQL.js b/lib/OpenLayers/Protocol/SQL.js deleted file mode 100644 index 404a3bac90..0000000000 --- a/lib/OpenLayers/Protocol/SQL.js +++ /dev/null @@ -1,88 +0,0 @@ -/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for - * full list of contributors). Published under the Clear BSD license. - * See http://svn.openlayers.org/trunk/openlayers/license.txt for the - * full text of the license. */ - -/** - * @requires OpenLayers/Protocol.js - */ - -/** - * Class: OpenLayers.Protocol.SQL - * Abstract SQL protocol class. Not to be instantiated directly. Use - * one of the SQL protocol subclasses instead. - * - * Inherits from: - * - - */ -OpenLayers.Protocol.SQL = OpenLayers.Class(OpenLayers.Protocol, { - - /** - * APIProperty: databaseName - * {String} - */ - databaseName: 'ol', - - /** - * APIProperty: tableName - * Name of the database table into which Features should be saved. - */ - tableName: "ol_vector_features", - - /** - * Property: postReadFiltering - * {Boolean} Whether the filter (if there's one) must be applied after - * the features have been read from the database; for example the - * BBOX strategy passes the read method a BBOX spatial filter, if - * postReadFiltering is true every feature read from the database - * will go through the BBOX spatial filter, which can be costly; - * defaults to true. - */ - postReadFiltering: true, - - /** - * Constructor: OpenLayers.Protocol.SQL - */ - initialize: function(options) { - OpenLayers.Protocol.prototype.initialize.apply(this, [options]); - }, - - /** - * APIMethod: destroy - * Clean up the protocol. - */ - destroy: function() { - OpenLayers.Protocol.prototype.destroy.apply(this); - }, - - /** - * APIMethod: supported - * This should be overridden by specific subclasses - * - * Returns: - * {Boolean} Whether or not the browser supports the SQL backend - */ - supported: function() { - return false; - }, - - /** - * Method: evaluateFilter - * If postReadFiltering is true evaluate the filter against the feature - * and return the result of the evaluation, otherwise return true. - * - * Parameters: - * {} The feature. - * {} The filter. - * - * Returns: - * {Boolean} true if postReadFiltering if false, the result of the - * filter evaluation otherwise. - */ - evaluateFilter: function(feature, filter) { - return filter && this.postReadFiltering ? - filter.evaluate(feature) : true; - }, - - CLASS_NAME: "OpenLayers.Protocol.SQL" -}); diff --git a/lib/deprecated.js b/lib/deprecated.js index a5b4a9a590..69f228228c 100644 --- a/lib/deprecated.js +++ b/lib/deprecated.js @@ -16,6 +16,7 @@ * @requires OpenLayers/Layer/EventPane.js * @requires OpenLayers/Layer/FixedZoomLevels.js * @requires OpenLayers/Layer/SphericalMercator.js + * @requires OpenLayers/Protocol.js * @requires OpenLayers/Protocol/SQL.js * @requires OpenLayers/Format/JSON.js * @requires OpenLayers/Format/WKT.js @@ -3725,6 +3726,85 @@ OpenLayers.Layer.VirtualEarth = OpenLayers.Class( } })(); +/** + * Class: OpenLayers.Protocol.SQL + * Abstract SQL protocol class. Not to be instantiated directly. Use + * one of the SQL protocol subclasses instead. + * + * Inherits from: + * - + */ +OpenLayers.Protocol.SQL = OpenLayers.Class(OpenLayers.Protocol, { + + /** + * APIProperty: databaseName + * {String} + */ + databaseName: 'ol', + + /** + * APIProperty: tableName + * Name of the database table into which Features should be saved. + */ + tableName: "ol_vector_features", + + /** + * Property: postReadFiltering + * {Boolean} Whether the filter (if there's one) must be applied after + * the features have been read from the database; for example the + * BBOX strategy passes the read method a BBOX spatial filter, if + * postReadFiltering is true every feature read from the database + * will go through the BBOX spatial filter, which can be costly; + * defaults to true. + */ + postReadFiltering: true, + + /** + * Constructor: OpenLayers.Protocol.SQL + */ + initialize: function(options) { + OpenLayers.Protocol.prototype.initialize.apply(this, [options]); + }, + + /** + * APIMethod: destroy + * Clean up the protocol. + */ + destroy: function() { + OpenLayers.Protocol.prototype.destroy.apply(this); + }, + + /** + * APIMethod: supported + * This should be overridden by specific subclasses + * + * Returns: + * {Boolean} Whether or not the browser supports the SQL backend + */ + supported: function() { + return false; + }, + + /** + * Method: evaluateFilter + * If postReadFiltering is true evaluate the filter against the feature + * and return the result of the evaluation, otherwise return true. + * + * Parameters: + * {} The feature. + * {} The filter. + * + * Returns: + * {Boolean} true if postReadFiltering if false, the result of the + * filter evaluation otherwise. + */ + evaluateFilter: function(feature, filter) { + return filter && this.postReadFiltering ? + filter.evaluate(feature) : true; + }, + + CLASS_NAME: "OpenLayers.Protocol.SQL" +}); /** * Class: OpenLayers.Protocol.SQL.Gears diff --git a/tests/Protocol/SQL.html b/tests/deprecated/Protocol/SQL.html similarity index 86% rename from tests/Protocol/SQL.html rename to tests/deprecated/Protocol/SQL.html index f02a5e855d..f45203db28 100644 --- a/tests/Protocol/SQL.html +++ b/tests/deprecated/Protocol/SQL.html @@ -1,6 +1,7 @@ - + +