Skip to content
This repository was archived by the owner on Jun 12, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/big_query/client/tables.rb
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ def validate_schema(schema)
mode = (ALLOWED_FIELD_MODES & [options[:mode].to_s]).first
field = { "name" => name.to_s, "type" => type }
field["mode"] = mode if mode
if field["type"] == 'RECORD'
field["fields"] = validate_schema(options[:fields])
end
fields << field
end
fields
Expand Down
41 changes: 34 additions & 7 deletions test/bigquery.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ def config
end

def test_for_tables
tables = @bq.tables
table = @bq.tables.select{|t| t['id'] == "#{config['project_id']}:#{config['dataset']}.test"}.first

assert_equal tables[0]['kind'], "bigquery#table"
assert_equal tables[0]['id'], "#{config['project_id']}:#{config['dataset']}.test"
assert_equal tables[0]['tableReference']['tableId'], 'test'
assert_equal table['kind'], "bigquery#table"
assert_equal table['tableReference']['tableId'], 'test'
end

def test_for_tables_formatted
Expand All @@ -43,11 +42,39 @@ def test_for_create_table
if @bq.tables_formatted.include? 'test123'
@bq.delete_table('test123')
end
result = @bq.create_table('test123', id: { type: 'INTEGER' })

schema = {
id: { type: 'INTEGER'},
city: {
name:"city",
type:"RECORD",
mode: "nullable",
fields: {
id: {name:"id", type:"INTEGER" },
name: {name:"name", type:"STRING" },
country: { name:"country", type:"STRING" },
time: { name:"time", type:"TIMESTAMP" }
}
}
}

result = @bq.create_table('test123', schema)

assert_equal result['kind'], "bigquery#table"
assert_equal result['tableReference']['tableId'], "test123"
assert_equal result['schema']['fields'], [{"name"=>"id", "type"=>"INTEGER"}]
assert_equal result['schema']['fields'], [
{"name"=>"id", "type"=>"INTEGER"},
{
"name"=>"city",
"type"=>"RECORD",
"fields"=>[
{"name"=>"id", "type"=>"INTEGER"},
{"name"=>"name", "type"=>"STRING"},
{"name"=>"country", "type"=>"STRING"},
{"name"=>"time", "type"=>"TIMESTAMP"}
]
}
]
end

def test_for_delete_table
Expand Down Expand Up @@ -101,7 +128,7 @@ def test_for_insert_array
end

def test_for_insert_job
res = @bq.insert_job(query: {query: "SELECT * FROM [#{config['dataset']}.test] LIMIT 1"})
result = @bq.insert_job(query: {query: "SELECT * FROM [#{config['dataset']}.test] LIMIT 1"})

assert_equal result['kind'], "bigquery#job"
end
Expand Down