go-on-rails 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b708a7ebbdda649c91023ff597f4c2572bf2a3ca
-  data.tar.gz: 8ddb8f02f36a180b1a79c027e6ebbb5a53cc224f
+  metadata.gz: e1806b545b4bae0d8816bc273634b32ceee30292
+  data.tar.gz: 39488fbb5332721fa236a551bdb7677dd8d3655c
 SHA512:
-  metadata.gz: 210ef6858d0c4ce898438a278ad82bea72eb4b8aad00bd7f093d082cc0eadaade36b40410af6d54b89b1e7f300024ae6b3835f08e821b79c2276f4299caa7cba
-  data.tar.gz: c8dc0b9bff1679124392a44223fa297a50ac586a15e6cc935ed6e3ed50b7b95cba352c523a0bf3fc898d2e6a0a697ba11307e87c855257c9828e23b606c37c04
+  metadata.gz: 26186a39dac4d17d4de99dda4c01c009bbb6b8969f9035fef7a1427fd2187807a073ade78f5863d4a7b473e4e622eb9786b68e1ffcf466d903435a66fa4d3fb6
+  data.tar.gz: c638a2daad0aeb2527edd25e2e249c27a41ad2d06aa60d16113d87c03ed34c31997505c6c91124352c7bb26a2ce33aea2dbb8c2f4d3c9101ebf980c39289b813

data/README.md

