Merge commit 'brynary/master'

Conflicts:

	lib/arel.rb
	lib/arel/session.rb

3 files changed, 54 insertions, 0 deletions

diff --git a/spec/schemas/mysql_schema.rb b/spec/schemas/mysql_schema.rb
new file mode 100644
index 0000000000..dc2558fd6a
--- /dev/null
+++ b/spec/schemas/mysql_schema.rb
@@ -0,0 +1,18 @@
+sql = <<-SQL
+  DROP TABLE IF EXISTS users;
+  CREATE TABLE users (
+    id INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    name VARCHAR(255) NOT NULL
+  );
+
+  DROP TABLE IF EXISTS photos;
+  CREATE TABLE photos (
+    id INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    user_id INTEGER NOT NULL,
+    camera_id INTEGER NOT NULL
+  );
+SQL
+
+sql.split(/;/).select(&:present?).each do |sql_statement|
+  ActiveRecord::Base.connection.execute sql_statement
+end
diff --git a/spec/schemas/postgresql_schema.rb b/spec/schemas/postgresql_schema.rb
new file mode 100644
index 0000000000..30fa665902
--- /dev/null
+++ b/spec/schemas/postgresql_schema.rb
@@ -0,0 +1,18 @@
+sql = <<-SQL
+  DROP TABLE IF EXISTS users;
+  CREATE TABLE users (
+    id SERIAL PRIMARY KEY NOT NULL,
+    name VARCHAR(255) NOT NULL
+  );
+
+  DROP TABLE IF EXISTS photos;
+  CREATE TABLE photos (
+    id SERIAL PRIMARY KEY NOT NULL,
+    user_id INTEGER NOT NULL,
+    camera_id INTEGER NOT NULL
+  );
+SQL
+
+sql.split(/;/).select(&:present?).each do |sql_statement|
+  ActiveRecord::Base.connection.execute sql_statement
+end
diff --git a/spec/schemas/sqlite3_schema.rb b/spec/schemas/sqlite3_schema.rb
new file mode 100644
index 0000000000..94d224520e
--- /dev/null
+++ b/spec/schemas/sqlite3_schema.rb
@@ -0,0 +1,18 @@
+sql = <<-SQL
+  DROP TABLE IF EXISTS users;
+  CREATE TABLE users (
+    id INTEGER NOT NULL PRIMARY KEY,
+    name VARCHAR(255) NOT NULL
+  );
+
+  DROP TABLE IF EXISTS photos;
+  CREATE TABLE photos (
+    id INTEGER NOT NULL PRIMARY KEY,
+    user_id INTEGER NOT NULL,
+    camera_id INTEGER NOT NULL
+  );
+SQL
+
+sql.split(/;/).select(&:present?).each do |sql_statement|
+  ActiveRecord::Base.connection.execute sql_statement
+end