mysql script lacking the first creation of db&tables, updated packages, not working with new express version?

anvarik · anvarik · commit c9ef000aeeff · 2013-12-24T17:00:11.000+01:00
diff --git a/README.md b/README.md
@@ -4,10 +4,30 @@ nodeblog
 
 ## About
 [Obtvse] (https://github.com/natew/obtvse) is developed by [@natew](https://github.com/natew) with Ruby&Rails.  
-[@gorekee](https://github.com/gorekee) has already [started](https://github.com/gorekee/obtvse-node.js) to convert it to nodejs, and I 
-asked his permission to continue his work
+I am trying to convert it to nodejs.
 
 ## Configuration
+Configuration file is `config.json`. It looks as following:
+
+  {
+      "user": "mysql_username",
+      "password": "mysql_password",
+      "DB": "mysql_db_name", 
+      "TABLE_POST": "posts",
+      "TABLE_PUBLISH": "publish",
+      "TABLE_COMMENT": "comment",
+      "PORT": "3000",
+      "env": "dev",
+      "postPerPage": 10,
+      "login": {
+          "user": "obtvse_admin_username",
+          "password": "obvtse_admin_password"
+      }
+  }
+
+`user` & `password` are your database username & password. `DB` is the database that you will store your blog posts. Web site content
+is stored in `TABLE_*`. `PORT` is the port your node server is running. `postPerPage` is modifiable as well. Finally set your admin login and password.
+
 Set MySql database and login information into the config.json under user/password.
 Set Admin module login information under login.user/login.password. 
 First run `npm install` for dependencies, then run `node app.js` in order to start the server.
@@ -16,3 +36,5 @@ First run `npm install` for dependencies, then run `node app.js` in order to sta
 ![Admin](http://i.imgur.com/hfnm9.png)
 ![Draft](http://i.imgur.com/x4lXL.png)
 ![Live](http://i.imgur.com/wbVJN.png)
+
+Note: Not working with the bew updates of Jade and Express!
diff --git a/app.js b/app.js
@@ -11,11 +11,11 @@ var app = module.exports = h5bp.server(express, {
     'root': './public'
 });
 app.configure(function() {
-    app.set('views', __dirname + '/views');
-    app.set('view engine', 'jade');
+    app.set('views', __dirname + '/views'); // where view files are
+    app.set('view engine', 'jade'); // jade
     app.use(express.bodyParser());
     app.use(express.methodOverride());
-    app.use(express.cookieParser());
+    app.use(express.cookieParser()); // cookie and session are for session tracking
     app.use(express.session({secret: '#Thij`YVv2OEz8UcqX'}));
     app.use(app.router);
     app.use(express.static(__dirname + '/public'));
diff --git a/lib/models/mysql.js b/lib/models/mysql.js
@@ -10,117 +10,151 @@ var options = require('./options'),
             user: options.storageConfig.user,
             password: options.storageConfig.password
         },
-        client = mysql.createConnection(loginData);
+client = mysql.createConnection(loginData);
 
- client.connect();
- 
+client.connect();
+
+// create the database if it is not there
+client.query('CREATE DATABASE ' + DB, function(err) {
+    if (err && err.number !== mysql.ERROR_DB_CREATE_EXIST) {
+        return;
+    }
+});
+
+// create posts table  if it is not there
+client.query(
+        'CREATE TABLE ' + TABLE_POST +
+        '(id INT(11) AUTO_INCREMENT, ' +
+        'title_html VARCHAR(255), ' +
+        'title_markup VARCHAR(255), ' +
+        'content_html TEXT, ' +
+        'content_markup TEXT, ' +
+        'created VARCHAR(255), ' +
+        'PRIMARY KEY (id))', function(err) {
+            if (err && err.number !== mysql.ER_TABLE_EXISTS_ERROR) {
+                return;
+            }
+        });
+    
+// create publish table if it is not there
+client.query(
+        'CREATE TABLE ' + TABLE_PUBLISH +
+        '(id INT(11) AUTO_INCREMENT, ' +
+        'post_id INT(11), ' +
+        'PRIMARY KEY (id))', function(err) {
+            if (err && err.number !== mysql.ER_TABLE_EXISTS_ERROR) {
+                return;
+            }
+        });        
+        
 // set db
 client.query('USE ' + DB);
 
 // constructor
-this.MySql = function() {};
+this.MySql = function() {
+};
 
 // add a new item
 this.MySql.prototype.add = function(obj, next) {
     client.query(
-        'INSERT INTO ' + TABLE_POST + ' ' +
-        'SET title_html = ?, title_markup = ?, content_markup = ?, content_html = ?, created = ?',
-        [obj.titleHtml, obj.titleMarkup, obj.contentMarkup, obj.contentHtml, obj.created],
-        next
-    );
+            'INSERT INTO ' + TABLE_POST + ' ' +
+            'SET title_html = ?, title_markup = ?, content_markup = ?, content_html = ?, created = ?',
+            [obj.titleHtml, obj.titleMarkup, obj.contentMarkup, obj.contentHtml, obj.created],
+            next
+            );
 };
 
 // find all items
 this.MySql.prototype.getAll = function(next) {
     client.query(
-        'SELECT * FROM ' + TABLE_POST + ' ' +
-        'ORDER BY id DESC',
-        function(err, result) {
-            if(err) 
-                console.t.log(err);
-            next(result);
-        }
+            'SELECT * FROM ' + TABLE_POST + ' ' +
+            'ORDER BY id DESC',
+            function(err, result) {
+                if (err)
+                    console.t.log(err);
+                next(result);
+            }
     );
 };
 
 // get all publish post ids
 this.MySql.prototype.getPubPostIds = function(next) {
     client.query(
-        'SELECT * FROM ' + TABLE_PUBLISH + ' ',
-        function(err, result) {
-            if(err) 
-                return next(err);
-            next(result);
-        }
+            'SELECT * FROM ' + TABLE_PUBLISH + ' ',
+            function(err, result) {
+                if (err)
+                    return next(err);
+                next(result);
+            }
     );
 };
 
 //update post
 this.MySql.prototype.update = function(obj, next) {
     client.query(
-        'UPDATE ' + TABLE_POST + ' ' +
-        'SET title_html = ?, title_markup = ?, content_markup = ?, content_html = ?, created = ? ' +
-        'WHERE id = ?',
-        [obj.titleHtml, obj.titleMarkup, obj.contentMarkup, obj.contentHtml, obj.created, obj.id],
-        next
-    );
+            'UPDATE ' + TABLE_POST + ' ' +
+            'SET title_html = ?, title_markup = ?, content_markup = ?, content_html = ?, created = ? ' +
+            'WHERE id = ?',
+            [obj.titleHtml, obj.titleMarkup, obj.contentMarkup, obj.contentHtml, obj.created, obj.id],
+            next
+            );
 };
 
 // remove an item
 this.MySql.prototype.remove = function(id, next) {
     client.query(
-        'DELETE FROM ' + TABLE_POST + ' ' +
-        'WHERE id = ?',
-        [id],
-        function(err) {
-            if(err) 
-                throw err;
-            next();
-        }
+            'DELETE FROM ' + TABLE_POST + ' ' +
+            'WHERE id = ?',
+            [id],
+            function(err) {
+                if (err)
+                    throw err;
+                next();
+            }
     );
 };
 
 // search for a post
 this.MySql.prototype.lookup = function(id, next) {
     client.query(
-        'SELECT post.*, pub.post_id ' +
-        'FROM ' + TABLE_POST + ' post ' +
-        'LEFT OUTER JOIN ' + TABLE_PUBLISH + ' pub ON post.id = pub.post_id ' +
-        'WHERE post.id = ?',
-        [id],
-        function(err, obj) {
-            next(err, obj[0]);
-        }
+            'SELECT post.*, pub.post_id ' +
+            'FROM ' + TABLE_POST + ' post ' +
+            'LEFT OUTER JOIN ' + TABLE_PUBLISH + ' pub ON post.id = pub.post_id ' +
+            'WHERE post.id = ?',
+            [id],
+            function(err, obj) {
+                next(err, obj[0]);
+            }
     );
 };
 
 // get last post by id
 this.MySql.prototype.getLast = function(next) {
     client.query(
-        'SELECT * FROM ' + TABLE_POST + ' ' +
-        'ORDER BY id DESC ' +
-        'LIMIT 1',
-        function(err, obj) {
-            next(err, obj[0]);
-        }
+            'SELECT * FROM ' + TABLE_POST + ' ' +
+            'ORDER BY id DESC ' +
+            'LIMIT 1',
+            function(err, obj) {
+                next(err, obj[0]);
+            }
     );
 };
 
 // insert post id into publish table
 this.MySql.prototype.publishPost = function(id) {
     this.unpublishPost(id);
     client.query(
-        'INSERT INTO ' + TABLE_PUBLISH + ' ' +
-        'SET post_id = ?',
-        [id]
-    );
+            'INSERT INTO ' + TABLE_PUBLISH + ' ' +
+            'SET post_id = ?',
+            [id]
+            );
 };
 
 // remove post id from publish table
 this.MySql.prototype.unpublishPost = function(id) {
     client.query(
-        'DELETE FROM ' + TABLE_PUBLISH + ' ' +
-        'WHERE post_id = ?',
-        [id]
-    );
+            'DELETE FROM ' + TABLE_PUBLISH + ' ' +
+            'WHERE post_id = ?',
+            [id]
+            );
 };
diff --git a/lib/models/postgre.js b/lib/models/postgre.js
@@ -0,0 +1,7 @@
+/* 
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
diff --git a/package.json b/package.json
@@ -1,12 +1,13 @@
 {
-    "name": "obtvse-node.js",
-    "version": "0.0.1",
-    "dependencies": {
-        "express": "2.5.8",
-        "jade": ">= 0.0.1",
-        "marked": ">= 0.2.3",
-        "redis": ">= 0.7.1",
-        "callsite": ">= 0.0.1",
-        "mysql": ">= 2.0.0-rc1"
-    }
-}
+  "name": "obtvse-node.js",
+  "version": "0.0.1",
+  "dependencies": {
+    "express": "~2.5.8",
+    "jade": "~0.35.0",
+    "marked": "~0.2.10",
+    "redis": "~0.10.0",
+    "callsite": "~1.0.0",
+    "mysql": "~2.0.0-rc2",
+    "pg": "~2.9.0"
+  }
+}
