Fixed version function test case

Author: mpartel

Makefile

@@ -1,4 +1,6 @@
 
+# To release a new version, change these numbers and
+# run ./build-and-test.sh to update the test cases
 EXT_VERSION_MAJOR = 0
 EXT_VERSION_MINOR = 1
 EXT_VERSION_PATCHLEVEL = 1

expected/postgres_protobuf.out

@@ -5,7 +5,7 @@
 CREATE EXTENSION postgres_protobuf;
 SELECT protobuf_extension_version() AS result;
 result
-100
+101
 (1 row)
 INSERT INTO protobuf_file_descriptor_sets (name, file_descriptor_set) VALUES ('default', '\x0afb0c0a196d61696e5f64657363726970746f725f7365742e70726f746f1209706770622e7465737422f7070a0e4578616d706c654d657373616765122c0a077363616c61727318012001280b32122e706770622e746573742e5363616c61727352077363616c61727312250a0e72657065617465645f696e743332180220032805520d7265706561746564496e74333212270a0f72657065617465645f737472696e67180320032809520e7265706561746564537472696e67123c0a05696e6e657218042001280b32262e706770622e746573742e4578616d706c654d6573736167652e496e6e65724d6573736167655205696e6e6572124d0a0e72657065617465645f696e6e657218052003280b32262e706770622e746573742e4578616d706c654d6573736167652e496e6e65724d657373616765520d7265706561746564496e6e6572122a0a07616e5f656e756d18062001280e32112e706770622e746573742e416e456e756d5206616e456e756d124a0a0b6d61705f7374723273747218072003280b32292e706770622e746573742e4578616d706c654d6573736167652e4d617053747232737472456e747279520a6d617053747232737472124a0a0b6d61705f696e743273747218082003280b32292e706770622e746573742e4578616d706c654d6573736167652e4d6170496e7432737472456e747279520a6d6170496e7432737472124a0a0b6d61705f696e7432696e7418092003280b32292e706770622e746573742e4578616d706c654d6573736167652e4d6170496e7432696e74456e747279520a6d6170496e7432696e7412500a0d6d61705f73747232696e6e6572180a2003280b322b2e706770622e746573742e4578616d706c654d6573736167652e4d617053747232696e6e6572456e747279520c6d617053747232696e6e65721a3d0a0f4d617053747232737472456e74727912100a036b657918012001280952036b657912140a0576616c7565180220012809520576616c75653a0238011a3d0a0f4d6170496e7432737472456e74727912100a036b657918012001280552036b657912140a0576616c7565180220012809520576616c75653a0238011a3d0a0f4d6170496e7432696e74456e74727912100a036b657918012001280552036b657912140a0576616c7565180220012805520576616c75653a0238011a670a114d617053747232696e6e6572456e74727912100a036b657918012001280952036b6579123c0a0576616c756518022001280b32262e706770622e746573742e4578616d706c654d6573736167652e496e6e65724d657373616765520576616c75653a0238011a520a0c496e6e65724d657373616765121b0a09696e6e65725f7374721801200128095208696e6e657253747212250a0e696e6e65725f7265706561746564180220032809520d696e6e657252657065617465642296040a075363616c61727312210a0c646f75626c655f6669656c64180120012801520b646f75626c654669656c64121f0a0b666c6f61745f6669656c64180220012802520a666c6f61744669656c64121f0a0b696e7433325f6669656c64180320012805520a696e7433324669656c64121f0a0b696e7436345f6669656c64180420012803520a696e7436344669656c6412210a0c75696e7433325f6669656c6418052001280d520b75696e7433324669656c6412210a0c75696e7436345f6669656c64180620012804520b75696e7436344669656c6412210a0c73696e7433325f6669656c64180720012811520b73696e7433324669656c6412210a0c73696e7436345f6669656c64180820012812520b73696e7436344669656c6412230a0d666978656433325f6669656c64180920012807520c666978656433324669656c6412230a0d666978656436345f6669656c64180a20012806520c666978656436344669656c6412250a0e73666978656433325f6669656c64180b2001280f520d73666978656433324669656c6412250a0e73666978656436345f6669656c64180c20012810520d73666978656436344669656c64121d0a0a626f6f6c5f6669656c64180d200128085209626f6f6c4669656c6412210a0c737472696e675f6669656c64180e20012809520b737472696e674669656c64121f0a0b62797465735f6669656c64180f2001280c520a62797465734669656c642a380a06416e456e756d120e0a0a456e756d56616c7565301000120e0a0a456e756d56616c7565311001120e0a0a456e756d56616c7565321002620670726f746f33'::BYTEA);
 INSERT INTO protobuf_file_descriptor_sets (name, file_descriptor_set) VALUES ('other', '\x0a6f0a1a6f746865725f64657363726970746f725f7365742e70726f746f120f706770622e746573742e6f7468657222380a154d657373616765496e4f7468657244657363536574121f0a0b696e7433325f6669656c64180120012805520a696e7433324669656c64620670726f746f33'::BYTEA);

generate_test_cases.rb

@@ -98,11 +98,23 @@ def generate_preamble
     test_sql("--", nil)
     test_sql('\\pset format unaligned', nil)
     test_sql('CREATE EXTENSION postgres_protobuf;', nil)
-    test_sql('SELECT protobuf_extension_version() AS result;', ['100'])
+    generate_version_check
     test_sql("INSERT INTO protobuf_file_descriptor_sets (name, file_descriptor_set) VALUES ('default', #{descriptor_set_data_hex("main_descriptor_set")});", nil)
     test_sql("INSERT INTO protobuf_file_descriptor_sets (name, file_descriptor_set) VALUES ('other', #{descriptor_set_data_hex("other_descriptor_set")});", nil)
   end
 
+  def generate_version_check
+    makefile = File.read('Makefile')
+    makefile =~ /EXT_VERSION_MAJOR\s*=\s*(\d+)/ or raise "EXT_VERSION_MAJOR not found in makefile"
+    major = $1.to_i
+    makefile =~ /EXT_VERSION_MINOR\s*=\s*(\d+)/ or raise "EXT_VERSION_MINOR not found in makefile"
+    minor = $1.to_i
+    makefile =~ /EXT_VERSION_PATCHLEVEL\s*=\s*(\d+)/ or raise "EXT_VERSION_PATCHLEVEL not found in makefile"
+    patchlevel = $1.to_i
+    version = major * 10000 + minor * 100 + patchlevel
+    test_sql('SELECT protobuf_extension_version() AS result;', [version.to_s])
+  end
+
   def format_expected_results(expected_results)
     if expected_results != nil
       rows = expected_results.join("\n")