go-on-rails 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2839e5d56004e5a3974cb77427e5c3438ef3c5df
-  data.tar.gz: 24a489fcc1fac898832b6d1269a287d0c88d7a89
+  metadata.gz: cd067bbca3b46eb5e2a99202de5051c0999cc9b1
+  data.tar.gz: c512f1d35f70162b32ff9b072e8097e30558471f
 SHA512:
-  metadata.gz: 6107aa404f72156d23e5191b0414c5d5c6d391eaca61e68cf48031f17d55c627fe4c30e8f46a2aeb6939c850835e2c83504354155ad369ffd03f7a64f443a7c5
-  data.tar.gz: 3a3a53bc94bbc3d8ce3b9d48b8d6140b8e1e2b19699843d13ed97206cdc9345b809330092b350cbf66c5afa97de2bba5ee99b5b582cd2cfde5c456f3edbe9032
+  metadata.gz: b0e8e5466e9b097c88c7c7507a28d95e80f120897ca7796858e2ddfbad4b7eac258cbcc9849d3d31e1bc0e750773bd4dba89f77ec55771b124e7bf0784265951
+  data.tar.gz: '0946cdda0badf2dce152b99a933ccf46ce20d6f7f3e9db55e97b62c61b7e621af3cb10a0e5392374de7a7cb42618a8b554e3936f066f7157e6ca64a6f00c8315'

data/README.md

