td_model 0.0.2 → 0.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b463ad1750c71a6e85acc68b4d742be47f881d07
4
- data.tar.gz: c2dd1ec98d5c7fef668e8008c78efde3c4dacd33
3
+ metadata.gz: af2733ecc06b8a751ca6d5a4a46823a3d23690e1
4
+ data.tar.gz: cd407694dff3075ba07c881e9f51e43acd75ccbb
5
5
  SHA512:
6
- metadata.gz: b76ea582640c84d5b9dc4fd696ec62c76e36a7ef6f661284a74ad54ccd9ddbb5e978da21595879253f346ab2ab9130b8d71413235aafb79c4e002c4e9d822bfc
7
- data.tar.gz: 2e77bf021036b082aa1a3f827d75b5466d199b3b7cff61ea7801bfa047ba57419d0255eadad101299b9061db6f6db8cfa6795666a9daf0f0fdadc486d9e80738
6
+ metadata.gz: 8ff4e27d257bfce6326cbdd3e98e35caa8289b1e22d6db18b191e4f6e2fa78c502364096d222e2b191580019aadff1d3588341ade2478ae43ba85ccc8912cd8b
7
+ data.tar.gz: b65838c118ee00210a4c081d1451810feb8a49eed84cedd303c5fb9f7bfa145be63e2c62949b068e6873b37e55d684523332bf5a523fded10d8cc5179dd961c4
data/lib/td_model/base.rb CHANGED
@@ -113,7 +113,13 @@ module TdModel
113
113
  end
114
114
  end
115
115
  elsif obj.instance_of?(String)
116
- @where_sql += " #{obj}"
116
+ if @where_sql.present?
117
+ where = "AND"
118
+ else
119
+ @where_sql = ''
120
+ where = "WHERE"
121
+ end
122
+ @where_sql += " #{where} #{obj}"
117
123
  else
118
124
  raise "Error"
119
125
  end
@@ -164,9 +170,13 @@ module TdModel
164
170
  self
165
171
  end
166
172
 
173
+ def self.query_execute
174
+ self.new.query_execute
175
+ end
176
+
167
177
  def query_execute
168
178
  if @select_sql.blank?
169
- @select_keys = [:time]
179
+ @select_keys = []
170
180
  self.class.attr_types.keys.each do |key|
171
181
  if @select_sql.blank?
172
182
  @select_sql = ''
@@ -178,13 +188,9 @@ module TdModel
178
188
  end
179
189
  end
180
190
  @sql = "#{@select_sql} FROM #{self.table_name} #{@where_sql} #{@order_sql} #{@limit_sql}"
181
- res = self.query(@sql)
191
+ res = ::TdModel::Sql.query(@sql)
182
192
 
183
- if res.blank?
184
- result = [self.class.new]
185
- else
186
- result = []
187
- end
193
+ result = []
188
194
  res.each do |td_response|
189
195
  result_val = {}
190
196
  @select_keys.each_with_index do |key, ix|
@@ -1,3 +1,3 @@
1
1
  module TdModel
2
- VERSION = "0.0.2"
2
+ VERSION = "0.0.3"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: td_model
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - hogino
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-02-01 00:00:00.000000000 Z
11
+ date: 2016-02-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler