* support selects

Author: Dror

client/example/main.html

@@ -16,6 +16,7 @@
 				<h1> Meteor SQL </h1>
 				<ul class="nav nav-pills active" id="formBuilderTabs">
 					<li class='active' ><a data-toggle='pill' href="#employeeTable">Employee Table</a></li>
+					<li ><a data-toggle='pill' href="#select">Select with Join</a></li>
 					<li ><a data-toggle='pill' href="#schema">Database Schema</a></li>
 				</ul>
 
@@ -25,6 +26,9 @@ <h1> Meteor SQL </h1>
 							{{> devwikEmployees}}
 						</div>
 					</div>
+					<div class="pill-pane" id="select">
+							{{> devwikSelects}}
+					</div>
 					<div class="pill-pane" id="schema">
 							{{> devwikTables}}
 					</div>

client/example/schema.html

@@ -1,4 +1,7 @@
 <template name="devwikTables">
+	<div>
+		The database schema is automatically generated. <strong>Each table has to have a unique key.</strong>
+	</div>
 	{{#each tables}}
 	{{> devwikTable}}
 	{{/each}}

client/example/select.html

@@ -1,4 +1,17 @@
-<template name="devwikSelect">
+<template name="devwikSelects">
+		<div class='row'>
+
+			On the server:
+			<pre> new Devwik.SQL.Select('empsCities', 'select employees.*, offices.city from employees, offices where offices.officeCode = employees.officecode');
+		</pre>
+On the client:
+			<pre> var Select = new Meteor.Select('empsCities'); </pre>
+		And then just use standard Meteor operations:
+			<pre> Template.devwikSelects.selects = function () {
+	return Select.find({});
+}; </pre>
+			<p>
+		</div>
 		<div class='row'>
 			<h4>
 				<div class='span1'>

client/example/select.js

@@ -1,8 +1,8 @@
 var notDone = true;
-var Select = new Meteor.Table('empsCities');
+var Select = new Meteor.Select('empsCities');
 
 
-	Template.devwikSelect.selects = function () {
+	Template.devwikSelects.selects = function () {
 		return Select.find({});
 	};
 

client/lib/sql/select.js

@@ -1,5 +1,5 @@
 "use strict";
-Meteor.Joing = function(name) {
+Meteor.Select = function(name) {
 	Meteor.subscribe(name);
 	var myCollection = new Meteor.Collection(name);
 

common/lib/devwik.js

@@ -1,4 +1,8 @@
-//based on http://javascriptweblog.wordpress.com/2011/08/08/fixing-the-javascript-typeof-operator/
-Devwik.toType = function(obj) {
-	return ({}).toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
-};
+if (typeof Devwik == 'undefined') {
+	 Devwik = function() {};
+ }
+
+ //based on http://javascriptweblog.wordpress.com/2011/08/08/fixing-the-javascript-typeof-operator/
+ Devwik.toType = function(obj) {
+	 return ({}).toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
+ };

server/client.js

@@ -2,7 +2,6 @@
  * Handle calls from the client
  */
 Meteor.methods({
-		//TODO: Remember Bobby, need to sanitize all the data
 		SQLinsert: function (table, args) {
 			try {
 				var statement = squel.insert().into(table);

server/dbinit.js

@@ -27,6 +27,7 @@ pool.getConnection(function(err, connection) {
 			Devwik.SQL.dbChanges();
 			// Poll the table with changes
 			Devwik.SQL.Poll();
+			Devwik.SQL.runTests();
 			Devwik.SQL.tables = {};
 			_.each(result, function(row){ //For each table in the db
 				if(!(row.Tables_in_meteor === dbChanges)) {
@@ -75,9 +76,11 @@ Devwik.SQL.execStatement(statement.toString());
  * @param {Boolean} ignoreErr -- optional. By default, we throw an exception on error
  * This makes us ignore the error. 
  * @returns {Array} result. The rows, if any returned by the query
- * TODO: We actually should no throw an error as a rule.
+ * TODO: We actually should not throw an error as a rule.
+ * TODO: escapge to avoid SQL injection
  */
 Devwik.SQL.execStatement = function(statement, ignoreErr) {
+	//statement = Devwik.SQL.connection.escape(statement);//TODO: is this good enough to avoid injections?
 	var future = new Future();
 	query = Devwik.SQL.connection.query(statement, function(err, result) {
 		//console.log(statement); //TODO: provide a way to show

server/lib/lib.js

@@ -2,3 +2,7 @@
 var Devwik = function() {}; //Provide a name space
 Devwik.SQL = function() {};
 
+//based on http://javascriptweblog.wordpress.com/2011/08/08/fixing-the-javascript-typeof-operator/
+Devwik.toType = function(obj) {
+	return ({}).toString.call(obj).match(/\s([a-zA-Z]+)/)[1].toLowerCase();
+};

server/select.js

@@ -4,25 +4,25 @@
  */
 
 //An SQL select statement
-Devwik.SQL.Select = function(statement) {
+Devwik.SQL.Select = function(name, statement) {
 	var self = this;
+	self.name = name;
 	self.statement = statement;
 	self.cols = [];
 	var future = new Future();
-	//Get the structure for a table
+	//Get the structure for a select
 	Devwik.SQL.connection.query(statement, function(err, rows) {
 		if (err) throw err;
 		_.each(rows, function(row){
 			if(self.cols.length === 0) {
 				self.setCols(row);
-				console.log(row);
 			}
 		});
 		future.ret();
 	}, self);
 	future.wait();
 
-		//this.setPublish();
+	this.setPublish();
 	return;
 };
 
@@ -31,8 +31,44 @@ Devwik.SQL.Select.prototype.setCols = function(row) {
 	var self = this;
 		_.each(row, function(value, name){
 	var col = {};
-			col[name] = value;
+			col.name = name;
+			col.type = Devwik.toType(value);
 			self.cols.push(col);
 			console.log(col);
 		});
 };
+
+/*
+ * Publish the Select to the client
+ */
+
+	Devwik.SQL.Select.prototype.setPublish = function() {
+		console.log('publish JOIN');
+		var select = this;
+		Meteor.publish(select.name, function () {
+		console.log('publish JOIN 1');
+			var self = this;
+			/*
+			 * Set up the callbacks
+			 */
+			select.added = function(name, id, data) {
+				self.added(name, id, data);
+			};
+			select.changed = function(name, id, data) {
+				self.changed(name, id, data);
+			};
+			select.removed = function(name, id) {
+				self.removed(name, id);
+			};
+			//fut.ret();
+			query = Devwik.SQL.connection.query(select.statement, function(err, result) {
+				if (err) {
+					throw err;
+				}
+				_.each(result, function(row){
+					self.added(select.name, new Meteor.Collection.ObjectID(), row);
+				});
+				self.ready();//indicate that the initial rows are ready
+			});
+		});
+	};