final v2.0 commit

Author: Pamblam

README.md

@@ -1,11 +1,14 @@
-# jSQL 
-v2
+![enter image description here](http://i.imgur.com/VQlJKOc.png)
+
+jSQL - Version 2.0  - *Now gluten free!*
+
+<hr>
 
 jSQL is a state and data management tool as well as a robust SQL engine. For complete documentation, please see [the jSQL Wiki](https://github.com/Pamblam/jSQL/wiki).
 
 Under the hood, jSQL has 3 layers: 
 
- - **At the Lowest level**, jSQL automatically chooses the best method of storage to save state and interacts directly with it. This layer exposes a persistence method, [`jSQL.commit()`](https://github.com/Pamblam/jSQL/wiki/Persistence-Management#jsqlpersist), which is called to serialize and store all data currently in the jSQL database on the user's hard drive. While the app is open and loaded in the browser, this data is serialized and stored within reach in the [`jSQL.tables`](https://github.com/Pamblam/jSQL/wiki/Persistence-Management#jsqltables) object where the library is able to perform operations on it.
+ - **At the Lowest level**, jSQL automatically chooses the best method of storage to save state and interacts directly with it. This layer exposes a persistence method, [`jSQL.commit()`](https://github.com/Pamblam/jSQL/wiki/Persistence-Management#jsqlcommit), which is called to serialize and store all data currently in the jSQL database on the user's hard drive. While the app is open and loaded in the browser, this data is serialized and stored within reach in the [`jSQL.tables`](https://github.com/Pamblam/jSQL/wiki/Persistence-Management#jsqltables) object where the library is able to perform operations on it.
 
  - **In the middle**, a set of methods are used to build [`jSQLQuery` objects](https://github.com/Pamblam/jSQL/wiki/jSQLquery-interface) which execute CRUD commands on the jSQL database and it's tables. *(See: [`jSQL.createTable()`](https://github.com/Pamblam/jSQL/wiki/Querying-the-Database#jsqlcreatetableparams), [`jSQL.select()`](https://github.com/Pamblam/jSQL/wiki/Querying-the-Database#jsqlselectcolumns), [`jSQL.insertInto()`](https://github.com/Pamblam/jSQL/wiki/Querying-the-Database#jsqlinsertintotablename), [`jSQL.dropTable()`](https://github.com/Pamblam/jSQL/wiki/Querying-the-Database#jsqldroptabletablename), [`jSQL.update()`](https://github.com/Pamblam/jSQL/wiki/Querying-the-Database#jsqlupdatetablename), and [`jSQL.deleteFrom()`](https://github.com/Pamblam/jSQL/wiki/Querying-the-Database#jsqldeletefromtablename))*
 
@@ -28,43 +31,29 @@ jSQL is implemented in a single JavaScript file. Save the [`jSQL.js`](https://gi
 When the database has loaded into memory, you'll want to make sure you have a table to work with. Any database operations that are to be made immediately when the app loads should be called from within the [`jSQL.load()`](https://github.com/Pamblam/jSQL/wiki/Persistence-Management#jsqlloadonloadcallback) callback.
 
     jSQL.load(function(){
-        jSQL.query("create table if not exists users (name varchar(25), age int)").execute();
-        
-        // alternatively, the low level syntax is...
-        // jSQL.createTable({users: {name: {type:varchar, args: 25}, age: {type: int}}}).ifNotExists().execute();
+	    var sql = "create table if not exists users (name varchar(25), age int)";
+        jSQL.query(sql).execute();
     });
 
- 
- 
 #### Insert into table
 
 At some point, you might want to put some data in that table.
 
     jSQL.query("insert into users ('bob', 34)").execute();
 
-For a performance boost, you can use the low level syntax instead:
-
-    jSQL.insertInto('users').values({name:'bob',  age:34}).execute();
-    
 Prefer prepared statements? Just replace values with question marks and pass the values to the execute method in an array.
 
     jSQL.query("insert into users (?, ?)").execute(['bob', 34]);
 
-You can use prepared statements in low level syntax too:
-
-    jSQL.insertInto('users').values({name:'?',  age:'?'}).execute(['bob',34]);
-    
 #### Select from table
 
 Once you've got the data in there, you're probably going to want to get it back out.
 
     var users = jSQL.query("select * from users where name like '%ob'").execute().fetchAll("ASSOC");
-    
-The low level select sytax is easy too:
 
-    var users = jSQL.select('*').from('users').where('name').like('%ob').execute().fetchAll("ASSOC");
+#### Persisting changes in the browser
 
-When you've made changes or additions to the database, call [`jSQL.persist()`](https://github.com/Pamblam/jSQL/wiki/Persistence-Management#jsqlpersist) to commit your changes. 
+When you've made changes or additions to the database, call [`jSQL.commit()`](https://github.com/Pamblam/jSQL/wiki/Persistence-Management#jsqlcommit) to commit your changes. 
 
 For more information and to read about other update, delete and other operations, see the [jSQL Wiki](https://github.com/Pamblam/jSQL/wiki#jsql-docs).
 

examples/keys/index.html

@@ -31,7 +31,9 @@
 				// Create a non-compound key using high-level syntax
 				jSQL.query("create table if not exists myTable (ID int primary, Name varchar, FOOD varchar)").execute(data);
 
-				jSQL.insertInto('myTable').values({ID:0, Name:'Nerd', FOOD: "Bagels"}).ignore().execute();
+				//jSQL.insertInto('myTable').values({ID:0, Name:'Nerd', FOOD: "Bagels"}).ignore().execute();
+				
+				jSQL.query("insert into myTable VALUES (0, 'nerd', 'bagel')").execute();
 
 				console.log("done");
 			});

jSQL.js

@@ -329,49 +329,41 @@
 			if(self.keys.primary.column){ 
 				var primary_key_columns = Array.isArray(self.keys.primary.column) ? self.keys.primary.column : [self.keys.primary.column];
 				var pk_col, pk_vals = [];
-				var violation;
 				for(var pk=0; pk_col=primary_key_columns[pk]; pk++){
 					var primary_index = self.colmap[pk_col];
-					violation = false;
 					if(null === row[primary_index]){
-						if(ignore === true){
-							violation = true;
-							continue;
-						}
+						if(ignore === true) return;
 						throw "Cannot insert a null value in a primary column";
 					}
 					pk_vals.push(row[primary_index]);
 				}
-				if(!violation){
-					pk_vals = JSON.stringify(pk_vals);
-					if(self.keys.primary.map.hasOwnProperty(pk_vals)) throw "Primary key violated";
-					self.keys.primary.map[pk_vals] = self.data.length;
+				pk_vals = JSON.stringify(pk_vals);
+				if(self.keys.primary.map.hasOwnProperty(pk_vals)){
+					if(ignore === true) return;
+					throw "Primary key violated";
 				}
+				self.keys.primary.map[pk_vals] = self.data.length;
 			}
 
 			// Check the unique keys, There may be multiple and they may be compound
 			var ukey;
 			for(var k=0; ukey=self.keys.unique[k]; k++){
 				var key_columns = Array.isArray(ukey.column) ? ukey.column : [ukey.column];
 				var col, vals = [];
-				var violation;
 				for(var uk=0; col=key_columns[uk]; uk++){
 					var index = self.colmap[col];
-					violation = false;
 					if(null === row[index]){
-						if(ignore === true){
-							violation = true;
-							continue;
-						}
+						if(ignore === true) return;
 						throw "Cannot insert a null value in a unique column";
 					}
 					vals.push(row[index]);
 				}
-				if(!violation){
-					vals = JSON.stringify(vals);
-					if(ukey.map.hasOwnProperty(vals)) throw "Unique key violated";
-					self.keys.unique[k].map[vals] = self.data.length;
+				vals = JSON.stringify(vals);
+				if(ukey.map.hasOwnProperty(vals)){
+					if(ignore === true) return;
+					throw "Unique key violated";
 				}
+				self.keys.unique[k].map[vals] = self.data.length;
 			}
 
 			self.data.push(row);
@@ -660,7 +652,7 @@
 							this.data[i] = preparedVals.shift();
 				}
 			}
-			jSQL.tables[this.table].insertRow(this.data, this.ignore);
+			jSQL.tables[this.table].insertRow(this.data, this.ignoreFlag);
 			return this;
 		};
 		this.ignore = function(){ this.ignoreFlag=true; return this; };
@@ -1221,10 +1213,16 @@
 
 			case "INSERT": 
 
-				var table, cols=[], values = [];
+				var table, cols=[], values = [], ignore = false;
 
+				var into = words.shift().toUpperCase();
+				if(into === "IGNORE"){
+					ignore = true;
+					into = words.shift().toUpperCase();
+				}
+				
 				// Next Word should be "INTO"
-				if(words.shift().toUpperCase() !== "INTO") throw "Unintelligible query. Expected 'INTO'";
+				if(into !== "INTO") throw "Unintelligible query. Expected 'INTO'";
 
 				// Next word should be the table name
 				table = removeQuotes(words.shift());
@@ -1277,8 +1275,8 @@
 					data[cols[i]] = values[i];
 				}
 
-				//jSQL.tables[table].insertRow(data);
-				return jSQL.insertInto(table).values(data);
+				var q = jSQL.insertInto(table).values(data);
+				return ignore ? q.ignore() : q;
 
 				break;
 			case "CREATE":