← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/query_rewrite.cc

Merge Joe, plus I updated the tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/query_rewrite.cc
28
28
#include <algorithm>
29
29
#include <vector>
30
30
 
 
31
using namespace std;
 
32
 
31
33
namespace drizzled
32
34
{
33
35
 
34
36
namespace plugin
35
37
{
36
38
 
37
 
std::vector<plugin::QueryRewriter *> all_rewriters;
 
39
vector<plugin::QueryRewriter *> all_rewriters;
38
40
 
39
41
 
40
42
bool QueryRewriter::addPlugin(QueryRewriter *in_rewriter)
51
53
{
52
54
  if (in_rewriter != NULL)
53
55
  {
54
 
    all_rewriters.erase(std::find(all_rewriters.begin(),
55
 
                                  all_rewriters.end(),
56
 
                                  in_rewriter));
 
56
    all_rewriters.erase(find(all_rewriters.begin(),
 
57
                             all_rewriters.end(),
 
58
                             in_rewriter));
57
59
  }
58
60
}
59
61
 
62
64
 * This is the QueryRewriter::rewrite entry point.
63
65
 * This gets called from within the Drizzle kernel.
64
66
 */
65
 
void QueryRewriter::rewriteQuery(const std::string &schema, std::string &to_rewrite)
 
67
void QueryRewriter::rewriteQuery(const string &schema, string &to_rewrite)
66
68
{
67
 
  for (std::vector<plugin::QueryRewriter *>::iterator iter= all_rewriters.begin();
 
69
  for (vector<plugin::QueryRewriter *>::iterator iter= all_rewriters.begin();
68
70
       iter != all_rewriters.end();
69
71
       ++iter)
70
72
  {