dm-metamapper 0.1.2 → 0.1.3

data/lib/dm-metamapper/version.rb

@@ -1,6 +1,6 @@
 module DataMapper 
   module MetaMapper
-    VERSION = "0.1.2" unless defined?(::DataMapper::MetaMapper::VERSION)
+    VERSION = "0.1.3" unless defined?(::DataMapper::MetaMapper::VERSION)
   end
   
 end

data/lib/templates/cpp/dmmm_dbface.cpp.erb

@@ -2,7 +2,8 @@
 #include "dmmm_utils.hpp"
 using namespace mysqlpp;
 using namespace std;
-using namespace DMMM;
+
+namespace DMMM {
 
 DBFace* DBFace::_this = NULL;
 
@@ -191,7 +192,7 @@ DBFace::insert(const string& table,
 	for(size_t j = 0; j < rows[i].size(); ++j){
 	    if (j != 0)
 		q << ",";
-	    q << quote << rows[i][j];
+	    q << rows[i][j];
 	}
 	q << ")";
     }
@@ -225,7 +226,7 @@ DBFace::insert(const string& table,
     {
 	if (it != field2Val.begin())
 	    q << ",";
-	q << quote << it->second;
+	q << it->second;
     }
     q << ")";
     log(q.str());
@@ -248,7 +249,7 @@ DBFace::update(const string& table,
     {
 	if (it != field2Val.begin())
 	    q << ",";
-	q << it->first << "=" << quote << it->second;
+	q << it->first << "=" << it->second;
     }
     if (where.size())
 	q << " WHERE " << where;
@@ -274,3 +275,5 @@ DBFace::now()
     }
     return UTILS::toString(mysqlRes[0]["now()"]);
 }
+
+} //namespace DMMM

data/lib/templates/cpp/dmmm_dbface.h.erb

@@ -5,6 +5,7 @@
 #include <iosfwd>
 #include <mysql++.h>
 #include <boost/thread/mutex.hpp>
+#include "dmmm_id.hpp"
 
 namespace DMMM {
 
@@ -56,6 +57,30 @@ private:
     std::ostream*                       _os;
 };
 
+
+
+
+template<class T>
+std::string
+toSQLString(const ID::Id<T>& id)
+{
+    mysqlpp::Query q(0);
+    q << mysqlpp::quote << id.to_s();	
+    
+    return q.str();
+}
+
+template<class T>
+std::string
+toSQLString(const T& t)
+{
+    mysqlpp::Query q(0);
+    q << mysqlpp::quote << t;	
+    
+    return q.str();
+}
+
+
 } //namespace DMMM
 
 #endif //DB_H

data/lib/templates/cpp/instance.hpp.erb

@@ -57,7 +57,7 @@ public:
         <%- model.generated_properties.each do |property| -%>
         if (_f_<%= property.name %>._dirty)
             field2Val["<%= property.name %>"] = 
-                UTILS::toString(_f_<%= property.name %>._base);
+                toSQLString(_f_<%= property.name %>._base);
         <%- end -%>
         std::string where =
             "<%= model.serial.name %>=" + UTILS::toString(_f_<%= model.serial.name %>._base);
@@ -79,7 +79,7 @@ public:
         <%- model.generated_properties.each do |property| -%>
         if (_f_<%= property.name %>._dirty)
             field2Val["<%= property.name %>"] = 
-                UTILS::toString(_f_<%= property.name %>._base);
+                toSQLString(_f_<%= property.name %>._base);
         <%- end -%>
         <% if model.serial %>
         if (DBFace::instance()->

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-metamapper
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jonah Honeyman
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 +02:00
+date: 2011-02-22 00:00:00 +02:00
 default_executable: 
 dependencies: []