fixes inserts of records with no pkey

Author: fridgerator

spec/migrations/mysql_migrations.sql

@@ -79,9 +79,7 @@ CREATE UNIQUE INDEX projects_88fsssfsf ON projects (id);
 
 CREATE TABLE user_projects(
   user_id INTEGER references users(id),
-  project_id INTEGER references projects(id),
-  created_at DATETIME,
-  updated_at DATETIME
+  project_id INTEGER references projects(id)
 );
 
 CREATE TABLE things(

spec/migrations/pg_migrations.sql

@@ -86,9 +86,7 @@ CREATE TABLE projects(
 
 CREATE TABLE user_projects(
   user_id INTEGER,
-  project_id INTEGER references projects(id),
-  created_at timestamp without time zone,
-  updated_at timestamp without time zone
+  project_id INTEGER references projects(id)
 );
 
 CREATE TABLE users_json(

spec/migrations/sqlite3_migrations.sql

@@ -73,9 +73,7 @@ CREATE UNIQUE INDEX projects_88fsssfsf ON projects (id);
 
 CREATE TABLE user_projects(
   user_id INTEGER references users(id),
-  project_id INTEGER references projects(id),
-  created_at DATETIME,
-  updated_at DATETIME
+  project_id INTEGER references projects(id)
 );
 
 CREATE TABLE things(

spec/repo_spec.cr

@@ -91,6 +91,18 @@ describe Crecto do
         changeset = Repo.insert(u)
         changeset.instance.id.should_not eq(nil)
       end
+
+      it "should insert records with no primary key or date fields" do
+        project = Project.new
+        project = Repo.insert(project).instance
+
+        up = UserProject.new
+        up.user_id = 123
+        up.project_id = project.id
+
+        changeset = Repo.insert(up)
+        changeset.errors.empty?.should be_true
+      end
     end
 
     describe "#all" do
@@ -1056,6 +1068,8 @@ describe Crecto do
       end
 
       it "should delete THROUGH destroy dependents" do
+        Repo.delete_all(UserProject)
+        Repo.delete_all(Project)
         Repo.delete_all(Post)
         other_p = Project.new; other_p = Repo.insert(other_p).instance
         other_up = UserProject.new; other_up.user_id = 999999; other_up.project_id = other_p.id; other_up = Repo.insert(other_up).instance

spec/spec_helper.cr

@@ -58,6 +58,9 @@ class Project < Crecto::Model
 end
 
 class UserProject < Crecto::Model
+  set_created_at_field nil
+  set_updated_at_field nil
+
   schema "user_projects", primary_key: false do
     belongs_to :user, User
     belongs_to :project, Project

spec/transactions_spec.cr

@@ -31,8 +31,12 @@ describe Crecto do
         Repo.delete_all(Post)
         Repo.delete_all(User)
 
+        puts "\n\nusers: #{Repo.all(User)}\n\n"
+
         user = quick_create_user("this should delete")
 
+        puts "\n\nusers: #{Repo.all(User)}\n\n"
+
         multi = Multi.new
         multi.delete(user)
         Repo.transaction(multi)

src/crecto/adapters/mysql_adapter.cr

@@ -48,9 +48,12 @@ module Crecto
 
         query = exec_execute(conn, q.join(" "), fields_values[:values])
         return query if conn.is_a?(DB::TopLevelTransaction)
+
         if changeset.instance.class.use_primary_key?
           last_insert_id = changeset.instance.pkey_value.nil? ? "LAST_INSERT_ID()" : "'#{changeset.instance.pkey_value.not_nil!}'"
           execute(conn, "SELECT * FROM #{changeset.instance.class.table_name} WHERE #{changeset.instance.class.primary_key_field} = #{last_insert_id}")
+        else
+          query
         end
       end
 

src/crecto/adapters/sqlite3_adapter.cr

@@ -50,6 +50,8 @@ module Crecto
         if changeset.instance.class.use_primary_key?
           last_insert_id = changeset.instance.pkey_value.nil? ? res.last_insert_id : changeset.instance.pkey_value.not_nil!
           execute(conn, "SELECT * FROM #{changeset.instance.class.table_name} WHERE #{changeset.instance.class.primary_key_field} = '#{last_insert_id}'")
+        else
+          res
         end
       end
 

src/crecto/repo.cr

@@ -8,9 +8,9 @@ module Crecto
 
       def to_h
         {
-          :message => @message.to_s,
-          :queryable => @queryable.to_s,
-          :failed_operation => @failed_operation
+          :message          => @message.to_s,
+          :queryable        => @queryable.to_s,
+          :failed_operation => @failed_operation,
         }
       end
     end
@@ -228,8 +228,12 @@ module Crecto
           changeset.add_error("insert_error", "Insert Failed")
         elsif config.adapter == Crecto::Adapters::Postgres || (config.adapter == Crecto::Adapters::Mysql && tx.nil?) ||
               (config.adapter == Crecto::Adapters::SQLite3 && tx.nil?)
-          new_instance = changeset.instance.class.from_rs(query.as(DB::ResultSet)).first?
-          changeset = new_instance.class.changeset(new_instance) if new_instance
+          if query.is_a?(DB::ResultSet)
+            new_instance = changeset.instance.class.from_rs(query.as(DB::ResultSet)).first?
+            changeset = new_instance.class.changeset(new_instance) if new_instance
+          else
+            changeset = queryable_instance.class.changeset(queryable_instance)
+          end
         end
       rescue e
         raise e unless changeset.check_unique_constraint_from_exception!(e, queryable_instance)