pg_query 0.3.2 → 0.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTg4NjYzYjRjY2ViODI5N2Q3ZDQ5MDFjNTI2MDMxZjMxOGUyMTRmNA==
-  data.tar.gz: !binary |-
-    MWY4ZDcyOTAzNTg4Y2MxNWQxM2FhN2VjYzMzNTdlOTM3ZTc1NDRlNA==
+SHA1:
+  metadata.gz: bb6aae73c537d8024ae4f667e21f83ada3e7d3a9
+  data.tar.gz: 3b5782a5498c6942bd854cc564150684373a34a2
 SHA512:
-  metadata.gz: !binary |-
-    MTA1MGNkNWFiOTgzMGZiYmIxNDk3YTZhZGJiMzI0MTZkOWNmYTlkMmU5ZmFi
-    ODZlZTc4NDdjMzY3YjdmYTc2MTUwMmEwMzI3NTgxMTdmYWUwMGFjYjMxYzk1
-    NDViYWNiMTJhZjI0N2RhMTc3MjRkNGQ5N2EzMmY4YzQ2M2E0Zjg=
-  data.tar.gz: !binary |-
-    OWMyY2JhMDExNjljYmE3ZmNmMmQzYmU1ZmQzZWQzOWM0NjRhNWU2YmI3ODUw
-    ZGFiZmUyYjJlZWJmMzc2N2Y4M2NmOTMyMjc2ZjEyN2E3NWNiOTgyNzJiZGQy
-    YjI4ZGFjYTU1MjcwMjJhNTc5NWJmNDM2YzQ4MGM1NmU1ZGYzMTM=
+  metadata.gz: c989c8be4d5c1047916dacbf810d106bacaf537177ed37f45c23da8ccaf098bab2ccf4838f8d9eadce096c8cf002392a0e13e57442af8f8ace3910dcd39435f7
+  data.tar.gz: ff83df2afe71e20accd4a2782697192110de4c220ba17f21d8dd139fe81d82ba5e0af9dbccd7d9b277a85a1156ad9c29fa80470a29f9c18ed6aca8c62facd220

data/ext/pg_query/extconf.rb

@@ -4,6 +4,26 @@ require 'open-uri'
 workdir = Dir.pwd
 pgdir = File.join(workdir, "postgres")
 
+# Limit the objects we build to speed up compilation times
+PG_OBJS = {
+  'backend/utils' => [
+    'mb/wchar.o', 'mb/encnames.o', 'mb/mbutils.o',
+    'mmgr/mcxt.o', 'mmgr/aset.o',
+    'error/elog.o', 'init/globals.o',
+    'adt/name.o' # namein
+  ],
+  'backend/parser' => [
+    'gram.o', 'parser.o', 'keywords.o', 'kwlookup.o', 'scansup.o'
+  ],
+  'backend/nodes' => [
+    'nodeFuncs.o', 'makefuncs.o', 'value.o', 'list.o', 'outfuncs_json.o'
+  ],
+  'backend/lib' => ['stringinfo.o'],
+  'port'        => ['qsort.o'],
+  'common'      => ['psprintf.o'],
+  'timezone'    => ['pgtz.o'],
+}
+
 # Download & compile PostgreSQL if we don't have it yet
 #
 # Note: We intentionally use a patched version that fixes bugs in outfuncs.c
@@ -17,16 +37,16 @@ if !Dir.exists?(pgdir)
   end
   system("unzip -q #{workdir}/postgres.zip -d #{workdir}") || raise("ERROR")
   system("mv #{workdir}/postgres-pg_query #{pgdir}") || raise("ERROR")
-  system("cd #{pgdir}; CFLAGS=-fPIC ./configure") || raise("ERROR")
-  system("cd #{pgdir}; make") || raise("ERROR")
+  system("cd #{pgdir}; CFLAGS=-fPIC ./configure -q") || raise("ERROR")
+  system("cd #{pgdir}; make -C src/backend lib-recursive") # Ensures headers are generated
+  PG_OBJS.each do |directory, objs|
+    system("cd #{pgdir}; make -C src/#{directory} #{objs.join(' ')}")  || raise("ERROR")
+  end
 end
 
-$objs = `find #{pgdir}/src/backend -name '*.o' | egrep -v '(main/main\.o|snowball|libpqwalreceiver|conversion_procs)' | xargs echo`
-$objs += " #{pgdir}/src/timezone/localtime.o #{pgdir}/src/timezone/strftime.o #{pgdir}/src/timezone/pgtz.o"
-$objs += " #{pgdir}/src/common/libpgcommon_srv.a #{pgdir}/src/port/libpgport_srv.a"
-$objs = $objs.split(" ")
-
+$objs = PG_OBJS.map { |directory, objs| objs.map { |obj| "#{pgdir}/src/#{directory}/#{obj}" } }.flatten
 $objs << File.join(File.dirname(__FILE__), "pg_query.o")
+$objs << File.join(File.dirname(__FILE__), "pg_polyfills.o")
 
 $CFLAGS << " -I #{pgdir}/src/include"
 

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 class PgQuery
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Lukas Fittl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 description: Parses SQL queries using a copy of the PostgreSQL server query parser
@@ -78,17 +78,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: PostgreSQL query parsing and normalization library