@@ -11,7 +11,7 @@ go-on-rails
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'go-on-rails', '~> 0.0.4'
+gem 'go-on-rails', '~> 0.0.5'
 ```
 
 And then execute:

data/lib/generators/gor/templates/gor_model.go.erb

@@ -1,6 +1,7 @@
 <%- param_name_plural = table_name = @model_name.underscore.pluralize -%>
 <%- model_name_underscore = @model_name.underscore -%>
 <%- col_names = @struct_info[:col_names] -%>
+<%- has_assoc = !@struct_info[:assoc_info][:has_many].empty? || !@struct_info[:assoc_info][:has_one].empty? -%>
 // The file is generated by go-on-rails, a Rails generator gem:
 // https://rubygems.org/gems/go-on-rails
 // Or on Github: https://github.com/goonr/go-on-rails
@@ -102,11 +103,14 @@ func <%= @model_name %>IncludesWhere(assocs []string, sql string, args ...interf
 		log.Println("No associated fields ard specified")
 		return var_<%= param_name_plural %>, err
 	}
+	if len(var_<%= param_name_plural %>) <= 0 {
+		return nil, errors.New("No results available")
+	}
 	ids := make([]interface{}, len(var_<%= param_name_plural %>))
 	for _, v := range var_<%= param_name_plural %> {
 		ids = append(ids, interface{}(v.Id))
 	}
-	<%- unless @struct_info[:assoc_info][:has_many].empty? && @struct_info[:assoc_info][:has_one].empty? -%>
+	<%- if has_assoc -%>
 	idsHolder := strings.Repeat(",?", len(ids)-1)
 	for _, assoc := range assocs {
 		switch assoc {
@@ -125,7 +129,7 @@ func <%= @model_name %>IncludesWhere(assocs []string, sql string, args ...interf
 						continue
 					}
 					for _, vv := range var_<%= v[:class_name].underscore.pluralize %> {
-						for _, vvv := range  var_<%= param_name_plural %> {
+						for i, vvv := range  var_<%= param_name_plural %> {
 							<%- if v[:foreign_key] -%>
 								if vv.<%= v[:foreign_key].camelize %> == vvv.Id {
 									vvv.<%= k %> = append(vvv.<%= k %>, vv)
@@ -135,6 +139,7 @@ func <%= @model_name %>IncludesWhere(assocs []string, sql string, args ...interf
 									vvv.<%= k %> = append(vvv.<%= k %>, vv)
 								}
 							<%- end -%>
+							var_<%= param_name_plural %>[i].<%= k %> = vvv.<%= k %>
 						}
 					}
 				<%- end -%>
@@ -142,7 +147,7 @@ func <%= @model_name %>IncludesWhere(assocs []string, sql string, args ...interf
 			<%- unless @struct_info[:assoc_info][:has_one].empty? -%>
 				<%- has_one = @struct_info[:assoc_info][:has_one] -%>
 				<%- has_one.each do |k, v| -%>
-				case "<%= k %>":
+				case "<%= k.underscore %>":
 					<%- if v[:foreign_key] -%>
 						where := fmt.Sprintf("<%= v[:foreign_key] %> IN (?%s)", idsHolder)
 					<%- else -%>
@@ -154,7 +159,7 @@ func <%= @model_name %>IncludesWhere(assocs []string, sql string, args ...interf
 						continue
 					}
 					for _, vv := range var_<%= v[:class_name].underscore.pluralize %> {
-						for _, vvv := range  var_<%= param_name_plural %> {
+						for i, vvv := range  var_<%= param_name_plural %> {
 							<%- if v[:foreign_key] -%>
 								if vv.<%= v[:foreign_key].camelize %> == vvv.Id {
 									vvv.<%= k %> = vv
@@ -164,6 +169,7 @@ func <%= @model_name %>IncludesWhere(assocs []string, sql string, args ...interf
 									vvv.<%= k %> = vv
 								}
 							<%- end -%>
+							var_<%= param_name_plural %>[i].<%= k %> = vvv.<%= k %>
 						}
 					}
 				<%- end -%>
@@ -400,40 +406,10 @@ func Destroy<%= @model_name %>(id int64) error {
 	if err != nil {
 		return err
 	}
-	<%- [:has_many, :has_one].each do |ass| -%>
-		<%- ass_cols = @struct_info[:assoc_info][ass] -%>
-		<%- unless ass_cols.empty? -%>
-			<%- ass_cols.each_value do |opts| -%>
-				<%- if opts.key? :dependent -%>
-					<%- if opts[:through] -%>
-						<%- case opts[:through] -%>
-						<%- when :destroy, :delete_all -%>
-							<%= opts[:class_name].underscore %>_ids, err := <%= opts[:through].to_s.singularize.camelize %>IntCol("<%= opts[:class_name].underscore %>_id", "<%= model_name_underscore %>_id = ?", var_<%= model_name_underscore %>.Id)
-							if err != nil {
-								return err
-							}
-							_, err = Destroy<%= opts[:class_name].pluralize %>(<%= opts[:class_name].underscore %>_ids...)
-							if err != nil {
-								return err
-							}
-							_, err = Destroy<%= opts[:through].to_s.pluralize.camelize %>Where("<%= model_name_underscore %>_id = ?", var_<%= model_name_underscore %>.Id)
-							if err != nil {
-								return err
-							}
-						<%- when :nullify -%>
-							<%#- FIXME: Need a DeleteAssociation func -%>
-						<%- end -%>
-					<%- else -%>
-						<%- if opts.key? :foreign_key -%>
-							Destroy<%= opts[:class_name].pluralize %>Where("<%= opts[:foreign_key] %> = ?", id)
-						<%- else -%>
-							Destroy<%= opts[:class_name].pluralize %>Where("<%= model_name_underscore %>_id = ?", id)
-						<%- end -%>
-					<%- end -%>
-				<%- end -%>
-			<%- end -%>
-		<%- end -%>
-	<%- end -%>
+	<%- if has_assoc -%>
+	// not care if exec properly temporarily
+	destroy<%= @model_name %>Associations(id)
+    <%- end -%>
 	return nil
 }
 
@@ -458,21 +434,9 @@ func Destroy<%= @model_name.pluralize %>(ids ...int64) (int64, error) {
 	if err != nil {
 		return 0, err
 	}
-	<%- [:has_many, :has_one].each do |ass| -%>
-		<%- ass_cols = @struct_info[:assoc_info][ass] -%>
-		<%- unless ass_cols.empty? -%>
-			<%- ass_cols.each_value do |opts| -%>
-				<%- if opts.key? :dependent -%>
-					<%- if opts.key? :foreign_key -%>
-    where := fmt.Sprintf("<%= opts[:foreign_key] %> IN (?%s)", idsHolder)
-    Destroy<%= opts[:class_name].pluralize %>Where(where, idsT)
-					<%- else -%>
-	where := fmt.Sprintf("<%= model_name_underscore %>_id IN (?%s)", idsHolder)
-    Destroy<%= opts[:class_name].pluralize %>Where(where, idsT)
-					<%- end -%>
-				<%- end -%>
-			<%- end -%>
-		<%- end -%>
+	<%- if has_assoc -%>
+	// not care if exec properly temporarily
+	destroy<%= @model_name %>Associations(ids...)
 	<%- end -%>
 	return cnt, nil
 }
@@ -487,6 +451,9 @@ func Destroy<%= @model_name.pluralize %>Where(where string, args ...interface{})
 	} else {
 		return 0, errors.New("No WHERE conditions provided")
 	}
+	<%- if has_assoc -%>
+	ids, x_err := <%= @model_name %>IdsWhere(where, args...)
+	<%- end -%>
 	stmt, err := db.Preparex(db.Rebind(sql))
 	result, err := stmt.Exec(args...)
 	if err != nil {
@@ -496,9 +463,86 @@ func Destroy<%= @model_name.pluralize %>Where(where string, args ...interface{})
 	if err != nil {
 		return 0, err
 	}
+	<%- if has_assoc -%>
+	if x_err != nil {
+		log.Printf("Delete associated objects error: %v\n", err)
+	} else {
+		destroy<%= @model_name %>Associations(ids...)
+	}
+	<%- end -%>
 	return cnt, nil
 }
 
+<%- if has_assoc -%>
+// the func not return err temporarily
+func destroy<%= @model_name %>Associations(ids ...int64) {
+	idsHolder := ""
+	if len(ids) > 1 {
+		idsHolder = strings.Repeat(",?", len(ids)-1)
+	}
+	idsT := []interface{}{}
+	for _, id := range ids {
+		idsT = append(idsT, interface{}(id))
+	}
+	var err error
+	// make sure no declared-and-not-used exception
+	_, _, _ = idsHolder, idsT, err
+	<%- [:has_many, :has_one].each do |ass| -%>
+		<%- ass_cols = @struct_info[:assoc_info][ass] -%>
+		<%- unless ass_cols.empty? -%>
+			<%- ass_cols.each_value do |opts| -%>
+				<%- if opts.key? :dependent -%>
+					<%- case opts[:dependent] -%>
+					<%- when :destroy, :delete_all -%>
+						<%- if opts[:through] -%>
+							sql := fmt.Sprintf("id IN (SELECT id FROM <%= opts[:through].to_s %> WHERE <%= model_name_underscore %>_id IN (?%s))", idsHolder)
+							_, err = Destroy<%= opts[:class_name].pluralize %>Where(sql, idsT...)
+							if err != nil {
+								log.Printf("Destroy associated object %s error: %v\n", "<%= opts[:class_name].pluralize %>", err)
+							}
+							sql = fmt.Sprintf("<%= model_name_underscore %>_id IN (?%s)", idsHolder)
+							_, err = Destroy<%= opts[:through].to_s.pluralize.camelize %>Where(sql, idsT...)
+							if err != nil {
+								log.Printf("Destroy associated object %s error: %v\n", "<%= opts[:through].to_s.singularize.camelize %>", err)
+							}
+						<%- else -%>
+							<%- if opts.key? :foreign_key -%>
+								sql := fmt.Sprintf("<%= opts[:foreign_key] %> IN (?%s)", idsHolder)
+							<%- else -%>
+								sql := fmt.Sprintf("<%= model_name_underscore %>_id IN (?%s)", idsHolder)
+							<%- end -%>
+							_, err = Destroy<%= opts[:class_name].pluralize %>Where(sql, idsT...)
+							if err != nil {
+								log.Printf("Destroy associated object %s error: %v\n", "<%= opts[:class_name].pluralize %>", err)
+							}
+						<%- end -%>
+					<%- when :nullify -%>
+						// no sql.NULLType supported, just set the associated field to zero value of int64
+						<%- if opts[:through] -%>
+							sql := fmt.Sprintf("UPDATE <%= opts[:through].to_s %> SET <%= opts[:class_name].underscore %>_id = 0 WHERE <%= opts[:class_name].underscore %>_id IN (?%s)", idsHolder)
+							_, err = Update<%= opts[:through].to_s.camelize %>BySql(sql, idsT...)
+							if err != nil {
+								log.Printf("Delete associated object %s error: %v\n", "<%= opts[:class_name].pluralize %>", err)
+							}
+						<%- else -%>
+							<%- if opts.key? :foreign_key -%>
+								sql := fmt.Sprintf("UPDATE <%= opts[:class_name].underscore.pluralize %> SET <%= opts[:foreign_key] %> = 0 WHERE <%= opts[:foreign_key] %> IN (?%s)", idsHolder)
+							<%- else -%>
+								sql := fmt.Sprintf("UPDATE <%= opts[:class_name].underscore.pluralize %> SET <%= model_name_underscore %>_id = 0 WHERE <%= model_name_underscore %>_id IN (?%s)", idsHolder)
+							<%- end -%>
+							_, err = Update<%= opts[:class_name].pluralize %>BySql(sql, idsT...)
+							if err != nil {
+								log.Printf("Delete associated object %s error: %v\n", "<%= opts[:class_name].pluralize %>", err)
+							}
+						<%- end -%>
+					<%- end -%>
+				<%- end -%>
+			<%- end -%>
+		<%- end -%>
+	<%- end -%>
+}
+<%- end -%>
+
 func (var_<%= model_name_underscore %> *<%= @model_name %>) Save() error {
 	if var_<%= model_name_underscore %>.Id == 0 {
 		return errors.New("Invalid Id field: it can't be a zero value")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: go-on-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - B1nj0y
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies: []
 description: Modeling, developing and testing your Golang app with your familiar Rails
   tools like rails generate, db migration, console etc. It is more meant to help integrating