dm-metamapper 0.1.4 → 0.1.6

data/lib/dm-metamapper/version.rb

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

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

@@ -9,33 +9,33 @@ DBFace* DBFace::_this = NULL;
 
 DBFace::DBFace(const string& database, const string& host, 
 	       const string& user, const string& password)
-    : _os(NULL)
+    : _os(NULL), _host(host), _user(user), _database(database),		
+      _password(password)
 {
     _this = this;
-    if (!_connection.connect(database.c_str(), host.c_str(), 
-			     user.c_str(), password.c_str()))
-    {
-	if (_os)
-	    (*_os) << "Could not connect to DB";        
-        cerr << "Could not connect to DB";
-        exit(-1);
-    }     
+    connect();
 }
 
 DBFace::DBFace(const string& database, const string& host, 
                const string& user, const string& password,
                ostream* os)
-    : _os(os)
+    : _os(os), _host(host), _user(user), _database(database),		
+      _password(password)
 {
     _this = this;
-    if (!_connection.connect(database.c_str(), host.c_str(), 
-			     user.c_str(), password.c_str()))
+    connect();
+}
+
+void
+DBFace::connect()
+{
+    if (!_connection.connect(_database.c_str(), _host.c_str(), 
+			     _user.c_str(), _password.c_str()))
     {
 	if (_os)
-	    (*_os) << "Could not connect to DB";
+	    (*_os) << "Could not connect to DB";        
         cerr << "Could not connect to DB";
-        exit(-1);
-    }     
+    }
 }
 
 void
@@ -82,6 +82,10 @@ DBFace::select(const vector<string>& tables,
     }
     catch (const mysqlpp::Exception& er) {
 	logError(er.what());
+	if (q.str() == "MySQL server has gone away"){
+	    connect();
+	    sleep(10);
+	}
         return false;
     }
     
@@ -114,6 +118,10 @@ DBFace::count(const vector<string>& tables,
     }
     catch (const mysqlpp::Exception& er) {
 	logError(er.what());
+	if (q.str() == "MySQL server has gone away"){
+	    connect();
+	    sleep(10);
+	}
         return false;
     }
 
@@ -151,6 +159,10 @@ DBFace::executeQuery(Query& q)
     }
     catch (const mysqlpp::Exception& er) {
 	logError(er.what());
+	if (q.str() == "MySQL server has gone away"){
+	    connect();
+	    sleep(10);
+	}
         return false;
     }
     return true;

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

@@ -20,7 +20,8 @@ public:
     DBFace(const std::string& database, const std::string& host, 
 	   const std::string& user, const std::string& password,
 	   std::ostream* os);
-    
+    void connect();
+
     bool insert(const std::string& table, 
 		const std::map<std::string, std::string>& field2Val,
 		size_t& rInsertId);
@@ -55,6 +56,10 @@ private:
     mutable boost::mutex                _mutex;
     static DBFace*                      _this;		
     std::ostream*                       _os;
+    std::string                         _host;
+    std::string                         _user;
+    std::string                         _database;
+    std::string                         _password;
 };
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-metamapper
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Jonah Honeyman
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-27 00:00:00 +02:00
+date: 2011-03-29 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -29,34 +29,34 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- lib/dm-metamapper/generator.rb
-- lib/dm-metamapper/model.rb
+- lib/dm-metamapper/template.rb
 - lib/dm-metamapper/config.rb
+- lib/dm-metamapper/metamapper.rb
+- lib/dm-metamapper/version.rb
 - lib/dm-metamapper/generators/cpp.rb
+- lib/dm-metamapper/generator.rb
+- lib/dm-metamapper/model.rb
 - lib/dm-metamapper/property.rb
-- lib/dm-metamapper/version.rb
-- lib/dm-metamapper/metamapper.rb
-- lib/dm-metamapper/template.rb
 - lib/dm-metamapper.rb
+- lib/templates/cpp/dmmm_utils.cpp.erb~
+- lib/templates/cpp/dmmm_utils.cpp.erb
+- lib/templates/cpp/dmmm_dbface.h.erb
 - lib/templates/cpp/dmmm_fields.hpp~
-- lib/templates/cpp/dmmm_dbface.cpp.erb
-- lib/templates/cpp/dmmm_utils.hpp~
+- lib/templates/cpp/dmmm_comparators.hpp.erb
+- lib/templates/cpp/dmmm_id.hpp.erb
+- lib/templates/cpp/dmmm_identifiers.hpp~
 - lib/templates/cpp/dmmm_id.h~
+- lib/templates/cpp/dmmm_utils.hpp~
 - lib/templates/cpp/dmmm_identifiers.hpp.erb
-- lib/templates/cpp/dmmm_utils.cpp.erb~
-- lib/templates/cpp/dmmm_dbface.h~
 - lib/templates/cpp/dmmm_fields.hpp.erb~
-- lib/templates/cpp/dmmm_comparators.hpp~
-- lib/templates/cpp/dmmm_comparators.hpp.erb
+- lib/templates/cpp/dmmm_dbface.cpp.erb
+- lib/templates/cpp/dmmm_dbface.cpp~
+- lib/templates/cpp/dmmm_dbface.h~
 - lib/templates/cpp/dmmm_fields.hpp.erb
-- lib/templates/cpp/dmmm_dbface.h.erb
 - lib/templates/cpp/instance.hpp.erb
-- lib/templates/cpp/dmmm_id.hpp.erb
-- lib/templates/cpp/dmmm_utils.cpp.erb
-- lib/templates/cpp/dmmm_dbface.cpp~
 - lib/templates/cpp/dmmm_utils.hpp.erb
 - lib/templates/cpp/class.hpp.erb
-- lib/templates/cpp/dmmm_identifiers.hpp~
+- lib/templates/cpp/dmmm_comparators.hpp~
 - README.md
 has_rdoc: true
 homepage: http://github.com/jonuts/dm-metamapper
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: dm-metamapper
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Code generating C++ ORM