@@ -88,3 +88,6 @@ When I had the idea to convert Rails app or build Golang app with Rails tools, I
 - Commit, do not mess with Rakefile or version (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 - Send me a pull request. Bonus points for topic branches.
 
+## License
+
+See the [LICENSE](https://github.com/goonr/go-on-rails/blob/master/MIT-LICENSE) file.

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

@@ -27,7 +27,7 @@ func Find<%= @model_name %>(id int64) (*<%= @model_name %>, error) {
 		return nil, errors.New("Invalid id: it can't be zero")
 	}
 	var_<%= model_name_underscore %> := <%= @model_name %>{}
-	err := db.Get(&var_<%= model_name_underscore %>, "SELECT * FROM <%= table_name %> WHERE id = $1 LIMIT 1", id)
+	err := db.Get(&var_<%= model_name_underscore %>, `SELECT * FROM <%= table_name %> WHERE id = ? LIMIT 1`, id)
 	if err != nil {
 		log.Printf("Error: %v\n", err)
 		return nil, err
@@ -60,7 +60,7 @@ func Find<%= @model_name.pluralize %>(ids ...int64) ([]<%= @model_name %>, error
 // Find<%= @model_name %>By find a single <%= model_name_underscore %> by a field name and a value
 func Find<%= @model_name %>By(field string, val interface{}) (*<%= @model_name %>, error) {
 	var_<%= model_name_underscore %> := <%= @model_name %>{}
-	sqlFmt := `SELECT * FROM <%= table_name %> WHERE %s = $1 LIMIT 1`
+	sqlFmt := `SELECT * FROM <%= table_name %> WHERE %s = ? LIMIT 1`
 	sqlStr := fmt.Sprintf(sqlFmt, field)
 	err := db.Get(&var_<%= model_name_underscore %>, sqlStr, val)
 	if err != nil {
@@ -72,7 +72,7 @@ func Find<%= @model_name %>By(field string, val interface{}) (*<%= @model_name %
 
 // Find<%= @model_name.pluralize %>By find all <%= param_name_plural %> by a field name and a value
 func Find<%= @model_name.pluralize %>By(field string, val interface{}) (var_<%= param_name_plural %> []<%= @model_name %>, err error) {
-	sqlFmt := `SELECT * FROM <%= table_name %> WHERE %s = $1`
+	sqlFmt := `SELECT * FROM <%= table_name %> WHERE %s = ?`
 	sqlStr := fmt.Sprintf(sqlFmt, field)
 	err = db.Select(&var_<%= param_name_plural %>, sqlStr, val)
 	if err != nil {
@@ -86,17 +86,99 @@ func Find<%= @model_name.pluralize %>By(field string, val interface{}) (var_<%=
 func All<%= @model_name.pluralize %>() (<%= param_name_plural %> []<%= @model_name %>, err error) {
 	err = db.Select(&<%= table_name %>, "SELECT * FROM <%= table_name %>")
 	if err != nil {
-		log.Print(err)
+		log.Println(err)
 		return nil, err
 	}
 	return <%= param_name_plural %>, nil
 }
 
+func <%= @model_name %>IncludesWhere(assocs []string, sql string, args ...interface{}) (var_<%= param_name_plural %> []<%= @model_name %>, err error) {
+	var_<%= param_name_plural %>, err = Find<%= @model_name.pluralize %>Where(sql, args...)
+	if err != nil {
+		log.Println(err)
+		return nil, err
+	}
+	if len(assocs) == 0 {
+		log.Println("No associated fields ard specified")
+		return var_<%= param_name_plural %>, err
+	}
+	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? -%>
+	idsHolder := strings.Repeat(",?", len(ids)-1)
+	for _, assoc := range assocs {
+		switch assoc {
+			<%- unless @struct_info[:assoc_info][:has_many].empty? -%>
+				<%- has_many = @struct_info[:assoc_info][:has_many] -%>
+				<%- has_many.each do |k, v| -%>
+				case "<%= k.underscore.pluralize %>":
+					<%- if v[:foreign_key] -%>
+						where := fmt.Sprintf("<%= v[:foreign_key] %> IN (?%s)", idsHolder)
+					<%- else -%>
+						where := fmt.Sprintf("<%= model_name_underscore %>_id IN (?%s)", idsHolder)
+					<%- end -%>
+					var_<%= v[:class_name].underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>Where(where, ids...)
+					if err != nil {
+						log.Printf("Error when query associated objects: %v\n", assoc)
+						continue
+					}
+					for _, vv := range var_<%= v[:class_name].underscore.pluralize %> {
+						for _, vvv := range  var_<%= param_name_plural %> {
+							<%- if v[:foreign_key] -%>
+								if vv.<%= v[:foreign_key].camelize %> == vvv.Id {
+									vvv.<%= k %> = append(vvv.<%= k %>, vv)
+								}
+							<%- else -%>
+								if vv.<%= @model_name.camelize %>Id == vvv.Id {
+									vvv.<%= k %> = append(vvv.<%= k %>, vv)
+								}
+							<%- end -%>
+						}
+					}
+				<%- end -%>
+			<%- end -%>
+			<%- unless @struct_info[:assoc_info][:has_one].empty? -%>
+				<%- has_one = @struct_info[:assoc_info][:has_one] -%>
+				<%- has_one.each do |k, v| -%>
+				case "<%= k %>":
+					<%- if v[:foreign_key] -%>
+						where := fmt.Sprintf("<%= v[:foreign_key] %> IN (?%s)", idsHolder)
+					<%- else -%>
+						where := fmt.Sprintf("<%= model_name_underscore %>_id IN (?%s)", idsHolder)
+					<%- end -%>
+					var_<%= v[:class_name].underscore.pluralize %>, err := Find<%= v[:class_name].pluralize %>Where(where, ids...)
+					if err != nil {
+						log.Printf("Error when query associated objects: %v\n", assoc)
+						continue
+					}
+					for _, vv := range var_<%= v[:class_name].underscore.pluralize %> {
+						for _, vvv := range  var_<%= param_name_plural %> {
+							<%- if v[:foreign_key] -%>
+								if vv.<%= v[:foreign_key].camelize %> == vvv.Id {
+									vvv.<%= k %> = vv
+								}
+							<%- else -%>
+								if vv.<%= @model_name.camelize %>Id == vvv.Id {
+									vvv.<%= k %> = vv
+								}
+							<%- end -%>
+						}
+					}
+				<%- end -%>
+			<%- end -%>
+		}
+	}
+	<%- end -%>
+	return var_<%= param_name_plural %>, nil
+}
+
 // <%= @model_name %>Ids get all the Ids of <%= @model_name %> records
 func <%= @model_name %>Ids() (ids []int64, err error) {
 	err = db.Select(&ids, "SELECT id FROM <%= table_name %>")
 	if err != nil {
-		log.Print(err)
+		log.Println(err)
 		return nil, err
 	}
 	return ids, nil
@@ -116,12 +198,12 @@ func <%= @model_name %>IntCol(col, where string, args ...interface{}) (intColRec
 	}
 	stmt, err := db.Preparex(sql)
 	if err != nil {
-		log.Print(err)
+		log.Println(err)
 		return nil, err
 	}
 	err = stmt.Select(&intColRecs, args...)
 	if err != nil {
-		log.Print(err)
+		log.Println(err)
 		return nil, err
 	}
 	return intColRecs, nil
@@ -135,12 +217,12 @@ func <%= @model_name %>StrCol(col, where string, args ...interface{}) (strColRec
 	}
 	stmt, err := db.Preparex(sql)
 	if err != nil {
-		log.Print(err)
+		log.Println(err)
 		return nil, err
 	}
 	err = stmt.Select(&strColRecs, args...)
 	if err != nil {
-		log.Print(err)
+		log.Println(err)
 		return nil, err
 	}
 	return strColRecs, nil
@@ -156,12 +238,12 @@ func Find<%= @model_name.pluralize %>Where(where string, args ...interface{}) (<
 	}
 	stmt, err := db.Preparex(sql)
 	if err != nil {
-		log.Print(err)
+		log.Println(err)
 		return nil, err
 	}
 	err = stmt.Select(&<%= param_name_plural %>, args...)
 	if err != nil {
-		log.Print(err)
+		log.Println(err)
 		return nil, err
 	}
 	return <%= param_name_plural %>, nil
@@ -173,12 +255,12 @@ func Find<%= @model_name.pluralize %>Where(where string, args ...interface{}) (<
 func Find<%= @model_name.pluralize %>BySql(sql string, args ...interface{}) (<%= param_name_plural %> []<%= @model_name %>, err error) {
 	stmt, err := db.Preparex(sql)
 	if err != nil {
-		log.Print(err)
+		log.Println(err)
 		return nil, err
 	}
 	err = stmt.Select(&<%= param_name_plural %>, args...)
 	if err != nil {
-		log.Print(err)
+		log.Println(err)
 		return nil, err
 	}
 	return <%= param_name_plural %>, nil
@@ -206,12 +288,12 @@ func Create<%= @model_name %>(am map[string]interface{}) (int64, error) {
 	sqlStr := fmt.Sprintf(sqlFmt, strings.Join(keys, ","), ":"+strings.Join(keys, ",:"))
 	result, err := db.NamedExec(sqlStr, am)
 	if err != nil {
-		log.Print(err)
+		log.Println(err)
 		return 0, err
 	}
 	lastId, err := result.LastInsertId()
 	if err != nil {
-		log.Print(err)
+		log.Println(err)
 		return 0, err
 	}
 	return lastId, nil
@@ -324,18 +406,23 @@ func Destroy<%= @model_name %>(id int64) error {
 			<%- ass_cols.each_value do |opts| -%>
 				<%- if opts.key? :dependent -%>
 					<%- if opts[:through] -%>
-						<%= 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
-						}
+						<%- 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)
@@ -448,7 +535,7 @@ func Update<%= @model_name %>(id int64, am map[string]interface{}) error {
 	sqlStr := fmt.Sprintf(sqlFmt, strings.Join(setKeysArr, ", "), id)
 	_, err := db.NamedExec(sqlStr, am)
 	if err != nil {
-		log.Print(err)
+		log.Println(err)
 		return err
 	}
 	return nil

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: go-on-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - B1nj0y
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-04-17 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 also help integrating some
-  api written in Golang to existed Rails app for high performance.
+  tools like rails generate, db migration, console etc. It is more meant to help integrating
+  some APIs written in Golang to existed Rails app for high performance.
 email: idegorepl@gmail.com
 executables: []
 extensions: []